cumuli 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd75adb4172768fa85d3dc9201b7e25a8d478bb
-  data.tar.gz: 6f5bf7cc32f829eca21c9811c7ec3c5ff6765ef4
+  metadata.gz: e61d96a9203fd5fed28980e2d3817ab7afcdfd5a
+  data.tar.gz: 0721f35292c999e27c9e7ad25904c93b2d59f353
 SHA512:
-  metadata.gz: 9d867f58b1a5a5471b6c699bd9d7e899a9da273fe063c2140ae22c0872ae56f6fa11c5fb26ff4e84db828617595186096d6fc46cd1b5779bb432fb76309a155e
-  data.tar.gz: 1bfb5e52e75fc552ad015803e5ce9b1472c351dcdbd292852281fc9e2f8ce02025bc799554d8074ac56a590d80460d571a5f2d3883e6ce2b0e9a56bf317fedd7
+  metadata.gz: 557916c9a94781c074aad2eb6646a7d7cf99755f17a4c9800d0a89ae45061a0bc58ba4725700fe018a88b81ab653a21caaa53c0990701ed9583ea30278b203bf
+  data.tar.gz: c83034cfc14815ca7d13d9b3aed3a109993ddaeb5be4d3ff6ed4f3777514038477a9f6155f2a097c8d9ee2843c4edc97a62e47fac1a1dcb57c833c4cd2306aa4

data/features/graceful_exits.feature

@@ -0,0 +1,27 @@
+Feature: Cumuli exits the app gracefully
+  In order to use Cumuli to test in an integration way, a suite of apps and services
+  As a developer with a SOA stack
+  I want cucumber to exit with a good success code
+
+  Background:
+    Given the app suite is loaded
+
+  Scenario: App is stopped in a cucumber step
+    When I shutdown the app suite
+    Then the processes should not be running
+    And I should see that the rake was not aborted
+
+  #Scenario: App's forked pid receives an INT signal
+    #When the forked pid receives an INT signal
+    #Then the processes should not be running
+    #And I should see that the rake was not aborted
+
+  Scenario: App's forked pid receives a KILL signal
+    When the forked pid receives an KILL signal
+    Then the processes should not be running
+    And I should see that the rake was not aborted
+
+  Scenario: App's forked pid receives a TERM signal
+    When the forked pid receives an TERM signal
+    Then the processes should not be running
+    And I should see that the rake was not aborted

data/features/step_definitions/app_steps.rb

@@ -6,27 +6,38 @@ Given(/^the app suite is loaded$/) do
     app_dir: File.dirname(__FILE__) + "/../../spec/fixtures/app_set"
   })
   @app.start
+  @app.wait_for_apps
   @pid = @app.pid
 end
 
-When(/^I shutdown the app suite$/) do
-  @trapped = false
+Given(/^the current thread is listening for signals$/) do
+  @signals = []
 
-  trap('INT') do
-    @trapped = true
+  ['KILL', 'INT', 'TERM', 'HUP'].each do |signal|
+    trap signal do
+      @signals << signal
+    end
   end
+end
 
+When(/^I shutdown the app suite$/) do
+  step "the current thread is listening for signals"
   @app.stop
 end
 
+When(/^the forked pid receives an (.*) signal$/) do |signal|
+  step "the current thread is listening for signals"
+  Process.kill(signal, @pid)
+end
+
 Then(/^I should see that the rake was not aborted$/) do
-  @trapped.should == false
+  @signals.should be_empty
 end
 
 Then(/^the processes should not be running$/) do
   Cumuli::Waiter.new.wait_until(3) do
-    pses = Cumuli::PS.new.children(@pid)
-    pses.nil?
+    report = Cumuli::PS.new.report(@pid)
+    report.empty?
   end
 end
 

data/lib/cumuli/app/app.rb

@@ -15,7 +15,7 @@ module Cumuli
     def start
       return if foreman_process.started?
 
-      Dir.chdir(app_dir) do 
+      Dir.chdir(app_dir) do
         listen_for_signals
         logger.print "Starting ..."
         foreman_process.start
@@ -23,20 +23,32 @@ module Cumuli
       end
     end
 
+    def stop
+      if foreman_process.started?
+        foreman_process.stop
+        wait_for_apps('stop') if wait?
+        @foreman_process = nil
+      end
+    end
+
     def logger
       @logger = StdoutLogger.new
     end
 
     def foreman_process
-      @termial ||= ForemanProcess.new(env, log_dir)
+      @foreman_process ||= Spawner.new(env, log_dir)
     end
 
     def apps
-      @apps ||= Procs.new(app_dir)
+      @apps ||= Procs.new(app_dir).apps
+    end
+
+    def process_pids
+      PS.new.family
     end
 
     def pid
-      foreman_process.pid
+      foreman_process.group_id
     end
 
     def wait?
@@ -46,46 +58,29 @@ module Cumuli
     def listen_for_signals
       SIGNALS.each do |signal|
         trap(signal) do
+          puts "#{self.class}: trapped signal #{signal} in #{Process.pid} ... stopping"
           stop
         end
       end
     end
 
-    def app_ports
-      apps.map.values.compact
-    end
-
-    def wait_for_apps
-      app_ports.each do |port|
-        wait_for_app(port)
+    def wait_for_apps(direction = 'start')
+      logger.add_space
+      apps.each do |app|
+        log_and_wait(app, direction)
       end
-
       logger.add_space
     end
 
-    def wait_for_app(port)
-      logger.print "waiting for apps on port: #{port}"
+    def log_and_wait(app, direction)
       timeout = wait_time || DEFAULT_WAIT_TIME
-      Waiter.new("Application on port #{port} unavailable after #{timeout} seconds")
-        .wait_until(timeout) { open_socket(port) }
-      logger.print "Application on #{port} available"
+      logger.print "#{direction}: waiting for app named '#{app.name}' at #{app.url}"
+      app.send("wait_for_#{direction}", timeout)
+      logger.print "#{direction}: application '#{app.name}' on #{app.url} complete"
+      logger.add_space
     rescue Exception => e
       stop
       raise e
     end
-
-    def open_socket(port)
-      TCPSocket.new('localhost', port)
-      true
-    rescue Errno::ECONNREFUSED
-      false
-    end
-
-    def stop
-      if foreman_process.started?
-        foreman_process.stop
-        @foreman_process = nil
-      end
-    end
   end
 end

data/lib/cumuli/app/procs.rb

@@ -28,24 +28,6 @@ module Cumuli
       def names
         map.keys
       end
-
-      class SubApp
-        attr_reader :parts
-
-        def initialize(line)
-          @parts = line.split
-        end
-
-        def name
-          parts.first.gsub(':', '')
-        end
-
-        def port
-          if index = parts.find_index('-p')
-            parts[index + 1] && parts[index + 1].to_i
-          end
-        end
-      end
     end
   end
 end

data/lib/cumuli/app/{foreman_process.rb → spawner.rb}

@@ -1,6 +1,6 @@
 module Cumuli
   class App
-    class ForemanProcess
+    class Spawner
       attr_reader :pid, :env, :log_dir
 
       def initialize(env, log_dir)
@@ -15,7 +15,7 @@ module Cumuli
       end
 
       def command
-        "HEROKU_ENV=#{env} RAILS_ENV=#{env} foreman start"
+        "foreman start"
       end
 
       def log_file
@@ -24,9 +24,17 @@ module Cumuli
 
       def start
         @pid = fork do
-          listen_for_signals
-          $stdout.reopen(log_file)
-          exec(command)
+          spawn(
+            {
+              'HEROKU_ENV' => env,
+              'RAILS_ENV' => env
+            },
+            command,
+            {
+              out: $stdout.reopen(log_file),
+              pgroup: true, # start a new process group
+            }
+          )
         end
       end
 
@@ -50,16 +58,14 @@ module Cumuli
         @pid = nil
       end
 
+      def group_id
+        PS.new.root_pid
+      end
+
       def kill_children
-        pids = PS.new.tree(pid)
-        pids.reverse.each do |p|
-          begin
-            Process.kill("KILL", p)
-          rescue Errno::ESRCH => e
-            puts "Small issue killing your child: #{p}; it looks to be dead"
-          end
-        end
+        Process.kill('INT', -group_id) # kills the forked group
       end
     end
   end
 end
+

data/lib/cumuli/app/sub_app.rb

@@ -0,0 +1,50 @@
+module Cumuli
+  class App
+    class SubApp
+      attr_reader :parts
+      attr_accessor :host
+
+      def initialize(line)
+        @parts = line.split
+        @host = 'localhost'
+      end
+
+      def name
+        parts.first.gsub(':', '')
+      end
+
+      def port
+        if index = parts.find_index('-p')
+          parts[index + 1] && parts[index + 1].to_i
+        end
+      end
+
+      def waitable?
+        host != 'localhost' || port
+      end
+
+      def wait_for_start(timeout)
+        return unless waitable?
+        Waiter.new("Application #{name} on port #{port} unavailable after #{timeout} seconds")
+          .wait_until(timeout) { socket_available? }
+      end
+
+      def wait_for_stop(timeout)
+        return unless waitable?
+        Waiter.new("Application #{name} on port #{port} still connected after #{timeout} seconds")
+          .wait_until(timeout) { !socket_available? }
+      end
+
+      def url
+        "http://#{host}#{port ? ':' + port.to_s : ''}"
+      end
+
+      def socket_available?
+        TCPSocket.new(host, port)
+        true
+      rescue Errno::ECONNREFUSED
+        false
+      end
+    end
+  end
+end

data/lib/cumuli/app.rb

@@ -1,5 +1,6 @@
 require "cumuli/app/app"
-require "cumuli/app/foreman_process"
+require "cumuli/app/spawner"
 require "cumuli/app/stdout_logger"
 require "cumuli/app/procs"
+require "cumuli/app/sub_app"
 

data/lib/cumuli/ps.rb

@@ -5,64 +5,98 @@ module Cumuli
     attr_reader :lines
 
     def initialize(list=self.class.list)
-      @lines = list.lines
-      @lines.shift # to remove header line
+      lines = list.lines
+      lines.shift # to remove the header
+      @lines = lines.map{|l| Line.new(l) }
     end
 
-    def matching(regex = REGEX)
-      @matching ||= lines
-        .select{|l| l.match(regex)}
-        .select{|l| !l.match(/^#{Process.pid} /) }
+    class Line
+      attr_reader :pid, :ppid, :command
+
+      def initialize(line)
+        elements = line.split
+        @pid = elements.shift.to_i
+        @ppid = elements.shift.to_i
+        @command = elements.join(' ')
+      end
+
+      def <=>(other)
+        self.pid <=> other.pid
+      end
+
+      def to_s
+        "#{pid} #{ppid} #{command}"
+      end
+    end
+
+    def root_pid
+      root && root.pid
     end
 
-    def kill
-      pids.each do |pid|
-        Process.kill("SIGINT", pid)
+    def root
+      foremans.first
+    end
+
+    def foremans
+      lines.select{|l| l.command.match(/foreman: master/) }.sort
+    end
+
+    def int(pids=[root_pids])
+      pids.compact.each do |pid|
+        Process.kill('INT', pid)
       end
     end
 
-    def pids(regex = REGEX)
-      matching(regex)
-        .map(&:split)
-        .map(&:first)
-        .map(&:to_i)
+    def kill(pids=[root_pid])
+      pids.compact.each do |pid|
+        Process.kill(9, pid)
+      end
     end
 
     def ppid_hash
       lines
-        .map(&:split)
-        .inject({}) do |hash, line_values|
-          pid = line_values[0].to_i
-          ppid = line_values[1].to_i
-          hash[ppid] ||= []
-          hash[ppid] << pid
+        .inject({}) do |hash, line|
+          hash[line.ppid] ||= []
+          hash[line.ppid] << line.pid
           hash
         end
     end
 
-    def line(pid)
-      lines.detect{|l| l.match(/^#{pid} /)}
+    def line(pid=root_pid)
+      line = lines.detect{|l| l.pid == pid }
+      line && line.to_s
     end
 
-    def tree(pid)
+    def family(pid=root_pid)
       collection = []
       if kids = children(pid)
         collection += kids
         kids.each do |k|
-          collection += tree(k)
+          collection += family(k)
         end
       end
       collection
     end
 
-    def children(pid)
+    def children(pid=root_pid)
       ppid_hash[pid]
     end
 
-    def report(pid)
-      tree(pid)
-      puts "\n"
-      puts matching
+    def report(pid=root_pid)
+      r = [line(pid).to_s]
+      family(pid).each do |p|
+        l = line(p)
+        r << l.to_s
+      end
+      r.join("\n")
+    end
+
+    def report_all
+      r = []
+      foremans.each do |line|
+        r << report(line.pid)
+      end
+      r.join("\n")
     end
 
     def self.list

data/lib/cumuli/tasks/cumuli.rake

@@ -4,14 +4,43 @@ require_relative "../cli/commander"
 require_relative "../cli/terminal"
 
 namespace :cumuli do
-  desc "kill the processes showing up in the nimbus:ps task"
-  task :kill do
-    Cumuli::PS.new.kill
+  namespace :kill do
+    desc "kill all foreman related processes"
+    task :all do
+      ps = Cumuli::PS.new
+      ps.kill(ps.foremans.map(&:pid))
+    end
+
+    desc "kill the first spawned foreman process"
+    task :root do
+      ps = Cumuli::PS.new
+      ps.kill
+    end
+  end
+
+  desc "kill the root process"
+  task :kill => ['cumuli:kill:root']
+
+  namespace :int do
+    desc "interrupt all foreman related processes"
+    task :all do
+      ps = Cumuli::PS.new
+      ps.int(ps.foremans.map(&:pid))
+    end
+
+    desc "kill the first spawned foreman process"
+    task :root do
+      ps = Cumuli::PS.new
+      ps.int
+    end
   end
 
-  desc "look at processes likely related to cumuli"
+  desc "interrupt the root process"
+  task :int => ['cumuli:int:root']
+
+  desc "look at the list of foreman related processes"
   task :ps do
-    puts Cumuli::PS.new.matching
+    puts Cumuli::PS.new.report_all
   end
 
   desc "run a remote command with the right ruby: rake cumuli:remote ../my_app rake db:migrate"

data/lib/cumuli/version.rb

@@ -1,3 +1,3 @@
 module Cumuli
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/spec/app/app_spec.rb

@@ -1,35 +1,46 @@
 require 'spec_helper'
 
 describe Cumuli::App do
-  describe '#start' do
-    let(:opts) {
-      {
-        env: 'test',
-        wait: false,
-        log_dir: log_dir,
-        app_dir: app_set_dir
-      }
+  let(:opts) {
+    {
+      env: 'test',
+      wait: false,
+      log_dir: log_dir,
+      app_dir: app_set_dir
     }
-    let(:app) { Cumuli::App.new(opts) }
-    let(:logs) { File.readlines("#{log_dir}/test.log") }
+  }
+  let(:app) { Cumuli::App.new(opts) }
+  let(:logs) { File.readlines("#{log_dir}/test.log") }
 
+  describe '#start' do
     before do
       clear_logs
       app.start
-      app.wait_for_app(2323)
+      app.wait_for_apps
     end
 
     after do
       app.stop
     end
 
+    it "stores a list of subprocesses" do
+      app.process_pids.size.should == 9
+    end
+
     it "launches subprocesses with the foreman command" do
-      ps_line = Cumuli::PS.new.matching.detect{|line| line.match(/foreman: master/) }
-      ps_line.should_not be_nil
+      ps_line = Cumuli::PS.new.foremans
+      ps_line.size.should == 3
     end
 
     it "redirects subprocess output to the logs" do
       logs.detect {|line| line.match(/started with pid/) }
     end
   end
+
+  describe '#stop' do
+    before do
+      app.start
+      app.wait_for_apps
+    end
+  end
 end

data/spec/app/sub_app_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Cumuli::App::SubApp do
+  let(:sub_app) {
+    Cumuli::App::SubApp.new(
+      "nodified: ../../../bin/cumuli ./noded -p 2323"
+    )
+  }
+
+  describe '#wait_for_start' do
+    it "raises an error if the app in unavailable via TCP socket after timeout" do
+      TCPSocket.should_receive(:new).with('localhost', 2323).and_raise(Exception)
+      expect {
+        sub_app.wait_for_start(0.002)
+      }.to raise_error
+    end
+
+    it "does not raise an error if the TCP socket is available" do
+      TCPSocket.should_receive(:new).with('localhost', 2323)
+      expect {
+        sub_app.wait_for_start(10)
+      }.not_to raise_error
+    end
+  end
+end

data/spec/cli/terminal_spec.rb

@@ -12,6 +12,7 @@ describe Cumuli::CLI::Terminal do
     end
   end
 
+  # TODO: this generates lots of noise when it is killed
   it "spawns a new thread that runs the command" do
     preserving_env do
       pid = fork do

data/spec/fixtures/ps.txt

@@ -0,0 +1,118 @@
+  PID  PPID COMM             ARGS                                                             USER
+    1     0 /sbin/launchd    /sbin/launchd                                                    root          
+   12     1 /usr/libexec/kex /usr/libexec/kextd                                               root          
+   13     1 /usr/libexec/Use /usr/libexec/UserEventAgent -l System                            root          
+   14     1 /usr/sbin/notify /usr/sbin/notifyd                                                root          
+   15     1 /usr/sbin/diskar /usr/sbin/diskarbitrationd                                       root          
+   16     1 /usr/libexec/con /usr/libexec/configd                                             root          
+   17     1 /usr/sbin/syslog /usr/sbin/syslogd                                                root          
+   18     1 /usr/libexec/ope /usr/libexec/opendirectoryd                                      root          
+   19     1 /usr/sbin/distno /usr/sbin/distnoted daemon                                       root          
+   20     1 /System/Library/ /System/Library/CoreServices/powerd.bundle/powerd                root          
+   21     1 /System/Library/ /System/Library/Frameworks/CoreServices.framework/Versions/A/Fra root          
+   22     1 /usr/sbin/blued  /usr/sbin/blued                                                  root          
+   24     1 /System/Library/ /System/Library/CoreServices/coreservicesd                       root          
+   26     1 /usr/sbin/securi /usr/sbin/securityd -i                                           root          
+   34     1 /usr/sbin/ntpd   /usr/sbin/ntpd -c /private/etc/ntp-restrict.conf -n -g -p /var/r root          
+   38     1 /System/Library/ /System/Library/PrivateFrameworks/MobileDevice.framework/Version _usbmuxd      
+   41     1 /usr/libexec/sta /usr/libexec/stackshot -t                                        root          
+   44     1 /System/Library/ /System/Library/PrivateFrameworks/GenerationalStorage.framework/ root          
+   48     1 /System/Library/ /System/Library/CoreServices/backupd.bundle/Contents/Resources/m root          
+   50     1 /System/Library/ /System/Library/Frameworks/CoreServices.framework/Frameworks/Met root          
+   51     1 /usr/sbin/mDNSRe /usr/sbin/mDNSResponder -launchd                                 _mdnsresponder
+   53     1 /System/Library/ /System/Library/CoreServices/loginwindow.app/Contents/MacOS/logi socialchorus  
+   55     1 /usr/sbin/Kernel /usr/sbin/KernelEventAgent                                       root          
+   57     1 /usr/libexec/hid /usr/libexec/hidd                                                root          
+   59     1 /sbin/dynamic_pa /sbin/dynamic_pager -F /private/var/vm/swapfile                  root          
+   64     1 autofsd          autofsd                                                          root          
+   86     1 /System/Library/ /System/Library/Frameworks/ApplicationServices.framework/Framewo _windowserver 
+   87     1 /usr/sbin/netbio /usr/sbin/netbiosd                                               _netbios      
+   95     1 /System/Library/ /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries root          
+  107     1 /System/Library/ /System/Library/CoreServices/logind                              root          
+  111     1 /usr/sbin/coreau /usr/sbin/coreaudiod                                             _coreaudiod   
+  132     1 /sbin/launchd    /sbin/launchd                                                    socialchorus  
+  135   132 /usr/libexec/Use /usr/libexec/UserEventAgent -l Aqua                              socialchorus  
+  137   132 /usr/sbin/distno /usr/sbin/distnoted agent                                        socialchorus  
+  142   132 /Applications/Go /Applications/Google Chrome.app/Contents/MacOS/Google Chrome -ps socialchorus  
+  143   132 /usr/sbin/pboard /usr/sbin/pboard                                                 socialchorus  
+  145   132 /Applications/Ut /Applications/Utilities/Terminal.app/Contents/MacOS/Terminal -ps socialchorus  
+  151   132 /System/Library/ /System/Library/CoreServices/Dock.app/Contents/MacOS/Dock        socialchorus  
+  152   132 /System/Library/ /System/Library/CoreServices/talagent                            socialchorus  
+  153   132 /System/Library/ /System/Library/CoreServices/SystemUIServer.app/Contents/MacOS/S socialchorus  
+  154   132 /System/Library/ /System/Library/CoreServices/Finder.app/Contents/MacOS/Finder    socialchorus  
+  161   132 /System/Library/ /System/Library/Frameworks/ApplicationServices.framework/Framewo socialchorus  
+  167     1 com.apple.dock.e com.apple.dock.extra                                             socialchorus  
+  170   132 /System/Library/ /System/Library/Image Capture/Support/Image Capture Extension.ap socialchorus  
+  197     1 /usr/sbin/fileco /usr/sbin/filecoordinationd                                      root          
+  201   132 /System/Library/ /System/Library/Services/AppleSpell.service/Contents/MacOS/Apple socialchorus  
+  206   132 /Users/socialcho /Users/socialchorus/Library/Application Support/1Password/Agent/ socialchorus  
+  244   132 /usr/libexec/war /usr/libexec/warmd_agent                                         socialchorus  
+  251   132 /System/Library/ /System/Library/PrivateFrameworks/IMCore.framework/imagent.app/C socialchorus  
+  257   132 /usr/local/opt/r /usr/local/opt/redis/bin/redis-server /usr/local/etc/redis.conf  socialchorus  
+  258   132 /usr/local/Cella /usr/local/Cellar/erlang/R15B03-1/lib/erlang/erts-5.9.3.1/bin/be socialchorus  
+  259   132 /usr/local/opt/p /usr/local/opt/postgresql/bin/postgres -D /usr/local/var/postgre socialchorus  
+  279   132 /System/Library/ /System/Library/CoreServices/Menu Extras/TextInput.menu/Contents socialchorus  
+  280   132 /Applications/iT /Applications/iTunes.app/Contents/MacOS/iTunesHelper.app/Content socialchorus  
+  287     1 /usr/local/Cella /usr/local/Cellar/erlang/R15B03-1/lib/erlang/erts-5.9.3.1/bin/ep socialchorus  
+  294   259 postgres: checkp postgres: checkpointer process                                   socialchorus  
+  295   259 postgres: writer postgres: writer process                                         socialchorus  
+  296   259 postgres: wal wr postgres: wal writer process                                     socialchorus  
+  297   259 postgres: autova postgres: autovacuum launcher process                            socialchorus  
+  298   259 postgres: stats  postgres: stats collector process                                socialchorus  
+  314   258 inet_gethost     inet_gethost 4                                                   socialchorus  
+  315   314 inet_gethost     inet_gethost 4                                                   socialchorus  
+  476   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+  480     1 /System/Library/ /System/Library/Frameworks/CoreMediaIO.framework/Resources/VDC.p root          
+  635   132 /Applications/Si /Applications/SizeUp.app/Contents/MacOS/SizeUp -psn_0_196656     socialchorus  
+  636   132 /System/Library/ /System/Library/CoreServices/System Events.app/Contents/MacOS/Sy socialchorus  
+ 1181   132 /usr/bin/ssh-age /usr/bin/ssh-agent -l                                            socialchorus  
+ 3407   132 /System/Library/ /System/Library/Frameworks/CoreServices.framework/Frameworks/Met socialchorus  
+ 9711     1 /System/Library/ /System/Library/CoreServices/backupd.bundle/Contents/Resources/m root          
+12532   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+13700   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+18651   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+21361   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+24124     1 /sbin/launchd    /sbin/launchd                                                    _spotlight    
+24126 24124 /System/Library/ /System/Library/Frameworks/CoreServices.framework/Frameworks/Met _spotlight    
+24127 24124 /usr/sbin/distno /usr/sbin/distnoted agent                                        _spotlight    
+31310   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+33165   132 /System/Library/ /System/Library/Frameworks/InputMethodKit.framework/Resources/im socialchorus  
+39847   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+42063   132 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+43458   132 /usr/libexec/lsb /usr/libexec/lsboxd                                              socialchorus  
+44874   132 /Applications/1P /Applications/1Password.app/Contents/MacOS/1Password -psn_0_5612 socialchorus  
+55087   142 /Applications/Go /Applications/Google Chrome.app/Contents/Versions/27.0.1453.116/ socialchorus  
+62807   132 /Applications/Te /Applications/TextMate.app/Contents/MacOS/TextMate -psn_0_268763 socialchorus  
+68282   132 /Applications/CC /Applications/CCMenu.app/Contents/MacOS/CCMenu -psn_0_2941646    socialchorus  
+71315     1 /usr/local/Cella /usr/local/Cellar/macvim/7.3-66/MacVim.app/Contents/MacOS/MacVim socialchorus  
+73066   151 /System/Library/ /System/Library/CoreServices/Dock.app/Contents/Resources/Dashboa socialchorus  
+86518     1 /usr/local/Cella /usr/local/Cellar/macvim/7.3-66/MacVim.app/Contents/MacOS/Vim -f socialchorus  
+87838     1 /usr/libexec/tas /usr/libexec/taskgated -p -s                                     root          
+45925   145 login            login -pf socialchorus                                           root          
+45926 45925 -bash            -bash                                                            socialchorus  
+57983   145 login            login -pf socialchorus                                           root          
+57984 57983 -bash            -bash                                                            socialchorus  
+28280     1 foreman: master  foreman: master                                                  socialchorus  
+28282 28280 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus  
+28283 28280 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@nimbus exec for socialchorus  
+28320 28282 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus  
+28321 28283 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@nimbus exec for socialchorus  
+28322 28320 foreman: master  foreman: master                                                  socialchorus  
+28323 28321 foreman: master  foreman: master                                                  socialchorus  
+28550 28322 ruby             ruby loop.rb                                                     socialchorus  
+28551 28322 ruby             ruby half_loop.rb                                                socialchorus  
+28552 28323 node             node nodified.js                                                 socialchorus  
+28562     1 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus  
+28564     1 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus  
+28638 28562 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus  
+28639 28638 foreman: master  foreman: master                                                  socialchorus  
+28657 28564 bash             bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus  
+28659 28657 foreman: master  foreman: master                                                  socialchorus  
+29102 28639 ruby             ruby loop.rb                                                     socialchorus  
+29103 28639 ruby             ruby half_loop.rb                                                socialchorus  
+29106 28659 ruby             ruby loop.rb                                                     socialchorus  
+29107 28659 ruby             ruby half_loop.rb                                                socialchorus  
+29142 69064 ps               ps axo pid,ppid,comm,args,user                                   root          
+29143 69064 mate             mate                                                             socialchorus  
+69063   145 login            login -pf socialchorus                                           root          
+69064 69063 -bash            -bash                                                            socialchorus  

data/spec/ps_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Cumuli::PS do
+  let(:ps_data) { File.read(File.dirname(__FILE__) + "/fixtures/ps.txt") }
+  let(:ps) { Cumuli::PS.new(ps_data) }
+  let(:pid) { 28280 }
+
+  describe '#root' do
+    it "should find the lead foreman process" do
+      ps.root_pid.should == pid
+    end
+  end
+
+  describe '#family' do
+    let(:family) { ps.family(pid) }
+    let(:children) { ps.children(pid) }
+
+    it "should not include the passed in pid" do
+      family.should_not include(pid)
+    end
+
+    it "includes direct children" do
+      family.should include(*children)
+    end
+
+    it "includes grandchildren" do
+      children.each do |child|
+        family.should include(*ps.children(child))
+      end
+    end
+  end
+
+  describe '#report' do
+    it "prints all the lines descended from the root process" do
+      ps.report.should == report_text
+    end
+  end
+end

data/spec/support/report.rb

@@ -0,0 +1,3 @@
+def report_text
+  "28280 1 foreman: master foreman: master socialchorus\n28282 28280 bash bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus\n28283 28280 bash bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@nimbus exec for socialchorus\n28320 28282 bash bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@cumuli exec for socialchorus\n28322 28320 foreman: master foreman: master socialchorus\n28550 28322 ruby ruby loop.rb socialchorus\n28551 28322 ruby ruby half_loop.rb socialchorus\n28321 28283 bash bash /Users/socialchorus/.rvm/bin/rvm ruby-2.0.0@nimbus exec for socialchorus\n28323 28321 foreman: master foreman: master socialchorus\n28552 28323 node node nodified.js socialchorus"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cumuli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - SocialChorus
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -102,16 +102,16 @@ files:
 - bin/cumuli
 - cumuli.gemspec
 - features/fixtures/test.log
-- features/graceful_exit.feature
+- features/graceful_exits.feature
 - features/step_definitions/app_steps.rb
 - features/support/env.rb
-- features/support/io_capture.rb
 - lib/cumuli.rb
 - lib/cumuli/app.rb
 - lib/cumuli/app/app.rb
-- lib/cumuli/app/foreman_process.rb
 - lib/cumuli/app/procs.rb
+- lib/cumuli/app/spawner.rb
 - lib/cumuli/app/stdout_logger.rb
+- lib/cumuli/app/sub_app.rb
 - lib/cumuli/cli.rb
 - lib/cumuli/cli/args.rb
 - lib/cumuli/cli/cli.rb
@@ -126,6 +126,7 @@ files:
 - lib/cumuli/waiter.rb
 - spec/app/app_spec.rb
 - spec/app/procs_spec.rb
+- spec/app/sub_app_spec.rb
 - spec/cli/args_spec.rb
 - spec/cli/commander_spec.rb
 - spec/cli/remote_command_spec.rb
@@ -137,10 +138,13 @@ files:
 - spec/fixtures/app_set/loopy/loop.rb
 - spec/fixtures/app_set/noded/.rvmrc
 - spec/fixtures/app_set/noded/nodified.js
+- spec/fixtures/ps.txt
+- spec/ps_spec.rb
 - spec/spec_helper.rb
 - spec/support/functional_helpers.rb
 - spec/support/log_helpers.rb
 - spec/support/mock_apps.rb
+- spec/support/report.rb
 - spec/waiter_spec.rb
 homepage: http://github.com/socialchorus/cumuli
 licenses:
@@ -168,12 +172,12 @@ specification_version: 4
 summary: Cumuli makes SOA on Heroku easier by delegating to Foreman in a Procfile
 test_files:
 - features/fixtures/test.log
-- features/graceful_exit.feature
+- features/graceful_exits.feature
 - features/step_definitions/app_steps.rb
 - features/support/env.rb
-- features/support/io_capture.rb
 - spec/app/app_spec.rb
 - spec/app/procs_spec.rb
+- spec/app/sub_app_spec.rb
 - spec/cli/args_spec.rb
 - spec/cli/commander_spec.rb
 - spec/cli/remote_command_spec.rb
@@ -185,8 +189,11 @@ test_files:
 - spec/fixtures/app_set/loopy/loop.rb
 - spec/fixtures/app_set/noded/.rvmrc
 - spec/fixtures/app_set/noded/nodified.js
+- spec/fixtures/ps.txt
+- spec/ps_spec.rb
 - spec/spec_helper.rb
 - spec/support/functional_helpers.rb
 - spec/support/log_helpers.rb
 - spec/support/mock_apps.rb
+- spec/support/report.rb
 - spec/waiter_spec.rb

data/features/graceful_exit.feature

@@ -1,14 +0,0 @@
-Feature: Cumuli exits the app gracefully
-  In order to use Cumuli to test in an integration way, a suite of apps and services
-  As a developer with a SOA stack
-  I want cucumber to exit with a good success code
-
-  Background:
-    Given the app suite is loaded
-
-  Scenario: App is stopped in a cucumber step
-    When I shutdown the app suite
-    Then the processes should not be running
-    And I should see that the rake was not aborted
-
-

data/features/support/io_capture.rb

@@ -1,11 +0,0 @@
-def capturing(stream=:stdout)
-  stream = $stdout
-  old_stream = stream.dup
-  new_steam = StringIO.new
-  stream = new_steam
-  yield
-  new_steam
-ensure
-  stream = old_stream
-  new_steam
-end