bumbleworks 0.0.90 → 0.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28e8c92dc9de4fb9204a5b2348565a1d47d960b0
-  data.tar.gz: 6fb4c218cbe093862c9a61b418aa32b2a4594238
+  metadata.gz: a41e2e146849e9de9752fcc88353008da72e6c94
+  data.tar.gz: 776a60a147c9cbd1512cae7d81519667ec514c2a
 SHA512:
-  metadata.gz: abb2292ed00b147314a70f633619c62e77a20e5ccd7bd73c4cb91e2131c8e58b5764dc3a38a4bb840079cc51859618a654b1ef5ae32270ea8f58a7429f5a8fce
-  data.tar.gz: b5fee4533318cea0829dcb9e691d6ccea143e94157730e89fccae34dbeac3513f1620d39b8f46f876f18230d0361fbb53cd5817c5ed861224b6fc78241019285
+  metadata.gz: 5f1d34125e457ae2b08b599d80cddd4e2f51b7ae332636d14c52cfb0fa2dd8f40e92ccc9336c30356d43bf17593338c5018bb5e1cc0d5a0e90ce0a5fd7d8a030
+  data.tar.gz: 01636c8cf9af7e4b5f452282f663962ef16afe8520ccb469a5f1deb8730bbcd76f810acb39aae6eaf13e3e436e41ea14f017910a479994c11414abe0c30c94ca

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.5
+  - 2.2.0

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.90"
+  VERSION = "0.0.91"
 end

data/lib/bumbleworks/worker.rb

@@ -8,12 +8,13 @@ class Bumbleworks::Worker < Ruote::Worker
 
   class << self
     def info
-      Bumbleworks.dashboard.worker_info || {}
+      Bumbleworks::Worker::Info || {}
     end
 
     def shutdown_all(options = {})
       # First, send all running workers a message to stop
       change_worker_state('stopped', options)
+    ensure
       # Now ensure that future started workers will be started
       # in "running" mode instead of automatically stopped
       change_worker_state('running', options)
@@ -27,10 +28,10 @@ class Bumbleworks::Worker < Ruote::Worker
       change_worker_state('running', options)
     end
 
-    def worker_states
+    def active_worker_states
       info.inject({}) { |hsh, info|
-        id, state = info[0], info[1]['state']
-        if state && state != 'stopped'
+        id, state = info.id, info.state
+        unless info.state.nil? || info.in_stopped_state?
           hsh[id] = state
         end
         hsh
@@ -41,21 +42,20 @@ class Bumbleworks::Worker < Ruote::Worker
       with_worker_state_enabled do
         Bumbleworks.dashboard.worker_state = new_state
         Bumbleworks::Support.wait_until(options) do
-          worker_states.values.all? { |state| state == new_state }
+          active_worker_states.values.all? { |state| state == new_state }
         end
       end
       return true
     rescue Bumbleworks::Support::WaitTimeout
-      raise WorkerStateNotChanged, "Worker states: #{worker_states.inspect}"
+      raise WorkerStateNotChanged, "Worker states: #{active_worker_states.inspect}"
     end
 
     def refresh_worker_info(options = {})
       with_worker_state_enabled do
-        Bumbleworks::Support.wait_until(options) do
-          info.all? { |id, worker_info|
-            worker_info['state'] == 'stopped' ||
-              Time.parse(worker_info['put_at']) > Time.now - 1
-          }
+        info.each do |worker_info|
+          if !worker_info.in_stopped_state? && worker_info.stalling?
+            worker_info.record_new_state("stalled")
+          end
         end
       end
     end
@@ -65,6 +65,22 @@ class Bumbleworks::Worker < Ruote::Worker
       yield
       Bumbleworks.dashboard.context['worker_state_enabled'] = false
     end
+
+    def control_document
+      doc = Bumbleworks.dashboard.storage.get('variables', 'worker_control') || {}
+      doc['type'] = 'variables'
+      doc['_id'] = 'worker_control'
+      doc['workers'] ||= {}
+      doc
+    end
+
+    def info_document
+      doc = Bumbleworks.dashboard.storage.get('variables', 'workers') || {}
+      doc['type'] = 'variables'
+      doc['_id'] = 'workers'
+      doc['workers'] ||= {}
+      doc
+    end
   end
 
   def initialize(*args, &block)
@@ -83,6 +99,10 @@ class Bumbleworks::Worker < Ruote::Worker
     end
   end
 
+  def class_name
+    self.class.to_s
+  end
+
   def save_info
     @info.save if @info
   end
@@ -92,10 +112,23 @@ class Bumbleworks::Worker < Ruote::Worker
     save_info
   end
 
+  def worker_control_variable
+    self.class.control_document["workers"][id]
+  end
+
+  def desired_state
+    control_hash = worker_control_variable ||
+      @storage.get("variables", "worker") ||
+      { "state" => "running" }
+    control_hash["state"]
+  end
+
   def determine_state
-    if @context['worker_state_enabled']
-      super
-      save_info
+    @state_mutex.synchronize do
+      if @state != "stopped" && @context["worker_state_enabled"]
+        @state = desired_state
+        save_info
+      end
     end
   end
 

data/lib/bumbleworks/worker/info.rb

@@ -3,18 +3,27 @@ require_relative "proxy"
 class Bumbleworks::Worker < Ruote::Worker
   class Info < Ruote::Worker::Info
     attr_reader :worker
+    extend Forwardable
+    extend Enumerable
+
+    def_delegators :worker,
+      :id, :pid, :name, :state, :ip, :hostname, :system, :launched_at
 
     class << self
       def raw_hash
         Bumbleworks.dashboard.worker_info || {}
       end
 
-      def all
-        raw_hash.map { |k, v|
-          from_hash(v.merge('id' => k))
+      def each
+        raw_hash.each { |k, v|
+          yield from_hash(v)
         }
       end
 
+      def all
+        to_a
+      end
+
       def where(options)
         filter_proc = proc { |worker|
           options.all? { |k, v|
@@ -26,11 +35,11 @@ class Bumbleworks::Worker < Ruote::Worker
 
       def filter
         return [] unless block_given?
-        all.select { |info| yield info.worker }
+        select { |info| yield info.worker }
       end
 
       def [](worker_id)
-        from_hash(raw_hash[worker_id].merge('id' => worker_id))
+        from_hash(raw_hash[worker_id])
       end
 
       def from_hash(hash)
@@ -61,6 +70,13 @@ class Bumbleworks::Worker < Ruote::Worker
       end
     end
 
+    def initialize(worker)
+      @worker = worker
+      @last_save = Time.now - 2 * 60
+
+      @msgs = [] unless worker.is_a?(Bumbleworks::Worker::Proxy)
+    end
+
     def ==(other)
       other.is_a?(Bumbleworks::Worker::Info) &&
         other.worker == worker
@@ -70,6 +86,31 @@ class Bumbleworks::Worker < Ruote::Worker
       self.class.raw_hash[worker.id]
     end
 
+    def reload
+      @worker = Bumbleworks::Worker::Proxy.new(raw_hash)
+    end
+
+    def record_new_state(state)
+      worker.state = state
+      save
+    end
+
+    def worker_class_name
+      worker.class_name
+    end
+
+    def uptime
+      if in_stopped_state? && worker.respond_to?(:uptime)
+        worker.uptime
+      else
+        Time.now - worker.launched_at
+      end
+    end
+
+    def in_stopped_state?
+      worker.state.nil? || ["stopped", "stalled"].include?(worker.state)
+    end
+
     def updated_at
       Time.parse(raw_hash['put_at'])
     end
@@ -104,39 +145,76 @@ class Bumbleworks::Worker < Ruote::Worker
       @worker.storage || Bumbleworks.dashboard.storage
     end
 
-    def initialize(worker)
-      @worker = worker
-      @last_save = Time.now - 2 * 60
+    def shutdown(options = {})
+      send_command("stopped", options)
+    end
 
-      @msgs = [] unless worker.is_a?(Bumbleworks::Worker::Proxy)
+    def pause(options = {})
+      send_command("paused", options)
+    end
+
+    def unpause(options = {})
+      send_command("running", options)
     end
 
-    def worker_info_document
-      doc = storage.get('variables', 'workers') || {}
+    alias_method :run, :unpause
+
+    def send_command(command, options = {})
+      save_control_message(command)
+      Bumbleworks::Worker.with_worker_state_enabled do
+        Bumbleworks::Support.wait_until(options) do
+          raw_hash["state"] == command
+        end
+      end
+      reload
+    end
+
+    def save_control_message(message)
+      doc = Bumbleworks::Worker.control_document
+      doc["workers"][id] ||= {}
+      doc["workers"][id]["state"] = message
+      storage.put(doc)
+    end
+
+    def processed_last_minute
+      raw_hash["processed_last_minute"]
+    end
+
+    def wait_time_last_minute
+      raw_hash["wait_time_last_minute"]
+    end
+
+    def processed_last_hour
+      raw_hash["processed_last_hour"]
+    end
+
+    def wait_time_last_hour
+      raw_hash["wait_time_last_hour"]
+    end
 
-      doc['type'] = 'variables'
-      doc['_id'] = 'workers'
-      doc['workers'] ||= {}
-      doc
+    def constant_worker_info_hash
+      {
+        "id" => @worker.id,
+        "class" => @worker.class_name,
+        "name" => @worker.name,
+        "ip" => @worker.ip,
+        "hostname" => @worker.hostname,
+        "pid" => @worker.pid,
+        "system" => @worker.system,
+        "launched_at" => @worker.launched_at,
+        "state" => @worker.state
+      }
     end
 
     def save
-      doc = worker_info_document
+      doc = Bumbleworks::Worker.info_document
 
       worker_info_hash = doc['workers'][@worker.id] || {}
 
+      worker_info_hash.merge!(constant_worker_info_hash)
       worker_info_hash.merge!({
-        'worker_id' => @worker.id,
-        'class' => @worker.class.to_s,
-        'name' => @worker.name,
-        'ip' => @worker.ip,
-        'hostname' => @worker.hostname,
-        'pid' => @worker.pid,
-        'system' => @worker.system,
         'put_at' => Ruote.now_to_utc_s,
-        'uptime' => Time.now - @worker.launched_at,
-        'launched_at' => @worker.launched_at,
-        'state' => @worker.state
+        'uptime' => uptime,
       })
 
       if defined?(@msgs)

data/lib/bumbleworks/worker/proxy.rb

@@ -1,11 +1,12 @@
 class Bumbleworks::Worker < Ruote::Worker
   class Proxy
     ProxiedAttributes = [
-      :id, :pid, :ip, :hostname, :system, :launched_at, :state, :name, :class
+      :id, :pid, :ip, :hostname, :system, :launched_at, :state, :name, :class, :uptime
     ]
 
     attr_reader *(ProxiedAttributes - [:launched_at])
     attr_reader :raw_hash
+    attr_writer :state
 
     def initialize(attributes)
       @raw_hash = attributes
@@ -14,8 +15,22 @@ class Bumbleworks::Worker < Ruote::Worker
       end
     end
 
+    # Allow storage to revert to the default for this Bumbleworks
+    # instance.
+    def storage
+      nil
+    end
+
+    def class_name
+      @class.to_s
+    end
+
     def launched_at
-      Time.parse(@launched_at)
+      if @launched_at.is_a?(String)
+        Time.parse(@launched_at)
+      else
+        @launched_at
+      end
     end
 
     def ==(other)

data/spec/lib/bumbleworks/worker/info_spec.rb

@@ -2,19 +2,51 @@ describe Bumbleworks::Worker::Info do
   let(:context) { Bumbleworks.dashboard.context }
   let(:proxy) {
     Bumbleworks::Worker::Proxy.new(
-      'class' => :f_class,
-      'pid' => :f_pid,
-      'name' => :f_name,
-      'id' => :f_id,
-      'state' => :f_state,
-      'ip' => :f_ip,
-      'hostname' => :f_hostname,
-      'system' => :f_system,
-      'launched_at' => :f_launched_at
+      "class" => "f_class",
+      "pid" => "f_pid",
+      "name" => "f_name",
+      "id" => "f_id",
+      "state" => "f_state",
+      "ip" => "f_ip",
+      "hostname" => "f_hostname",
+      "system" => "f_system",
+      "uptime" => "f_uptime",
+      "launched_at" => "2010-10-10 10:10:10"
     )
   }
   subject { described_class.new(proxy) }
 
+
+  describe "delegation to hash" do
+    let(:raw_hash) {
+      {
+        "processed_last_minute" => 20,
+        "wait_time_last_minute" => 300.5,
+        "processed_last_hour" => 540,
+        "wait_time_last_hour" => 15.6
+      }
+    }
+    before(:each) do
+      allow(subject).to receive(:raw_hash).and_return(raw_hash)
+    end
+
+    it { is_expected.to fetch(:processed_last_minute).from(raw_hash) }
+    it { is_expected.to fetch(:wait_time_last_minute).from(raw_hash) }
+    it { is_expected.to fetch(:processed_last_hour).from(raw_hash) }
+    it { is_expected.to fetch(:wait_time_last_hour).from(raw_hash) }
+  end
+
+  describe "delegation to worker/proxy" do
+    it { is_expected.to delegate(:id).to(proxy) }
+    it { is_expected.to delegate(:pid).to(proxy) }
+    it { is_expected.to delegate(:name).to(proxy) }
+    it { is_expected.to delegate(:state).to(proxy) }
+    it { is_expected.to delegate(:ip).to(proxy) }
+    it { is_expected.to delegate(:hostname).to(proxy) }
+    it { is_expected.to delegate(:system).to(proxy) }
+    it { is_expected.to delegate(:launched_at).to(proxy) }
+  end
+
   describe '.raw_hash' do
     it 'returns Bumbleworks.dashboard.worker_info' do
       allow(Bumbleworks.dashboard).to receive(:worker_info).and_return(:bontron)
@@ -30,15 +62,16 @@ describe Bumbleworks::Worker::Info do
   describe '.from_hash' do
     it 'returns an info object using a proxy worker with given attributes' do
       hash = {
-        'class' => :f_class,
-        'pid' => :f_pid,
-        'name' => :f_name,
-        'id' => :f_id,
-        'state' => :f_state,
-        'ip' => :f_ip,
-        'hostname' => :f_hostname,
-        'system' => :f_system,
-        'launched_at' => :f_launched_at
+        "class" => "f_class",
+        "pid" => "f_pid",
+        "name" => "f_name",
+        "id" => "f_id",
+        "state" => "f_state",
+        "ip" => "f_ip",
+        "hostname" => "f_hostname",
+        "system" => "f_system",
+        "uptime" => "f_uptime",
+        "launched_at" => "2010-10-10 10:10:10"
       }
       allow(described_class).to receive(:new).
         with(proxy).
@@ -60,7 +93,7 @@ describe Bumbleworks::Worker::Info do
     describe '.[]' do
       it 'calls from_hash with raw data for given worker id' do
         allow(described_class).to receive(:from_hash).
-          with({ 'foo' => 1, 'id' => 'f_id' }).and_return(:foo_info)
+          with({ 'foo' => 1 }).and_return(:foo_info)
         expect(described_class['f_id']).to eq(:foo_info)
       end
     end
@@ -68,9 +101,9 @@ describe Bumbleworks::Worker::Info do
     describe '.all' do
       it 'converts raw hash into info instances' do
         allow(described_class).to receive(:from_hash).
-          with({ 'foo' => 1, 'id' => 'f_id'}).and_return(:foo_info)
+          with({ 'foo' => 1 }).and_return(:foo_info)
         allow(described_class).to receive(:from_hash).
-          with({ 'bar' => 1, 'id' => 'b_id'}).and_return(:bar_info)
+          with({ 'bar' => 1 }).and_return(:bar_info)
         expect(described_class.all).to match_array([:foo_info, :bar_info])
       end
     end
@@ -128,6 +161,26 @@ describe Bumbleworks::Worker::Info do
     end
   end
 
+  describe "#worker_class_name" do
+    it "returns class_name from worker/proxy" do
+      allow(proxy).to receive(:class_name).and_return('barkle rutfut')
+      expect(subject.worker_class_name).to eq('barkle rutfut')
+    end
+  end
+
+  describe "#uptime" do
+    it "returns difference between now and updated_at" do
+      frozen_time = Time.now
+      allow(Time).to receive(:now).and_return(frozen_time)
+      expect(subject.uptime).to eq(frozen_time - subject.launched_at)
+    end
+
+    it "returns previous persisted uptime if stopped" do
+      allow(proxy).to receive(:state).and_return("stopped")
+      expect(subject.uptime).to eq(proxy.uptime)
+    end
+  end
+
   describe "#updated_at" do
     it "returns parsed put_at from raw hash for worker" do
       allow(subject).to receive(:raw_hash).and_return({
@@ -175,8 +228,8 @@ describe Bumbleworks::Worker::Info do
   describe "#raw_hash" do
     it "returns value from worker_info hash at key of worker id" do
       allow(described_class).to receive(:raw_hash).and_return({
-        :f_id => :foo_hash,
-        :b_id => :bar_hash
+        "f_id" => :foo_hash,
+        "b_id" => :bar_hash
       })
       expect(subject.raw_hash).to eq(:foo_hash)
     end
@@ -194,6 +247,28 @@ describe Bumbleworks::Worker::Info do
     end
   end
 
+  describe "#in_stopped_state?" do
+    it "returns true if state is stopped" do
+      allow(proxy).to receive(:state).and_return("stopped")
+      expect(subject).to be_in_stopped_state
+    end
+
+    it "returns true if state is stalled" do
+      allow(proxy).to receive(:state).and_return("stalled")
+      expect(subject).to be_in_stopped_state
+    end
+
+    it "returns true if state is nil" do
+      allow(proxy).to receive(:state).and_return(nil)
+      expect(subject).to be_in_stopped_state
+    end
+
+    it "returns false if state is running" do
+      allow(proxy).to receive(:state).and_return("running")
+      expect(subject).not_to be_in_stopped_state
+    end
+  end
+
   describe "#stalling?" do
     it "returns inverse of #responding?" do
       allow(subject).to receive(:responding?).and_return(true)
@@ -202,4 +277,96 @@ describe Bumbleworks::Worker::Info do
       expect(subject).to be_stalling
     end
   end
+
+  context "worker control commands" do
+    subject { Bumbleworks::Worker::Info.first }
+    let(:other_worker) { Bumbleworks::Worker::Info.all[1] }
+    before(:each) do
+      2.times { Bumbleworks.start_worker! }
+    end
+
+    describe "#shutdown" do
+      it "shuts down just this worker" do
+        subject.shutdown
+        expect(subject.state).to eq("stopped")
+        expect(other_worker.state).to eq("running")
+      end
+    end
+
+    describe "#pause" do
+      it "pauses just this worker" do
+        subject.pause
+        expect(subject.state).to eq("paused")
+        expect(other_worker.state).to eq("running")
+      end
+    end
+
+    describe "#unpause" do
+      it "unpauses just this worker" do
+        [subject, other_worker].map(&:pause)
+        subject.unpause
+        expect(subject.state).to eq("running")
+        expect(other_worker.state).to eq("paused")
+      end
+    end
+
+    describe "#run" do
+      it "is an alias for unpause" do
+        expect(subject.method(:run)).to eq(subject.method(:unpause))
+      end
+    end
+  end
+
+  describe "#reload" do
+    it "generates a new proxy from the current raw hash" do
+      Bumbleworks.start_worker!
+      subject = Bumbleworks::Worker::Info.first
+      expect(Bumbleworks::Worker::Proxy).to receive(:new).
+        with(subject.raw_hash).and_return(:a_worker)
+      subject.reload
+      expect(subject.worker).to eq(:a_worker)
+    end
+  end
+
+  describe "#record_new_state" do
+    it "saves new state" do
+      expect(subject.worker).to receive(:state=).with("an awesome state").ordered
+      expect(subject).to receive(:save).ordered
+      subject.record_new_state("an awesome state")
+    end
+  end
+
+  describe "#save" do
+    before(:each) { Bumbleworks.start_worker! }
+    subject { Bumbleworks::Worker::Info.first }
+
+    it "persists all data unchanged to the engine storage" do
+      expected_hash = subject.constant_worker_info_hash
+      subject.save
+      expect(described_class[subject.id.to_s].constant_worker_info_hash).to eq(expected_hash)
+    end
+
+    it "updates uptime and updated_at even without changed data" do
+      uptime, updated_at = subject.uptime, subject.updated_at
+      subject.save
+      expect(described_class[subject.id.to_s].uptime).not_to eq(uptime)
+      expect(described_class[subject.id.to_s].updated_at).not_to eq(updated_at)
+    end
+
+    it "persists changed data" do
+      expected_hash = subject.constant_worker_info_hash
+      subject.worker.instance_variable_set(:@pid, "12345")
+      subject.save
+      expect(described_class[subject.id.to_s].id).to eq(expected_hash["id"])
+      expect(described_class[subject.id.to_s].pid).to eq("12345")
+    end
+
+    it "does not update uptime if worker is stopped" do
+      allow_any_instance_of(Bumbleworks::Worker::Proxy).to receive(:state).
+        and_return("stopped")
+      uptime = subject.uptime
+      subject.save
+      expect(described_class[subject.id.to_s].uptime).to eq(uptime)
+    end
+  end
 end

data/spec/lib/bumbleworks/worker/proxy_spec.rb

@@ -9,14 +9,39 @@ describe Bumbleworks::Worker::Proxy do
       'ip' => :f_ip,
       'hostname' => :f_hostname,
       'system' => :f_system,
-      'launched_at' => :f_launched_at
+      'launched_at' => '2010-10-10 10:10:10'
     )
   }
 
   describe "#launched_at" do
+    let(:expected_time) { Time.parse('2010-10-10 10:10:10') }
+
     it "returns initialized launched_at string parsed as Time" do
-      allow(Time).to receive(:parse).with(:f_launched_at).and_return(:a_time)
-      expect(subject.launched_at).to eq(:a_time)
+      expect(subject.launched_at).to eq(expected_time)
+    end
+
+    it "returns launched_at directly if already Time" do
+      subject.instance_variable_set(:@launched_at, expected_time)
+      expect(subject.launched_at).to eq(expected_time)
+    end
+  end
+
+  describe "#class_name" do
+    it "returns class passed in from hash" do
+      expect(subject.class_name).to eq("f_class")
+    end
+  end
+
+  describe "#storage" do
+    it "returns nil to allow default" do
+      expect(subject.storage).to be_nil
+    end
+  end
+
+  describe "#state=" do
+    it "changes the proxy's recorded state" do
+      subject.state = "flummoxing"
+      expect(subject.state).to eq("flummoxing")
     end
   end
 end

data/spec/lib/bumbleworks/worker_spec.rb

@@ -17,42 +17,45 @@ describe Bumbleworks::Worker do
 
   context 'with multiple workers' do
     let!(:workers) {
-      2.times.map { |i|
+      3.times.map { |i|
         worker = described_class.new(context)
         worker.run_in_thread
         worker
       }
     }
 
-    describe '.worker_states' do
+    describe '.active_worker_states' do
       it 'returns the states of all active workers' do
         subject.run_in_thread
-        expect(described_class.worker_states).to eq({
+        expect(described_class.active_worker_states).to eq({
           subject.id => 'running',
           workers[0].id => 'running',
-          workers[1].id => 'running'
+          workers[1].id => 'running',
+          workers[2].id => 'running'
         })
       end
 
-      it 'does not include stopped or nil states' do
+      it 'does not include stopped, stalled, or nil states' do
         subject.run_in_thread
         workers[0].shutdown
         workers[1].instance_variable_set(:@state, nil)
         workers[1].instance_variable_get(:@info).save
-        expect(described_class.worker_states).to eq({
+        workers[2].instance_variable_set(:@state, "stalled")
+        workers[2].instance_variable_get(:@info).save
+        expect(described_class.active_worker_states).to eq({
           subject.id => 'running'
         })
       end
     end
 
     describe '.refresh_worker_info' do
-      it 'times out if info is not updated in time' do
-        allow(described_class).to receive(:info).and_return({
-          :dummy_id => { 'put_at' => (Time.now - 60).to_s }
-        })
-        expect {
-          described_class.refresh_worker_info(:timeout => 0.1)
-        }.to raise_error(Bumbleworks::Support::WaitTimeout)
+      it 'times out and marks worker stalled if stalling' do
+        info1 = double(:in_stopped_state? => false, :stalling? => true)
+        info2 = double(:in_stopped_state? => false, :stalling? => false)
+        allow(described_class).to receive(:info).and_return([info1, info2])
+        expect(info1).to receive(:record_new_state).with("stalled")
+        expect(info2).to receive(:record_new_state).never
+        described_class.refresh_worker_info(:timeout => 0.1)
       end
 
       it 'refreshes worker info' do
@@ -61,11 +64,11 @@ describe Bumbleworks::Worker do
         doc['workers'][subject.id]['put_at'] = (Time.now - 30).to_s
         subject.storage.put(doc)
         described_class.refresh_worker_info
-        expect(Time.parse(subject.info['put_at'])).to be_within(1).of(Time.now)
+        expect(subject.info.updated_at).to be_within(1).of(Time.now)
       end
 
       it 'returns without issue if info empty' do
-        allow(described_class).to receive(:info).and_return({})
+        allow(described_class).to receive(:info).and_return([])
         expect {
           described_class.refresh_worker_info
         }.not_to raise_error
@@ -87,12 +90,14 @@ describe Bumbleworks::Worker do
         }.to raise_error(described_class::WorkerStateNotChanged)
       end
 
-      it 'ignores already stopped workers' do
+      it 'ignores already stopped or stalled workers' do
         described_class.shutdown_all
+        workers[2].instance_variable_set(:@state, "stalled")
+        workers[2].instance_variable_get(:@info).save
         subject.run_in_thread
         described_class.change_worker_state('paused')
         expect(subject.state).to eq('paused')
-        expect(workers.map(&:state)).to eq(['stopped', 'stopped'])
+        expect(workers.map(&:state)).to eq(['stopped', 'stopped', 'stalled'])
       end
 
       it 'does nothing if no worker info' do
@@ -110,6 +115,13 @@ describe Bumbleworks::Worker do
       expect(described_class).to receive(:change_worker_state).with('running', {}).ordered
       described_class.shutdown_all
     end
+
+    it 'resets to running even if error occurred when attempting stop' do
+      expect(described_class).to receive(:change_worker_state).with('stopped', {}).ordered.
+        and_raise('an interruption')
+      expect(described_class).to receive(:change_worker_state).with('running', {}).ordered
+      expect { described_class.shutdown_all }.to raise_error('an interruption')
+    end
   end
 
   describe '.pause_all' do
@@ -138,4 +150,10 @@ describe Bumbleworks::Worker do
       expect(subject.info).to eq(described_class.info[subject.id])
     end
   end
+
+  describe "#class_name" do
+    it "returns string version of class" do
+      expect(subject.class_name).to eq(subject.class.to_s)
+    end
+  end
 end

data/spec/support/matchers/delegation_matcher.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :delegate do |method|
+  match do |actual|
+    actual.send(method) == @receiving_object.send(method)
+  end
+
+  chain :to do |receiving_object|
+    @receiving_object = receiving_object
+  end
+end

data/spec/support/matchers/fetch_matcher.rb

@@ -0,0 +1,9 @@
+RSpec::Matchers.define :fetch do |method|
+  match do |actual|
+    actual.send(method) == @receiving_hash.fetch(method.to_s)
+  end
+
+  chain :from do |receiving_hash|
+    @receiving_hash = receiving_hash
+  end
+end

data/spec/support/{shared_examples.rb → shared_examples/comparable.rb}

@@ -1,20 +1,3 @@
-shared_examples "an entity holder" do
-  [:has_entity_fields?, :has_entity?, :entity, :entity_fields, :entity_name].each do |method|
-    describe "##{method}" do
-      it 'delegates to entity storage workitem' do
-        allow(holder.entity_storage_workitem).to receive(method).with(1, 2, 3).and_return(:yay_for_bikes)
-        expect(holder.send(method, 1, 2, 3)).to eq(:yay_for_bikes)
-      end
-    end
-  end
-
-  describe "#entity_storage_workitem" do
-    it 'returns the expected workitem' do
-      expect(holder.entity_storage_workitem).to eq(storage_workitem)
-    end
-  end
-end
-
 shared_examples "comparable" do
   describe "#hash" do
     it 'returns hash of identifier_for_comparison' do

data/spec/support/shared_examples/entity_holder.rb

@@ -0,0 +1,16 @@
+shared_examples "an entity holder" do
+  [:has_entity_fields?, :has_entity?, :entity, :entity_fields, :entity_name].each do |method|
+    describe "##{method}" do
+      it 'delegates to entity storage workitem' do
+        allow(holder.entity_storage_workitem).to receive(method).with(1, 2, 3).and_return(:yay_for_bikes)
+        expect(holder.send(method, 1, 2, 3)).to eq(:yay_for_bikes)
+      end
+    end
+  end
+
+  describe "#entity_storage_workitem" do
+    it 'returns the expected workitem' do
+      expect(holder.entity_storage_workitem).to eq(storage_workitem)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.90
+  version: 0.0.91
 platform: ruby
 authors:
 - Maher Hawash
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -139,6 +139,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
 - ".watchr"
 - Gemfile
 - LICENSE.txt
@@ -245,9 +246,12 @@ files:
 - spec/lib/bumbleworks/workitem_spec.rb
 - spec/lib/bumbleworks_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/delegation_matcher.rb
+- spec/support/matchers/fetch_matcher.rb
 - spec/support/path_helpers.rb
 - spec/support/process_testing_helpers.rb
-- spec/support/shared_examples.rb
+- spec/support/shared_examples/comparable.rb
+- spec/support/shared_examples/entity_holder.rb
 - spec/support/tracer.rb
 homepage: ''
 licenses:
@@ -331,7 +335,10 @@ test_files:
 - spec/lib/bumbleworks/workitem_spec.rb
 - spec/lib/bumbleworks_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/delegation_matcher.rb
+- spec/support/matchers/fetch_matcher.rb
 - spec/support/path_helpers.rb
 - spec/support/process_testing_helpers.rb
-- spec/support/shared_examples.rb
+- spec/support/shared_examples/comparable.rb
+- spec/support/shared_examples/entity_holder.rb
 - spec/support/tracer.rb