childprocess 0.0.3 → 0.0.4

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'tmpdir'
 
 begin
   require 'jeweler'
@@ -46,3 +47,20 @@ rescue LoadError
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
   end
 end
+
+task :clean do
+  rm_rf "pkg"
+  rm_rf "childprocess.jar"
+end
+
+desc 'Create jar to bundle in selenium-webdriver'
+task :jar => [:clean, :build] do
+  tmpdir = Dir.mktmpdir("childprocess-jar")
+  gem_to_package = Dir['pkg/*.gem'].first
+  gem_name = File.basename(gem_to_package, ".gem")
+  p :gem_to_package => gem_to_package, :gem_name => gem_name
+  
+  sh "gem install -i #{tmpdir} #{gem_to_package} --ignore-dependencies --no-rdoc --no-ri"
+  sh "jar cf childprocess.jar -C #{tmpdir}/gems/#{gem_name}/lib ."
+  sh "jar tf childprocess.jar"
+end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/childprocess.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{childprocess}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
@@ -42,7 +42,8 @@ Gem::Specification.new do |s|
      "lib/childprocess/windows/structs.rb",
      "spec/childprocess_spec.rb",
      "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/unix_process_spec.rb"
   ]
   s.homepage = %q{http://github.com/jarib/childprocess}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -51,7 +52,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Cross-platform ruby library for managing child processes.}
   s.test_files = [
     "spec/childprocess_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/unix_process_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/childprocess.rb

@@ -27,6 +27,8 @@ module ChildProcess
       :ironruby
     elsif RUBY_PLATFORM =~ /mswin|msys|mingw32/
       :windows
+    else
+      :unix
     end
   end
 

data/lib/childprocess/unix/process.rb

@@ -14,8 +14,9 @@ module ChildProcess
 
         send_kill
         wait
-      rescue Errno::ECHILD
-        # that'll do
+      rescue Errno::ECHILD, Errno::ESRCH
+        # handle rase condition where process dies between timeout
+        # and send_kill
         true
       end
 

data/spec/childprocess_spec.rb

@@ -57,4 +57,5 @@ describe ChildProcess do
     end
   end
 
+  it_should_behave_like "unix process" if ChildProcess.platform == :unix
 end

data/spec/spec_helper.rb

@@ -88,3 +88,5 @@ Spec::Runner.configure do |config|
     @process && @process.alive? && @process.stop
   }
 end
+
+require "unix_process_spec"

data/spec/unix_process_spec.rb

@@ -0,0 +1,29 @@
+shared_examples_for "unix process" do
+  it "handles ECHILD race condition where process dies between timeout and KILL" do
+    process = sleeping_ruby
+
+    process.stub!(:fork).and_return('fakepid')
+    process.stub!(:send_term)
+    process.stub!(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
+    process.stub!(:send_kill).and_raise(Errno::ECHILD)
+
+    process.start
+    lambda { process.stop }.should_not raise_error
+
+    process.stub(:alive?).and_return(false)
+  end
+
+  it "handles ESRCH race condition where process dies between timeout and KILL" do
+    process = sleeping_ruby
+
+    process.stub!(:fork).and_return('fakepid')
+    process.stub!(:send_term)
+    process.stub!(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
+    process.stub!(:send_kill).and_raise(Errno::ESRCH)
+
+    process.start
+    lambda { process.stop }.should_not raise_error
+
+    process.stub(:alive?).and_return(false)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jari Bakken
@@ -78,6 +78,7 @@ files:
 - spec/childprocess_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/unix_process_spec.rb
 has_rdoc: true
 homepage: http://github.com/jarib/childprocess
 licenses: []
@@ -109,3 +110,4 @@ summary: Cross-platform ruby library for managing child processes.
 test_files: 
 - spec/childprocess_spec.rb
 - spec/spec_helper.rb
+- spec/unix_process_spec.rb