open4 1.2.0 → 1.3.0

data/lib/open4.rb

@@ -4,7 +4,7 @@ require 'timeout'
 require 'thread'
 
 module Open4
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
   def self.version() VERSION end
 
   class Error < ::StandardError; end
@@ -38,7 +38,17 @@ module Open4
   module_function :popen4
   module_function :open4
 
-  def self.do_popen(b = nil, exception_propagation_at = nil, &cmd)
+  def popen4ext(closefds=false, *cmd, &b)
+    Open4.do_popen(b, :init, closefds) do |ps_read, ps_write|
+      ps_read.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      ps_write.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+      exec(*cmd)
+      raise 'forty-two'   # Is this really needed?
+    end
+  end
+  module_function :popen4ext
+
+  def self.do_popen(b = nil, exception_propagation_at = nil, closefds=false, &cmd)
     pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe
 
     verbose = $VERBOSE
@@ -46,6 +56,13 @@ module Open4
       $VERBOSE = nil
 
       cid = fork {
+        if closefds
+          exlist = [0, 1, 2] | [pw,pr,pe,ps].map{|p| [p.first.fileno, p.last.fileno] }.flatten
+          ObjectSpace.each_object(IO){|io|
+            io.close if (not io.closed?) and (not exlist.include? io.fileno)
+          }
+        end
+
         pw.last.close
         STDIN.reopen pw.first
         pw.first.close

data/open4.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "open4"
-  spec.version = "1.2.0"
+  spec.version = "1.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "open4"
   spec.description = "description: open4 kicks the ass"
@@ -29,6 +29,7 @@ Gem::Specification::new do |spec|
  "test",
  "test/pfork4_test.rb",
  "test/popen4_test.rb",
+ "test/popen4ext_test.rb",
  "test/support",
  "test/support/test_case.rb",
  "white_box",

data/test/popen4ext_test.rb

@@ -0,0 +1,82 @@
+require 'test_case'
+
+module Open4
+
+class POpen4Test < TestCase
+  UNKNOWN_CMD = 'asdfadsfjlkkk'
+  UNKNOWN_CMD_ERRORS = [Errno::ENOENT, Errno::EINVAL]
+
+  def test_unknown_command_propagates_exception
+    err = assert_raises(*UNKNOWN_CMD_ERRORS) { popen4ext true, UNKNOWN_CMD }
+    assert_match /#{UNKNOWN_CMD}/, err.to_s if on_mri?
+  end
+
+  def test_exception_propagation_avoids_zombie_child_process
+    assert_raises(*UNKNOWN_CMD_ERRORS) { popen4ext true, UNKNOWN_CMD }
+    assert_empty Process.waitall
+  end
+
+  def test_exit_failure
+    code = 43
+    cid, _ = popen4ext true, %{ruby -e "exit #{43}"}
+    assert_equal code, wait_status(cid)
+  end
+
+  def test_exit_success
+    cid, _ = popen4ext true, %{ruby -e "exit"}
+    assert_equal 0, wait_status(cid)
+  end
+
+  def test_passes_child_pid_to_block
+    cmd = %{ruby -e "STDOUT.print Process.pid"}
+    cid_in_block = nil
+    cid_in_fun = nil
+    status = popen4ext(true, cmd) do |cid, _, stdout, _|
+      cid_in_block = cid
+      cid_in_fun = stdout.read.to_i
+    end
+    assert_equal cid_in_fun, cid_in_block
+  end
+
+  def test_io_pipes_without_block
+    via_msg = 'foo'
+    err_msg = 'bar'
+    cmd = <<-END
+ruby -e "
+  STDOUT.write STDIN.read
+  STDERR.write '#{err_msg}'
+"
+    END
+    cid, stdin, stdout, stderr = popen4ext true, cmd
+    stdin.write via_msg
+    stdin.close
+    out_actual = stdout.read
+    err_actual = stderr.read
+    assert_equal via_msg, out_actual
+    assert_equal err_msg, err_actual
+    assert_equal 0, wait_status(cid)
+  end
+
+  def test_io_pipes_with_block
+    via_msg = 'foo'
+    err_msg = 'bar'
+    out_actual, err_actual = nil
+    cmd = <<-END
+ruby -e "
+  STDOUT.write STDIN.read
+  STDERR.write '#{err_msg}'
+"
+    END
+    status = popen4ext(true, cmd) do |_, stdin, stdout, stderr|
+      stdin.write via_msg
+      stdin.close
+      out_actual = stdout.read
+      err_actual = stderr.read
+    end
+    assert_equal via_msg, out_actual
+    assert_equal err_msg, err_actual
+    assert_equal 0, status.exitstatus
+  end
+end
+
+end

metadata

@@ -1,32 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: open4
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.3.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-05 00:00:00 Z
+date: 2011-11-19 00:00:00.000000000 Z
 dependencies: []
-
-description: "description: open4 kicks the ass"
+description: ! 'description: open4 kicks the ass'
 email: ara.t.howard@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README
 - README.erb
@@ -44,42 +34,31 @@ files:
 - samples/timeout.rb
 - test/pfork4_test.rb
 - test/popen4_test.rb
+- test/popen4ext_test.rb
 - test/support/test_case.rb
 - white_box/leak.rb
 homepage: https://github.com/ahoward/open4
 licenses: []
-
-metadata: {}
-
 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: codeforpeople
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: open4
 test_files: []
-