floatyhelper 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7024e7ae1ace180d0ba623a779142751f111ca132c7a1511fc639df0813e8f7
-  data.tar.gz: 3f485a4d782fb4cfd9d9046a37b849f7ed6fdc9612801b52c68fda2df248ea31
+  metadata.gz: 431619b53e0f4ef48e234d613b2bd3c4c9c91e62b5366805e50edbb256f81499
+  data.tar.gz: 213649667596adfeb3d293cd4862f3f9a6eaffd15137fa581039801729d20ae4
 SHA512:
-  metadata.gz: 3160e2841c6e1a56bbae01ef957e0d630cc0e1d73954bbb548fb0c715b0d252cbec65da8d4f19fc6aa6a9e7b5aade015185562dfcfdd56920810d9b4931169b4
-  data.tar.gz: 71e1c753ad8c414ca6b4c0c914ced8c3c3682d4b6db4be09911d5a4723ad99aee33209a2596e9cff20297d59260659c7ba483855d257b7496394454fee193300
+  metadata.gz: db5cc8257144b831c73b76132dfa647bc8d03bc98fcd84ef6a2de1a9613866967e8ffc16ddb3f6961eea62eb08b83e537d07f4fbe5e67cc7475f0b4515df0ece
+  data.tar.gz: 45e795caf7ab69ba2f3d0ff980396cb24220233334fd524a1292cbafad934123c642cfeb2248dfd1b97c5b5a926d8109167b1f8bc7143a1890a3547fa67837bc

data/lib/floatyhelper.rb

@@ -113,8 +113,10 @@ class Floatyhelper
             type = ''
             if options.check
               query = VM.query(host)
-              type = query[host]['template'].gsub('-pixa4','')
-              remaining = VM.alive(host, query) ? "#{query[host]['remaining']} hours remaining" : 'Expired'
+              if query && query['ok']
+                type = query[host]['template'].gsub('-pixa4','')
+                remaining = VM.alive(host, query) ? "#{query[host]['remaining']} hours remaining" : 'Expired'
+              end
             end
             puts '  %-15s  %-28s  %s' % [host, type, remaining]
           end

data/lib/floatyhelper/floaty.rb

@@ -81,7 +81,7 @@ class Floaty
   def self.check_tokens
     data = load_vmfloaty_config
     issues = false
-    FLOATY_SERVICES.each do |service, _info|
+    FLOATY_SERVICES.each do |service, info|
       if data['services'].nil? || data['services'][service].nil? || data['services'][service]['token'].nil?
         puts "#{service} service token not found in .vmfloaty.yml".yellow
         issues = true
@@ -93,7 +93,13 @@ class Floaty
       next if result['ok']
 
       puts "Problem checking #{service} token: #{result['reason']}".red
-      data['services']['token'] = nil
+      data['services'][service]['token'] = nil
+      if result['reason'].include?('Unparseable')
+        # User might have an old URL. Let's make sure to replace it with the latest.
+        # Should probably actually check the output for a 503/404 rather than make the
+        # assumption here.
+        data['services'][service]['url'] = info['url']
+      end
       issues = true
     end
     if issues
@@ -108,6 +114,7 @@ class Floaty
     # so ignore it until we reach the hash.
     lines = output.split("\n")
     index = lines.index { |l| l[0] == '{' }
+    return { 'ok' => false, 'reason' => 'Unparseable response from floaty' } if index.nil?
     output = lines[index..-1].join
     JSON.parse(output.gsub('=>',':'))
   end
@@ -125,8 +132,10 @@ class Floaty
         while status.nil?
           begin
             line = read.gets
-            puts line
-            output += line
+            unless line.nil?
+              puts line
+              output += line
+            end
           rescue EOFError, Errno::EIO
             # GNU/Linux raises EIO on read operation when pty is closed - see pty.rb docs
             # Ensure child process finishes and then pass through to ensure below to get status

data/lib/floatyhelper/version.rb

@@ -1,3 +1,3 @@
 module FloatyhelperVersion
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

data/lib/floatyhelper/vm.rb

@@ -109,7 +109,7 @@ class VM
     puts 'Waiting for snapshots to appear in floaty query...'
     alldone = false
     until alldone
-      puts `tput cup #{hosts.count+2}` if clr
+      puts `tput cup #{hosts.count + 2}` if clr
       alldone = true
       print "\r" unless clr
       hosts.each do |host|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floatyhelper
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Nick Burgan-Illig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler