childprocess 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63503076c91b015a05049ce4909a79dccffb1fc6
-  data.tar.gz: 06207a205990b72490b31ce3af1088b6a49c21c2
+  metadata.gz: c1bf2633335fa2da24ffd367d4a83e624b9e22b1
+  data.tar.gz: 4f05990d1fb49c76270f9ff11211fe4e05daca46
 SHA512:
-  metadata.gz: 81e45d2d76bf9a7d79c3f2accdac8b769994942292ffc2a80d7b9809e06c6d4dd068bcd56c861e0440784287f4c3165030b994173a93369112fcad4ab862a1d2
-  data.tar.gz: 29132e001b36f540c75d66984721e23cbef19ff10124b95b53c59a33bec33170a10c9411dd2d96dd36e779d7ade95cf2089d8d0106f8484bee5c8c99937cea2c
+  metadata.gz: 08bc35f482edba588bf05e54777a2e3f1c2a91c0126a32d9cbdf126511deaf6c6958366e5fafd7e2f00fa370942ffe791fbb1b2aa211a0f34748f94a85789beb
+  data.tar.gz: 7531827c11b12ab23b4f87c487a05bce4cf3fb4a2ee0fd3f45f8dbe7c1803364a7f9577b43c6d0a4b62e92e3bd03ab9a5cb263bf64bf623f1c84a6b7f830c38b

data/README.md

@@ -124,6 +124,16 @@ ChildProcess.posix_spawn = true
 process = ChildProcess.build(*args)
 ```
 
+### Ensure entire process tree dies
+
+By default, the child process does not create a new process group. This means there's no guarantee that the entire process tree will die when the child process is killed. To solve this:
+
+```ruby
+process = ChildProcess.build(*args)
+process.new_process_group = true
+process.start
+```
+
 #### Detach from parent
 
 ```ruby

data/lib/childprocess/abstract_process.rb

@@ -24,6 +24,15 @@ module ChildProcess
     #
     attr_accessor :cwd
 
+    #
+    #
+    # Set this to true to make the child process the leader of a new process group
+    #
+    # This can be used to make sure that all grandchildren are killed
+    # when the child process dies.
+    #
+    attr_accessor :leader
+
     #
     # Create a new process with the given args.
     #
@@ -43,6 +52,7 @@ module ChildProcess
       @cwd         = nil
       @detach      = false
       @duplex      = false
+      @leader      = false
       @environment = {}
     end
 
@@ -161,6 +171,10 @@ module ChildProcess
       @duplex
     end
 
+    def leader?
+      @leader
+    end
+
     def log(*args)
       $stderr.puts "#{self.inspect} : #{args.inspect}" if $DEBUG
     end

data/lib/childprocess/unix/fork_exec_process.rb

@@ -20,7 +20,7 @@ module ChildProcess
         @pid = fork {
           # 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?
+          ::Process.setpgid 0, 0 if leader?
 
           if @cwd
             Dir.chdir(@cwd)

data/lib/childprocess/unix/posix_spawn_process.rb

@@ -33,7 +33,7 @@ module ChildProcess
           actions.add_close fileno_for(writer)
         end
 
-        attrs.pgroup = 0 unless keep_pgid?
+        attrs.pgroup = 0 if leader?
         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

@@ -52,21 +52,6 @@ module ChildProcess
         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
@@ -89,10 +74,10 @@ module ChildProcess
       end
 
       def _pid
-        if keep_pgid?
-          @pid
-        else
+        if leader?
           -@pid # negative pid == process group
+        else
+          @pid
         end
       end
 

data/lib/childprocess/version.rb

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

data/lib/childprocess/windows/process.rb

@@ -16,8 +16,8 @@ module ChildProcess
 
         poll_for_exit(timeout)
       ensure
-        @handle.close
-        @job.close
+        close_handle
+        close_job_if_necessary
       end
 
       def wait
@@ -26,8 +26,9 @@ module ChildProcess
         else
           @handle.wait
           @exit_code = @handle.exit_code
-          @handle.close
-          @job.close
+
+          close_handle
+          close_job_if_necessary
 
           @exit_code
         end
@@ -64,11 +65,13 @@ module ChildProcess
           builder.stderr      = @io.stderr
         end
 
-        @job = Job.new
         @pid = builder.start
         @handle = Handle.open @pid
 
-        @job << @handle
+        if leader?
+          @job = Job.new
+          @job << @handle
+        end
 
         if duplex?
           raise Error, "no stdin stream" unless builder.stdin
@@ -78,6 +81,15 @@ module ChildProcess
         self
       end
 
+      def close_handle
+        @handle.close
+      end
+
+      def close_job_if_necessary
+        @job.close if leader?
+      end
+
+
       class Job
         def initialize
           @pointer = Lib.create_job_object(nil, nil)

data/spec/childprocess_spec.rb

@@ -205,7 +205,9 @@ describe ChildProcess do
 
   it 'kills the full process tree', :process_builder => false do
     Tempfile.open('kill-process-tree') do |file|
-      process = write_pid_in_sleepy_grand_child(file.path).start
+      process = write_pid_in_sleepy_grand_child(file.path)
+      process.leader = true
+      process.start
 
       pid = wait_until(30) do
         Integer(rewind_and_read(file)) rescue nil

metadata

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