subprocess 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 82c898802f4160693d7836102254e37c303db198
+  data.tar.gz: 71481f1fe51f83f84be323b801674c6ae34c8723
+SHA512:
+  metadata.gz: f3b32e75da714a7eb24ab94fa5486ed190c128b5e1e92fa8545a9797c93ff74cdef92f45a8d3e54b8d6fd653284d85d5640f6c89b926d23f9cfdd01786bbbdf3
+  data.tar.gz: d7d449f41f1d7c2a2201af471916bdac29696cea27058ada2454d91de7ac6543cb56715ae56393dc61b9e9c2c1a31c1fce01b7b76934d1f929909e23307324d1

data/README.md

@@ -1,5 +1,4 @@
-Subprocess
-==========
+# Subprocess [![Build Status](https://travis-ci.org/stripe/subprocess.svg?branch=master)](https://travis-ci.org/stripe/subprocess)
 
 ![Jacques Cousteau Submarine](http://i.imgur.com/lmej24F.jpg)
 

data/lib/subprocess.rb

@@ -111,12 +111,9 @@ module Subprocess
         if Signal.respond_to?(:signame)
           # ruby 2.0 way
           sig_name = Signal.signame(sig_num)
-        elsif Signal.list.respond_to?(:key)
+        else
           # ruby 1.9 way
           sig_name = Signal.list.key(sig_num)
-        else
-          # ruby 1.8 way
-          sig_name = Signal.list.index(sig_num)
         end
 
         if sig_name
@@ -221,12 +218,11 @@ module Subprocess
     #   numbers that should not be closed before executing the child process.
     #   Note that, unlike Python (which has :close_fds defaulting to false), all
     #   file descriptors not specified here will be closed.
+    # @option opts [Hash] :exec_opts A hash that will be merged into the options
+    #   hash of the call to {Kernel#exec}.
     #
     # @option opts [Proc] :preexec_fn A function that will be called in the
-    #   child process immediately before executing `cmd`. Note: we don't
-    #   actually close file descriptors, but instead set them to auto-close on
-    #   `exec` (using `FD_CLOEXEC`), so your application will probably continue
-    #   to behave as expected.
+    #   child process immediately before executing `cmd`.
     #
     # @yield [process] Yields the just-spawned {Process} to the optional block.
     #   This occurs after all of {Process}'s error handling has been completed,
@@ -235,6 +231,7 @@ module Subprocess
     # @yieldparam process [Process] The process that was just spawned.
     def initialize(cmd, opts={}, &blk)
       raise ArgumentError, "cmd must be an Array" unless Array === cmd
+      raise ArgumentError, "cmd cannot be empty" if cmd.empty?
 
       @command = cmd
 
@@ -253,69 +250,8 @@ module Subprocess
 
       @pid = fork do
         begin
-          require 'fcntl'
-
           FileUtils.cd(opts[:cwd]) if opts[:cwd]
 
-          # The only way to mark an fd as CLOEXEC in ruby is to create an IO
-          # object wrapping it. In 1.8, however, there's no way to create that
-          # IO without it believing it owns the underlying fd, s.t. it will
-          # close the fd if the IO is GC'd before the exec. Since we don't want
-          # that, we stash a list of these IO objects to prevent them from
-          # getting GC'd, since we are about to exec, which will clean
-          # everything up anyways.
-          fds = []
-
-          # We have a whole ton of file descriptors that we don't want leaking
-          # into the child. Set them all to close when we exec away.
-          #
-          # Ruby 1.9+ note: exec has a :close_others argument (and 2.0 closes
-          # FDs by default). When we stop supporting Ruby 1.8, all of this can
-          # go away.
-          if File.directory?("/dev/fd")
-            # On many modern UNIX-y systems, we can perform an optimization by
-            # looking through /dev/fd, which is a sparse listing of all the
-            # descriptors we have open. This allows us to avoid an expensive
-            # linear scan.
-            Dir.foreach("/dev/fd") do |file|
-              fd = file.to_i
-              if file.start_with?('.') || fd < 3 || retained_fds.include?(fd)
-                next
-              end
-              begin
-                fds << mark_fd_cloexec(fd)
-              rescue Errno::EBADF
-                # The fd might have been closed by now; that's peaceful.
-              end
-            end
-          else
-            # This is the big hammer. There's not really a good way of doing
-            # this comprehensively across all platforms without just trying them
-            # all. We only go up to the soft limit here. If you've been messing
-            # with the soft limit, we might miss a few. Also, on OSX (perhaps
-            # BSDs in general?), where the soft limit means something completely
-            # different.
-            special = [@child_stdin, @child_stdout, @child_stderr].compact
-            special = Hash[special.map { |f| [f.fileno, f] }]
-            3.upto(::Process.getrlimit(::Process::RLIMIT_NOFILE).first) do |fd|
-              next if retained_fds.include?(fd)
-              begin
-                # I don't know why we need to do this, but OSX started freaking
-                # out when trying to dup2 below if FD_CLOEXEC had been set on a
-                # fresh IO instance referring to the same underlying file
-                # descriptor as what we were trying to dup2 from.
-                if special[fd]
-                  special[fd].fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-                else
-                  fds << mark_fd_cloexec(fd)
-                end
-              rescue Errno::EBADF # Ignore FDs that don't exist
-              end
-            end
-          end
-
-          # dup2 the correct descriptors into place. Note that this clears the
-          # FD_CLOEXEC flag on the new file descriptors (but not the old ones).
           ::STDIN.reopen(@child_stdin) if @child_stdin
           ::STDOUT.reopen(@child_stdout) if @child_stdout
           if opts[:stderr] == STDOUT
@@ -333,19 +269,18 @@ module Subprocess
           # Call the user back, maybe?
           opts[:preexec_fn].call if opts[:preexec_fn]
 
-          # Ruby 1.8's exec is really stupid--there's no way to specify that
-          # you want to exec a single thing *without* performing shell
-          # expansion. So this is the next best thing.
-          args = cmd
-          if cmd.length == 1
-            args = ["'" + cmd[0].gsub("'", "\\'") + "'"]
-          end
+          options = {close_others: true}.merge(opts.fetch(:exec_opts, {}))
           if opts[:retain_fds]
-            redirects = {}
-            retained_fds.each { |fd| redirects[fd] = fd }
-            args << redirects
+            retained_fds.each { |fd| options[fd] = fd }
           end
-          exec(*args)
+
+          # Ruby's Kernel#exec will call an exec(3) variant if called with two
+          # or more arguments, but when called with just a single argument will
+          # spawn a subshell with that argument as the command. Since we always
+          # want to call exec(3), we use the third exec form, which passes a
+          # [cmdname, argv0] array as its first argument and never invokes a
+          # subshell.
+          exec([cmd[0], cmd[0]], *cmd[1..-1], options)
 
         rescue Exception => e
           # Dump all errors up to the parent through the control socket
@@ -366,7 +301,7 @@ module Subprocess
       control_w.close
 
       # Any errors during the spawn process? We'll get past this point when the
-      # child execs and the OS closes control_w because of the FD_CLOEXEC
+      # child execs and the OS closes control_w
       begin
         e = Marshal.load(control_r)
         e = "Unknown Failure" unless e.is_a?(Exception) || e.is_a?(String)
@@ -547,16 +482,6 @@ module Subprocess
       end
     end
 
-    def mark_fd_cloexec(fd)
-      io = IO.new(fd)
-      io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-      io
-    rescue ArgumentError => e
-      # Ruby maintains a self-pipe for thread interrupts, but it handles closing
-      # it on forks/execs
-      raise unless e.message == "The given fd is not accessible because RubyVM reserves it"
-    end
-
     @sigchld_mutex = Mutex.new
     @sigchld_fds = {}
     @sigchld_old_handler = nil

data/lib/subprocess/version.rb

@@ -1,3 +1,3 @@
 module Subprocess
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subprocess
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Carl Jackson
@@ -13,54 +12,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Control and communicate with spawned processes
@@ -74,33 +67,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/subprocess/version.rb
-- lib/subprocess.rb
 - README.md
+- lib/subprocess.rb
+- lib/subprocess/version.rb
 homepage: https://github.com/stripe/subprocess
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A port of Python's subprocess module to Ruby
 test_files: []
 has_rdoc: