vmfloaty 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5a8aa5f96b46944ccf39b5218791ade53d56834
-  data.tar.gz: 5ba89a4493c1bbe5aa14caaecf58d992af59fdc2
+  metadata.gz: 7f2eaf3fd1178351347feaa7733d6742ac0f5dc9
+  data.tar.gz: b62b58f255127ad8b9566805f962b070c1f590fe
 SHA512:
-  metadata.gz: 46df128c9da17337d0c4880eedd3288d367b928134d3c931115d27801ddf22a776834926cd0c55896cba13b944915666fe4610f237b44efb179a8088313ca722
-  data.tar.gz: da0865befca262fcb10b32f05ea233a724f5b1c56bbd40f4b015ff455050b738900c6d7da55ac888eeb01dfc2a914f06d700819f58565e15ee4c9044961df733
+  metadata.gz: 15e588134c795f3014e09e980c0d84b22aa8e477404ecf8ebf74240ab03aa4290903e95dc528c4081fd8915f42e955c6ca84055122d84353a60dc62a69d2c830
+  data.tar.gz: 283f9468a507845eac92cd8f74d486aacc63fca9e3ffafc9b50a086660ffd9f1ec35dbfbda0aeb03c6bc857e2e9efad109e23eaa6beeebda8744ec742b3195a7

data/lib/vmfloaty.rb

@@ -113,21 +113,15 @@ class Vmfloaty
         if active
           # list active vms
           begin
-            status = Auth.token_status(verbose, url, token)
+            running_vms = Utils.get_all_token_vms(verbose, url, token)
           rescue TokenError => e
             STDERR.puts e
             exit 1
+          rescue Exception => e
+            STDERR.puts e
+            exit 1
           end
 
-          # 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?
             Utils.prettyprint_hosts(running_vms, verbose, url)
           end
@@ -167,6 +161,7 @@ class Vmfloaty
       c.option '--lifetime INT', Integer, 'VM TTL (Integer, in hours)'
       c.option '--disk INT', Integer, 'Increases VM disk space (Integer, in gb)'
       c.option '--tags STRING', String, 'free-form VM tagging (json)'
+      c.option '--all', 'Modifies all vms acquired by a token'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         url = options.url ||= config['url']
@@ -175,40 +170,106 @@ class Vmfloaty
         disk = options.disk
         tags = JSON.parse(options.tags) if options.tags
         token = options.token || config['token']
+        modify_all = options.all
 
-        if lifetime || tags
+        running_vms = nil
+
+        if modify_all
           begin
-            modify_req = Pooler.modify(verbose, url, hostname, token, lifetime, tags)
-          rescue TokenError => e
+            running_vms = Utils.get_all_token_vms(verbose, url, token)
+          rescue Exception => e
             STDERR.puts e
-            exit 1
           end
+        elsif hostname.include? ","
+          running_vms = hostname.split(",")
+        end
+
+        if lifetime || tags
+          # all vms
+          if !running_vms.nil?
+            begin
+              modify_hash = {}
+              modify_flag = true
+
+              running_vms.each do |vm|
+                modify_hash[vm] = Pooler.modify(verbose, url, vm, token, lifetime, tags)
+              end
 
-          if modify_req["ok"]
-            puts "Successfully modified vm #{hostname}."
+              modify_hash.each do |hostname,status|
+                if status == false
+                  STDERR.puts "Could not modify #{hostname}."
+                  modify_flag = false
+                end
+              end
+
+              if modify_flag
+                puts "Successfully modified all vms. Use `floaty list --active` to see the results."
+              end
+            rescue Exception => e
+              STDERR.puts e
+              exit 1
+            end
           else
-            STDERR.puts "Could not modify given host #{hostname} at #{url}."
-            puts modify_req
-            exit 1
+            # Single Vm
+            begin
+              modify_req = Pooler.modify(verbose, url, hostname, token, lifetime, tags)
+            rescue TokenError => e
+              STDERR.puts e
+              exit 1
+            end
+
+            if modify_req["ok"]
+              puts "Successfully modified vm #{hostname}."
+            else
+              STDERR.puts "Could not modify given host #{hostname} at #{url}."
+              puts modify_req
+              exit 1
+            end
           end
         end
 
         if disk
-          begin
-            disk_req = Pooler.disk(verbose, url, hostname, token, disk)
-          rescue TokenError => e
-            STDERR.puts e
-            exit 1
-          end
+          # all vms
+          if !running_vms.nil?
+            begin
+              modify_hash = {}
+              modify_flag = true
+
+              running_vms.each do |vm|
+                modify_hash[vm] = Pooler.disk(verbose, url, vm, token, disk)
+              end
 
-          if disk_req["ok"]
-            puts "Successfully updated disk space of vm #{hostname}."
+              modify_hash.each do |hostname,status|
+                if status == false
+                  STDERR.puts "Could not update disk space on #{hostname}."
+                  modify_flag = false
+                end
+              end
+
+              if modify_flag
+                puts "Successfully made request to update disk space on all vms."
+              end
+            rescue Exception => e
+              STDERR.puts e
+              exit 1
+            end
           else
-            STDERR.puts "Could not modify given host #{hostname} at #{url}."
-            puts disk_req
-            exit 1
+            # single vm
+            begin
+              disk_req = Pooler.disk(verbose, url, hostname, token, disk)
+            rescue TokenError => e
+              STDERR.puts e
+              exit 1
+            end
+
+            if disk_req["ok"]
+              puts "Successfully made request to update disk space of vm #{hostname}."
+            else
+              STDERR.puts "Could not modify given host #{hostname} at #{url}."
+              puts disk_req
+              exit 1
+            end
           end
-        else
         end
       end
     end
@@ -234,21 +295,15 @@ class Vmfloaty
         if delete_all
           # get vms with token
           begin
-            status = Auth.token_status(verbose, url, token)
+            running_vms = Utils.get_all_token_vms(verbose, url, token)
           rescue TokenError => e
             STDERR.puts e
             exit 1
+          rescue Exception => e
+            STDERR.puts e
+            exit 1
           end
 
-          # 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?
             Utils.prettyprint_hosts(running_vms, verbose, url)
             # query y/n
@@ -308,6 +363,7 @@ class Vmfloaty
           exit 1
         end
 
+        puts "Snapshot pending. Use `floaty query host` to determine when snapshot is valid."
         pp snapshot_req
       end
     end

data/lib/vmfloaty/utils.rb

@@ -79,4 +79,17 @@ class Utils
       puts "- #{vm}.#{domain} (#{metadata.join(", ")})"
     end
   end
+
+  def self.get_all_token_vms(verbose, url, token)
+    # get vms with token
+    status = Auth.token_status(verbose, url, token)
+
+    vms = status[token]['vms']
+    if vms.nil?
+      raise "You have no running vms"
+    end
+
+    running_vms = vms['running']
+    running_vms
+  end
 end

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.7.1'
+  @version = '0.7.2'
 
   def self.get
     @version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander