command_runner_ng 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130d48c47f75bc4bf9cda29964b2ee29f34c1c57
-  data.tar.gz: f63abf2a6127e4ccbe0d669ef75baaeaa93726ab
+  metadata.gz: 341dc1d0132412d53c1e5d258d7a6a03e96e3a4e
+  data.tar.gz: 94ac85a463daa4020bf069c47adba3a99fe4aebb
 SHA512:
-  metadata.gz: 8f31d164defc091230024b5b1d6ef0f1a37650d48c3fdab131e8220ea4cfc904aad24c33469ed5d27ffce0744876ef966f0f8e424e355dd03ed3e45a87fd91a9
-  data.tar.gz: 3b7d20c02db29c8ded423ba1471fd7c5b0e2d6775d50541ab5a882366cb485e80c7770d395a0ef36344519b110627a519572d71b782eff1ecab457de60d97d88
+  metadata.gz: 175e6af549e49bf1269032c11f0881ca5b89f79706ba706f082cba51af96b1a1ef13bf04d5d7955d64c3057af39096c94be946350934c25b10e71cfc6b741aac
+  data.tar.gz: 5308811978a0c87a00e2aef3766b95fb733da28bcf32f58f327e65f1a58f5633f9b7143eddf4f5a1e9f3fc591bdcfb78a6286026a5e40b50123a9a01e20a42f9

data/lib/command_runner.rb

@@ -27,9 +27,8 @@ module CommandRunner
   # to the caller of run.
   #
   def self.run(*args, timeout: nil)
-    # These could be tweakable through vararg opts
+    # This could be tweakable through vararg opts
     tick = 0.1
-    bufsize = 4096
 
     now = Time.now
 
@@ -58,37 +57,19 @@ module CommandRunner
     io = IO.popen(*args, :err=>[:child, :out])
     data = ""
 
-    # Wait until stdout closes
-    while Time.now < deadline_sequence.first[:deadline] do
-      IO.select([io], nil, nil, tick)
-      begin
-        data << io.read_nonblock(bufsize)
-      rescue IO::WaitReadable
-        # Ignore: tick time reached without io
-      rescue EOFError
-        # Child closed stdout (probably dead, but not necessarily)
-        break
-      end
-    end
-
     # Run through all deadlines until command completes.
     # We could merge this block into the selecting block above,
     # but splitting like this saves us a Process.wait syscall per iteration.
+    eof = false
     deadline_sequence.each do |point|
       while Time.now < point[:deadline]
         if Process.wait(io.pid, Process::WNOHANG)
+          read_nonblock_safe!(io, data, tick)
           result = {out: data, status: $?}
           io.close
           return result
-        else
-          IO.select([io], nil, nil, tick)
-          begin
-            data << io.read_nonblock(bufsize)
-          rescue IO::WaitReadable
-            # Ignore: tick time reached without io
-          rescue EOFError
-            # Child closed stdout (probably dead, but not necessarily)
-          end
+        elsif !eof
+          eof = read_nonblock_safe!(io, data, tick)
         end
       end
 
@@ -116,12 +97,33 @@ module CommandRunner
       end
     end
 
-    # Either we didn't have a deadline, or none of the deadlines killed of the child.
+    # Either we didn't have a deadline, or none of the deadlines killed off the child.
     Process.wait(io.pid)
+    read_nonblock_safe!(io, data, tick)
     result = {out: data, status: $?}
     io.close
 
     result
   end
 
+  private
+
+  # Read data async, appending to data_out,
+  # returning true on EOF, false otherwise
+  def self.read_nonblock_safe!(io, data_out, tick)
+    IO.select([io], nil, nil, tick)
+    begin
+      # Read all available data until EAGAIN or EOF
+      loop do
+        data_out << io.read_nonblock(4096)
+      end
+    rescue IO::WaitReadable
+      # Ignore: tick time reached without io
+      return false
+    rescue EOFError
+      # Child closed stdout (probably dead, but not necessarily)
+      return true
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_runner_ng
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Mikkel Kamstrup Erlandsen