childprocess 0.3.1 → 0.3.2

data/lib/childprocess.rb

@@ -8,6 +8,8 @@ module ChildProcess
   autoload :Windows,  'childprocess/windows'
   autoload :JRuby,    'childprocess/jruby'
 
+  @posix_spawn = false
+
   class << self
     def new(*args)
       case os
@@ -57,8 +59,6 @@ module ChildProcess
       os == :windows
     end
 
-    @posix_spawn = false
-
     def posix_spawn?
       enabled = @posix_spawn || %w[1 true].include?(ENV['CHILDPROCESS_POSIX_SPAWN'])
       return false unless enabled
@@ -143,6 +143,13 @@ module ChildProcess
         file.close_on_exec = true
       elsif file.respond_to?(:fcntl) && defined?(Fcntl::FD_CLOEXEC)
         file.fcntl Fcntl::F_SETFD, Fcntl::FD_CLOEXEC
+
+        if jruby? && posix_spawn?
+          # on JRuby, the fcntl call above apparently isn't enough when
+          # we're launching the process through posix_spawn.
+          fileno = JRuby.posix_fileno_for(file)
+          Unix::Lib.fcntl fileno, Fcntl::F_SETFD, Fcntl::FD_CLOEXEC
+        end
       elsif windows?
         Windows::Lib.dont_inherit file
       else

data/lib/childprocess/errors.rb

@@ -1,14 +1,21 @@
 module ChildProcess
-  class Error < StandardError; end
-  class TimeoutError < StandardError; end
-  class SubclassResponsibility < StandardError; end
-  class InvalidEnvironmentVariable < StandardError; end
-  class LaunchError < StandardError; end
+  class Error < StandardError
+  end
 
-  class MissingPlatformError < StandardError
-    def initialize
-      platform = ChildProcess.platform_name
+  class TimeoutError < Error
+  end
+
+  class SubclassResponsibility < Error
+  end
 
+  class InvalidEnvironmentVariable < Error
+  end
+
+  class LaunchError < Error
+  end
+
+  class MissingPlatformError < Error
+    def initialize
       message = "posix_spawn is not yet supported on #{ChildProcess.platform_name} (#{RUBY_PLATFORM}), falling back to default implementation. " +
                 "If you believe this is an error, please file a bug at http://github.com/jarib/childprocess/issues"
 

data/lib/childprocess/unix/lib.rb

@@ -1,4 +1,3 @@
-
 module ChildProcess
   module Unix
     module Lib
@@ -15,6 +14,8 @@ module ChildProcess
       end
 
       attach_function :strerror, [:int], :string
+      attach_function :chdir, [:string], :int
+      attach_function :fcntl, [:int, :int, :int], :int # fcntl actually takes varags, but we only need this version.
 
       # int posix_spawnp(
       #   pid_t *restrict pid,

data/lib/childprocess/unix/posix_spawn_process.rb

@@ -41,6 +41,13 @@ module ChildProcess
         argv = Argv.new(@args)
         envp = Envp.new(ENV.to_hash.merge(@environment))
 
+        if ChildProcess.jruby?
+          # on JRuby, the current working directory is for some reason not inherited.
+          # We'll work around it by making a chdir call through FFI.
+          # TODO: report this to JRuby
+          Lib.chdir Dir.pwd
+        end
+
         ret = Lib.posix_spawnp(
           pid_ptr,
           @args.first, # TODO: not sure this matches exec() behaviour

data/lib/childprocess/unix/process.rb

@@ -30,6 +30,7 @@ module ChildProcess
 
         assert_started
         pid, status = ::Process.waitpid2(@pid, ::Process::WNOHANG)
+        pid = nil if pid == 0 # may happen on jruby
 
         log(:pid => pid, :status => status)
 

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,94 +1,88 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: childprocess
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
 platform: ruby
-authors: 
+authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ffi
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 0
-        - 6
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
-  version_requirements: *id004
-description: This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+description: This gem aims at being a simple and reliable solution for controlling
+  external programs running in the background on any Ruby / OS combination.
+email:
 - jari.bakken@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
 - .rspec
@@ -135,38 +129,30 @@ files:
 - spec/windows_spec.rb
 homepage: http://github.com/jarib/childprocess
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: childprocess
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.
-test_files: 
+summary: This gem aims at being a simple and reliable solution for controlling external
+  programs running in the background on any Ruby / OS combination.
+test_files:
 - spec/abstract_io_spec.rb
 - spec/childprocess_spec.rb
 - spec/io_spec.rb