floatyhelper 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15888ba1cfc729b4e52f5a0dd5c33e3c7873439e8c6c5422509c17ac264d0878
-  data.tar.gz: bae08f4e75b2530ba10d9a028f2346a3c89e5706015fea4258e8f1fd118e2bb6
+  metadata.gz: 3ec4a8e272838f94aa48d2917739aa2c57396f25e9e156e12f98e6e210732b5c
+  data.tar.gz: 1af47c81157071dc4d72bcf48d62a726cb71f43c888048dab878b4ef6e1d93af
 SHA512:
-  metadata.gz: 888ebc61101ac904f1893d3698edf7adbfc41d31b34c722dbe3a21ac8c9aa538db6711f1485f2297251527787fbb4e13fb5bf1ae066cbe676ba461ac1c360743
-  data.tar.gz: 36a956a699d35d51e7af96d6a646392dfb4871605194a924a7843031742b390da071ffdc5df147c7752eb2741473c7be9a146a2d702477b36ac070bd53c3935d
+  metadata.gz: 64d4f6adfd316a906db6a196afced6649892c03a119bb76d73367d0684122ae4fe7c52854ad497d254e4d7622a78eab58dcf690b4675a72b6e2cda1f2a95327e
+  data.tar.gz: 3f2f6b0bb5066b5b9a17f39c412160906da339a2d53b3792bb177e0a1edc94aca50689b297ad940cb88a29a4a8acbbffc2c52bb792376afb0d24079a8e913e8d

data/lib/floatyhelper.rb

@@ -41,7 +41,7 @@ class Floatyhelper
       c.syntax = 'floatyhelper list'
       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.option '--nocheck', 'Do not check remaining lifetime of each VM'
+      c.option '--check', 'Check remaining lifetime of each VM'
       c.action do |args, options|
         data = Conf.load_data
         if data['vms'].keys.length == 0
@@ -51,11 +51,11 @@ class Floatyhelper
             puts "#{tag}:"
             hosts.each do |host|
               remaining = ''
-              unless options.nocheck
+              if options.check
                 query = VM.query(host)
                 remaining = VM.alive(host, query) ? "#{query[host]['remaining']} hours remaining" : "Expired"
               end
-              puts "  #{host}\t#{remaining}"
+              puts "  %-15s  %s" % [host, remaining]
             end
           end
         end
@@ -274,20 +274,25 @@ class Floatyhelper
         data = Conf.load_data
         expired = false
         data['vms'].each do |tag, hosts|
-          is_alive = false
+          expired_hosts = []
           hosts.each do |host|
-            is_alive |= VM.alive(host)
+            expired_hosts << host unless VM.alive(host)
           end
-          unless is_alive
+          unless expired_hosts.empty?
             expired = true
-            if options.y
-              answer = 'y'
+            if expired_hosts & hosts == hosts
+              answer = options.y ? 'y' : ask("All hosts in tag #{tag} have expired. Delete this tag? [Y/n] ".yellow)
+              if answer.empty? || answer.capitalize == 'Y'
+                Groups.delete_tag(tag) 
+                puts "Tag #{tag} deleted".green
+              end
             else
-              answer = ask "All hosts in tag #{tag} have expired. Delete this tag? [Y/n] ".yellow
-            end
-            if answer.empty? || answer.capitalize == 'Y'
-              Groups.delete_tag(tag) 
-              puts "Tag #{tag} deleted".green
+              expired_hosts.each { |host| puts "#{host}".yellow } unless options.y
+              answer = options.y ? 'y' : ask("The above hosts in tag #{tag} have expired. Delete these hosts from the tag? [Y/n]".yellow)
+              if answer.empty? || answer.capitalize == 'Y'
+                Groups.removehosts(expired_hosts, tag)
+                puts "Expired hosts from #{tag} deleted".green
+              end
             end
           end
         end

data/lib/floatyhelper/version.rb

@@ -1,3 +1,3 @@
 module Floatyhelper
-  VERSION = "1.0"
+  VERSION = "1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floatyhelper
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Nick Burgan-Illig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler