childprocess 0.1.6 → 0.1.7

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Jari Bakken
+Copyright (c) 2010-2011 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -18,7 +18,6 @@ a standalone library.
 
    process.start
 
-   process.started?  #=> true
    process.alive?    #=> true
    process.exited?   #=> false
 
@@ -48,4 +47,4 @@ How the process is launched and killed depends on the platform:
 
 == Copyright
 
-Copyright (c) 2010 Jari Bakken. See LICENSE for details.
+Copyright (c) 2010-2011 Jari Bakken. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/childprocess.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{childprocess}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jari Bakken"]
-  s.date = %q{2010-12-22}
+  s.date = %q{2011-02-12}
   s.description = %q{This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.}
   s.email = %q{jari.bakken@gmail.com}
   s.extra_rdoc_files = [
@@ -48,25 +48,26 @@ Gem::Specification.new do |s|
     "spec/abstract_io_spec.rb",
     "spec/childprocess_spec.rb",
     "spec/jruby_spec.rb",
+    "spec/pid_behavior.rb",
     "spec/spec_helper.rb",
     "spec/unix_spec.rb",
     "spec/windows_spec.rb"
   ]
   s.homepage = %q{http://github.com/jarib/childprocess}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Cross-platform ruby library for managing child processes.}
   s.test_files = [
     "spec/abstract_io_spec.rb",
     "spec/childprocess_spec.rb",
     "spec/jruby_spec.rb",
+    "spec/pid_behavior.rb",
     "spec/spec_helper.rb",
     "spec/unix_spec.rb",
     "spec/windows_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/childprocess.rb

@@ -49,6 +49,14 @@ module ChildProcess
       platform == :jruby
     end
 
+    def jruby_on_unix?
+      return false unless jruby?
+      # patterns grabbed from http://lopica.sourceforge.net/os.html
+      require "java"
+      name = java.lang.System.getProperty("os.name").downcase
+      name =~ /mac os|linux|solaris|bsd/
+    end
+
     def windows?
       !jruby? && os == :windows
     end

data/lib/childprocess/abstract_process.rb

@@ -1,5 +1,7 @@
 module ChildProcess
   class AbstractProcess
+    POLL_INTERVAL = 0.1
+
     attr_reader :exit_code
 
     #
@@ -35,6 +37,10 @@ module ChildProcess
       raise SubclassResponsibility, "io"
     end
 
+    def pid
+      raise SubclassResponsibility, "pid"
+    end
+
     #
     # Launch the child process
     #
@@ -112,8 +118,6 @@ module ChildProcess
       raise SubclassResponsibility, "launch_process"
     end
 
-    POLL_INTERVAL = 0.1
-
     def started?
       @started
     end

data/lib/childprocess/jruby/process.rb

@@ -28,6 +28,26 @@ module ChildProcess
         @exit_code = @process.exitValue
       end
 
+      #
+      # Only supported in JRuby on a Unix operating system, thanks to limitations
+      # in Java's classes
+      #
+      # @return [Fixnum] the pid of the process after it has started
+      # @raise [NotImplementedError] when trying to access pid on non-Unix platform
+      #
+      def pid
+        if @process.getClass.getName != "java.lang.UNIXProcess"
+          raise NotImplementedError.new("pid is not supported by JRuby child processes on Windows")
+        end
+
+        # About the best way we can do this is with a nasty reflection-based impl
+        # Thanks to Martijn Courteaux
+        # http://stackoverflow.com/questions/2950338/how-can-i-kill-a-linux-process-in-java-with-sigkill-process-destroy-does-sigter/2951193#2951193
+        field = @process.getClass.getDeclaredField("pid")
+        field.accessible = true
+        field.get(@process)
+      end
+
       private
 
       def launch_process(&blk)

data/lib/childprocess/unix/process.rb

@@ -1,6 +1,10 @@
 module ChildProcess
   module Unix
     class Process < AbstractProcess
+      #
+      # @return [Fixnum] the pid of the process after it has started
+      #
+      attr_reader :pid
 
       def io
         @io ||= Unix::IO.new
@@ -19,7 +23,7 @@ module ChildProcess
         send_kill
         wait
       rescue Errno::ECHILD, Errno::ESRCH
-        # handle rase condition where process dies between timeout
+        # handle race condition where process dies between timeout
         # and send_kill
         true
       end

data/lib/childprocess/windows/process.rb

@@ -1,6 +1,10 @@
 module ChildProcess
   module Windows
     class Process < AbstractProcess
+      #
+      # @return [Fixnum] the pid of the process after it has started
+      #
+      attr_reader :pid
 
       def io
         @io ||= Windows::IO.new

data/spec/childprocess_spec.rb

@@ -39,14 +39,14 @@ describe ChildProcess do
 
   it "lets child process inherit the environment of the current process" do
     Tempfile.open("env-spec") do |file|
-      with_env('env-spec' => 'yes') do
+      with_env('INHERITED' => 'yes') do
         process = write_env(file.path).start
         process.poll_for_exit(EXIT_TIMEOUT)
       end
 
       file.rewind
       child_env = eval(file.read)
-      child_env['env-spec'].should == 'yes'
+      child_env['INHERITED'].should == 'yes'
     end
   end
 

data/spec/jruby_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../spec_helper', __FILE__)
+require "pid_behavior"
 
 if ChildProcess.jruby?
   describe ChildProcess::JRuby::IO do
@@ -9,4 +10,15 @@ if ChildProcess.jruby?
     end
   end
 
-end
+  describe ChildProcess::JRuby::Process do
+    if ChildProcess.jruby_on_unix?
+      it_behaves_like "a platform that provides the child's pid"
+    else
+      it "raises an error when trying to access the child's pid" do
+        process = exit_with(0)
+        process.start
+        lambda { process.pid }.should raise_error(NotImplementedError)
+      end
+    end
+  end
+end

data/spec/pid_behavior.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../spec_helper', __FILE__)
+
+shared_examples_for "a platform that provides the child's pid" do
+  it "knows the child's pid" do
+    Tempfile.open("pid-spec") do |file|
+      process = write_pid(file.path)
+      process.start
+      process.poll_for_exit(10)
+      file.rewind
+      process.pid.should == file.read.chomp.to_i
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -43,6 +43,14 @@ module ChildProcessSpecHelper
     ruby_process(tmp_script(code), *args)
   end
 
+  def write_pid(path)
+    code = <<-RUBY
+      File.open(#{path.inspect}, "w") { |f| f << Process.pid }
+    RUBY
+
+    ruby_process tmp_script(code)
+  end
+
   def exit_with(exit_code)
     ruby_process(tmp_script("exit(#{exit_code})"))
   end
@@ -57,13 +65,14 @@ module ChildProcessSpecHelper
   end
 
   def tmp_script(code)
-    tf = Tempfile.new("childprocess-temp")
-    tf << code
-    tf.close
+    # use an ivar to avoid GC
+    @tf = Tempfile.new("childprocess-temp")
+    @tf << code
+    @tf.close
 
     puts code if $DEBUG
 
-    tf.path
+    @tf.path
   end
 
   def within(seconds, &blk)

data/spec/unix_spec.rb

@@ -1,7 +1,10 @@
 require File.expand_path('../spec_helper', __FILE__)
+require "pid_behavior"
 
 if ChildProcess.unix?
   describe ChildProcess::Unix::Process do
+    it_behaves_like "a platform that provides the child's pid"
+
     it "handles ECHILD race condition where process dies between timeout and KILL" do
       process = sleeping_ruby
 
@@ -46,4 +49,4 @@ if ChildProcess.unix?
     end
   end
 
-end
+end

data/spec/windows_spec.rb

@@ -1,9 +1,12 @@
 require File.expand_path('../spec_helper', __FILE__)
+require "pid_behavior"
 
 if ChildProcess.windows?
   describe ChildProcess::Windows::IO do
     let(:io) { ChildProcess::Windows::IO.new }
 
+    it_behaves_like "a platform that provides the child's pid"
+
     it "raises an ArgumentError if given IO does not respond to :fileno" do
       lambda { io.stdout = nil }.should raise_error(ArgumentError, /must have :fileno or :to_io/)
     end
@@ -15,4 +18,4 @@ if ChildProcess.windows?
       lambda { io.stdout = fake_io }.should raise_error(ArgumentError, /must have :fileno or :to_io/)
     end
   end
-end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jari Bakken
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +01:00
+date: 2011-02-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id001
@@ -40,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -53,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 3
         version: 0.6.3
   type: :runtime
   version_requirements: *id003
@@ -101,6 +87,7 @@ files:
 - spec/abstract_io_spec.rb
 - spec/childprocess_spec.rb
 - spec/jruby_spec.rb
+- spec/pid_behavior.rb
 - spec/spec_helper.rb
 - spec/unix_spec.rb
 - spec/windows_spec.rb
@@ -118,21 +105,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Cross-platform ruby library for managing child processes.
@@ -140,6 +123,7 @@ test_files:
 - spec/abstract_io_spec.rb
 - spec/childprocess_spec.rb
 - spec/jruby_spec.rb
+- spec/pid_behavior.rb
 - spec/spec_helper.rb
 - spec/unix_spec.rb
 - spec/windows_spec.rb