prcs 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077573c7fbd76fa760861e115d6897484a287cc07fedc31d96f042c6506de005
-  data.tar.gz: 0ec469f6a34a5aa7c95c7a8630df1da23c95f316e0fc481ede1a2bbf1073592b
+  metadata.gz: f7fa54dc731ecef77d0dea7c842729eb9e969df2044876104f587675ecdf8b6e
+  data.tar.gz: ba6d8533b334085cfefa0bd2cce873cd5d936cc52bd8793a7b57a683c1390041
 SHA512:
-  metadata.gz: ade5ea2adac2f69a436ca4002d897df3a372dddb5d75b3e0092c12fb47a0089d9ba3e6f40303ec72aba8bb23c205277170bb5b3333e4eaf4e9c4547143f16fbe
-  data.tar.gz: 07c203c333c4b9b1e0f8fdd199171a5b7a6752a28e525ff9ffa05b4456337f586442b3cee3402ef8a0fb8813b32ddc0f21927538d26332ce418756ecce5553e4
+  metadata.gz: bcc20dc8393d858b918b0566b2888518cf3e7ec43e3f9fa398b65c95fe259fb8dd2ca30eaadff163a0add5601d83af90cdd5e6e2843f254dd69f6b34caf0e684
+  data.tar.gz: 86b9c1f7152680b06e33da3a09d529ca699f9cd08263cb2cbe7a6ee5ccd60bd24d458e76582805af371d1ad9e28125e9c46d328e91b05dacf2d42fc53cecb292

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prcs (0.1.0)
+    prcs (0.3.0)
       childprocess (~> 3.0, >= 3.0.0)
       ffi (~> 1.12)
 

data/lib/prcs.rb

@@ -7,11 +7,13 @@ module PRCS
   class Error < StandardError; end
 
   class Runner
+    attr_reader :command
+
     def initialize(command)
       @command = command
       @process = nil
-      @stdout = ""
-      @stderr = ""
+      @stdout = nil
+      @stderr = nil
 
       @external_queues = {}.tap do |it|
         it[:stdout] = Queue.new
@@ -20,13 +22,13 @@ module PRCS
       @logcollectors = {}
     end
 
-    def run!
+    def run!(stdin = nil)
       stdout_pipe, stdout_wr = IO.pipe
       stderr_pipe, stderr_wr = IO.pipe
 
       ChildProcess.posix_spawn = true
       @process = ChildProcess.build(*@command)
-      @process.leader = true
+      @process.duplex = true if stdin
       @process.io.stdout = stdout_wr
       @process.io.stderr = stderr_wr
 
@@ -35,6 +37,11 @@ module PRCS
       stdout_wr.close
       stderr_wr.close
 
+      if stdin
+        @process.io.stdin.write(stdin)
+        @process.io.stdin.close
+      end
+
       @logcollectors[:stdout] = Thread.new(stdout_pipe) do |pipe|
         Thread.current[:running] = true
         Thread.current[:log] = ""
@@ -44,9 +51,9 @@ module PRCS
             output = pipe.readline_nonblock
             @external_queues[:stdout] << output
             Thread.current[:log] << output
+            sleep(0.1)
           rescue IO::EAGAINWaitReadable, EOFError
           end
-          sleep(1)
         end
       end
 
@@ -59,15 +66,22 @@ module PRCS
             output = pipe.readline_nonblock
             @external_queues[:stderr] << output
             Thread.current[:log] << output
+            sleep(0.1)
           rescue IO::EAGAINWaitReadable, EOFError
           end
-          sleep(1)
         end
       end
 
       self
     end
 
+    def run_and_wait!
+      self.run!
+      @process.wait
+
+      self
+    end
+
     def kill!(timeout = 15)
       @logcollectors.values.each do |collector_thread|
         collector_thread[:running] = false
@@ -90,25 +104,29 @@ module PRCS
     end
 
     def stdout_queue
-      [].tap { |it|
+      "".tap { |it|
         begin
           while(true)
             it << @external_queues[:stdout].pop(true)
           end
         rescue ThreadError
         end
-      }.join
+      }
     end
 
     def stderr_queue
-      [].tap { |it|
+      "".tap { |it|
         begin
           while(true)
             it << @external_queues[:stderr].pop(true)
           end
         rescue ThreadError
         end
-      }.join
+      }
+    end
+
+    def stdin
+      @process.io.stdin
     end
 
     def stdout

data/lib/prcs/version.rb

@@ -1,3 +1,3 @@
 module PRCS
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prcs
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Kasper Grubbe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess