childprocess 0.2.8 → 0.2.9

data/.travis.yml

@@ -3,7 +3,13 @@ rvm:
   - 1.9.2
   - 1.9.3
   - jruby
-  # - rbx
+  - rbx
 env:
   - CHILDPROCESS_POSIX_SPAWN=true
-  - CHILDPROCESS_POSIX_SPAWN=false
+  - CHILDPROCESS_POSIX_SPAWN=false
+matrix:
+  exclude:
+    - rvm: rbx
+      env: CHILDPROCESS_POSIX_SPAWN=true
+    - rvm: jruby
+      env: CHILDPROCESS_POSIX_SPAWN=true

data/README.md

@@ -47,7 +47,7 @@ Implementation
 
 How the process is launched and killed depends on the platform:
 
-* Unix     : fork + exec
+* Unix     : fork + exec (or posix_spawn if enabled)
 * Windows  : CreateProcess and friends
 * JRuby    : java.lang.{Process,ProcessBuilder}
 

data/lib/childprocess.rb

@@ -10,17 +10,17 @@ module ChildProcess
 
   class << self
     def new(*args)
-      case platform
-      when :jruby
-        JRuby::Process.new(args)
-      when :windows
-        Windows::Process.new(args)
+      case os
       when :macosx, :linux, :unix, :cygwin
         if posix_spawn?
           Unix::PosixSpawnProcess.new(args)
+        elsif jruby?
+          JRuby::Process.new(args)
         else
           Unix::ForkExecProcess.new(args)
         end
+      when :windows
+        Windows::Process.new(args)
       else
         raise Error, "unsupported platform #{platform.inspect}"
       end
@@ -32,10 +32,6 @@ module ChildProcess
         :jruby
       elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == "ironruby"
         :ironruby
-      elsif RUBY_PLATFORM =~ /mswin|msys|mingw32/
-        :windows
-      elsif RUBY_PLATFORM =~ /cygwin/
-        :cygwin
       else
         os
       end
@@ -46,7 +42,7 @@ module ChildProcess
     end
 
     def unix?
-      !jruby? && [:macosx, :linux, :unix].include?(os)
+      !windows?
     end
 
     def linux?
@@ -57,14 +53,12 @@ module ChildProcess
       platform == :jruby
     end
 
-    def jruby_on_unix?
-      jruby? and [:macosx, :linux, :unix].include? os
-    end
-
     def windows?
-      !jruby? && os == :windows
+      os == :windows
     end
 
+    @posix_spawn = false
+
     def posix_spawn?
       enabled = @posix_spawn || %w[1 true].include?(ENV['CHILDPROCESS_POSIX_SPAWN'])
       return false unless enabled
@@ -85,6 +79,10 @@ module ChildProcess
       false
     end
 
+    #
+    # Set this to true to enable experimental use of posix_spawn.
+    #
+
     def posix_spawn=(bool)
       @posix_spawn = bool
     end
@@ -95,12 +93,14 @@ module ChildProcess
         host_os = RbConfig::CONFIG['host_os'].downcase
 
         case host_os
-        when /mswin|msys|mingw32|cygwin/
-          :windows
-        when /darwin|mac os/
-          :macosx
         when /linux/
           :linux
+        when /darwin|mac os/
+          :macosx
+        when /mswin|msys|mingw32/
+          :windows
+        when /cygwin/
+          :cygwin
         when /solaris|bsd/
           :unix
         else
@@ -161,3 +161,5 @@ module ChildProcess
 
   end # class << self
 end # ChildProcess
+
+require 'jruby' if ChildProcess.jruby?

data/lib/childprocess/errors.rb

@@ -2,15 +2,15 @@ module ChildProcess
   class Error < StandardError; end
   class TimeoutError < StandardError; end
   class SubclassResponsibility < StandardError; end
-  class InvalidEnvironmentVariableName < StandardError; end
+  class InvalidEnvironmentVariable < StandardError; end
   class LaunchError < StandardError; end
 
   class MissingPlatformError < StandardError
     def initialize
       platform = ChildProcess.platform_name
 
-      message = "posix_spawn is not yet supported on #{ChildProcess.platform_name} (#{RUBY_PLATFORM}), falling back to fork/exec. " +
-                "Please file a bug at http://github.com/jarib/childprocess/issues"
+      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"
 
       super(message)
     end

data/lib/childprocess/jruby.rb

@@ -1,9 +1,56 @@
+require 'java'
+require 'jruby'
+
+class Java::SunNioCh::FileChannelImpl
+  field_reader :fd
+end
+
+class Java::JavaIo::FileDescriptor
+  if ChildProcess.os == :windows
+    field_reader :handle
+  else
+    field_reader :fd
+  end
+end
+
 module ChildProcess
   module JRuby
+    def self.posix_fileno_for(obj)
+      channel = ::JRuby.reference(obj).channel
+      begin
+        channel.getFDVal
+      rescue NoMethodError
+        fileno = channel.fd
+        if fileno.kind_of?(Java::JavaIo::FileDescriptor)
+          fileno = fileno.fd
+        end
+
+        fileno == -1 ? obj.fileno : fileno
+      end
+    rescue
+      # fall back
+      obj.fileno
+    end
+
+    def self.windows_handle_for(obj)
+      channel = ::JRuby.reference(obj).channel
+      fileno = obj.fileno
+
+      begin
+        fileno = channel.getFDVal
+      rescue NoMethodError
+        fileno = channel.fd if channel.respond_to?(:fd)
+      end
+
+      if fileno.kind_of? Java::JavaIo::FileDescriptor
+        fileno.handle
+      else
+        Windows::Lib.handle_for fileno
+      end
+    end
   end
 end
 
-require "java"
 require "childprocess/jruby/pump"
 require "childprocess/jruby/io"
-require "childprocess/jruby/process"
+require "childprocess/jruby/process"

data/lib/childprocess/tools/generator.rb

@@ -46,6 +46,7 @@ module ChildProcess
       end
 
       def fetch_size(type_name, opts = {})
+        print "sizeof(#{type_name}): "
         src = <<-EOF
 int main() {
   printf("%d", (unsigned int)sizeof(#{type_name}));
@@ -59,10 +60,14 @@ int main() {
           raise "sizeof(#{type_name}) == #{output.to_i} (output=#{output})"
         end
 
-        @sizeof[type_name] = output.to_i
+        size = output.to_i
+        @sizeof[type_name] = size
+
+        puts size
       end
 
       def fetch_constant(name, opts)
+        print "#{name}: "
         src = <<-EOF
 int main() {
   printf("%d", (unsigned int)#{name});
@@ -71,12 +76,14 @@ int main() {
         EOF
 
         output = execute(src, opts)
-        @constants[name] = Integer(output)
+        value  = Integer(output)
+        @constants[name] = value
+
+        puts value
       end
 
 
       def execute(src, opts)
-
         program = Array(opts[:define]).map do |key, value|
           <<-SRC
 #ifndef #{key}

data/lib/childprocess/unix/lib.rb

@@ -1,10 +1,19 @@
+
 module ChildProcess
   module Unix
     module Lib
       extend FFI::Library
-
       ffi_lib FFI::Library::LIBC
 
+      if ChildProcess.os == :macosx
+        attach_function :_NSGetEnviron, [], :pointer
+        def self.environ
+          _NSGetEnviron().read_pointer
+        end
+      elsif respond_to? :attach_variable
+        attach_variable :environ, :pointer
+      end
+
       attach_function :strerror, [:int], :string
 
       # int posix_spawnp(

data/lib/childprocess/unix/platform/x86_64-linux.rb

@@ -1,7 +1,8 @@
 module ChildProcess::Unix::Platform
   SIZEOF = {
      :posix_spawn_file_actions_t => 80,
-     :posix_spawnattr_t          => 336
+     :posix_spawnattr_t          => 336,
+     :sigset_t                   => 128
   }
   POSIX_SPAWN_RESETIDS   = 1
   POSIX_SPAWN_SETPGROUP  = 2

data/lib/childprocess/unix/posix_spawn_process.rb

@@ -13,22 +13,22 @@ module ChildProcess
 
         if @io
           if @io.stdout
-            actions.add_dup @io.stdout.fileno, $stdout.fileno
+            actions.add_dup fileno_for(@io.stdout), fileno_for($stdout)
           else
-            actions.add_open $stdout.fileno, "/dev/null", File::WRONLY, 0644
+            actions.add_open fileno_for($stdout), "/dev/null", File::WRONLY, 0644
           end
 
           if @io.stderr
-            actions.add_dup @io.stderr.fileno, $stderr.fileno
+            actions.add_dup fileno_for(@io.stderr), fileno_for($stderr)
           else
-            actions.add_open $stderr.fileno, "/dev/null", File::WRONLY, 0644
+            actions.add_open fileno_for($stderr), "/dev/null", File::WRONLY, 0644
           end
         end
 
         if duplex?
           reader, writer = ::IO.pipe
-          actions.add_dup reader.fileno, $stdin.fileno
-          actions.add_close writer.fileno
+          actions.add_dup fileno_for(reader), fileno_for($stdin)
+          actions.add_close fileno_for(writer)
         end
 
         if defined? Platform::POSIX_SPAWN_USEVFORK
@@ -37,13 +37,17 @@ module ChildProcess
 
         attrs.flags = flags
 
+        # wrap in helper classes in order to avoid GC'ed pointers
+        argv = Argv.new(@args)
+        envp = Envp.new(ENV.to_hash.merge(@environment))
+
         ret = Lib.posix_spawnp(
           pid_ptr,
           @args.first, # TODO: not sure this matches exec() behaviour
           actions,
           attrs,
           argv,
-          env
+          envp
         )
 
         if duplex?
@@ -62,38 +66,58 @@ module ChildProcess
         ::Process.detach(@pid) if detach?
       end
 
-      def argv
-        arg_ptrs = @args.map do |e|
-          if e.include?("\0")
-            raise ArgumentError, "argument cannot contain null bytes: #{e.inspect}"
+      if ChildProcess.jruby?
+        def fileno_for(obj)
+          ChildProcess::JRuby.posix_fileno_for(obj)
+        end
+      else
+        def fileno_for(obj)
+          obj.fileno
+        end
+      end
+
+      class Argv
+        def initialize(args)
+          @ptrs = args.map do |e|
+            if e.include?("\0")
+              raise ArgumentError, "argument cannot contain null bytes: #{e.inspect}"
+            end
+
+            FFI::MemoryPointer.from_string(e.to_s)
           end
-          FFI::MemoryPointer.from_string(e.to_s)
+
+          @ptrs << nil
         end
-        arg_ptrs << nil
 
-        argv = FFI::MemoryPointer.new(:pointer, arg_ptrs.size)
-        argv.put_array_of_pointer(0, arg_ptrs)
+        def to_ptr
+          argv = FFI::MemoryPointer.new(:pointer, @ptrs.size)
+          argv.put_array_of_pointer(0, @ptrs)
 
-        argv
-      end
+          argv
+        end
+      end # Argv
 
-      def env
-        env_ptrs = ENV.to_hash.merge(@environment).map do |key, val|
-          if key.include?("=")
-            raise InvalidEnvironmentVariableName, key
+      class Envp
+        def initialize(env)
+          @ptrs = env.map do |key, val|
+            if key =~ /=|\0/ || val.include?("\0")
+              raise InvalidEnvironmentVariable, "#{key.inspect} => #{val.inspect}"
+            end
+
+            FFI::MemoryPointer.from_string("#{key}=#{val}")
           end
 
-          FFI::MemoryPointer.from_string("#{key}=#{val}")
+          @ptrs << nil
         end
 
-        env_ptrs << nil
-
-        env = FFI::MemoryPointer.new(:pointer, env_ptrs.size)
-        env.put_array_of_pointer(0, env_ptrs)
+        def to_ptr
+          env = FFI::MemoryPointer.new(:pointer, @ptrs.size)
+          env.put_array_of_pointer(0, @ptrs)
 
-        env
-      end
+          env
+        end
+      end # Envp
 
     end
   end
-end
+end

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/childprocess/windows/lib.rb

@@ -252,12 +252,20 @@ module ChildProcess
           )
 
           str = buf.read_string(size).strip
-          "#{str} (#{errnum})"
+          if errnum == 0
+            "Unknown error (Windows says #{str.inspect}, but it did not.)"
+          else
+            "#{str} (#{errnum})"
+          end
         end
 
         def handle_for(fd_or_io)
           if fd_or_io.kind_of?(IO) || fd_or_io.respond_to?(:fileno)
-            handle = get_osfhandle(fd_or_io.fileno)
+            if ChildProcess.jruby?
+              handle = ChildProcess::JRuby.windows_handle_for(fd_or_io)
+            else
+              handle = get_osfhandle(fd_or_io.fileno)
+            end
           elsif fd_or_io.kind_of?(Fixnum)
             handle = get_osfhandle(fd_or_io)
           elsif fd_or_io.respond_to?(:to_io)

data/lib/childprocess/windows/process_builder.rb

@@ -48,12 +48,12 @@ module ChildProcess
         strings = ENV.map { |k,v| "#{k}=#{v}\0" }
 
         # extras
-        @environment.each do |key, value|
-          if key.include?("=")
-            raise InvalidEnvironmentVariableName, key
+        @environment.each do |key, val|
+          if key =~ /=|\0/ || val.include?("\0")
+            raise InvalidEnvironmentVariable, "#{key.inspect} => #{val.inspect}"
           end
 
-          strings << "#{key}=#{value}\0"
+          strings << "#{key}=#{val}\0"
         end
 
         strings << "\0" # terminate the env block

data/spec/io_spec.rb

@@ -85,10 +85,10 @@ describe ChildProcess do
   # http://travis-ci.org/#!/jarib/childprocess/jobs/487331
   #
 
-  it "works with pipes", :jruby => false do
+  it "works with pipes", :process_builder => false do
     process = ruby(<<-CODE)
-      STDOUT.puts "stdout"
-      STDERR.puts "stderr"
+      STDOUT.print "stdout"
+      STDERR.print "stderr"
     CODE
 
     stdout, stdout_w = IO.pipe
@@ -109,12 +109,15 @@ describe ChildProcess do
     stdout_w.close
     stderr_w.close
 
-    stdout.read.should == "stdout\n"
-    stderr.read.should == "stderr\n"
+    out = stdout.read
+    err = stderr.read
+
+    [out, err].should == %w[stdout stderr]
   end
 
   it "can set close-on-exec when IO is inherited" do
-    server = TCPServer.new("localhost", 4433)
+    port = random_free_port
+    server = TCPServer.new("127.0.0.1", port)
     ChildProcess.close_on_exec server
 
     process = sleeping_ruby
@@ -123,6 +126,6 @@ describe ChildProcess do
     process.start
     server.close
 
-    lambda { TCPServer.new("localhost", 4433).close }.should_not raise_error
+    wait_until { can_bind? "127.0.0.1", port }
   end
 end

data/spec/jruby_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../spec_helper', __FILE__)
 require "pid_behavior"
 
-if ChildProcess.jruby?
+if ChildProcess.jruby? && !ChildProcess.windows?
   describe ChildProcess::JRuby::IO do
     let(:io) { ChildProcess::JRuby::IO.new }
 
@@ -11,7 +11,7 @@ if ChildProcess.jruby?
   end
 
   describe ChildProcess::JRuby::Process do
-    if ChildProcess.jruby_on_unix?
+    if ChildProcess.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

data/spec/spec_helper.rb

@@ -115,6 +115,32 @@ module ChildProcessSpecHelper
     10
   end
 
+  def random_free_port
+    server = TCPServer.new('127.0.0.1', 0)
+    port   = server.addr[1]
+    server.close
+
+    port
+  end
+
+  def wait_until(timeout = 10, &blk)
+    end_time = Time.now + timeout
+
+    until Time.now >= end_time
+      return if yield
+      sleep 0.05
+    end
+
+    raise "timed out"
+  end
+
+  def can_bind?(host, port)
+    TCPServer.new(host, port).close
+    true
+  rescue
+    false
+  end
+
 end # ChildProcessSpecHelper
 
 Thread.abort_on_exception = true
@@ -125,8 +151,8 @@ RSpec.configure do |c|
     @process && @process.alive? && @process.stop
   }
 
-  if defined?(JRUBY_VERSION)
-    c.filter_run_excluding :jruby => false
+  if ChildProcess.jruby? && !ChildProcess.posix_spawn?
+    c.filter_run_excluding :process_builder => false
   end
 
   if ChildProcess.linux? && ChildProcess.posix_spawn?

data/spec/unix_spec.rb

@@ -1,7 +1,8 @@
 require File.expand_path('../spec_helper', __FILE__)
 require "pid_behavior"
 
-if ChildProcess.unix? && !ChildProcess.posix_spawn?
+if ChildProcess.unix? && !ChildProcess.jruby? && !ChildProcess.posix_spawn?
+
   describe ChildProcess::Unix::Process do
     it_behaves_like "a platform that provides the child's pid"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec