childprocess 0.3.0 → 0.3.1

data/lib/childprocess.rb

@@ -11,7 +11,7 @@ module ChildProcess
   class << self
     def new(*args)
       case os
-      when :macosx, :linux, :unix, :cygwin
+      when :macosx, :linux, :solaris, :bsd, :cygwin
         if posix_spawn?
           Unix::PosixSpawnProcess.new(args)
         elsif jruby?
@@ -22,7 +22,7 @@ module ChildProcess
       when :windows
         Windows::Process.new(args)
       else
-        raise Error, "unsupported platform #{platform.inspect}"
+        raise Error, "unsupported platform #{platform_name.inspect}"
       end
     end
     alias_method :build, :new
@@ -101,8 +101,10 @@ module ChildProcess
           :windows
         when /cygwin/
           :cygwin
-        when /solaris|bsd/
-          :unix
+        when /solaris|sunos/
+          :solaris
+        when /bsd/
+          :bsd
         else
           raise Error, "unknown os: #{host_os.inspect}"
         end
@@ -144,7 +146,7 @@ module ChildProcess
       elsif windows?
         Windows::Lib.dont_inherit file
       else
-        raise Error, "not sure how to set close-on-exec for #{file.inspect} on #{platform.inspect}"
+        raise Error, "not sure how to set close-on-exec for #{file.inspect} on #{platform_name.inspect}"
       end
     end
 

data/lib/childprocess/jruby.rb

@@ -8,9 +8,9 @@ end
 class Java::JavaIo::FileDescriptor
   if ChildProcess.os == :windows
     field_reader :handle
-  else
-    field_reader :fd
   end
+
+  field_reader :fd
 end
 
 module ChildProcess

data/lib/childprocess/jruby/pump.rb

@@ -30,6 +30,7 @@ module ChildProcess
 
           while read != -1
             avail = [@input.available, 1].max
+            avail = BUFFER_SIZE if avail > BUFFER_SIZE
             read = @input.read(buffer, 0, avail)
 
             if read > 0

data/lib/childprocess/tools/generator.rb

@@ -1,4 +1,3 @@
-require 'ffi'
 require 'fileutils'
 
 module ChildProcess
@@ -120,8 +119,8 @@ int main() {
       end
 
       def result
-        if @sizeof.empty?
-          raise "no sizes collected, nothing to do"
+        if @sizeof.empty? && @constants.empty?
+          raise "no data collected, nothing to do"
         end
 
         out =  ['module ChildProcess::Unix::Platform']

data/lib/childprocess/unix/platform/i386-solaris.rb

@@ -0,0 +1,11 @@
+module ChildProcess::Unix::Platform
+  SIZEOF = {
+     :posix_spawn_file_actions_t => 4,
+     :posix_spawnattr_t          => 4,
+     :sigset_t                   => 16
+  }
+  POSIX_SPAWN_RESETIDS   = 1
+  POSIX_SPAWN_SETPGROUP  = 2
+  POSIX_SPAWN_SETSIGDEF  = 4
+  POSIX_SPAWN_SETSIGMASK = 8
+end

data/lib/childprocess/version.rb

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

data/lib/childprocess/windows/lib.rb

@@ -138,12 +138,12 @@ module ChildProcess
       attach_function :terminate_process, :TerminateProcess, [:pointer, :uint], :bool
 
       #
-      # long _get_osfhandle(
+      # intptr_t _get_osfhandle(
       #    int fd
       # );
       #
 
-      attach_function :get_osfhandle, :_get_osfhandle, [:int], :long
+      attach_function :get_osfhandle, :_get_osfhandle, [:int], :intptr_t
 
       #
       # int _open_osfhandle (

data/lib/childprocess/windows/process_builder.rb

@@ -72,7 +72,7 @@ module ChildProcess
           @inherit,     # inherit handles
           @flags,       # creation flags
           @env_ptr,     # environment
-          nil,          # current directory
+          cwd,          # current directory
           startup_info, # startup info
           process_info  # process info
         )
@@ -94,6 +94,10 @@ module ChildProcess
         @flags |= DETACHED_PROCESS if @detach
       end
 
+      def cwd
+        @cwd ||= FFI::MemoryPointer.from_string(Dir.pwd)
+      end
+
       def setup_io
         if @stdout || @stderr
           startup_info[:dwFlags] ||= 0

data/spec/childprocess_spec.rb

@@ -138,14 +138,16 @@ describe ChildProcess do
       process = ruby("print Dir.pwd")
       process.io.stdout = process.io.stderr = file
 
+      expected_dir = nil
       Dir.chdir(Dir.tmpdir) do
+        expected_dir = Dir.pwd
         process.start
       end
 
       process.wait
 
       file.rewind
-      file.read.should == Dir.tmpdir
+      file.read.should == expected_dir
     end
   end
 

data/spec/io_spec.rb

@@ -128,4 +128,25 @@ describe ChildProcess do
 
     wait_until { can_bind? "127.0.0.1", port }
   end
+
+  it "handles long output" do
+    process = ruby <<-CODE
+    print 'a'*3000
+    CODE
+
+    out = Tempfile.new("long-output")
+    out.sync = true
+
+    begin
+      process.io.stdout = out
+
+      process.start
+      process.wait
+
+      out.rewind
+      out.read.size.should == 3000
+    ensure
+      out.close
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -151,7 +151,7 @@ RSpec.configure do |c|
     @process && @process.alive? && @process.stop
   }
 
-  if ChildProcess.jruby? && !ChildProcess.posix_spawn?
+  if ChildProcess.jruby? && ChildProcess.new("true").instance_of?(ChildProcess::JRuby::Process)
     c.filter_run_excluding :process_builder => false
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-02-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -112,6 +112,7 @@ files:
 - lib/childprocess/unix/io.rb
 - lib/childprocess/unix/lib.rb
 - lib/childprocess/unix/platform/i386-linux.rb
+- lib/childprocess/unix/platform/i386-solaris.rb
 - lib/childprocess/unix/platform/x86_64-linux.rb
 - lib/childprocess/unix/platform/x86_64-macosx.rb
 - lib/childprocess/unix/posix_spawn_process.rb
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: childprocess
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 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.