cumuli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f273b5230330006e3325b4d0e314f98592cd613
-  data.tar.gz: f5888db3dd0621ae18b35f846ff03b1c22274b52
+  metadata.gz: 01547cb2adf31baf7fd1328f3a7807bfd08aed43
+  data.tar.gz: ced1f7b479d52b9a86b9cdb25163ab3a146587ed
 SHA512:
-  metadata.gz: 55dbad295e1f5613786f87ae39c454b7b1817ce7325440258c164438f03dd74a1d11aec2f2d7734052d681672b680d525f3b27fc14b92f796f8b0052a6f74306
-  data.tar.gz: 6567664b296c3107bf61297e50d94c0cea1b6edeaf2a7fdcd19bdc000900bc2dc25173c8b85bcecea8d1a04cabf6825138658edf501297d7d8c3f718c6ddf2d2
+  metadata.gz: 31f12a1ccf7d92442cee54661035eb3e202bcabd8e85fdac9244268a2fb343ec17b7da5fc3f82f7ce4e2caa1f57f066580301246b622043d749b6b105b358dca
+  data.tar.gz: 0648447b4050095bcea6c3296b4c46974051e2f5d13b4eaac6e98a0493c3b6728d3ad48b9252768ecdad6047c1166490b1fb8b424a8842e688e10e0bdb0fe4ae

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc

data/Rakefile

@@ -1,2 +1,8 @@
 require "bundler/gem_tasks"
 require "#{File.dirname(__FILE__)}/lib/cumuli/tasks.rb"
+
+require 'cucumber'
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:cucumber) do |t|
+  t.cucumber_opts = "features --format pretty"
+end

data/cumuli.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "cucumber"
 end

data/features/graceful_exit.feature

@@ -0,0 +1,14 @@
+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/step_definitions/app_steps.rb

@@ -0,0 +1,32 @@
+Given(/^the app suite is loaded$/) do
+  @app = Cumuli::App.new({
+    env: 'test',
+    wait_time: 5,
+    log_dir: File.dirname(__FILE__) + "/../../spec/fixtures/log",
+    app_dir: File.dirname(__FILE__) + "/../../spec/fixtures/app_set"
+  })
+  @app.start
+  @pid = @app.pid
+end
+
+When(/^I shutdown the app suite$/) do
+  @trapped = false
+
+  trap('INT') do
+    @trapped = true
+  end
+
+  @app.stop
+end
+
+Then(/^I should see that the rake was not aborted$/) do
+  @trapped.should == false
+end
+
+Then(/^the processes should not be running$/) do
+  Cumuli::Waiter.new.wait_until(3) do
+    pses = Cumuli::PS.new.children(@pid)
+    pses.nil?
+  end
+end
+

data/features/support/env.rb

@@ -0,0 +1,13 @@
+require 'cucumber'
+
+require_relative "../../lib/cumuli"
+
+Dir["#{File.dirname(__FILE__)}/*.rb"].each do |f|
+  require f
+end
+
+
+at_exit do
+  #@app.stop
+end
+

data/features/support/io_capture.rb

@@ -0,0 +1,11 @@
+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

data/lib/cumuli/app/foreman_process.rb

@@ -45,10 +45,17 @@ module Cumuli
 
       def stop
         return if @killed_it
-        Process.kill('INT', 0) # kills all processes in the group
+        kill_children
         @killed_it = true
         @pid = nil
       end
+
+      def kill_children
+        pids = PS.new.tree(pid)
+        pids.reverse.each do |p|
+          Process.kill("KILL", p)
+        end
+      end
     end
   end
 end

data/lib/cumuli/ps.rb

@@ -45,9 +45,18 @@ module Cumuli
     end
 
     def tree(pid)
-      child_pids = ppid_hash[pid]
-      puts "#{pid} => #{child_pids}"
-      child_pids.map{|cpid| tree(cpid) } if child_pids  
+      collection = []
+      if kids = children(pid)
+        collection += kids
+        kids.each do |k|
+          collection += tree(k)
+        end
+      end
+      collection
+    end
+
+    def children(pid)
+      ppid_hash[pid]
     end
 
     def report(pid)

data/lib/cumuli/version.rb

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

data/spec/support/mock_apps.rb

@@ -1,7 +1,3 @@
 def app_set_dir
   File.expand_path(File.dirname(__FILE__)) + "/../fixtures/app_set"
 end
-
-def fail_set_dir
-  File.expand_path(File.dirname(__FILE__)) + "/../fixtures/fail_set"
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cumuli
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - SocialChorus
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman
@@ -70,6 +70,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Cumuli runs several foreman processes in different directories
 email:
 - developers@socialchorus.com
@@ -87,6 +101,11 @@ files:
 - Rakefile
 - bin/cumuli
 - cumuli.gemspec
+- features/fixtures/test.log
+- features/graceful_exit.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
@@ -148,6 +167,11 @@ signing_key:
 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/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/cli/args_spec.rb