vmfloaty 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d229737ed9cb959ec725227d7c344ad56c1af7fcd7a53a59502fdb5bf7c0c696
-  data.tar.gz: 4625d46bc08dc61e806beff43237adac120d509ae704c437b47d56a4ef5413bf
+  metadata.gz: 3250656d33ed86eadaeded7da8f91b1c320f38ee9e8637d657273b43dab897f4
+  data.tar.gz: 1b78092a62379ee36ce7c78dc52a0f7920366dc15e3795edc4c2be3a33a53f15
 SHA512:
-  metadata.gz: 8763f1c3849bfa0ab7ad2f45cae9737ab16c4f96c7aa9ff9545126979bc7ab611cc40db1c5ace88d812a1dc7004eafa8b27210df92cbe316aff07480db9fe80a
-  data.tar.gz: eb5691d5fc84dc667abb0609c6ed9ce1222838e07cc3a5818c5d7294c888e869d28b8fd89300787e4691cfbf691b12356d01c2528d6c2235d832e7245b220dc3
+  metadata.gz: 3f0bab1c9aeda1ecc76b0246faac85267528ae2cc9708bf9ca430134e1535af701d565be9a1a4f32566d4d07d21d6a02e73d4d9f3188183206a6bbcb1274796d
+  data.tar.gz: 020e1ffbc61da0d7784e453229e82c737939ff864d0c9a7a36d4ed563827a01a2328681d5832a808f0dd0613e26fd4f07b81f9769df3be72a5dd85111cd4505f

data/lib/vmfloaty/utils.rb

@@ -130,8 +130,13 @@ class Utils
         tag_pairs = []
         tag_pairs = host_data['tags'].map { |key, value| "#{key}: #{value}" } unless host_data['tags'].nil?
         duration = "#{host_data['running']}/#{host_data['lifetime']} hours"
-        metadata = [host_data['template'], duration, *tag_pairs]
-        output_target.puts "- #{hostname}.#{host_data['domain']} (#{metadata.join(', ')})".gsub(/^/, ' ' * indent)
+        metadata = [host_data['state'], host_data['template'], duration, *tag_pairs]
+        message = "- #{hostname}.#{host_data['domain']} (#{metadata.join(', ')})".gsub(/^/, ' ' * indent)
+        if host_data['state'] && host_data['state'] == "destroyed"
+          output_target.puts message.colorize(:red)
+        else
+          output_target.puts message
+        end
       when 'NonstandardPooler'
         line = "- #{host_data['fqdn']} (#{host_data['os_triple']}"
         line += ", #{host_data['hours_left_on_reservation']}h remaining"

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class Vmfloaty
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end
 

data/spec/vmfloaty/utils_spec.rb

@@ -283,7 +283,7 @@ describe Utils do
         }
       end
 
-      let(:default_output) { "- #{fqdn} (ubuntu-1604-x86_64, 9.66/12 hours)" }
+      let(:default_output) { "- #{fqdn} (running, ubuntu-1604-x86_64, 9.66/12 hours)" }
 
       it 'prints output with host fqdn, template and duration info' do
         expect(STDOUT).to receive(:puts).with(default_output)
@@ -311,7 +311,7 @@ describe Utils do
         end
 
         it 'prints output with host fqdn, template, duration info, and tags' do
-          output = "- #{fqdn} (redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)"
+          output = "- #{fqdn} (running, redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)"
 
           expect(STDOUT).to receive(:puts).with(output)
 
@@ -458,13 +458,24 @@ describe Utils do
       it 'prints more information when vmpooler_fallback is set output with job id, host, template, lifetime, user and role' do
         fallback = {'vmpooler_fallback' => 'vmpooler'}
         service.config.merge! fallback
-        default_output_second_line="  - #{fqdn} (#{template}, 7.67/48 hours, user: bob, role: agent)"
+        default_output_second_line="  - #{fqdn} (running, #{template}, 7.67/48 hours, user: bob, role: agent)"
         expect(STDOUT).to receive(:puts).with(default_output_first_line)
         expect(STDOUT).to receive(:puts).with(default_output_second_line)
 
         subject
       end
 
+      it 'prints in red when destroyed' do
+        fallback = {'vmpooler_fallback' => 'vmpooler'}
+        service.config.merge! fallback
+        response_body_vmpooler[fqdn_hostname]['state'] = "destroyed"
+        default_output_second_line_red="  - #{fqdn} (destroyed, #{template}, 7.67/48 hours, user: bob, role: agent)".red
+        expect(STDOUT).to receive(:puts).with(default_output_first_line)
+        expect(STDOUT).to receive(:puts).with(default_output_second_line_red)
+
+        subject
+      end
+
       context 'when print_to_stderr option is true' do
         let(:print_to_stderr) { true }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Brian Cain
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize