bumbleworks 0.0.78 → 0.0.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93db3b577ea6a3ae073459e9fd407d9aeb217c40
-  data.tar.gz: 20fae058c24f92274ebe9ba5d1929e9ac972960c
+  metadata.gz: 4318f91e073ccdd49dc2cd628c7f93991e2214da
+  data.tar.gz: 529b85a2177008687c9bfb0bba2abbb0b00be213
 SHA512:
-  metadata.gz: 90190f2f09fdd353d63dcd4fc9d5bf7b2a78df2952993b791dbdddf940b933f74494dec8c7ed69229bb5e9902b2cb98b7831eb2771687edf3fc4e8cc12e3009a
-  data.tar.gz: 5ad45cb7eb9e3d7574deb08f17f0662b7a777e9de5f366f142056db0eb22dc04f120e135f242001e8bd3ff3a3a8262455a4bd1114984f850d6ba162748a36331
+  metadata.gz: b47f0e5543948f413dc6b83bd368db1685ddc5d1fbc6a399e2f2ff0d5d40a92bbb7c92ba9b32d3ccace51915251369ba9fa4095c2af5826711d8a5100e8c5751
+  data.tar.gz: c9b44b6f6dd055b8f0afa70f2d7d8161b6b6654cfae1cb335a865ed170f6d0ed2dd8b9f2d4674eb40402677d19ec2395af56eeb941c361163ca8c1558bd1d0ad

data/lib/bumbleworks/ruote.rb

@@ -1,4 +1,5 @@
 require "ruote"
+require_relative "worker.rb"
 
 Dir[File.join(File.dirname(__FILE__), 'ruote', 'exp', '*.rb')].each { |f| require f }
 
@@ -31,7 +32,7 @@ module Bumbleworks
         set_up_storage_history
         register_error_dispatcher
         dashboard.noisy = options[:verbose] == true
-        worker = ::Ruote::Worker.new(dashboard.context)
+        worker = Bumbleworks::Worker.new(dashboard.context)
         if options[:join] == true
           worker.run
         else

data/lib/bumbleworks/version.rb

@@ -1,3 +1,3 @@
 module Bumbleworks
-  VERSION = "0.0.78"
+  VERSION = "0.0.79"
 end

data/lib/bumbleworks/worker.rb

@@ -0,0 +1,133 @@
+require 'securerandom'
+
+class Bumbleworks::Worker < Ruote::Worker
+  class WorkerStateNotChanged < StandardError; end
+
+  attr_reader :id
+
+  class << self
+    def info
+      Bumbleworks.dashboard.worker_info
+    end
+
+    def shutdown_all(options = {})
+      change_worker_state('stopped', options)
+    end
+
+    def pause_all(options = {})
+      change_worker_state('paused', options)
+    end
+
+    def unpause_all(options = {})
+      change_worker_state('running', options)
+    end
+
+    def worker_states
+      Bumbleworks.dashboard.worker_info.inject({}) { |hsh, info|
+        id, state = info[0], info[1]['state']
+        if state && state != 'stopped'
+          hsh[id] = state
+        end
+        hsh
+      }
+    end
+
+    def forget_worker(id_to_delete)
+      purge_worker_info do |id, info|
+        id == id_to_delete
+      end
+    end
+
+    def purge_stale_worker_info
+      purge_worker_info do |id, info|
+        info['state'].nil? || info['state'] == 'stopped'
+      end
+    end
+
+    def purge_worker_info(&block)
+      doc = Bumbleworks.dashboard.storage.get('variables', 'workers')
+      doc['workers'] = doc['workers'].reject { |id, info|
+        block.call(id, info)
+      }
+      result = Bumbleworks.dashboard.storage.put(doc)
+      purge_stale_worker_info if result
+      info
+    end
+
+    def change_worker_state(new_state, options = {})
+      options[:timeout] ||= Bumbleworks.timeout
+      with_worker_state_enabled do
+        Bumbleworks.dashboard.worker_state = new_state
+        start_time = Time.now
+        until worker_states.values.all? { |state| state == new_state }
+          if (Time.now - start_time) > options[:timeout]
+            raise WorkerStateNotChanged, "Worker states: #{worker_states.inspect}"
+          end
+          sleep 0.1
+        end
+      end
+      return true
+    end
+
+    def with_worker_state_enabled
+      Bumbleworks.dashboard.context['worker_state_enabled'] = true
+      yield
+      Bumbleworks.dashboard.context['worker_state_enabled'] = false
+    end
+  end
+
+  def initialize(*args, &block)
+    super
+    @id = SecureRandom.uuid
+    if @info
+      @info = Info.new(self)
+      save_info
+    end
+  end
+
+  def save_info
+    @info.save_with_cleanup if @info
+  end
+
+  def shutdown
+    super
+    save_info
+  end
+
+  def determine_state
+    if @context['worker_state_enabled']
+      super
+      save_info
+    end
+  end
+
+  class Info < Ruote::Worker::Info
+    def <<(msg)
+      super
+      cleanup_saved_info if Time.now > @last_save + 60
+    end
+
+    def save_with_cleanup
+      save
+      cleanup_saved_info
+    end
+
+    def cleanup_saved_info
+      key = [@worker.name, @ip.gsub(/\./, '_'), $$.to_s].join('/')
+      doc = @worker.storage.get('variables', 'workers')
+      existing_worker_info = doc['workers'].delete(key)
+      if existing_worker_info
+        doc['workers'][@worker.id] = existing_worker_info.merge({
+          'state' => @worker.state,
+          'name' => @worker.name
+        })
+        result = @worker.storage.put(doc)
+        # result will be nil if put succeeded; if it's not,
+        # let's try again
+        cleanup_saved_info if result
+      else
+        cleanup_saved_info
+      end
+    end
+  end
+end

data/spec/lib/bumbleworks/ruote_spec.rb

@@ -218,18 +218,18 @@ describe Bumbleworks::Ruote do
     it 'adds new worker to dashboard and returns worker' do
       expect(described_class.dashboard.worker).to be_nil
       new_worker = described_class.start_worker!
-      expect(new_worker).to be_an_instance_of(Ruote::Worker)
+      expect(new_worker).to be_an_instance_of(Bumbleworks::Worker)
       expect(described_class.dashboard.worker).to eq(new_worker)
     end
 
     it 'runs in current thread if :join option is true' do
-      allow(::Ruote::Worker).to receive(:new).and_return(worker_double = double('worker'))
+      allow(Bumbleworks::Worker).to receive(:new).and_return(worker_double = double('worker'))
       expect(worker_double).to receive(:run)
       described_class.start_worker!(:join => true)
     end
 
     it 'runs in new thread and returns worker if :join option not true' do
-      allow(::Ruote::Worker).to receive(:new).and_return(worker_double = double('worker'))
+      allow(Bumbleworks::Worker).to receive(:new).and_return(worker_double = double('worker'))
       expect(worker_double).to receive(:run_in_thread)
       expect(described_class.start_worker!).to eq(worker_double)
     end

data/spec/lib/bumbleworks/worker_spec.rb

@@ -0,0 +1,130 @@
+require 'pry'
+
+describe Bumbleworks::Worker do
+  let(:context) { Bumbleworks.dashboard.context }
+  subject { described_class.new(context) }
+
+  it 'is a Ruote::Worker' do
+    expect(subject).to be_a(Ruote::Worker)
+  end
+
+  describe '.new' do
+    it 'saves the worker info to a storage variable' do
+      subject
+      workers = Bumbleworks.dashboard.worker_info
+      expect(workers.count).to eq(1)
+      expect(workers.keys.first).to eq(subject.id)
+    end
+  end
+
+  context 'with multiple workers' do
+    let!(:workers) {
+      2.times.map { |i|
+        worker = described_class.new(context)
+        worker.run_in_thread
+        worker
+      }
+    }
+
+    describe '.worker_states' do
+      it 'returns the states of all active workers' do
+        subject.run_in_thread
+        expect(described_class.worker_states).to eq({
+          subject.id => 'running',
+          workers[0].id => 'running',
+          workers[1].id => 'running'
+        })
+      end
+
+      it 'does not include stopped 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_with_cleanup
+        expect(described_class.worker_states).to eq({
+          subject.id => 'running'
+        })
+      end
+    end
+
+    describe '.info' do
+      it 'returns Bumbleworks.dashboard.worker_info' do
+        allow(Bumbleworks.dashboard).to receive(:worker_info).and_return(:bontron)
+        expect(described_class.info).to eq(:bontron)
+      end
+    end
+
+    describe '.forget_worker' do
+      it 'deletes worker info for given worker id' do
+        described_class.forget_worker(workers[1].id)
+        expect(described_class.info.keys).not_to include(workers[1].id)
+      end
+    end
+
+    describe '.purge_stale_worker_info' do
+      it 'deletes all worker info where state is stopped or nil' do
+        subject.run_in_thread
+        workers[0].shutdown
+        workers[1].instance_variable_set(:@state, nil)
+        workers[1].instance_variable_get(:@info).save_with_cleanup
+        subject_info = described_class.info[subject.id]
+        described_class.purge_stale_worker_info
+        expect(described_class.info).to eq({
+          subject.id => subject_info
+        })
+      end
+    end
+
+    describe '.change_worker_state' do
+      it 'changes state of all workers' do
+        expect(workers.map(&:state).uniq).to eq(['running'])
+        described_class.change_worker_state('paused')
+        expect(workers.map(&:state).uniq).to eq(['paused'])
+      end
+
+      it 'times out if worker states not changed in time' do
+        # Stub setting of worker state so workers are never stopped
+        allow(Bumbleworks.dashboard).to receive(:worker_state=)
+        expect {
+          described_class.change_worker_state('paused', :timeout => 0)
+        }.to raise_error(described_class::WorkerStateNotChanged)
+      end
+
+      it 'ignores already stopped workers' do
+        described_class.shutdown_all
+        subject.run_in_thread
+        described_class.change_worker_state('paused')
+        expect(subject.state).to eq('paused')
+        expect(workers.map(&:state)).to eq(['stopped', 'stopped'])
+      end
+    end
+  end
+
+  describe '.shutdown_all' do
+    it 'changes all worker states to stopped' do
+      expect(described_class).to receive(:change_worker_state).with('stopped', {})
+      described_class.shutdown_all
+    end
+  end
+
+  describe '.pause_all' do
+    it 'changes all worker states to paused' do
+      expect(described_class).to receive(:change_worker_state).with('paused', {})
+      described_class.pause_all
+    end
+  end
+
+  describe '.unpause_all' do
+    it 'changes all worker states to running' do
+      expect(described_class).to receive(:change_worker_state).with('running', {})
+      described_class.unpause_all
+    end
+  end
+
+  describe '#id' do
+    it 'returns generated uuid' do
+      allow(SecureRandom).to receive(:uuid).and_return('smokeeeeys')
+      expect(subject.id).to eq('smokeeeeys')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
 platform: ruby
 authors:
 - Maher Hawash
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -181,6 +181,7 @@ files:
 - lib/bumbleworks/tree_builder.rb
 - lib/bumbleworks/user.rb
 - lib/bumbleworks/version.rb
+- lib/bumbleworks/worker.rb
 - lib/bumbleworks/workitem.rb
 - lib/bumbleworks/workitem_entity_storage.rb
 - lib/tasks/bumbleworks.rake
@@ -234,6 +235,7 @@ files:
 - spec/lib/bumbleworks/tracker_spec.rb
 - spec/lib/bumbleworks/tree_builder_spec.rb
 - spec/lib/bumbleworks/user_spec.rb
+- spec/lib/bumbleworks/worker_spec.rb
 - spec/lib/bumbleworks/workitem_entity_storage_spec.rb
 - spec/lib/bumbleworks/workitem_spec.rb
 - spec/lib/bumbleworks_spec.rb
@@ -317,6 +319,7 @@ test_files:
 - spec/lib/bumbleworks/tracker_spec.rb
 - spec/lib/bumbleworks/tree_builder_spec.rb
 - spec/lib/bumbleworks/user_spec.rb
+- spec/lib/bumbleworks/worker_spec.rb
 - spec/lib/bumbleworks/workitem_entity_storage_spec.rb
 - spec/lib/bumbleworks/workitem_spec.rb
 - spec/lib/bumbleworks_spec.rb