floatyhelper 1.2 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ee4302416a75ac2d3833651e42e48a78bec672c2b01b71a443c1a757c965ed
-  data.tar.gz: 03a74f9eb941e32c7d594ecfcb7e618b6de61dc6e14ca26bf5218dd996afba99
+  metadata.gz: b9107871b6337de1b4508247eebc2f59e1250e5ed7b61a4ee358f3e7d920e5e5
+  data.tar.gz: d346fccc76b850c599d9ab7bef16e2a5eebb51897482158e273d45c7082bb9fa
 SHA512:
-  metadata.gz: 1fe09821098beea2bb66b3e0629f531728dda29c7da57fe053946ce248bd84df25fc5ff704feaa0e69241320cbbe02fd0f2b30aa476cccc53abe5fcefd56b5ce
-  data.tar.gz: 025641c3d7e9515258e4e370d4fb598cc6fb4998edd859549981e3214b0aae3d8cfed1f9e12d3cbcece725bd5f15c736635b416755e69d93ae9e26eeffe00d18
+  metadata.gz: 23e2932ddc4a3f11edbd8cff698420d83f3e41c9e0e13b92b8391e6eb474cfe5078958542e4b572a9f99728ed2a7fe6832fba17d9f3958d744da153cfb537832
+  data.tar.gz: 1600273e214fb4abf841f64150ccaf393e14088e312e3147af8adb9c2634e4ce4c3642c0974470e03bf96a37147657d7750a5e7ae44940a38fe8bb0b0445747e

data/lib/floatyhelper.rb

@@ -15,7 +15,7 @@ class Floatyhelper
   def run
     program :name, 'floatyhelper'
     program :version, '1.0.0'
-    program :description, <<-EOT
+    program :description, <<~EOT
     Commands for manipulating vmpooler VMs with floaty. Use the addhosts command from within a pe_acceptance_tests folder
     that has recently finished a run to add those hosts to the list of hosts managed by floatyhelper (or specify a sut.log
     file directly).
@@ -38,24 +38,31 @@ class Floatyhelper
     end
 
     command :list do |c|
-      c.syntax = 'floatyhelper list'
+      c.syntax = 'floatyhelper list [tag]'
       c.summary = 'List all VMs and their associated tags'
-      c.description = 'This lists all VMs currently defined in the status.yaml file, added via the addhosts command, and their associated tags.'
+      c.description = <<~EOT
+      This lists all VMs currently defined in the status.yaml file, added via the addhosts command, and their associated tags.
+      If a tag is specified, it will only lists the hosts in that tag.
+      EOT
       c.option '--check', 'Check remaining lifetime of each VM'
       c.action do |args, options|
         data = Conf.load_data
         if data['vms'].keys.length == 0
           puts 'No VM groups are defined'.yellow
         else
+          requested_tag = args.count > 0 ? args[0] : nil
           data['vms'].each do |tag, hosts|
+            next if requested_tag && requested_tag != tag
             puts "#{tag}:"
             hosts.each do |host|
               remaining = ''
+              type = ''
               if options.check
                 query = VM.query(host)
+                type = query[host]['template'].gsub('-pixa4','')
                 remaining = VM.alive(host, query) ? "#{query[host]['remaining']} hours remaining" : "Expired"
               end
-              puts "  %-15s  %s" % [host, remaining]
+              puts "  %-15s  %-28s  %s" % [host, type, remaining]
             end
           end
         end
@@ -63,11 +70,14 @@ class Floatyhelper
     end
 
     command :check do |c|
-      c.syntax = 'floatyhelper check'
+      c.syntax = 'floatyhelper check [tag]'
       c.summary = 'Checks the remaining lifetime of each tracked VM.'
-      c.description = 'Same as floatyhelper list --check. Checks the remaining lifetime of each tracked VM.'
+      c.description = <<~EOT
+      Same as floatyhelper list --check. Checks the remaining lifetime of each tracked VM.
+      If a tag is specified, it will only check hosts in that tag.
+      EOT
       c.action do |args, options|
-        command(:list).run('--check')
+        command(:list).run(*args,'--check')
       end
     end
 
@@ -261,6 +271,7 @@ class Floatyhelper
       c.syntax = 'floatyhelper snapshot <host|tag> <snaptag>'
       c.summary = 'Snapshot the given VM or group of taggedhosts'
       c.description = 'Creates a snapshot of a host or group of tagged hosts, and defines a string to use as a "snaptag" to refer to this group of snapshots.'
+      c.option '--clr', 'Clear screen and show VMs in a column when checking status, rather than a single line.'
       c.action do |args, options|
         if args.length < 2
           puts "Please specify both a host/tag and a snaptag"
@@ -269,7 +280,7 @@ class Floatyhelper
             answer = ask "Snaptag #{args[1]} already exists. Are you sure you want to overwrite? [y/N] ".yellow
             return unless answer.capitalize == 'Y'
           end
-          VM.snapshot(args[0], args[1])
+          VM.snapshot(args[0], args[1], options.clr)
         end
       end
     end

data/lib/floatyhelper/version.rb

@@ -1,3 +1,3 @@
 module Floatyhelper
-  VERSION = "1.2"
+  VERSION = "1.4"
 end

data/lib/floatyhelper/vm.rb

@@ -40,7 +40,7 @@ class VM
     end
   end
 
-  def self.snapshot(id, snaptag)
+  def self.snapshot(id, snaptag, clr=false)
     snaptag = 'Blank Snaptag' unless snaptag
     hosts = Hosts.get_hosts_from_id(id)
     shas = {}
@@ -54,27 +54,30 @@ class VM
       shas[host] = sha
     end
 
+    data = Conf.load_data
+    data['snapshots'] ||= {}
+    data['snapshots'][id] ||= {}
+    data['snapshots'][id][snaptag] = shas
+    Conf.write_data(data)
+
+    puts `tput clear` if clr
     puts 'Waiting for snapshots to appear in floaty query...'
     alldone = false
     while !alldone do
+      puts `tput cup 1` if clr
       alldone = true
-      print "\r"
+      print "\r" unless clr
       hosts.each do |host|
         answer = eval(`floaty query #{host}`)[host]
         done = answer.keys.include?('snapshots') && answer['snapshots'].include?(shas[host])
         status = done ? 'Done' : 'Wait'
-        print "* #{host}: #{status} *"
+        print "* #{host}: #{status} *" unless clr
+        puts "* #{host}: #{status} *" if clr
         alldone &= done
       end
       sleep(1)
     end
     puts ''
-
-    data = Conf.load_data
-    data['snapshots'] ||= {}
-    data['snapshots'][id] ||= {}
-    data['snapshots'][id][snaptag] = shas
-    Conf.write_data(data)
   end
 
   def self.getsnapshot(id, snaptag)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floatyhelper
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.4'
 platform: ruby
 authors:
 - Nick Burgan-Illig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler