From 5f6cd1df1d2b3ebf0b6590755b83a40f6d2176c3 Mon Sep 17 00:00:00 2001
From: Brian Cain <brian.cain@puppetlabs.com>
Date: Sat, 9 Jul 2016 19:53:12 -0700
Subject: [PATCH] (#25) Remove printing from delete method in pooler api

---
 lib/vmfloaty.rb              |  9 ++++++++-
 lib/vmfloaty/pooler.rb       | 12 +++++-------
 lib/vmfloaty/version.rb      |  2 +-
 spec/vmfloaty/pooler_spec.rb |  3 ++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/vmfloaty.rb b/lib/vmfloaty.rb
index 31137e8..1ac1ad7 100644
--- a/lib/vmfloaty.rb
+++ b/lib/vmfloaty.rb
@@ -212,7 +212,14 @@ class Vmfloaty
 
             if ans
               # delete vms
-              Pooler.delete(verbose, url, running_vms, token)
+              puts "Scheduling all vms for for deletion"
+              response = Pooler.delete(verbose, url, running_vms, token)
+              response.each do |host,vals|
+                if vals['ok'] == false
+                  STDERR.puts "There was a problem with your request for vm #{host}."
+                  STDERR.puts vals
+                end
+              end
             end
           end
 
diff --git a/lib/vmfloaty/pooler.rb b/lib/vmfloaty/pooler.rb
index acc42f2..c6e2d4e 100644
--- a/lib/vmfloaty/pooler.rb
+++ b/lib/vmfloaty/pooler.rb
@@ -85,17 +85,15 @@ class Pooler
       conn.headers['X-AUTH-TOKEN'] = token
     end
 
+    response_body = {}
+
     hosts.each do |host|
-      puts "Scheduling host #{host} for deletion"
       response = conn.delete "vm/#{host}"
       res_body = JSON.parse(response.body)
-      if res_body['ok']
-        puts "Deletion for vm #{host} successfully scheduled"
-      else
-        STDERR.puts "There was a problem with your request for vm #{host}."
-        STDERR.puts res_body
-      end
+      response_body[host] = res_body
     end
+
+    response_body
   end
 
   def self.status(verbose, url)
diff --git a/lib/vmfloaty/version.rb b/lib/vmfloaty/version.rb
index 212c710..afbc3a8 100644
--- a/lib/vmfloaty/version.rb
+++ b/lib/vmfloaty/version.rb
@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.4.0'
+  @version = '0.5.0'
 
   def self.get
     @version
diff --git a/spec/vmfloaty/pooler_spec.rb b/spec/vmfloaty/pooler_spec.rb
index 52c7a16..9e73a71 100644
--- a/spec/vmfloaty/pooler_spec.rb
+++ b/spec/vmfloaty/pooler_spec.rb
@@ -94,6 +94,7 @@ describe Pooler do
   describe "#delete" do
     before :each do
       @delete_response_body_success = "{\"ok\":true}"
+      @delete_response = {"fq6qlpjlsskycq6"=>{"ok"=>true}}
     end
 
     it "deletes a specified vm" do
@@ -101,7 +102,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 eq @delete_response
     end
   end