diff --git a/lib/vmfloaty.rb b/lib/vmfloaty.rb index 835b2cf..f0bb761 100644 --- a/lib/vmfloaty.rb +++ b/lib/vmfloaty.rb @@ -280,12 +280,15 @@ class Vmfloaty case action when "get" pass = password "Enter your password please:", '*' - puts Auth.get_token(verbose, url, user, pass) + token = Auth.get_token(verbose, url, user, pass) + puts token when "delete" pass = password "Enter your password please:", '*' - Auth.delete_token(verbose, url, user, pass, token) + result = Auth.delete_token(verbose, url, user, pass, token) + puts result when "status" - puts Auth.token_status(verbose, url, token) + status = Auth.token_status(verbose, url, token) + puts status when nil STDERR.puts "No action provided" else diff --git a/lib/vmfloaty/auth.rb b/lib/vmfloaty/auth.rb index 7c823e5..a973ae1 100644 --- a/lib/vmfloaty/auth.rb +++ b/lib/vmfloaty/auth.rb @@ -29,7 +29,7 @@ class Auth response = conn.delete "/token/#{token}" res_body = JSON.parse(response.body) if res_body["ok"] - puts res_body + return res_body else STDERR.puts "There was a problem with your request:" puts res_body @@ -49,7 +49,7 @@ class Auth res_body = JSON.parse(response.body) if res_body["ok"] - res_body + return res_body else STDERR.puts "There was a problem with your request:" puts res_body diff --git a/spec/vmfloaty/auth_spec.rb b/spec/vmfloaty/auth_spec.rb index b30a3ad..05af433 100644 --- a/spec/vmfloaty/auth_spec.rb +++ b/spec/vmfloaty/auth_spec.rb @@ -33,7 +33,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'}). to_return(:status => 200, :body => @delete_token_response, :headers => {}) - #expect(Auth.delete_token(false, @vmpooler_url, "first.last", "password", @token)).to eq @delete_token_response + expect(Auth.delete_token(false, @vmpooler_url, "first.last", "password", @token)).to eq JSON.parse(@delete_token_response) end end