vmfloaty 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1ad61f6bedb9c15e1b21bc4f2dd15318cf9303
-  data.tar.gz: ab8a768ccf3e445dec61240b1e03ea50f2f14958
+  metadata.gz: b8849ed21080f1589fd4f70e59c9f1ce14fcf914
+  data.tar.gz: 5db00fc0a141cab894f92322a271fe6245774264
 SHA512:
-  metadata.gz: 5ed7675e01385ec0b5d1339fc5a5d3392ef28b5eae58ebd8cc26f9f4956e2679d0fc9af3267f58482cbf6b92acd5ecc1d0db8d1441e85be1141037fe9d23e0f3
-  data.tar.gz: 2bbbc795099999f7c0a076d748f42f7f757842822f15a7217892dbe68e2046fbb7847c79a9f62470498783042d915d92839c7801130af0914903835c0dd96cc2
+  metadata.gz: d5048f063419586c37e31a41bc2b1a747afc0e42125c9ddcd2abacb8eaeb2e01a7b9efa6ba672bb6591f3f740712d2c32a938cd4afa57c47166202486e43b3b1
+  data.tar.gz: 2a0bdc61b773e2d3797defe336dda52f0f42c7e949c80c89a8ff2c51691f50351d9a713ac909ad3f6ed00b5a7eea329c6bcf65b2470602252875a1aa8b870243

data/lib/vmfloaty.rb

@@ -22,7 +22,7 @@ class Vmfloaty
       c.syntax = 'floaty get os_type1=x ox_type2=y ...'
       c.summary = 'Gets a vm or vms based on the os flag'
       c.description = ''
-      c.example 'Gets 3 vms', 'floaty get centos=3 debian --user brian --url http://vmpooler.example.com'
+      c.example 'Gets a few vms', 'floaty get centos=3 debian --user brian --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--user STRING', String, 'User to authenticate with'
       c.option '--url STRING', String, 'URL of vmpooler'
@@ -73,14 +73,36 @@ class Vmfloaty
       c.description = ''
       c.example 'Filter the list on centos', 'floaty list centos --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
+      c.option '--active', 'Prints information about active vms for a given 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']
         filter = args[0]
         url = options.url ||= config['url']
+        token = options.token || config['token']
+        active = options.active
+
+        if active
+          # list active vms
+          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']
 
-        os_list = Pooler.list(verbose, url, filter)
-        puts os_list
+          if ! running_vms.nil?
+            Utils.prettyprint_hosts(running_vms, verbose, url)
+          end
+        else
+          # list available vms from pooler
+          os_list = Pooler.list(verbose, url, filter)
+          puts os_list
+        end
       end
     end
 
@@ -159,7 +181,7 @@ class Vmfloaty
           running_vms = vms['running']
 
           if ! running_vms.nil?
-            Utils.prettyprint_hosts(running_vms)
+            Utils.prettyprint_hosts(running_vms, verbose, url)
             # query y/n
             puts ""
             ans = agree("Delete all VMs associated with token #{token}? [y/N]")

data/lib/vmfloaty/utils.rb

@@ -41,10 +41,18 @@ class Utils
     os_types
   end
 
-  def self.prettyprint_hosts(hosts)
+  def self.prettyprint_hosts(hosts, verbose, url)
     puts "Running VMs:"
     hosts.each do |vm|
-      puts "- #{vm}"
+      vm_info = Pooler.query(verbose, url, vm)
+      if vm_info['ok']
+        domain = vm_info[vm]['domain']
+        template = vm_info[vm]['template']
+        lifetime = vm_info[vm]['lifetime']
+        running = vm_info[vm]['running']
+
+        puts "- #{vm}.#{domain} (#{template}, #{running}/#{lifetime} hours)"
+      end
     end
   end
 end

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.2.16'
+  @version = '0.2.17'
 
   def self.get
     @version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Brian Cain