bumbleworks 0.0.58 → 0.0.59

data/lib/bumbleworks/ruote.rb

@@ -51,8 +51,8 @@ module Bumbleworks
           options[:method] = :cancel
         end
 
-        if options[:method] == :cancel
-          dashboard.cancel(wfid)
+        if options[:method] == :cancel || !options[:force]
+          dashboard.send(options[:method], wfid)
         else
           storage.remove_process(wfid)
         end
@@ -82,7 +82,7 @@ module Bumbleworks
         start_time = Time.now
         while dashboard.process_wfids.count > 0
           new_process_wfids = dashboard.process_wfids - notified_process_wfids
-          if options[:method] == :cancel
+          if options[:method] == :cancel || !options[:force]
             send_cancellation_message(options[:method], new_process_wfids)
           else
             storage.clear
@@ -99,11 +99,7 @@ module Bumbleworks
 
       def send_cancellation_message(method, process_wfids)
         process_wfids.each do |wfid|
-          if method == :cancel
-            dashboard.cancel(wfid)
-          else
-            storage.remove_process(wfid)
-          end
+          dashboard.send(method, wfid)
         end
       end
 

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.58"
+  VERSION = "0.0.59"
 end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -65,6 +65,12 @@ describe Bumbleworks::Ruote do
         described_class.kill_process!('woot', :timeout => 0.5)
       }.to raise_error(Bumbleworks::Ruote::KillTimeout)
     end
+
+    it 'uses storage.remove_process if force option is true' do
+      Bumbleworks.dashboard.storage.should_receive(:remove_process).with('woot')
+      Bumbleworks.dashboard.stub(:process).with('woot').and_return(nil)
+      described_class.kill_process!('woot', :force => true)
+    end
   end
 
   describe ".cancel_all_processes!" do
@@ -176,6 +182,12 @@ describe Bumbleworks::Ruote do
         described_class.kill_all_processes!(:timeout => 0.5)
       }.to raise_error(Bumbleworks::Ruote::KillTimeout)
     end
+
+    it 'uses storage.clear if force option is true' do
+      Bumbleworks.dashboard.stub(:process_wfids).and_return(['wfid'], [])
+      Bumbleworks.dashboard.storage.should_receive(:clear)
+      described_class.kill_all_processes!(:force => true)
+    end
   end
 
   describe '.send_cancellation_message' do
@@ -185,9 +197,9 @@ describe Bumbleworks::Ruote do
       described_class.send_cancellation_message(:cancel, ['wfid1', 'wfid2'])
     end
 
-    it 'removes given processes from storage if method is kill' do
-      Bumbleworks.dashboard.storage.should_receive(:remove_process).with('wfid1')
-      Bumbleworks.dashboard.storage.should_receive(:remove_process).with('wfid2')
+    it 'sends kill message to given wfids if method is kill' do
+      Bumbleworks.dashboard.should_receive(:kill).with('wfid1')
+      Bumbleworks.dashboard.should_receive(:kill).with('wfid2')
       described_class.send_cancellation_message(:kill, ['wfid1', 'wfid2'])
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.58
+  version: 0.0.59
   prerelease: 
 platform: ruby
 authors:
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1107263111673014541
+      hash: -849036903259587551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1107263111673014541
+      hash: -849036903259587551
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23