posix-spawn 0.3.3 → 0.3.5

data/README.md

@@ -179,6 +179,12 @@ These `Process::spawn` arguments are currently supported to any of
       clearing environment variables:
         :unsetenv_others => true   : clear environment variables except specified by env
         :unsetenv_others => false  : don't clear (default)
+      current directory:
+        :chdir => str
+      process group:
+        :pgroup => true or 0 : make a new process group
+        :pgroup => pgid      : join to specified process group
+        :pgroup => nil       : don't change the process group (default)
       redirection:
         key:
           FD              : single file descriptor in child process
@@ -196,16 +202,10 @@ These `Process::spawn` arguments are currently supported to any of
           :err    : the file descriptor 2 which is the standard error
           integer : the file descriptor of specified the integer
           io      : the file descriptor specified as io.fileno
-      current directory:
-        :chdir => str
 
 These options are currently NOT supported:
 
     options: hash
-      process group:
-        :pgroup => true or 0 : make a new process group
-        :pgroup => pgid      : join to specified process group
-        :pgroup => nil       : don't change the process group (default)
       resource limit: resourcename is core, cpu, data, etc.  See Process.setrlimit.
         :rlimit_resourcename => limit
         :rlimit_resourcename => [cur_limit, max_limit]

data/ext/posix-spawn.c

@@ -5,6 +5,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <signal.h>
 #include <spawn.h>
 #include <stdio.h>
 #include <string.h>
@@ -14,13 +15,8 @@
 
 #ifdef RUBY_VM
 #include <ruby/st.h>
-extern void rb_enable_interrupt(void);
-extern void rb_disable_interrupt(void);
 #else
-#include <node.h>
 #include <st.h>
-#define rb_enable_interrupt()
-#define rb_disable_interrupt()
 #endif
 
 #ifndef RARRAY_LEN
@@ -209,6 +205,42 @@ posixspawn_file_actions_init(posix_spawn_file_actions_t *fops, VALUE options)
 	rb_hash_foreach(options, posixspawn_file_actions_operations_iter, (VALUE)fops);
 }
 
+/*
+ * Initialize pgroup related flags in the posix_spawnattr struct based on the
+ * options Hash.
+ *
+ *   :pgroup => 0 | true - spawned process is in a new process group with the
+ *                         same id as the new process's pid.
+ *   :pgroup => pgid     - spawned process is in a new process group with id
+ *                         pgid.
+ *   :pgroup => nil      - spawned process has the same pgid as the parent
+ *                         process (this is the default).
+ *
+ * The options Hash is modified in place with the :pgroup key being removed.
+ */
+static void
+posixspawn_set_pgroup(VALUE options, posix_spawnattr_t *pattr, short *pflags)
+{
+	VALUE pgroup_val;
+	pgroup_val = rb_hash_delete(options, ID2SYM(rb_intern("pgroup")));
+
+	switch (TYPE(pgroup_val)) {
+		case T_TRUE:
+			(*pflags) |= POSIX_SPAWN_SETPGROUP;
+			posix_spawnattr_setpgroup(pattr, 0);
+			break;
+		case T_FIXNUM:
+			(*pflags) |= POSIX_SPAWN_SETPGROUP;
+			posix_spawnattr_setpgroup(pattr, FIX2INT(pgroup_val));
+			break;
+		case T_NIL:
+			break;
+		default:
+			rb_raise(rb_eTypeError, ":pgroup option is invalid");
+			break;
+	}
+}
+
 static int
 each_env_check_i(VALUE key, VALUE val, VALUE arg)
 {
@@ -289,6 +321,8 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 	pid_t pid;
 	posix_spawn_file_actions_t fops;
 	posix_spawnattr_t attr;
+	sigset_t mask;
+	short flags = 0;
 
 	/* argv is a [[cmdname, argv0], argv1, argvN, ...] array. */
 	if (TYPE(argv) != T_ARRAY ||
@@ -347,15 +381,25 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 	}
 
 	posixspawn_file_actions_init(&fops, options);
-
 	posix_spawnattr_init(&attr);
+
+	/* child does not block any signals */
+	flags |= POSIX_SPAWN_SETSIGMASK;
+	sigemptyset(&mask);
+	posix_spawnattr_setsigmask(&attr, &mask);
+
 #if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__)
 	/* Force USEVFORK on linux. If this is undefined, it's probably because
 	 * you forgot to define _GNU_SOURCE at the top of this file.
 	 */
-	posix_spawnattr_setflags(&attr, POSIX_SPAWN_USEVFORK);
+	flags |= POSIX_SPAWN_USEVFORK;
 #endif
 
+	/* setup pgroup options */
+	posixspawn_set_pgroup(options, &attr, &flags);
+
+	posix_spawnattr_setflags(&attr, flags);
+
 	if (RTEST(dirname = rb_hash_delete(options, ID2SYM(rb_intern("chdir"))))) {
 		char *new_cwd = StringValuePtr(dirname);
 		cwd = getcwd(NULL, 0);
@@ -363,9 +407,7 @@ rb_posixspawn_pspawn(VALUE self, VALUE env, VALUE argv, VALUE options)
 	}
 
 	if (RHASH_SIZE(options) == 0) {
-		rb_enable_interrupt();
 		ret = posix_spawnp(&pid, file, &fops, &attr, cargv, envp ? envp : environ);
-		rb_disable_interrupt();
 		if (cwd) {
 			chdir(cwd);
 			free(cwd);

data/lib/posix/spawn.rb

@@ -159,8 +159,9 @@ module POSIX
     # the POSIX::Spawn module documentation.
     def fspawn(*args)
       env, argv, options = extract_process_spawn_arguments(*args)
+      valid_options = [:chdir, :unsetenv_others, :pgroup]
 
-      if badopt = options.find{ |key,val| !fd?(key) && ![:chdir,:unsetenv_others].include?(key) }
+      if badopt = options.find{ |key,val| !fd?(key) && !valid_options.include?(key) }
         raise ArgumentError, "Invalid option: #{badopt[0].inspect}"
       elsif !argv.is_a?(Array) || !argv[0].is_a?(Array) || argv[0].size != 2
         raise ArgumentError, "Invalid command name"
@@ -169,7 +170,7 @@ module POSIX
       fork do
         begin
           # handle FD => {FD, :close, [file,mode,perms]} options
-          options.map do |key, val|
+          options.each do |key, val|
             if fd?(key)
               key = fd_to_io(key)
 
@@ -196,6 +197,11 @@ module POSIX
           # { :chdir => '/' } in options means change into that dir
           ::Dir.chdir(options[:chdir]) if options[:chdir]
 
+          # { :pgroup => pgid } options
+          pgroup = options[:pgroup]
+          pgroup = 0 if pgroup == true
+          Process::setpgid(0, pgroup) if pgroup
+
           # do the deed
           ::Kernel::exec(*argv)
         ensure

data/lib/posix/spawn/child.rb

@@ -1,9 +1,5 @@
 require 'posix/spawn'
 
-class String
-  alias bytesize size
-end unless ''.respond_to?(:bytesize)
-
 module POSIX
   module Spawn
     # POSIX::Spawn::Child includes logic for executing child processes and
@@ -145,22 +141,32 @@ module POSIX
       # Raises MaximumOutputExceeded when the total number of bytes output
       #   exceeds the amount specified by the max argument.
       def read_and_write(input, stdin, stdout, stderr, timeout=nil, max=nil)
-        if input
-          input = input.dup.force_encoding('BINARY') if input.respond_to?(:force_encoding)
-        else
-          stdin.close
-        end
-
         max = nil if max && max <= 0
         out, err = '', ''
         offset = 0
 
+        # force all string and IO encodings to BINARY under 1.9 for now
+        if out.respond_to?(:force_encoding)
+          [stdin, stdout, stderr].each do |fd|
+            fd.set_encoding('BINARY', 'BINARY')
+          end
+          out.force_encoding('BINARY')
+          err.force_encoding('BINARY')
+          input = input.dup.force_encoding('BINARY') if input
+        end
+
         timeout = nil if timeout && timeout <= 0.0
         @runtime = 0.0
         start = Time.now
 
-        writers = input ? [stdin] : []
         readers = [stdout, stderr]
+        writers =
+          if input
+            [stdin]
+          else
+            stdin.close
+            []
+          end
         t = timeout
         while readers.any? || writers.any?
           ready = IO.select(readers, writers, readers + writers, t)
@@ -171,11 +177,11 @@ module POSIX
             begin
               boom = nil
               size = fd.write_nonblock(input)
-              input = input[size, input.bytesize]
+              input = input[size, input.size]
             rescue Errno::EPIPE => boom
             rescue Errno::EAGAIN, Errno::EINTR
             end
-            if boom || input.bytesize == 0
+            if boom || input.size == 0
               stdin.close
               writers.delete(stdin)
             end

data/lib/posix/spawn/version.rb

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

data/test/test_spawn.rb

@@ -155,7 +155,7 @@ module SpawnImplementationTests
   end
 
   def test_spawn_redirect_invalid_fds_raises_exception
-    pid = _spawn("echo", "hiya", 250 => 3)
+    pid = _spawn("echo", "hiya", 1 => 250)
     assert_process_exit_status pid, 127
   rescue Errno::EBADF
     # this happens on darwin only. GNU does spawn and exits 127.
@@ -269,6 +269,37 @@ module SpawnImplementationTests
     File.unlink(file) rescue nil
   end
 
+  ##
+  # :pgroup => <pgid>
+
+  def test_spawn_inherit_pgroup_from_parent_by_default
+    pgrp = Process.getpgrp
+    pid = _spawn("ruby", "-e", "exit(Process.getpgrp == #{pgrp} ? 0 : 1)")
+    assert_process_exit_ok pid
+  end
+
+  def test_spawn_inherit_pgroup_from_parent_when_nil
+    pgrp = Process.getpgrp
+    pid = _spawn("ruby", "-e", "exit(Process.getpgrp == #{pgrp} ? 0 : 1)", :pgroup => nil)
+    assert_process_exit_ok pid
+  end
+
+  def test_spawn_new_pgroup_with_true
+    pid = _spawn("ruby", "-e", "exit(Process.getpgrp == $$ ? 0 : 1)", :pgroup => true)
+    assert_process_exit_ok pid
+  end
+
+  def test_spawn_new_pgroup_with_zero
+    pid = _spawn("ruby", "-e", "exit(Process.getpgrp == $$ ? 0 : 1)", :pgroup => 0)
+    assert_process_exit_ok pid
+  end
+
+  def test_spawn_explicit_pgroup
+    pgrp = Process.getpgrp
+    pid = _spawn("ruby", "-e", "exit(Process.getpgrp == #{pgrp} ? 0 : 1)", :pgroup => pgrp)
+    assert_process_exit_ok pid
+  end
+
   ##
   # Exceptions
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: posix-spawn
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.3.3
+  segments: 
+  - 0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Ryan Tomayko
@@ -11,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -08:00
+date: 2011-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +27,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 7
+        - 6
         version: 0.7.6
   type: :development
   version_requirements: *id001
@@ -71,12 +81,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []