vmfloaty 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70900ca54a2a255931f813c0a2030bc9d729f0e8
-  data.tar.gz: 25e286669b6dc14e8182382cb4352937fa834f81
+  metadata.gz: 04b7261aa013260aba635e266b003d845e4a2c58
+  data.tar.gz: 83bbc1c12ace45c6a1ea288121762f13d3b841ae
 SHA512:
-  metadata.gz: 43ec435e2a17f0da693b70ec53f5012ab45eda4a7c44b0d5844a47f14b4ddbc731b698376e157b3248dc95acac8f4cf30f57ac16ea29363b711c814f9505038e
-  data.tar.gz: 41985d6e6da58dd9628e5ff44da683e830a742f413a2335d2cb91a6673f348ad4396780a8b38201aaf4356948929416d720c84550635c1222dba9cbbe9bed8ef
+  metadata.gz: 4e38aedb270708b75d9464744b73b507a6dfdab100567a079287b6b06aa0ac57fabaa03e0e18761c5d1b21e2921f15fbd36ab5beeddcbf3266cac2981d90931c
+  data.tar.gz: 04ddaf46164b38bf84df47ee8d5a0e96d87b6be5d64941ee72a075e5264511c7556b8fdd85a2875fadfea37820cfbc307adc6dd46eb32621c1cb552d70cbec94

data/lib/vmfloaty.rb

@@ -35,6 +35,7 @@ class Vmfloaty
       c.option '--token STRING', String, 'Token for pooler service'
       c.option '--notoken', 'Makes a request without a token'
       c.option '--force', 'Forces vmfloaty to get requested vms'
+      c.option '--json', 'Prints retrieved vms in JSON format'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         service = Service.new(options, config)
@@ -62,7 +63,12 @@ class Vmfloaty
         end
 
         response = service.retrieve(verbose, os_types, use_token)
-        puts Utils.format_hosts(response)
+        hosts = Utils.standardize_hostnames(response)
+        if options.json
+          puts JSON.pretty_generate(hosts)
+        else
+          puts Utils.format_host_output(hosts)
+        end
       end
     end
 

data/lib/vmfloaty/utils.rb

@@ -4,7 +4,7 @@ require 'vmfloaty/nonstandard_pooler'
 class Utils
   # TODO: Takes the json response body from an HTTP GET
   # request and "pretty prints" it
-  def self.format_hosts(response_body)
+  def self.standardize_hostnames(response_body)
     # vmpooler response body example when `floaty get` arguments are `ubuntu-1610-x86_64=2 centos-7-x86_64`:
     # {
     #   "ok": true,
@@ -32,31 +32,26 @@ class Utils
       raise ArgumentError, "Bad GET response passed to format_hosts: #{response_body.to_json}"
     end
 
-    hostnames = []
-
     # vmpooler reports the domain separately from the hostname
     domain = response_body.delete('domain')
 
-    if domain
-      # vmpooler output
-      response_body.each do |os, hosts|
-        if hosts['hostname'].kind_of?(Array)
-          hosts['hostname'].map!{ |host| hostnames << host + "." + domain + " (#{os})"}
-        else
-          hostnames << hosts["hostname"] + ".#{domain} (#{os})"
-        end
-      end
-    else
-      response_body.each do |os, hosts|
-        if hosts['hostname'].kind_of?(Array)
-          hosts['hostname'].map!{ |host| hostnames << host + " (#{os})" }
-        else
-          hostnames << hosts['hostname'] + " (#{os})"
-        end
+    result = {}
+
+    response_body.each do |os, value|
+      hostnames = Array(value['hostname'])
+      if domain
+        hostnames.map! {|host| "#{host}.#{domain}"}
       end
+      result[os] = hostnames
     end
 
-    hostnames.map { |hostname| puts "- #{hostname}" }
+    result
+  end
+
+  def self.format_host_output(hosts)
+    hosts.flat_map do |os, names|
+      names.map { |name| "- #{name} (#{os})" }
+    end.join("\n")
   end
 
   def self.generate_os_hash(os_args)

data/lib/vmfloaty/version.rb

@@ -1,3 +1,3 @@
 class Vmfloaty
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

data/spec/vmfloaty/utils_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../lib/vmfloaty/utils'
 
 describe Utils do
 
-  describe "#format_hosts" do
+  describe "#standardize_hostnames" do
     before :each do
       @vmpooler_response_body ='{
          "ok": true,
@@ -26,24 +26,48 @@ describe Utils do
            "hostname": "power8-ubuntu16.04-6.delivery.mycompany.net"
          }
        }'
-      @vmpooler_output = <<-OUT
+    end
+
+    it "formats a result from vmpooler into a hash of os to hostnames" do
+      result = Utils.standardize_hostnames(JSON.parse(@vmpooler_response_body))
+      expect(result).to eq('centos-7-x86_64' => ["dlgietfmgeegry2.delivery.mycompany.net"],
+                           'ubuntu-1610-x86_64' => ["gdoy8q3nckuob0i.delivery.mycompany.net", "ctnktsd0u11p9tm.delivery.mycompany.net"])
+    end
+
+    it "formats a result from the nonstandard pooler into a hash of os to hostnames" do
+      result = Utils.standardize_hostnames(JSON.parse(@nonstandard_response_body))
+      expect(result).to eq('solaris-10-sparc' => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
+                           'ubuntu-16.04-power8' => ['power8-ubuntu16.04-6.delivery.mycompany.net'])
+    end
+  end
+
+  describe "#format_host_output" do
+    before :each do
+      @vmpooler_results = {
+        'centos-7-x86_64' => ["dlgietfmgeegry2.delivery.mycompany.net"],
+        'ubuntu-1610-x86_64' => ["gdoy8q3nckuob0i.delivery.mycompany.net", "ctnktsd0u11p9tm.delivery.mycompany.net"]
+      }
+      @nonstandard_results = {
+        'solaris-10-sparc' => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
+        'ubuntu-16.04-power8' => ['power8-ubuntu16.04-6.delivery.mycompany.net']
+      }
+      @vmpooler_output = <<-OUT.chomp
+- dlgietfmgeegry2.delivery.mycompany.net (centos-7-x86_64)
 - gdoy8q3nckuob0i.delivery.mycompany.net (ubuntu-1610-x86_64)
 - ctnktsd0u11p9tm.delivery.mycompany.net (ubuntu-1610-x86_64)
-- dlgietfmgeegry2.delivery.mycompany.net (centos-7-x86_64)
       OUT
-      @nonstandard_output = <<-OUT
+      @nonstandard_output = <<-OUT.chomp
 - sol10-10.delivery.mycompany.net (solaris-10-sparc)
 - sol10-11.delivery.mycompany.net (solaris-10-sparc)
 - power8-ubuntu16.04-6.delivery.mycompany.net (ubuntu-16.04-power8)
       OUT
     end
-
     it "formats a hostname hash from vmpooler into a list that includes the os" do
-      expect { Utils.format_hosts(JSON.parse(@vmpooler_response_body)) }.to output( @vmpooler_output).to_stdout_from_any_process
+      expect(Utils.format_host_output(@vmpooler_results)).to eq(@vmpooler_output)
     end
 
     it "formats a hostname hash from the nonstandard pooler into a list that includes the os" do
-      expect { Utils.format_hosts(JSON.parse(@nonstandard_response_body)) }.to output(@nonstandard_output).to_stdout_from_any_process
+      expect(Utils.format_host_output(@nonstandard_results)).to eq(@nonstandard_output)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander