process_watcher 0.2 → 0.3

data/lib/process_watcher/linux/process_monitor.rb

@@ -51,7 +51,7 @@ module ProcessWatcher
       @pid = fork do
         oldstderr = STDERR.clone
         pr.close
-        STDIN.reopen(File.open('/dev/null', 'r'))
+        STDIN.close
         STDOUT.reopen(pw)
         STDERR.reopen(pw)
         begin
@@ -76,14 +76,14 @@ module ProcessWatcher
               # ass, the real one should depend on the kernel's buffer
               # sizes.
               result = fdes.readpartial(4096)
-              yield(:output => result)
+              yield(:output => result) if block_given?
             end
           end unless array.nil?
           array[2].each do |fdes|
             # Do something with erroneous condition.
           end unless array.nil?
         end
-        yield(:exit_code => $?.exitstatus, :exit_status => $?)
+        yield(:exit_code => $?.exitstatus, :exit_status => $?) if block_given?
       end
 
       return @pid
@@ -94,8 +94,8 @@ module ProcessWatcher
     # === Return
     # true:: Always return true
     def cleanup
-      @reader.join
-      @io.close
+      @reader.join if @reader
+      @io.close if @io && !@io.closed?
     end
 
   end

data/lib/process_watcher/version.rb

@@ -1,3 +1,3 @@
 module ProcessWatcher
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

data/spec/process_watcher/monitor_spec.rb

@@ -0,0 +1,59 @@
+#--
+# Copyright: Copyright (c) 2010 RightScale, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# 'Software'), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+describe ProcessWatcher::ProcessMonitor do
+
+  before(:each) do
+    @monitor = ProcessWatcher::ProcessMonitor.new
+  end
+
+  after(:each) do
+    @monitor.cleanup
+  end
+
+  it 'should launch and watch well-behaved processes' do
+    ruby = "puts 42; exit 42"
+    times = 0
+    pid = @monitor.spawn('ruby', '-e', ruby) do |hash|
+      case times
+      when 0 then hash.should == {:output => "42\n"}
+      when 1 then hash[:exit_code].should == 42
+        hash[:exit_status].should_not be_nil
+      else fail "Shouldn't see more than two ticks"
+      end
+      times += 1
+    end
+    @monitor.cleanup
+    lambda { Process.kill(0, pid) }.should raise_exception(Errno::ESRCH)
+  end
+
+  it 'should launch processes where we don\'t care about output' do
+    ruby = "puts 42; exit 42"
+    times = 0
+    pid = @monitor.spawn('ruby', '-e', ruby)
+    @monitor.cleanup
+    lambda { Process.kill(0, pid) }.should raise_exception(Errno::ESRCH)
+  end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: process_watcher
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Graham Hughes
@@ -15,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -07:00
+date: 2010-11-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: rspec
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,7 +31,8 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  requirement: *id001
+  type: :development
+  version_requirements: *id001
 description: |
   ProcessWatcher is a cross platform interface for running subprocesses
   safely.  Unlike backticks or popen in Ruby 1.8, it will not invoke a
@@ -60,6 +60,7 @@ files:
 - lib/process_watcher/watcher.rb
 - lib/process_watcher/win32/process_monitor.rb
 - process_watcher.gemspec
+- spec/process_watcher/monitor_spec.rb
 - spec/process_watcher/watcher_spec.rb
 - spec/process_watcher_spec.rb
 - spec/rcov.opts
@@ -100,6 +101,7 @@ signing_key:
 specification_version: 3
 summary: Cross platform interface to running subprocesses
 test_files: 
+- spec/process_watcher/monitor_spec.rb
 - spec/process_watcher/watcher_spec.rb
 - spec/process_watcher_spec.rb
 - spec/rcov.opts