floatyhelper 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b180846de407899145d32783fbab1321b931441adc29303fc6f6652dcf074a9
-  data.tar.gz: 0470b598bae65a844467a8a873f16fb02540637aea45f74b6c45526d6ae7c069
+  metadata.gz: 1829fb78be42701872cbbc6e8960ab3e3ebcd8c20b4b5983a32111e5ee2a7b1c
+  data.tar.gz: 551dfec7ca2c9f64d1f975b6c202882de69b8e09f4cd06d66a50e55623a5d680
 SHA512:
-  metadata.gz: 67131dfaa118a90be128166ff43d67bb3e2315c3012058d74b4d8e46431877a9113a9be88c0fc48caab6e5b6427c516f41e6d9325b8f230eaca186cf8f03c27d
-  data.tar.gz: 4373c7403986df1fdf8e02b196996ef403beefd9180ea786d9adbc9906dc6d008b449dfca49870460df6db360e56e3ff2afc4ccc449e71d3c317d5ba938b3ef8
+  metadata.gz: 5300396a677ea5076639329b4d7fc5cf5ec07c267ad59c840d782f4f997484a704b0e4cfdccfb1b64c1c6ef1937a58d287ce1832936ed6cfeb71d5403e0a335b
+  data.tar.gz: 91aec17eede5c0241b47e96653556580d476ebe17bdd8d0caae7df0b8f51094917b484f5b3e8c504b8b6669929da333f4bbdde7c1c3c9809965c487d3bce446b

data/lib/floatyhelper/floaty.rb

@@ -127,37 +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
-            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
-            nil
-          rescue IO::WaitReadable, IO::WaitWritable
-            retry
-          ensure
-            status ||= PTY.check(pid)
+      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
           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.4'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/lib/floatyhelper/vm.rb

@@ -162,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.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Nick Burgan-Illig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 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.