background_process 1.0 → 1.1

data/README.textile

@@ -4,13 +4,15 @@ This is like popen4, but provides several convenience methods for interacting
 with the process. It only works on UNIX and Ruby implementations that support 
 fork and native UNIX I/O streams.
 
+"Click here for Complete Documentation":http://rdoc.info/projects/timcharper/background_process
+
 Example:
 
 <pre>
 process = BackgroundProcess.run("sh -c 'sleep 1; exit 1'")
 process.running? # => true
 process.wait # => #<Process::Status: pid=34774,exited(1)>
-process.running? #=> true
+process.running? #=> false
 process.exitstatus # => 1
 </pre>
 

data/lib/background_process/io_helpers.rb

@@ -4,17 +4,18 @@ module BackgroundProcess::IOHelpers
     begin
       Timeout::timeout(timeout) do
         # Something that should be interrupted if it takes too much time...
-        while true
-          available_streams, _, _ = Kernel.select(streams, nil, nil, 1)
-          available_streams.each do |s|
+        until streams.empty?
+          active_streams, _, _ = Kernel.select(streams, nil, nil, 1)
+          active_streams.each do |s|
+            (streams -= [s]; next) if s.eof?
             content = s.gets
             if result = (block.arity == 1 ? yield(content) : yield(s, content))
               return result
             end
-          end if available_streams
+          end if active_streams
         end
       end
-      true
+      nil
     rescue Timeout::Error
       nil
     end

data/spec/background_process/background_process_spec.rb

@@ -45,7 +45,7 @@ describe BackgroundProcess do
 
   describe "#exitstatus" do
     it "returns the exit status of a process after it exits." do
-      process = BackgroundProcess.run("bash -c 'sleep 1; exit 1'")
+      process = BackgroundProcess.run("bash -c 'sleep 0.1; exit 1'")
       process.exitstatus.should == 1
       process.exitstatus.should == 1
     end
@@ -55,14 +55,14 @@ describe BackgroundProcess do
     it "waits for a process with timeout" do
       process = BackgroundProcess.run("sleep 3")
       started_waiting = Time.now
-      process.wait(0.5).should be_false
-      (Time.now - started_waiting).should be_close(0.5, 0.1)
+      process.wait(0.1).should be_false
+      (Time.now - started_waiting).should be_close(0.1, 0.05)
     end
   end
 
   describe "#detect" do
     it "calls the provided block for every line outputted, and returns the first non-false value" do
-      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.1; do a=$(($a + 1)); echo $a; done'")
+      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.05; do a=$(($a + 1)); echo $a; done'")
       result = process.detect do |line|
         "golden" if line.strip == "3"
       end
@@ -71,7 +71,7 @@ describe BackgroundProcess do
     end
 
     it "yields the stream if two parameters are provided on the block" do
-      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.1; do a=$(($a + 1)); echo $a 1>&2; done'")
+      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.05; do a=$(($a + 1)); echo $a 1>&2; done'")
       result = process.detect(:both, 1) do |stream, line|
         "golden" if stream == process.stderr && line.strip == "3"
       end
@@ -81,7 +81,7 @@ describe BackgroundProcess do
 
     it "aborts if the provided timeout is reached" do
       process = BackgroundProcess.run("sleep 2")
-      result = process.detect(:both, 0.1) do |stream, line|
+      result = process.detect(:both, 0.05) do |stream, line|
         true
       end
       result.should be_nil
@@ -89,7 +89,7 @@ describe BackgroundProcess do
     end
 
     it "monitors the specified stream" do
-      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.1; do a=$(($a + 1)); echo $a; echo $a 1>&2; done'")
+      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.05; do a=$(($a + 1)); echo $a; echo $a 1>&2; done'")
       output = []
       process.detect(:stdout) do |line|
         output << line.to_i
@@ -105,10 +105,25 @@ describe BackgroundProcess do
     end
 
     it "never yields if nothing occurs on specified streams" do
-      process = BackgroundProcess.run("bash -c 'a=0; while sleep 0.1; do a=$(($a + 1)); echo $a; done'")
+      process = BackgroundProcess.run("bash -c 'echo hi'")
       process.detect(:stderr, 1) do |line|
         raise(Spec::Expectations::ExpectationNotMetError, "expected to not yield the block")
       end
     end
+
+    it "quits when the process does" do
+      process = BackgroundProcess.run("sleep 0.3")
+      started_waiting = Time.now
+      result = process.detect(:both, 1) do |line|
+        line.should_not be_nil
+      end
+      result.should be_nil
+      (Time.now - started_waiting).should < 0.4
+    end
+
+    it "yields the very last bit of the process output" do
+      process = BackgroundProcess.run("echo hello; printf hi")
+      process.detect(:both, 1) { |line| line == "hi" }.should == true
+    end
   end
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Tim Harper
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 -06:00
+date: 2010-04-22 00:00:00 -06:00
 default_executable: 
 dependencies: []