childprocess 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc6b66871c56637224c64a8a7c6562d86e7a932c
-  data.tar.gz: c792a3c348e1770cd1d62f8b2f351fe59d070458
+  metadata.gz: 63503076c91b015a05049ce4909a79dccffb1fc6
+  data.tar.gz: 06207a205990b72490b31ce3af1088b6a49c21c2
 SHA512:
-  metadata.gz: f4a4b15be2ab0c554d85397965e620a4740da60dd39d743a69a47d5d46f924483e17a52889cabb404f65b0be93b659b13b585f0889b7fff366ab0802b5a6f809
-  data.tar.gz: 70341756153abc0bfa838f4a135193e51032a681c6d98cda035727331a589ed9baf2eab32c9007e3d7dcd7a5e822a1ba8a204558052abe0291ed6b023da790ea
+  metadata.gz: 81e45d2d76bf9a7d79c3f2accdac8b769994942292ffc2a80d7b9809e06c6d4dd068bcd56c861e0440784287f4c3165030b994173a93369112fcad4ab862a1d2
+  data.tar.gz: 29132e001b36f540c75d66984721e23cbef19ff10124b95b53c59a33bec33170a10c9411dd2d96dd36e779d7ade95cf2089d8d0106f8484bee5c8c99937cea2c

data/lib/childprocess/unix/fork_exec_process.rb

@@ -18,7 +18,9 @@ module ChildProcess
         end
 
         @pid = fork {
-          ::Process.setpgid 0, 0 # same process group as parent
+          # Children of the forked process will inherit its process group
+          # This is to make sure that all grandchildren dies when this Process instance is killed
+          ::Process.setpgid 0, 0 unless keep_pgid?
 
           if @cwd
             Dir.chdir(@cwd)

data/lib/childprocess/unix/lib.rb

@@ -92,7 +92,7 @@ module ChildProcess
 
       def self.check(errno)
         if errno != 0
-          raise Error, Lib.strerror(errno)
+          raise Error, Lib.strerror(FFI.errno)
         end
       end
 
@@ -159,6 +159,11 @@ module ChildProcess
           ptr.read_short
         end
 
+        def pgroup=(pid)
+          self.flags |= Platform::POSIX_SPAWN_SETPGROUP
+          Lib.check Lib.posix_spawnattr_setpgroup(@ptr, pid)
+        end
+
         def to_ptr
           @ptr
         end

data/lib/childprocess/unix/posix_spawn_process.rb

@@ -33,7 +33,7 @@ module ChildProcess
           actions.add_close fileno_for(writer)
         end
 
-        attrs.flags |= Platform::POSIX_SPAWN_SETPGROUP
+        attrs.pgroup = 0 unless keep_pgid?
         attrs.flags |= Platform::POSIX_SPAWN_USEVFORK if defined? Platform::POSIX_SPAWN_USEVFORK
 
         # wrap in helper classes in order to avoid GC'ed pointers

data/lib/childprocess/unix/process.rb

@@ -29,13 +29,13 @@ module ChildProcess
         return true if @exit_code
 
         assert_started
-        pid, status = ::Process.waitpid2(@pid, ::Process::WNOHANG)
+        pid, status = ::Process.waitpid2(_pid, ::Process::WNOHANG | ::Process::WUNTRACED)
         pid = nil if pid == 0 # may happen on jruby
 
         log(:pid => pid, :status => status)
 
         if pid
-          @exit_code = status.exitstatus || status.termsig
+          set_exit_code(status)
         end
 
         !!pid
@@ -47,11 +47,26 @@ module ChildProcess
         if exited?
           exit_code
         else
-          _, status = ::Process.waitpid2 @pid
-          @exit_code = status.exitstatus || status.termsig
+          _, status = ::Process.waitpid2 _pid
+          set_exit_code(status)
         end
       end
 
+      #
+      # Set this to true to avoid resetting the parent group id in the child
+      #
+      # This is a temporary workaround for https://github.com/jarib/childprocess/issues/69
+      # and will probably be removed in the future.
+      #
+
+      def keep_pgid=(bool)
+        @keep_pgid = bool
+      end
+
+      def keep_pgid?
+        !!@keep_pgid
+      end
+
       private
 
       def send_term
@@ -66,7 +81,19 @@ module ChildProcess
         assert_started
 
         log "sending #{sig}"
-        ::Process.kill sig, -@pid
+        ::Process.kill sig, _pid
+      end
+
+      def set_exit_code(status)
+        @exit_code = status.exitstatus || status.termsig
+      end
+
+      def _pid
+        if keep_pgid?
+          @pid
+        else
+          -@pid # negative pid == process group
+        end
       end
 
     end # Process

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec