process-helper 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5801c46c90163e46beb528091ad2dfa932cafd0
-  data.tar.gz: c8fa6a8f6b5c503b3ea2369bd0b15264badef55d
+  metadata.gz: 2ce039ab19c243fb4798183b2ae3acab432de81c
+  data.tar.gz: 440ba72e2b87290a0f1f3a00e220cad071aefd8e
 SHA512:
-  metadata.gz: f78e7ad32fd2720831db9ff75982665e305f975c91be07c659f4618c885d83e86543705efcfc56d4b2b90f516b6bda43db36724082fd1ff3e787c6fd94fb390b
-  data.tar.gz: 4088d5ed29f3ad6ab9c6a01c38655c318a33b9fe35bfafb59ea6299ad6ef11278a7f2d1f6229870591d1a5456c7732450bf2e1b5ee37a2870777c5e7614ded23
+  metadata.gz: 8fd6ac4b78c2c8709e6d14380474ecbba215f7be92f4cf3dbcce805823e407c2540539cd5da087201c1e567be461789a790496bb6076cae2bae2c164f23f8ebc
+  data.tar.gz: 9aad6802e56a4b0ce403c44e345e41bceecf57ba9bd9353568edeead4a83f580daf2ba2780a7bee6d5f8f60c8b50bfac513b9ffe924a5a26db618a0375fc68e0

data/lib/process-helper.rb

@@ -20,27 +20,27 @@ module ProcessHelper
     # output_to_wait_for:: Regex containing expected output, +start+ will block until a line of STDOUT matches this regex, if this is nil, then no waiting occurs.
     # wait_timeout:: Timeout while waiting for particular output.
     # env:: Hash of extra environment variables with which to start the process.
-    def start(command_and_args = [], output_to_wait_for = nil, wait_timeout = nil, env = {})
+    def start(command_and_args = [], output_to_wait_for = nil, wait_timeout = nil, env = {}, opts = {})
       out_r, out_w = IO.pipe
-      err_r, err_w = IO.pipe
+      @out_log = ProcessLog.new(out_r, @opts).start
+      if opts[:stderr]
+        err_r, err_w = IO.pipe
+        @err_log = ProcessLog.new(err_r, @opts).start
+      else
+        err_w = out_w
+      end
       @pid = spawn(env, *command_and_args, :out => out_w, :err => err_w)
       out_w.close
-      err_w.close
-
-      log = []
-
-      @out_log = ProcessLog.new(out_r, @opts, log).start
-      @err_log = ProcessLog.new(err_r, @opts).start
-
-      @out_log.wait_for_output(output_to_wait_for, :timeout => wait_timeout) if output_to_wait_for
+      err_w.close if opts[:stderr]
+      @out_log.wait_for_output(output_to_wait_for, :timeout => wait_timeout) unless output_to_wait_for.nil?
     end
 
     # returns true if the process exited with an exit code of 0.
     def wait_for_exit
       @out_log.wait
-      @err_log.wait
+      @err_log.wait unless @err_log.nil?
 
-      Process.wait @pid
+      Process.wait(@pid)
       @exit_status = $CHILD_STATUS
 
       @pid = nil
@@ -57,7 +57,8 @@ module ProcessHelper
     # * +:out+
     # * +:err+
     def get_log(which)
-      _get_log(which).to_a
+      log = _get_log(which)
+      log.nil? ? [] : log.to_a
     end
 
     # Gets an array containing all the lines for the specified stream, emptying the stored buffer.
@@ -65,7 +66,8 @@ module ProcessHelper
     # * +:out+
     # * +:err+
     def get_log!(which)
-      _get_log(which).drain
+      log = _get_log(which)
+      log.nil? ? [] : log.drain
     end
 
     # Blocks the current thread until the specified regex has been matched in the output.
@@ -121,10 +123,10 @@ module ProcessHelper
     def wait_for_output(regex, opts = {})
       opts = { :poll_rate => 0.25 }.merge(opts)
       opts[:timeout] ||= 30
-      cutoff = DateTime.now + Rational(opts[:timeout].to_i, 86_400)
+      cutoff = Time.now + opts[:timeout].to_i
       until _any_line_matches(regex)
         sleep(opts[:poll_rate])
-        fail "Timeout of #{opts[:timeout]} seconds exceeded while waiting for output that matches '#{regex}'" if DateTime.now > cutoff
+        fail "Timeout of #{opts[:timeout]} seconds exceeded while waiting for output that matches '#{regex}'" if Time.now > cutoff
         fail "EOF encountered while waiting for output that matches '#{regex}'" if eof and !_any_line_matches(regex)
       end
     end

data/spec/process_helper_spec.rb

@@ -1,6 +1,14 @@
 require 'spec_helper'
 
+def run(*args)
+  process = ProcessHelper::ProcessHelper.new
+  process.start(*args)
+  process.wait_for_exit
+  process
+end
+
 module ProcessHelper
+
   describe ProcessHelper do
     context 'Things...' do
       it 'It should start a process and capture the exit status (success)' do
@@ -33,23 +41,20 @@ module ProcessHelper
       end
 
       it 'It should expose stdout' do
-        process = ProcessHelper.new
-        process.start(['sh', '-c', 'echo hello ; echo there'])
-        process.wait_for_exit
+        process = run(['sh', '-c', 'echo hello ; echo there'])
         out = process.get_log(:out)
-        expect(out.count).to eq(2)
-        expect(out[0]).to eq("hello\n")
-        expect(out[1]).to eq("there\n")
+        expect(out).to eq(["hello\n", "there\n"])
+      end
+
+      it 'It should expose stdout and stderr' do
+        process = run(['sh', '-c', 'echo hello; echo there >&2'])
+        expect(process.get_log(:out)).to eq(["hello\n", "there\n"])
+        expect(process.get_log(:err)).to eq([])
       end
 
       it 'It should expose stderr' do
-        process = ProcessHelper.new
-        process.start(['sh', '-c', 'echo hello >&2; echo there >&2'])
-        process.wait_for_exit
-        err = process.get_log(:err)
-        expect(err.count).to eq(2)
-        expect(err[0]).to eq("hello\n")
-        expect(err[1]).to eq("there\n")
+        process = run(['sh', '-c', 'echo hello >&2; echo there >&2'], nil, nil, {}, stderr: true)
+        expect(process.get_log(:err)).to eq(["hello\n", "there\n"])
       end
 
       it 'It should expose the pid' do
@@ -63,9 +68,7 @@ module ProcessHelper
 
       it 'It should timestamp the logs' do
         t0 = Time.now
-        process = ProcessHelper.new
-        process.start(['sh', '-c', 'echo a ; sleep 1 ; echo b ; sleep 1 ; echo c'])
-        process.wait_for_exit
+        process = run(['sh', '-c', 'echo a ; sleep 1 ; echo b ; sleep 1 ; echo c'])
         t1 = Time.now
 
         out = process.get_log(:out)
@@ -85,7 +88,7 @@ module ProcessHelper
         process = ProcessHelper.new
         process.start(
           ['sh', '-c', 'echo frog >&2 ; sleep 1 ; echo cat ; sleep 1 ; echo dog ; sleep 1 ; echo frog'],
-          /fro/
+          /fro/, nil, {}, stderr: true
         )
         t1 = Time.now
 
@@ -117,7 +120,7 @@ module ProcessHelper
         process = ProcessHelper.new
         process.start(
           ['sh', '-c', 'echo frog >&2 ; sleep 1 ; echo cat ; sleep 1 ; echo dog ; sleep 1 ; echo frog; sleep 3; echo goat'],
-          /fro/
+          /fro/, nil, {}, stderr: true
         )
         t1 = Time.now
 
@@ -133,7 +136,8 @@ module ProcessHelper
       it 'It should support draining the logs' do
         process = ProcessHelper.new
         process.start(
-          ['bash', '-c', 'for ((i=0; $i<10; i=$i+1)) ; do echo out $i ; echo err $i >&2 ; sleep 1 ; done']
+          ['bash', '-c', 'for ((i=0; $i<10; i=$i+1)) ; do echo out $i ; echo err $i >&2 ; sleep 1 ; done'],
+          nil, nil, {}, stderr: true
         )
 
         sleep 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process-helper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - rachel evans
@@ -57,10 +57,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Utility for managing sub processes.
 test_files:
-- spec/process_helper_spec.rb
 - spec/spec_helper.rb
+- spec/process_helper_spec.rb