bumbleworks 0.0.31 → 0.0.32

data/lib/bumbleworks/ruote.rb

@@ -9,14 +9,7 @@ module Bumbleworks
 
     class << self
       def dashboard(options = {})
-        @dashboard ||= begin
-          context = if options[:start_worker] == true
-            ::Ruote::Worker.new(storage)
-          else
-            storage
-          end
-          ::Ruote::Dashboard.new(context)
-        end
+        @dashboard ||= ::Ruote::Dashboard.new(storage)
       end
 
       # Start a worker, which will begin polling for messages in
@@ -35,11 +28,14 @@ module Bumbleworks
       #   exits.
       #
       def start_worker!(options = {})
-        @dashboard = nil
-        dashboard(:start_worker => true)
         dashboard.noisy = options[:verbose] == true
-        dashboard.join if options[:join] == true
-        dashboard.worker
+        worker = ::Ruote::Worker.new(dashboard.context)
+        if options[:join] == true
+          worker.run
+        else
+          worker.run_in_thread
+        end
+        worker
       end
 
       def launch(name, *args)
@@ -61,7 +57,7 @@ module Bumbleworks
         while dashboard.processes.count > 0
           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"
+            raise error_type, "Process #{options[:method]} taking too long - #{dashboard.processes.count} processes remain.  Errors: #{dashboard.errors}"
           end
           sleep 0.1
         end

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -88,10 +88,6 @@ describe Bumbleworks::Ruote do
     it 'does not start a worker by default' do
       described_class.dashboard.worker.should be_nil
     end
-
-    it 'starts a worker if :start_worker option is true' do
-      described_class.dashboard(:start_worker => true).worker.should_not be_nil
-    end
   end
 
   describe '.start_worker!' do
@@ -102,23 +98,20 @@ describe Bumbleworks::Ruote do
       described_class.dashboard.worker.should == new_worker
     end
 
-    it 'joins current thread if :join option is true' do
-      ::Ruote::Dashboard.stub(:new).and_return(dash_double = double('dash', :worker => nil))
-      dash_double.should_receive(:noisy=).with(false)
-      dash_double.should_receive(:join)
+    it 'runs in current thread if :join option is true' do
+      ::Ruote::Worker.stub(:new).and_return(worker_double = double('worker'))
+      worker_double.should_receive(:run)
       described_class.start_worker!(:join => true)
     end
 
-    it 'returns if :join option not true' do
-      ::Ruote::Dashboard.stub(:new).and_return(dash_double = double('dash', :worker => nil))
-      dash_double.should_receive(:noisy=).with(false)
-      dash_double.should_receive(:join).never
-      described_class.start_worker!
+    it 'runs in new thread and returns worker if :join option not true' do
+      ::Ruote::Worker.stub(:new).and_return(worker_double = double('worker'))
+      worker_double.should_receive(:run_in_thread)
+      described_class.start_worker!.should == worker_double
     end
 
     it 'sets dashboard to noisy if :verbose option true' do
-      ::Ruote::Dashboard.stub(:new).and_return(dash_double = double('dash', :worker => nil))
-      dash_double.should_receive(:noisy=).with(true)
+      described_class.dashboard.should_receive(:noisy=).with(true)
       described_class.start_worker!(:verbose => true)
     end
   end

metadata

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