vmfloaty 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67dbbc5d6d8ccb1f5c5663f9483759784f6a97d4
-  data.tar.gz: aee780777b391982f50e1cfc2bd84bc74c93e9d1
+  metadata.gz: eab6e0237c6ce8afe7ce25cb2573a852bd4e6e63
+  data.tar.gz: 6fa9a7232f1814cc602f1e8aa98900b618aab97d
 SHA512:
-  metadata.gz: 1f23297133c942c633df3d1b44ab645df7049c43a726739f606d71458fec57b353d05e81123dcf7a5731f923eccd92a6b60e276ffa2fdc99d50c8247dc7686b5
-  data.tar.gz: ccfc5600caab2e20698052fb299e2db7bdb9b40058cc185aa8308bb5cac872e5333b592d108298301ac3c63e7c40c07da533450c4c40d266740b61dcf3015e01
+  metadata.gz: 32cc876286d8dcc6d887dc471d5a4ca7af1bc541a7b838674fea05ff809712367f20e0181fda5182d9cde487e487b69277ae02b84a6972dbe8b11d6011a6996d
+  data.tar.gz: a1f92a6bd32a1d30fea8bdb258b03e56440fb81c5bf289510973ce02e8666a19aedfddd3a1a504fc459c3a21f705b3fb93ce46457b39510e4b75abb9ad1beb58

data/lib/vmfloaty.rb

@@ -56,8 +56,10 @@ class Vmfloaty
               end
               pass = password "Enter your password please:", '*'
               token = Auth.get_token(verbose, url, user, pass)
-              puts "\nToken retrieved!"
-              puts token
+              unless token.nil?
+                puts "\nToken retrieved!"
+                puts token
+              end
             end
 
             response = Pooler.retrieve(verbose, os_types, token, url)
@@ -90,11 +92,15 @@ class Vmfloaty
         if active
           # list active vms
           status = Auth.token_status(verbose, url, token)
-          # print vms
-          vms = status[token]['vms']
-          if vms.nil?
-            STDERR.puts "You have no running vms"
-            exit 0
+          unless status.nil?
+            # print vms
+            vms = status[token]['vms']
+            if vms.nil?
+              STDERR.puts "You have no running vms"
+              exit 0
+            end
+          else
+            STDERR.puts "Could not retrieve active vms"
           end
 
           running_vms = vms['running']
@@ -194,6 +200,12 @@ class Vmfloaty
         if delete_all
           # get vms with token
           status = Auth.token_status(verbose, url, token)
+
+          if status.nil?
+            STDERR.puts "Could not retrieve status with token"
+            exit 1
+          end
+
           # print vms
           vms = status[token]['vms']
           if vms.nil?
@@ -333,14 +345,26 @@ class Vmfloaty
         when "get"
           pass = password "Enter your password please:", '*'
           token = Auth.get_token(verbose, url, user, pass)
-          puts token
+          unless token.nil?
+            puts token
+          else
+            STDERR.puts 'Could not make a request for a token'
+          end
         when "delete"
           pass = password "Enter your password please:", '*'
           result = Auth.delete_token(verbose, url, user, pass, token)
-          puts result
+          unless result.nil?
+            puts result
+          else
+            STDERR.puts 'Could not make a request to delete a token'
+          end
         when "status"
           status = Auth.token_status(verbose, url, token)
-          puts status
+          unless status.nil?
+            puts status
+          else
+            STDERR.puts 'Could not make a request to get token status'
+          end
         when nil
           STDERR.puts "No action provided"
         else
@@ -380,8 +404,12 @@ class Vmfloaty
           end
           pass = password "Enter your password please:", '*'
           token = Auth.get_token(verbose, url, user, pass)
-          puts "\nToken retrieved!"
-          puts token
+          unless token.nil?
+            puts "\nToken retrieved!"
+            puts token
+          else
+            STDERR.puts 'Could not get token...requesting vm without a token anyway...'
+          end
         end
 
         Ssh.ssh(verbose, host_os, token, url)

data/lib/vmfloaty/auth.rb

@@ -12,16 +12,15 @@ class Auth
     if res_body["ok"]
       return res_body["token"]
     else
-      STDERR.puts "There was a problem with your request:"
-      puts res_body
-      exit 1
+      STDERR.puts "There was a problem with your request:\n#{res_body}"
+      return nil
     end
   end
 
   def self.delete_token(verbose, url, user, password, token)
     if token.nil?
       STDERR.puts 'You did not provide a token'
-      exit 1
+      return nil
     end
 
     conn = Http.get_conn_with_auth(verbose, url, user, password)
@@ -31,16 +30,15 @@ class Auth
     if res_body["ok"]
       return res_body
     else
-      STDERR.puts "There was a problem with your request:"
-      puts res_body
-      exit 1
+      STDERR.puts "There was a problem with your request:\n#{res_body}"
+      return nil
     end
   end
 
   def self.token_status(verbose, url, token)
     if token.nil?
       STDERR.puts 'You did not provide a token'
-      exit 1
+      return nil
     end
 
     conn = Http.get_conn(verbose, url)
@@ -51,9 +49,8 @@ class Auth
     if res_body["ok"]
       return res_body
     else
-      STDERR.puts "There was a problem with your request:"
-      puts res_body
-      exit 1
+      STDERR.puts "There was a problem with your request:\n#{res_body}"
+      return nil
     end
   end
 end

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.6.0'
+  @version = '0.6.1'
 
   def self.get
     @version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander