vmfloaty 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2eaf3fd1178351347feaa7733d6742ac0f5dc9
-  data.tar.gz: b62b58f255127ad8b9566805f962b070c1f590fe
+  metadata.gz: 5e9839332624e775b43ac11d341814f66e08af2e
+  data.tar.gz: 1d7c9903d7a1c0f8b7005796163de932deeaa0cf
 SHA512:
-  metadata.gz: 15e588134c795f3014e09e980c0d84b22aa8e477404ecf8ebf74240ab03aa4290903e95dc528c4081fd8915f42e955c6ca84055122d84353a60dc62a69d2c830
-  data.tar.gz: 283f9468a507845eac92cd8f74d486aacc63fca9e3ffafc9b50a086660ffd9f1ec35dbfbda0aeb03c6bc857e2e9efad109e23eaa6beeebda8744ec742b3195a7
+  metadata.gz: 0905e72f1f27ff2f8deec1931949b1772b39cfba8613f493c9e997d0cd36cd688ef43f62a57391e258332a40273557bf2fba95fe2e2b141c8cda06b57621324d
+  data.tar.gz: 7b4049b1384737e711d8f1946d51290aa234e6cbbccf8741de802603351d5a070013eaba14b3dee91d6bd2db3b30902ca6e99a341a257438cac2cd16708b9e31

data/lib/vmfloaty/pooler.rb

@@ -94,6 +94,10 @@ class Pooler
   end
 
   def self.delete(verbose, url, hosts, token)
+    if token.nil?
+      raise TokenError, "Token provided was nil. Request cannot be made to delete vm"
+    end
+
     conn = Http.get_conn(verbose, url)
 
     if token

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.7.2'
+  @version = '0.7.3'
 
   def self.get
     @version

data/lib/vmfloaty.rb

@@ -2,6 +2,8 @@
 
 require 'rubygems'
 require 'commander'
+require 'colorize'
+require 'json'
 require 'pp'
 require 'vmfloaty/auth'
 require 'vmfloaty/pooler'
@@ -336,7 +338,14 @@ class Vmfloaty
           exit 1
         else
           hosts = hostnames.split(',')
-          Pooler.delete(verbose, url, hosts, token)
+          begin
+            Pooler.delete(verbose, url, hosts, token)
+          rescue TokenError => e
+            STDERR.puts e
+            exit 1
+          end
+
+          puts "Schedulered vmpooler to delete vms #{hosts}."
           exit 0
         end
       end
@@ -406,12 +415,39 @@ class Vmfloaty
       c.example 'Gets the current vmpooler status', 'floaty status --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
+      c.option '--json', 'Prints status in JSON format'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         url = options.url ||= config['url']
 
         status = Pooler.status(verbose, url)
-        pp status
+        message = status['status']['message']
+        pools = status['pools']
+
+        if options.json
+          pp status
+        else
+          pools.select! {|name,pool| pool['ready'] < pool['max']} if ! verbose
+
+          width = pools.keys.map(&:length).max
+          pools.each do |name,pool|
+            begin
+              max = pool['max']
+              ready = pool['ready']
+              pending = pool['pending']
+              missing = max - ready - pending
+              char = 'o'
+              puts "#{name.ljust(width)} #{(char*ready).green}#{(char*pending).yellow}#{(char*missing).red}"
+            rescue => e
+              puts "#{name.ljust(width)} #{e.red}"
+            end
+          end
+
+          puts
+          puts message.colorize(status['status']['ok'] ? :default : :red)
+        end
+
+        exit status['status']['ok']
       end
     end
 

data/spec/vmfloaty/pooler_spec.rb

@@ -118,6 +118,10 @@ describe Pooler do
 
       expect(Pooler.delete(false, @vmpooler_url, ['fq6qlpjlsskycq6'], 'mytokenfile')).to eq @delete_response
     end
+
+    it "raises a token error if no token provided" do
+      expect{ Pooler.delete(false, @vmpooler_url, ['myfakehost'], nil) }.to raise_error(TokenError)
+    end
   end
 
   describe "#status" do

metadata

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