bumbleworks 0.0.57 → 0.0.58

data/lib/bumbleworks/process.rb

@@ -4,6 +4,14 @@ module Bumbleworks
 
     attr_reader :id
 
+    class << self
+      def all
+        Bumbleworks.dashboard.process_wfids.map do |wfid|
+          new(wfid)
+        end
+      end
+    end
+
     def initialize(wfid)
       @id = wfid
     end

data/lib/bumbleworks/ruote.rb

@@ -51,7 +51,12 @@ module Bumbleworks
           options[:method] = :cancel
         end
 
-        dashboard.send(options[:method], wfid)
+        if options[:method] == :cancel
+          dashboard.cancel(wfid)
+        else
+          storage.remove_process(wfid)
+        end
+
         start_time = Time.now
         while dashboard.process(wfid)
           if (Time.now - start_time) > options[:timeout]
@@ -72,25 +77,33 @@ module Bumbleworks
           options[:method] = :cancel
         end
 
-        notified_processes = []
+        notified_process_wfids = []
 
         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
+        while dashboard.process_wfids.count > 0
+          new_process_wfids = dashboard.process_wfids - notified_process_wfids
+          if options[:method] == :cancel
+            send_cancellation_message(options[:method], new_process_wfids)
+          else
+            storage.clear
+          end
+          notified_process_wfids += new_process_wfids
 
           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}"
+            raise error_type, "Process #{options[:method]} taking too long - #{dashboard.process_wfids.count} processes remain.  Errors: #{dashboard.errors}"
           end
           sleep 0.1
         end
       end
 
-      def send_cancellation_message(method, processes)
-        processes.each do |ps|
-          dashboard.send(method, ps.wfid)
+      def send_cancellation_message(method, process_wfids)
+        process_wfids.each do |wfid|
+          if method == :cancel
+            dashboard.cancel(wfid)
+          else
+            storage.remove_process(wfid)
+          end
         end
       end
 

data/lib/bumbleworks/tracker.rb

@@ -2,6 +2,14 @@ module Bumbleworks
   class Tracker
     attr_reader :id, :original_hash
 
+    class << self
+      def all
+        Bumbleworks.dashboard.get_trackers.map do |tid, attrs|
+          new(tid, attrs)
+        end
+      end
+    end
+
     def initialize(id, original_hash = nil)
       @id = id
       @original_hash = original_hash || Bumbleworks.dashboard.get_trackers[id]

data/lib/bumbleworks/version.rb

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

data/spec/lib/bumbleworks/process_spec.rb

@@ -25,6 +25,16 @@ describe Bumbleworks::Process do
     end
   end
 
+  describe '.all' do
+    it 'returns instances for all process wfids' do
+      bp1 = Bumbleworks.launch!('going_to_the_dance')
+      bp2 = Bumbleworks.launch!('going_to_the_dance')
+      bp3 = Bumbleworks.launch!('straightening_the_rocks')
+      wait_until { Bumbleworks.dashboard.process_wfids.count == 3 }
+      described_class.all.should =~ [bp1, bp2, bp3]
+    end
+  end
+
   describe '.new' do
     it 'sets workflow id' do
       bp = described_class.new('apples')

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -60,7 +60,6 @@ describe Bumbleworks::Ruote do
     end
 
     it 'times out if process is not killed in time' do
-      Bumbleworks.dashboard.stub(:kill)
       Bumbleworks.dashboard.stub(:process).with('woot').and_return(:i_exist)
       expect {
         described_class.kill_process!('woot', :timeout => 0.5)
@@ -121,12 +120,12 @@ describe Bumbleworks::Ruote do
         Bumbleworks.dashboard.wait_for("lazy_guy_#{i}".to_sym)
       end
 
-      Bumbleworks.dashboard.processes.count.should == 5
+      Bumbleworks.dashboard.process_wfids.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
+      Bumbleworks.dashboard.process_wfids.count.should == 0
     end
 
     it 'times out if processes are not cancelled in time' do
@@ -140,7 +139,7 @@ describe Bumbleworks::Ruote do
       end
       Bumbleworks.launch!('time_hog')
       Bumbleworks.dashboard.wait_for(:pigheaded)
-      Bumbleworks.dashboard.processes.count.should == 1
+      Bumbleworks.dashboard.process_wfids.count.should == 1
       expect {
         described_class.cancel_all_processes!(:timeout => 0.5)
       }.to raise_error(Bumbleworks::Ruote::CancelTimeout)
@@ -172,15 +171,27 @@ describe Bumbleworks::Ruote do
     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])
+      Bumbleworks.dashboard.stub(:process_wfids).and_return(['immortal_wfid'])
       expect {
         described_class.kill_all_processes!(:timeout => 0.5)
       }.to raise_error(Bumbleworks::Ruote::KillTimeout)
     end
   end
 
+  describe '.send_cancellation_message' do
+    it 'sends cancel message to given wfids if method is cancel' do
+      Bumbleworks.dashboard.should_receive(:cancel).with('wfid1')
+      Bumbleworks.dashboard.should_receive(:cancel).with('wfid2')
+      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')
+      described_class.send_cancellation_message(:kill, ['wfid1', 'wfid2'])
+    end
+  end
+
   describe '.dashboard' do
     it 'raises an error if no storage is defined' do
       Bumbleworks.storage = nil

data/spec/lib/bumbleworks/tracker_spec.rb

@@ -7,7 +7,21 @@ describe Bumbleworks::Tracker do
     Bumbleworks.storage = {}
     Bumbleworks.dashboard.stub(:get_trackers => fake_trackers)
   end
-  
+
+  describe '.all' do
+    it 'returns instances for each tracker in system' do
+      trackers = described_class.all
+      trackers.all? { |t| t.class == Bumbleworks::Tracker }.should be_true
+      trackers.map(&:id).should =~ [
+        'on_error',
+        'global_tracker',
+        'local_tracker',
+        'local_error_intercept',
+        'participant_tracker'
+      ]
+    end
+  end
+
   describe '.new' do
     it 'sets tracker id and fetches original_hash from dashboard' do
       tr = described_class.new('global_tracker')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.57
+  version: 0.0.58
   prerelease: 
 platform: ruby
 authors:
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 855634540597559898
+      hash: 1107263111673014541
 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: 855634540597559898
+      hash: 1107263111673014541
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23