From e8f420a08ce1adc59b7d158986e1706041789bf3 Mon Sep 17 00:00:00 2001 From: Tim Sharpe Date: Sun, 3 Feb 2019 12:46:15 +1100 Subject: [PATCH] (rubocop) Fix Layout/EmptyLineAfterGuardClause --- lib/vmfloaty/auth.rb | 3 +++ lib/vmfloaty/ssh.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/lib/vmfloaty/auth.rb b/lib/vmfloaty/auth.rb index a1fdd60..dcf06c0 100644 --- a/lib/vmfloaty/auth.rb +++ b/lib/vmfloaty/auth.rb @@ -13,6 +13,7 @@ class Auth res_body = JSON.parse(resp.body) return res_body['token'] if res_body['ok'] + raise TokenError, "HTTP #{resp.status}: There was a problem requesting a token:\n#{res_body}" end @@ -24,6 +25,7 @@ class Auth response = conn.delete "token/#{token}" res_body = JSON.parse(response.body) return res_body if res_body['ok'] + raise TokenError, "HTTP #{response.status}: There was a problem deleting a token:\n#{res_body}" end @@ -36,6 +38,7 @@ class Auth res_body = JSON.parse(response.body) return res_body if res_body['ok'] + raise TokenError, "HTTP #{response.status}: There was a problem getting the status of a token:\n#{res_body}" end end diff --git a/lib/vmfloaty/ssh.rb b/lib/vmfloaty/ssh.rb index 0b3f9bb..5de4313 100644 --- a/lib/vmfloaty/ssh.rb +++ b/lib/vmfloaty/ssh.rb @@ -17,11 +17,13 @@ class Ssh def self.ssh(verbose, host_os, token, url) ssh_path = which('ssh') raise 'Could not determine path to ssh' unless ssh_path + os_types = {} os_types[host_os] = 1 response = Pooler.retrieve(verbose, os_types, token, url) raise "Could not get vm from vmpooler:\n #{response}" unless response['ok'] + user = host_os =~ /win/ ? 'Administrator' : 'root' hostname = "#{response[host_os]['hostname']}.#{response['domain']}"