diff --git a/lib/vmfloaty.rb b/lib/vmfloaty.rb index 28923ce..3441c64 100644 --- a/lib/vmfloaty.rb +++ b/lib/vmfloaty.rb @@ -144,10 +144,16 @@ class Vmfloaty c.option '--url STRING', String, 'URL of vmpooler' c.action do |args, options| verbose = options.verbose || config['verbose'] - hosts = args[0] + hostnames = args[0] token = options.token || config['token'] url = options.url ||= config['url'] + if hostnames.nil? + STDERR.puts "You did not provide any hosts to delete" + exit 1 + end + + hosts = hostnames.split(',') Pooler.delete(verbose, url, hosts, token) end end diff --git a/lib/vmfloaty/pooler.rb b/lib/vmfloaty/pooler.rb index 7efa321..04d670c 100644 --- a/lib/vmfloaty/pooler.rb +++ b/lib/vmfloaty/pooler.rb @@ -71,13 +71,7 @@ class Pooler res_body end - def self.delete(verbose, url, hostnames, token) - if hostnames.nil? - STDERR.puts "You did not provide any hosts to delete" - exit 1 - end - - hosts = hostnames.split(',') + def self.delete(verbose, url, hosts, token) conn = Http.get_conn(verbose, url) if token diff --git a/spec/vmfloaty/pooler_spec.rb b/spec/vmfloaty/pooler_spec.rb index 9d46a80..52c7a16 100644 --- a/spec/vmfloaty/pooler_spec.rb +++ b/spec/vmfloaty/pooler_spec.rb @@ -101,7 +101,7 @@ describe Pooler do with(:headers => {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Faraday v0.9.1', 'X-Auth-Token'=>'mytokenfile'}). to_return(:status => 200, :body => @delete_response_body_success, :headers => {}) - #expect(Pooler.delete(false, @vmpooler_url, 'fq6qlpjlsskycq6', 'mytokenfile')).to output(/Scheduling host fq6qlpjlsskycq6 for deletion/).to_stdout + #expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile')).to output(/Scheduling host fq6qlpjlsskycq6 for deletion/).to_stdout end end