posix-spawn 0.3.5 → 0.3.6

data/ext/extconf.rb

@@ -3,4 +3,9 @@ require 'mkmf'
 # warnings save lives
 $CFLAGS << " -Wall "
 
-create_makefile('posix_spawn_ext')
+if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
+  File.open('Makefile','w'){|f| f.puts "default: \ninstall: " }
+else
+  create_makefile('posix_spawn_ext')
+end
+

data/ext/posix-spawn.c

@@ -69,14 +69,22 @@ posixspawn_obj_to_fd(VALUE obj)
 
 		case T_FILE:
 			/* IO object */
-			fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+			if (rb_respond_to(obj, rb_intern("posix_fileno"))) {
+				fd = FIX2INT(rb_funcall(obj, rb_intern("posix_fileno"), 0));
+			} else {
+				fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+			}
 			break;
 
 		case T_OBJECT:
 			/* some other object */
 			if (rb_respond_to(obj, rb_intern("to_io"))) {
 				obj = rb_funcall(obj, rb_intern("to_io"), 0);
-				fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+				if (rb_respond_to(obj, rb_intern("posix_fileno"))) {
+					fd = FIX2INT(rb_funcall(obj, rb_intern("posix_fileno"), 0));
+				} else {
+					fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+				}
 			}
 			break;
 	}

data/lib/posix/spawn.rb

@@ -1,7 +1,30 @@
-require 'posix_spawn_ext'
+unless RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
+  require 'posix_spawn_ext'
+end
+
 require 'posix/spawn/version'
 require 'posix/spawn/child'
 
+class IO
+  if defined? JRUBY_VERSION
+    require 'jruby'
+    def posix_fileno
+      case self
+      when STDIN, $stdin
+        0
+      when STDOUT, $stdout
+        1
+      when STDERR, $stderr
+        2
+      else
+        JRuby.reference(self).getOpenFile.getMainStream.getDescriptor.getChannel.getFDVal
+      end
+    end
+  else
+    alias :posix_fileno :fileno
+  end
+end
+
 module POSIX
   # The POSIX::Spawn module implements a compatible subset of Ruby 1.9's
   # Process::spawn and related methods using the IEEE Std 1003.1 posix_spawn(2)
@@ -151,6 +174,16 @@ module POSIX
     def pspawn(*args)
       env, argv, options = extract_process_spawn_arguments(*args)
       raise NotImplementedError unless respond_to?(:_pspawn)
+
+      if defined? JRUBY_VERSION
+        # On the JVM, changes made to the environment are not propagated down
+        # to C via get/setenv, so we have to fake it here.
+        unless options[:unsetenv_others] == true
+          env = ENV.merge(env)
+          options[:unsetenv_others] = true
+        end
+      end
+
       _pspawn(env, argv, options)
     end
 

data/lib/posix/spawn/version.rb

@@ -1,5 +1,5 @@
 module POSIX
   module Spawn
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

data/test/test_backtick.rb

@@ -6,31 +6,31 @@ class BacktickTest < Test::Unit::TestCase
 
   def test_backtick_simple
     out = `exit`
-    assert_equal out, ''
-    assert_equal $?.exitstatus, 0
+    assert_equal '', out
+    assert_equal 0, $?.exitstatus
   end
 
   def test_backtick_output
     out = `echo 123`
-    assert_equal out, "123\n"
-    assert_equal $?.exitstatus, 0
+    assert_equal "123\n", out
+    assert_equal 0, $?.exitstatus, 0
   end
 
   def test_backtick_failure
     out = `nosuchcmd 2> /dev/null`
-    assert_equal out, ''
-    assert_equal $?.exitstatus, 127
+    assert_equal '', out
+    assert_equal 127, $?.exitstatus
   end
 
   def test_backtick_redirect
     out = `nosuchcmd 2>&1`
-    assert_equal out, "/bin/sh: nosuchcmd: command not found\n"
-    assert_equal $?.exitstatus, 127
+    assert_equal "/bin/sh: nosuchcmd: command not found\n", out
+    assert_equal 127, $?.exitstatus, 127
   end
 
   def test_backtick_huge
     out = `yes | head -50000`
-    assert_equal out.size, 100000
-    assert_equal $?.exitstatus, 0
+    assert_equal 100000, out.size
+    assert_equal 0, $?.exitstatus
   end
 end

data/test/test_child.rb

@@ -75,9 +75,11 @@ class ChildTest < Test::Unit::TestCase
   end
 
   def test_timeout
+    start = Time.now
     assert_raise TimeoutExceeded do
       Child.new('sleep', '1', :timeout => 0.05)
     end
