floatyhelper 2.0.1 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5a427189944d8960bab3ac42f1def0053e19fbed5a76d23fe866bef85ea28d
-  data.tar.gz: acddc4079e86b93b58a3ac1f4df3163fa440595e5f499f130ad5babeaa42f0cd
+  metadata.gz: 1829fb78be42701872cbbc6e8960ab3e3ebcd8c20b4b5983a32111e5ee2a7b1c
+  data.tar.gz: 551dfec7ca2c9f64d1f975b6c202882de69b8e09f4cd06d66a50e55623a5d680
 SHA512:
-  metadata.gz: 97a90ee999e59877c3125cd96611b3de3a5eead211800eb0f233e9e2a9951680583309b053b173a3cb402c2b8ed4f8e7f698fb44e5484c86520e1875f5820604
-  data.tar.gz: cbb27ccfe2310492034eb123a0bff8c7e39dc681091fc6bec444084a390c581c8e18d8d1b9ffd6a2729e1b591c0c1d52c93d7bb34bdf37e6c460f7d0e428bf6f
+  metadata.gz: 5300396a677ea5076639329b4d7fc5cf5ec07c267ad59c840d782f4f997484a704b0e4cfdccfb1b64c1c6ef1937a58d287ce1832936ed6cfeb71d5403e0a335b
+  data.tar.gz: 91aec17eede5c0241b47e96653556580d476ebe17bdd8d0caae7df0b8f51094917b484f5b3e8c504b8b6669929da333f4bbdde7c1c3c9809965c487d3bce446b

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
@@ -120,35 +127,24 @@ class Floaty
     if use_pty
       output = ''
       status = nil
-      PTY.spawn("/usr/bin/env floaty #{command}") do |read, write, pid|
-        write.close
-        while status.nil?
-          begin
-            line = read.gets
+      IO.popen("/usr/bin/env floaty #{command}", :err => [:child, :out]) do |io|
+        while !Process.waitpid(io.pid, Process::WNOHANG)
+          line = io.gets
+          unless line.nil?
             puts line
             output += line
-          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
-            nil
-          rescue IO::WaitReadable, IO::WaitWritable
-            retry
-          ensure
-            status ||= PTY.check(pid)
           end
         end
-
-        Process.waitall
-        # Double check we have the status
-        status ||= PTY.check(pid)
       end
+      # Need to check exit status
+      output
     else
       output, status = Open3.capture2e("/usr/bin/env floaty #{command}")
+      if !status.exitstatus.zero? && !ignore_error
+        puts "Error running 'floaty #{command}': #{output}".red
+        exit status.exitstatus
+      end
+      output
     end
-    if !status.exitstatus.zero? && !ignore_error
-      puts "Error running 'floaty #{command}': #{output}".red
-      exit status.exitstatus
-    end
-    output
   end
 end

data/lib/floatyhelper/version.rb

@@ -1,3 +1,3 @@
 module FloatyhelperVersion
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/lib/floatyhelper/vm.rb

@@ -25,8 +25,11 @@ class VM
 
   def self.find_pooled_platforms
     begin # rubocop:disable Style/RedundantBegin
-      result = Net::HTTP.get('vmpooler.delivery.puppetlabs.net','/status')
-      result = JSON.parse(result)
+      uri = URI.parse('https://vmpooler.delivery.puppetlabs.net/status')
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      result = http.get(uri.request_uri)
+      result = JSON.parse(result.body)
       # Techinally, 'max > 0' tells you if it's a pooled platform, but if
       # the pool is empty, we'll want to fall back to ABS anyway.
       result['pools'].select { |_pool, info| info['ready'].positive? }.map { |pool, _info| pool.gsub('-pixa4','') }
@@ -109,7 +112,7 @@ class VM
     puts 'Waiting for snapshots to appear in floaty query...'
     alldone = false
     until alldone
-      puts `tput cup 4` if clr
+      puts `tput cup #{hosts.count + 2}` if clr
       alldone = true
       print "\r" unless clr
       hosts.each do |host|
@@ -159,7 +162,10 @@ class VM
   def self.get_vm(platform: 'centos-7-x86_64', force_abs: false)
     if !find_pooled_platforms.include?(platform.gsub('-pixa4','')) || force_abs
       response = Floaty.floaty_cmd("get #{platform} --service abs --priority 1", use_pty: true)
-      response.chomp.split('- ')[1].split[0].split('.')[0]
+      vmlinesplit = response.chomp.split('- ')
+      # When use_pty is true, we've already printed stderr/stdout, so no need to do so again.
+      raise "Error obtaining a VM" if vmlinesplit.count == 1
+      vmlinesplit[1].split[0].split('.')[0]
     else
       response = Floaty.floaty_cmd("get #{platform} --service vmpooler")
       raise "Error obtaining a VM: #{response}" if response.include?('error')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: floatyhelper
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.5
 platform: ruby
 authors:
 - Nick Burgan-Illig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,8 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: CLI tool for manipulating Puppet's vmpooler VMs with Vmfloaty.