vmfloaty 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e22ca01b2db81f1c9fcc0332a6ad701eddb36566
-  data.tar.gz: 7656dd21e3e635bfbb80c88e251629fb6b3938fa
+  metadata.gz: 84071f80697d4710056550214dddb804ffa5dc16
+  data.tar.gz: 81ca1c10c49c0ec05558f12b57aec85858c4a1f7
 SHA512:
-  metadata.gz: 771a0f09058b031084f92ed1b12ab0d6836cfec45900bf131e6cfb4046553d9ae437b31bcd2d7e8e1acf7254a417cce7b4dcaecb113fd7a961c06b1eb6e2f2ac
-  data.tar.gz: 78eb6e29cc49eadd4a505e4c90423926698058fc825b1a961246519c8f16772953826a8bb99fa64eb6285595e8f4e767eec11ee004795f6f985ed3b17376b593
+  metadata.gz: 6dc3b64f3a23ec41378d85d239aafc4c6281082045e121c6267ca4e48c81da984151a29d21a4210b0d7d6c8c5c2c51f08d55dacf96c0e1fe8b1c76ecc61056d0
+  data.tar.gz: 93265ea14f9c3b576be432fb9561e680f7f0eceba10d08e97eaf5a9b8de22b3a801d899798e869ebe50e1fab88c74ee5818ed3bd185ef54757b683e357b7c5e7

data/lib/vmfloaty/utils.rb

@@ -51,6 +51,7 @@ class Utils
         vms[host]['template'] = vm_info[host]['template']
         vms[host]['lifetime'] = vm_info[host]['lifetime']
         vms[host]['running'] = vm_info[host]['running']
+        vms[host]['tags'] = vm_info[host]['tags']
       end
     end
     vms
@@ -64,8 +65,13 @@ class Utils
       template = info['template']
       lifetime = info['lifetime']
       running = info['running']
+      tags = info['tags'] || {}
 
-      puts "- #{vm}.#{domain} (#{template}, #{running}/#{lifetime} hours)"
+      tag_pairs = tags.map {|key,value| "#{key}: #{value}" }
+      duration = "#{running}/#{lifetime} hours"
+      metadata = [template, duration, *tag_pairs]
+
+      puts "- #{vm}.#{domain} (#{metadata.join(", ")})"
     end
   end
 end

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.3.0'
+  @version = '0.3.1'
 
   def self.get
     @version

data/spec/vmfloaty/utils_spec.rb

@@ -31,4 +31,61 @@ describe Utils do
       expect(Utils.generate_os_hash(host_arg)).to be_empty
     end
   end
+
+  describe '#prettyprint_hosts' do
+    let(:host_without_tags) { 'mcpy42eqjxli9g2' }
+    let(:host_with_tags)    { 'aiydvzpg23r415q' }
+    let(:url)               { 'http://pooler.example.com' }
+
+    let(:host_info_with_tags) do
+      {
+        host_with_tags => {
+          "template" => "redhat-7-x86_64",
+          "lifetime" => 48,
+          "running"  => 7.67,
+          "tags"     => {
+            "user" => "bob",
+            "role" => "agent"
+          },
+          "domain" => "delivery.puppetlabs.net"
+        }
+      }
+    end
+
+    let(:host_info_without_tags) do
+      {
+        host_without_tags => {
+          "template" => "ubuntu-1604-x86_64",
+          "lifetime" => 12,
+          "running"  => 9.66,
+          "domain"   => "delivery.puppetlabs.net"
+        }
+      }
+    end
+
+    let(:output_with_tags)    { "- #{host_with_tags}.delivery.puppetlabs.net (redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)" }
+    let(:output_without_tags) { "- #{host_without_tags}.delivery.puppetlabs.net (ubuntu-1604-x86_64, 9.66/12 hours)" }
+
+    it 'prints an output with host fqdn, template and duration info' do
+      allow(Utils).to receive(:get_vm_info).
+        with(host_without_tags, false, url).
+        and_return(host_info_without_tags)
+
+      expect(Utils).to receive(:puts).with("Running VMs:")
+      expect(Utils).to receive(:puts).with(output_without_tags)
+
+      Utils.prettyprint_hosts(host_without_tags, false, url)
+    end
+
+    it 'prints an output with host fqdn, template, duration info, and tags when supplied' do
+      allow(Utils).to receive(:get_vm_info).
+        with(host_with_tags, false, url).
+        and_return(host_info_with_tags)
+
+      expect(Utils).to receive(:puts).with("Running VMs:")
+      expect(Utils).to receive(:puts).with(output_with_tags)
+
+      Utils.prettyprint_hosts(host_with_tags, false, url)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander