diff --git a/lib/vmfloaty/pooler.rb b/lib/vmfloaty/pooler.rb index 023f971..8695fb4 100644 --- a/lib/vmfloaty/pooler.rb +++ b/lib/vmfloaty/pooler.rb @@ -12,11 +12,11 @@ class Pooler response = conn.get 'vm' response_body = JSON.parse(response.body) - if os_filter - hosts = response_body.select { |i| i[/#{os_filter}/] } - else - hosts = response_body - end + hosts = if os_filter + response_body.select { |i| i[/#{os_filter}/] } + else + response_body + end hosts end diff --git a/lib/vmfloaty/ssh.rb b/lib/vmfloaty/ssh.rb index 4e25965..bf9cb76 100644 --- a/lib/vmfloaty/ssh.rb +++ b/lib/vmfloaty/ssh.rb @@ -23,11 +23,7 @@ class Ssh response = Pooler.retrieve(verbose, os_types, token, url) if response['ok'] == true - if host_os =~ /win/ - user = 'Administrator' - else - user = 'root' - end + user = host_os =~ /win/ ? 'Administrator' : 'root' hostname = "#{response[host_os]['hostname']}.#{response['domain']}" cmd = "#{ssh_path} #{user}@#{hostname}"