+    assert (Time.now-start) <= 0.2
   end
 
   def test_timeout_with_child_hierarchy

data/test/test_popen.rb

@@ -10,8 +10,8 @@ class PopenTest < Test::Unit::TestCase
     i.close
     ::Process.wait(pid)
 
-    assert_equal o.read, "hello world"
-    assert_equal $?.exitstatus, 0
+    assert_equal "hello world", o.read
+    assert_equal 0, $?.exitstatus
   ensure
     [i, o, e].each{ |io| io.close rescue nil }
   end

data/test/test_spawn.rb

@@ -68,7 +68,7 @@ module SpawnImplementationTests
 
   def test_sanity_of_checking_clone_with_sh
     rd, wr = IO.pipe
-    pid = _spawn("exec 2>/dev/null 100<&#{rd.to_i} || exit 1", rd => rd)
+    pid = _spawn("exec 2>/dev/null 100<&#{rd.posix_fileno} || exit 1", rd => rd)
     assert_process_exit_status pid, 0
   ensure
     [rd, wr].each { |fd| fd.close rescue nil }
@@ -94,7 +94,7 @@ module SpawnImplementationTests
 
   def test_spawn_close_option_with_fd_number
     rd, wr = IO.pipe
-    pid = _spawn("exec 2>/dev/null 100<&#{rd.to_i} || exit 1", rd.to_i => :close)
+    pid = _spawn("exec 2>/dev/null 100<&#{rd.posix_fileno} || exit 1", rd.posix_fileno => :close)
     assert_process_exit_status pid, 1
 
     assert !rd.closed?
@@ -105,7 +105,7 @@ module SpawnImplementationTests
 
   def test_spawn_close_option_with_io_object
     rd, wr = IO.pipe
-    pid = _spawn("exec 2>/dev/null 100<&#{rd.to_i} || exit 1", rd => :close)
+    pid = _spawn("exec 2>/dev/null 100<&#{rd.posix_fileno} || exit 1", rd => :close)
     assert_process_exit_status pid, 1
 
     assert !rd.closed?
@@ -123,7 +123,7 @@ module SpawnImplementationTests
 
   def test_spawn_closing_multiple_fds_with_array_keys
     rd, wr = IO.pipe
-    pid = _spawn("exec 2>/dev/null 101>&#{wr.to_i} || exit 1", [rd, wr, :out] => :close)
+    pid = _spawn("exec 2>/dev/null 101>&#{wr.posix_fileno} || exit 1", [rd, wr, :out] => :close)
     assert_process_exit_status pid, 1
   ensure
     [rd, wr].each { |fd| fd.close rescue nil }
@@ -145,7 +145,7 @@ module SpawnImplementationTests
 
   def test_spawn_redirect_fds_with_fd_numbers
     rd, wr = IO.pipe
-    pid = _spawn("echo", "hello world", 1 => wr.fileno, rd.fileno => :close)
+    pid = _spawn("echo", "hello world", 1 => wr.posix_fileno, rd.posix_fileno => :close)
     wr.close
     output = rd.read
     assert_process_exit_ok pid
@@ -181,7 +181,7 @@ module SpawnImplementationTests
   # have to pass it explicitly as fd => fd.
   def test_explicitly_passing_an_fd_as_open
     rd, wr = IO.pipe
-    pid = _spawn("exec 101>&#{wr.to_i} || exit 1", wr => wr)
+    pid = _spawn("exec 101>&#{wr.posix_fileno} || exit 1", wr => wr)
     assert_process_exit_ok pid
   ensure
     [rd, wr].each { |fd| fd.close rescue nil }

data/test/test_system.rb

@@ -6,24 +6,24 @@ class SystemTest < Test::Unit::TestCase
 
   def test_system
     ret = system("true")
-    assert_equal ret, true
-    assert_equal $?.exitstatus, 0
+    assert_equal true, ret
+    assert_equal 0, $?.exitstatus
   end
 
   def test_system_nonzero
     ret = system("false")
-    assert_equal ret, false
-    assert_equal $?.exitstatus, 1
+    assert_equal false, ret
+    assert_equal 1, $?.exitstatus
   end
 
   def test_system_nonzero_via_sh
     ret = system("exit 1")
-    assert_equal ret, false
-    assert_equal $?.exitstatus, 1
+    assert_equal false, ret
+    assert_equal 1, $?.exitstatus
   end
 
   def test_system_failure
     ret = system("nosuch")
-    assert_equal ret, false
+    assert_equal false, ret
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: posix-spawn
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 -07:00
+date: 2011-04-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: posix_spawnp(2) for ruby