subcontractor 0.3.0 → 0.3.1

data/examples/Procfile

@@ -1,3 +1,4 @@
 thin: ruby -I ../lib ../bin/subcontract --rvm ruby-1.8.7-p249@subcontractor-webapp --chdir webapp --signal INT -- bundle exec rackup config.ru -p 3001
 webrick: ruby -I ../lib ../bin/subcontract --rvm ruby-1.8.7-p249@subcontractor-webapp --chdir webapp --signal INT -- bundle exec thin --rackup config.ru -p 3002 start
 sleepy: ruby -I ../lib ../bin/subcontract --chdir script -- ruby sleepy.rb
+slanger: ruby -I ../lib ../bin/subcontract --chdir slanger --rvm ruby-1.9.2@slanger -- bundle exec slanger --app_key xxx --secret xxx -w 0.0.0.0:8081

data/examples/slanger/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.9.2@slanger --create

data/examples/slanger/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gem "slanger"

data/lib/subcontractor/cli.rb

@@ -11,7 +11,7 @@ module Subcontractor
       signal = options[:signal] || "TERM"
       PTY.spawn(command) do |stdin, stdout, pid|
         trap("TERM") do
-          options.has_key?(:rvm) ? send_kill(signal, *child_pids(pid)) : send_kill(signal, pid)
+          send_kill(signal, find_pids_to_kill(pid))
         end
         until stdin.eof?
           puts stdin.gets
@@ -19,16 +19,24 @@ module Subcontractor
       end
     end
 
-    def send_kill(signal, *pids)
+    def send_kill(signal, pids)
       pids.each { |pid| Process.kill(signal, pid) }
     end
 
-    def child_pids(pid)
+    def find_pids_to_kill(*pids_to_investigate)
+      pids_to_kill = pids_to_investigate
+      begin
+        pids_to_investigate = find_child_pids(pids_to_investigate)
+        pids_to_kill = pids_to_investigate + pids_to_kill
+      end until pids_to_investigate.empty?
+      pids_to_kill
+    end
+
+    def find_child_pids(pids)
       lines = `ps axo pid,ppid`
       child_pids = lines.map(&:split).select do |(child_pid, parent_pid)|
-        parent_pid == pid.to_s
+        pids.include?(parent_pid.to_i)
       end.map(&:first).map(&:to_i)
-      child_pids + [pid]
     end
 
     def build_command(parts, options)

data/lib/subcontractor/version.rb

@@ -1,3 +1,3 @@
 module Subcontractor
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: subcontractor
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Tony Pitluga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-22 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: []
 
 description: rvm aware process launcher for foreman
@@ -36,6 +36,8 @@ files:
 - bin/subcontract
 - examples/Procfile
 - examples/script/sleepy.rb
+- examples/slanger/.rvmrc
+- examples/slanger/Gemfile
 - examples/webapp/.rvmrc
 - examples/webapp/Gemfile
 - examples/webapp/app.rb