bumbleworks 0.0.23 → 0.0.24

data/lib/bumbleworks.rb

@@ -25,7 +25,7 @@ module Bumbleworks
       def_delegators :configuration, setting, "#{setting.to_s}="
     end
 
-    def_delegators Bumbleworks::Ruote, :dashboard, :start_worker!, :cancel_all_processes!
+    def_delegators Bumbleworks::Ruote, :dashboard, :start_worker!, :cancel_all_processes!, :kill_all_processes!
     def_delegator Bumbleworks::ProcessDefinition, :define, :define_process
 
     # @public

data/lib/bumbleworks/ruote.rb

@@ -3,6 +3,7 @@ require "ruote"
 module Bumbleworks
   class Ruote
     class CancelTimeout < StandardError; end
+    class KillTimeout < StandardError; end
 
     class << self
       def dashboard(options = {})
@@ -45,19 +46,28 @@ module Bumbleworks
 
       def cancel_all_processes!(options = {})
         options[:timeout] ||= 5
+        unless options[:method] == :kill
+          options[:method] = :cancel
+        end
+
         dashboard.processes.each do |ps|
-          dashboard.cancel(ps.wfid)
+          dashboard.send(options[:method], ps.wfid)
         end
 
-        cancel_start_time = Time.now
+        start_time = Time.now
         while dashboard.processes.count > 0
-          if (Time.now - cancel_start_time) > options[:timeout]
-            raise CancelTimeout, "Cancel taking too long - #{dashboard.processes.count} processes remain"
+          if (Time.now - start_time) > options[:timeout]
+            error_type = options[:method] == :cancel ? CancelTimeout : KillTimeout
+            raise error_type, "Process #{options[:method]} taking too long - #{dashboard.processes.count} processes remain"
           end
           sleep 0.1
         end
       end
 
+      def kill_all_processes!(options = {})
+        cancel_all_processes!(options.merge(:method => :kill))
+      end
+
       def register_participants(&block)
         dashboard.register(&block) if block
         set_catchall_if_needed

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -41,6 +41,41 @@ describe Bumbleworks::Ruote do
     end
   end
 
+  describe ".kill_all_processes!" do
+    before :each do
+      Bumbleworks.storage = {}
+      Bumbleworks::Ruote.register_participants
+      Bumbleworks.start_worker!
+    end
+
+    it 'kills all processes without running on_cancel' do
+      5.times do |i|
+        Bumbleworks.define_process "do_nothing_#{i}" do
+          sequence :on_cancel => 'rethink_life' do
+            participant :ref => "lazy_guy_#{i}", :task => 'absolutely_nothing'
+          end
+          define 'rethink_life' do
+            wait '10s'
+          end
+        end
+        Bumbleworks.launch!("do_nothing_#{i}")
+        Bumbleworks.dashboard.wait_for("lazy_guy_#{i}".to_sym)
+      end
+      Bumbleworks.dashboard.processes.count.should == 5
+      described_class.kill_all_processes!
+      Bumbleworks.dashboard.processes.count.should == 0
+    end
+
+    it 'times out if processes are not killed in time' do
+      Bumbleworks.dashboard.stub(:kill)
+      ps1 = double('process', :wfid => nil)
+      Bumbleworks.dashboard.stub(:processes).and_return([ps1])
+      expect {
+        described_class.kill_all_processes!(:timeout => 0.5)
+      }.to raise_error(Bumbleworks::Ruote::KillTimeout)
+    end
+  end
+
   describe '.dashboard' do
     it 'raises an error if no storage is defined' do
       Bumbleworks.storage = nil

data/spec/lib/bumbleworks_spec.rb

@@ -116,6 +116,11 @@ describe Bumbleworks do
       Bumbleworks::Ruote.should_receive(:cancel_all_processes!).and_return(:cancelling)
       Bumbleworks.cancel_all_processes!.should == :cancelling
     end
+
+    it 'includes kill_all_processes!' do
+      Bumbleworks::Ruote.should_receive(:kill_all_processes!).and_return(:killing)
+      Bumbleworks.kill_all_processes!.should == :killing
+    end
   end
 
   describe '.launch!' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote