bumbleworks 0.0.36 → 0.0.37

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.bash_color

data/lib/bumbleworks/ruote.rb

@@ -70,12 +70,14 @@ module Bumbleworks
           options[:method] = :cancel
         end
 
-        dashboard.processes.each do |ps|
-          dashboard.send(options[:method], ps.wfid)
-        end
+        notified_processes = []
 
         start_time = Time.now
         while dashboard.processes.count > 0
+          new_processes = dashboard.processes - notified_processes
+          send_cancellation_message(options[:method], new_processes)
+          notified_processes += new_processes
+
           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.  Errors: #{dashboard.errors}"
@@ -84,6 +86,12 @@ module Bumbleworks
         end
       end
 
+      def send_cancellation_message(method, processes)
+        processes.each do |ps|
+          dashboard.send(method, ps.wfid)
+        end
+      end
+
       def kill_all_processes!(options = {})
         cancel_all_processes!(options.merge(:method => :kill))
       end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -87,6 +87,48 @@ describe Bumbleworks::Ruote do
       Bumbleworks.dashboard.processes.count.should == 0
     end
 
+
+    it 'cancels processes which show up while waiting' do
+      class Bumbleworks::Ruote
+        class << self
+          alias_method :original, :send_cancellation_message
+          def send_cancellation_message(method, processes)
+            # 2. call original method to cancel the processes kicked off below
+            original(method, processes)
+
+            # 3. launch some more processes before returning, but only do it once.
+            #    These should also be cancelled.
+            if !@kicked_off
+              Bumbleworks.define_process "do_more_nothing" do
+                participant :ref => "lazy_guy_bob", :task => 'absolutely_nothing'
+              end
+
+              10.times do
+                Bumbleworks.launch!("do_more_nothing")
+              end
+              @kicked_off = true
+            end
+          end
+        end
+      end
+
+      # 1. kick off some processes, wait for them then cancel them.
+      5.times do |i|
+        Bumbleworks.define_process "do_nothing_#{i}" do
+          participant :ref => "lazy_guy_#{i}", :task => 'absolutely_nothing'
+        end
+        Bumbleworks.launch!("do_nothing_#{i}")
+        Bumbleworks.dashboard.wait_for("lazy_guy_#{i}".to_sym)
+      end
+
+      Bumbleworks.dashboard.processes.count.should == 5
+
+      described_class.cancel_all_processes!(:timeout => 30)
+
+      # 4. When this is all done, all processes should be cancelled.
+      Bumbleworks.dashboard.processes.count.should == 0
+    end
+
     it 'times out if processes are not cancelled in time' do
       Bumbleworks.define_process "time_hog" do
         sequence :on_cancel => 'ignore_parents' do
@@ -245,4 +287,4 @@ describe Bumbleworks::Ruote do
       described_class.dashboard.participant_list.first.classname.should == 'Bumbleworks::StorageParticipant'
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -236,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1823599650182375009
+      hash: -2225895181847802927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1823599650182375009
+      hash: -2225895181847802927
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23