maestro_shell 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f2ca3dac172b93dccfde42bf5bfcfeb042a267f
-  data.tar.gz: 5bf446d9b239637b23041364e3ecd30401568abf
+  metadata.gz: 7202e558e1c7bc226196fa6580f929837523680a
+  data.tar.gz: 2c56889dba049af09e23c1ad5fd9c888d3658df8
 SHA512:
-  metadata.gz: dcbe93166275dfac4926dd321a2fe9e9caa15be545be9e3aa61fa643d98495f4adc6527022a4afd9a41b805bd1df9910fcec14112e39a42fe196a4079a537e53
-  data.tar.gz: afe2c5eb62a9b975d4bedc13acf07199e99a2630c0b3b5129eb996e27a0f2cdabbd3b4f48cc73ce634332c1d5b5940145495ded01fed52a7b4e3a613a48df610
+  metadata.gz: 1671da72da032d007631ba2e9761f5ad2914e6aae54c334ecce0b4694e7f54660fda8cdfb93130d0761bc4814292e63f884aca5705d5a706d7ef73e4cbb39f93
+  data.tar.gz: 6c820aadf68fd69a0e0c98862584226e0c4fa398686e5b08f68c445de08bd62f5b0bc5e4beec3e0bed78a697886873a8416840dbd007a1ffff6410e4fac2be18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maestro_shell (0.0.3)
+    maestro_shell (0.0.4)
       json (>= 1.4.6)
       logging (= 1.8.0)
       rubyzip (= 0.9.8)

data/lib/util/shell.rb

@@ -76,22 +76,26 @@ module Maestro
       def run_script_with_delegate(delegate, on_output)
         File.open(@output_file.path, 'a') do |out_file|
           status = IO.popen4(@command_line) do |pid, stdin, stdout, stderr|
-            threads = []
-            # Read stdout/stderr and push to output
-            [ stdout, stderr ].each do |stream|
-              threads << Thread.new do
-                while !stream.eof? && text = stream.readpartial(1024)
+            # Keep reading input until all (stdin/stderr) streams report eof
+            readers = [stdout, stderr]
+            while readers.any?
+              ready = IO.select(readers, [], readers)
+              # no writers
+              # ready[1].each { ... }
+              ready[0].each do |fd|
+                if fd.eof?
+                  readers.delete fd
+                 else
+
+                  text = fd.readpartial(1024)
                   out_file.write(text)
 
                   if delegate && on_output
-                    delegate.send(on_output, text, stream == stderr)
+                    delegate.send(on_output, text, fd == stderr)
                   end
                 end
               end
             end
-
-            # Wait for stream handler threads to exit
-            threads.each { |t| t.join }
           end
         end
 

data/lib/util/version.rb

@@ -1,7 +1,7 @@
 module Maestro
   module Util
     class Shell
-      VERSION = '0.0.3'
+      VERSION = '0.0.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestro_shell
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Doug Henderson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging