vmfloaty 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24b1f8db9ba5d7741f7364868c17976f779cf28
-  data.tar.gz: 3ac32fe7709e6e8a2ba39b32aaa503ce92e0e5ab
+  metadata.gz: cf2985c45b997c54451e9d295f228d064f385c78
+  data.tar.gz: 1b94780071b7258f34fda134c720b468fd8e909c
 SHA512:
-  metadata.gz: 67f4beb31fc6fb3b2880177a301648cd431b4d79097d4a2aa4b74211b7446cf146338dafffb425d5feb7b5d34048dd1d557e36f677e82ecdd26576a466c1d2fe
-  data.tar.gz: 63e69b768a855e37d845f7aca4f6221734e1cedeffa63f89453d4ee68da52f65e00dfd5fd553e50b8264dc81240630dbebd5f1e54494800421c910e469e01f52
+  metadata.gz: 8e41473307c941b2aa4078457110036a35743a896ec26c658c431ee9edc7b3356c716aa6e0b282352056a291c2b557179f0f1931fe3f6180e16d48644abdbc32
+  data.tar.gz: 31d3f725a8551c259134eb250ec7f148edb69320e12276775cb1d57e12f87ba5fa0a40fd62899c9c8886fcb4c1f7d5025fd4edb8aea3c63005432b563af18c08

data/lib/vmfloaty.rb

@@ -140,14 +140,51 @@ class Vmfloaty
       c.description = ''
       c.example 'Schedules the deletion of a host or hosts', 'floaty delete myhost1,myhost2 --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
+      c.option '--all', 'Deletes all vms acquired by a token'
       c.option '--token STRING', String, 'Token for vmpooler'
       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']
+        delete_all = options.all
 
+        if delete_all
+          # get vms with token
+          status = Auth.token_status(verbose, url, token)
+          # print vms
+          vms = status[token]['vms']
+          if vms.nil?
+            STDERR.puts "You have no running vms"
+            exit 0
+          end
+
+          running_vms = vms['running']
+
+          if ! running_vms.nil?
+            puts "Running VMs:"
+            running_vms.each do |vm|
+              puts "- #{vm}"
+            end
+            # query y/n
+            puts ""
+            ans = agree("Delete all VMs associated with token #{token}? [y/N]")
+            if ans
+              # delete vms
+              Pooler.delete(verbose, url, running_vms, token)
+            end
+          end
+
+          exit 0
+        end
+
+        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
@@ -248,7 +285,7 @@ class Vmfloaty
           pass = password "Enter your password please:", '*'
           Auth.delete_token(verbose, url, user, pass, token)
         when "status"
-          Auth.token_status(verbose, url, token)
+          puts Auth.token_status(verbose, url, token)
         when nil
           STDERR.puts "No action provided"
         else

data/lib/vmfloaty/auth.rb

@@ -49,7 +49,7 @@ class Auth
     res_body = JSON.parse(response.body)
 
     if res_body["ok"]
-      puts res_body
+      res_body
     else
       STDERR.puts "There was a problem with your request:"
       puts res_body

data/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

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.2.14'
+  @version = '0.2.15'
 
   def self.get
     @version

data/spec/vmfloaty/auth_spec.rb

@@ -48,7 +48,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 => @token_status_response, :headers => {})
 
-      expect(Auth.token_status(false, @vmpooler_url, @token)).to eq @get_token_response
+      expect(Auth.token_status(false, @vmpooler_url, @token)).to eq JSON.parse(@token_status_response)
     end
   end
 end

data/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander