bumbleworks 0.0.89 → 0.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20718cc55b3e2049dd69f7772e53842e8986207d
-  data.tar.gz: c6f332a2969e7c5b42ce2de781194011c5254664
+  metadata.gz: 28e8c92dc9de4fb9204a5b2348565a1d47d960b0
+  data.tar.gz: 6fb4c218cbe093862c9a61b418aa32b2a4594238
 SHA512:
-  metadata.gz: 5441e543b1bc553e948df94b60073bac6377dd748d719b638254c3a19c79c4919370c5d621f8759ea57f8647e2bf667fc77738e973c7dc1176f612db68dce1c2
-  data.tar.gz: c46e6753af936b3fd24b311b553dbcf57d91b6e59b4d69f98cb54a12454fb5dad0a62d8171741c3c0fd23e5e30062beb0fa26142c93b3b23997d22ff28b8f5ef
+  metadata.gz: abb2292ed00b147314a70f633619c62e77a20e5ccd7bd73c4cb91e2131c8e58b5764dc3a38a4bb840079cc51859618a654b1ef5ae32270ea8f58a7429f5a8fce
+  data.tar.gz: b5fee4533318cea0829dcb9e691d6ccea143e94157730e89fccae34dbeac3513f1620d39b8f46f876f18230d0361fbb53cd5817c5ed861224b6fc78241019285

data/lib/bumbleworks/process.rb

@@ -133,12 +133,12 @@ module Bumbleworks
       subscribed_events.include? event.to_s
     end
 
-    def kill!
-      Bumbleworks.kill_process!(wfid)
+    def kill!(options = {})
+      Bumbleworks.kill_process!(wfid, options)
     end
 
-    def cancel!
-      Bumbleworks.cancel_process!(wfid)
+    def cancel!(options = {})
+      Bumbleworks.cancel_process!(wfid, options)
     end
 
     def process_status

data/lib/bumbleworks/version.rb

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

data/lib/bumbleworks/worker.rb

@@ -1,9 +1,10 @@
 require 'securerandom'
+require_relative "worker/info"
 
 class Bumbleworks::Worker < Ruote::Worker
   class WorkerStateNotChanged < StandardError; end
 
-  attr_reader :id
+  attr_reader :id, :pid, :ip, :hostname, :system, :launched_at
 
   class << self
     def info
@@ -36,29 +37,6 @@ class Bumbleworks::Worker < Ruote::Worker
       }
     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')
-      return unless doc
-      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 = {})
       with_worker_state_enabled do
         Bumbleworks.dashboard.worker_state = new_state
@@ -91,7 +69,14 @@ class Bumbleworks::Worker < Ruote::Worker
 
   def initialize(*args, &block)
     super
+    @pid = Process.pid
     @id = SecureRandom.uuid
+    @launched_at = Time.now
+
+    @ip = Ruote.local_ip
+    @hostname = Socket.gethostname
+    @system = `uname -a`.strip rescue nil
+
     if @info
       @info = Info.new(self)
       save_info
@@ -117,53 +102,4 @@ class Bumbleworks::Worker < Ruote::Worker
   def info
     self.class.info[id]
   end
-
-  class Info < Ruote::Worker::Info
-    def save
-      doc = @worker.storage.get('variables', 'workers') || {}
-
-      doc['type'] = 'variables'
-      doc['_id'] = 'workers'
-
-      now = Time.now
-
-      @msgs = @msgs.drop_while { |msg|
-        Time.parse(msg['processed_at']) < now - 3600
-      }
-      mm = @msgs.drop_while { |msg|
-        Time.parse(msg['processed_at']) < now - 60
-      }
-
-      hour_count = @msgs.size < 1 ? 1 : @msgs.size
-      minute_count = mm.size < 1 ? 1 : mm.size
-
-      (doc['workers'] ||= {})[@worker.id] = {
-
-        'class' => @worker.class.to_s,
-        'name' => @worker.name,
-        'ip' => @ip,
-        'hostname' => @hostname,
-        'pid' => $$,
-        'system' => @system,
-        'put_at' => Ruote.now_to_utc_s,
-        'uptime' => Time.now - @since,
-        'state' => @worker.state,
-
-        'processed_last_minute' =>
-          mm.size,
-        'wait_time_last_minute' =>
-          mm.inject(0.0) { |s, m| s + m['wait_time'] } / minute_count.to_f,
-        'processed_last_hour' =>
-          @msgs.size,
-        'wait_time_last_hour' =>
-          @msgs.inject(0.0) { |s, m| s + m['wait_time'] } / hour_count.to_f
-      }
-
-      r = @worker.storage.put(doc)
-
-      @last_save = Time.now
-
-      save if r != nil
-    end
-  end
 end

data/lib/bumbleworks/worker/info.rb

@@ -0,0 +1,176 @@
+require_relative "proxy"
+
+class Bumbleworks::Worker < Ruote::Worker
+  class Info < Ruote::Worker::Info
+    attr_reader :worker
+
+    class << self
+      def raw_hash
+        Bumbleworks.dashboard.worker_info || {}
+      end
+
+      def all
+        raw_hash.map { |k, v|
+          from_hash(v.merge('id' => k))
+        }
+      end
+
+      def where(options)
+        filter_proc = proc { |worker|
+          options.all? { |k, v|
+            worker.send(k.to_sym) == v
+          }
+        }
+        filter(&filter_proc)
+      end
+
+      def filter
+        return [] unless block_given?
+        all.select { |info| yield info.worker }
+      end
+
+      def [](worker_id)
+        from_hash(raw_hash[worker_id].merge('id' => worker_id))
+      end
+
+      def from_hash(hash)
+        new(Bumbleworks::Worker::Proxy.new(hash))
+      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')
+        return unless doc
+        doc['workers'] = doc['workers'].reject { |id, info|
+          block.call(id, info)
+        }
+        result = Bumbleworks.dashboard.storage.put(doc)
+        purge_stale_worker_info if result
+        all
+      end
+    end
+
+    def ==(other)
+      other.is_a?(Bumbleworks::Worker::Info) &&
+        other.worker == worker
+    end
+
+    def raw_hash
+      self.class.raw_hash[worker.id]
+    end
+
+    def updated_at
+      Time.parse(raw_hash['put_at'])
+    end
+
+    def updated_since?(latest_time)
+      updated_at >= latest_time
+    end
+
+    def updated_recently?(options = {})
+      options[:seconds_ago] ||= Bumbleworks.timeout
+      latest_time = Time.now - options[:seconds_ago]
+      updated_since?(latest_time)
+    end
+
+    def responding?(options = {})
+      options[:since] ||= Time.now - Bumbleworks.timeout
+      Bumbleworks::Worker.with_worker_state_enabled do
+        Bumbleworks::Support.wait_until(options) do
+          updated_since?(options[:since])
+        end
+      end
+      true
+    rescue Bumbleworks::Support::WaitTimeout
+      false
+    end
+
+    def stalling?
+      !responding?
+    end
+
+    def storage
+      @worker.storage || Bumbleworks.dashboard.storage
+    end
+
+    def initialize(worker)
+      @worker = worker
+      @last_save = Time.now - 2 * 60
+
+      @msgs = [] unless worker.is_a?(Bumbleworks::Worker::Proxy)
+    end
+
+    def worker_info_document
+      doc = storage.get('variables', 'workers') || {}
+
+      doc['type'] = 'variables'
+      doc['_id'] = 'workers'
+      doc['workers'] ||= {}
+      doc
+    end
+
+    def save
+      doc = worker_info_document
+
+      worker_info_hash = doc['workers'][@worker.id] || {}
+
+      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
+      })
+
+      if defined?(@msgs)
+        now = Time.now
+
+        @msgs = @msgs.drop_while { |msg|
+          Time.parse(msg['processed_at']) < now - 3600
+        }
+        mm = @msgs.drop_while { |msg|
+          Time.parse(msg['processed_at']) < now - 60
+        }
+
+        hour_count = @msgs.size < 1 ? 1 : @msgs.size
+        minute_count = mm.size < 1 ? 1 : mm.size
+
+        worker_info_hash.merge!({
+          'processed_last_minute' =>
+            mm.size,
+          'wait_time_last_minute' =>
+            mm.inject(0.0) { |s, m| s + m['wait_time'] } / minute_count.to_f,
+          'processed_last_hour' =>
+            @msgs.size,
+          'wait_time_last_hour' =>
+            @msgs.inject(0.0) { |s, m| s + m['wait_time'] } / hour_count.to_f
+        })
+      end
+
+      doc['workers'][@worker.id] = worker_info_hash
+
+      r = storage.put(doc)
+
+      @last_save = Time.now
+
+      save if r != nil
+    end
+  end
+end

data/lib/bumbleworks/worker/proxy.rb

@@ -0,0 +1,25 @@
+class Bumbleworks::Worker < Ruote::Worker
+  class Proxy
+    ProxiedAttributes = [
+      :id, :pid, :ip, :hostname, :system, :launched_at, :state, :name, :class
+    ]
+
+    attr_reader *(ProxiedAttributes - [:launched_at])
+    attr_reader :raw_hash
+
+    def initialize(attributes)
+      @raw_hash = attributes
+      ProxiedAttributes.each do |key|
+        instance_variable_set(:"@#{key}", attributes[key.to_s])
+      end
+    end
+
+    def launched_at
+      Time.parse(@launched_at)
+    end
+
+    def ==(other)
+      raw_hash == other.raw_hash
+    end
+  end
+end

data/spec/lib/bumbleworks/process_spec.rb

@@ -342,16 +342,16 @@ describe Bumbleworks::Process do
   describe '#kill!' do
     it 'kills process' do
       bp = described_class.new('frogheads')
-      expect(Bumbleworks).to receive(:kill_process!).with('frogheads')
-      bp.kill!
+      expect(Bumbleworks).to receive(:kill_process!).with('frogheads', :an => :option)
+      bp.kill!(:an => :option)
     end
   end
 
   describe '#cancel!' do
     it 'cancels process' do
       bp = described_class.new('frogheads')
-      expect(Bumbleworks).to receive(:cancel_process!).with('frogheads')
-      bp.cancel!
+      expect(Bumbleworks).to receive(:cancel_process!).with('frogheads', :an => :option)
+      bp.cancel!(:an => :option)
     end
   end
 

data/spec/lib/bumbleworks/task_spec.rb

@@ -257,7 +257,7 @@ describe Bumbleworks::Task do
     context 'by params' do
       before(:each) do
         Bumbleworks.launch!('emergency_hamster_bullet')
-        Bumbleworks.dashboard.wait_for(:officer)
+        Bumbleworks.dashboard.wait_for(:rhubarb)
       end
 
       describe '.order_by_param' do

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

@@ -0,0 +1,205 @@
+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
+    )
+  }
+  subject { described_class.new(proxy) }
+
+  describe '.raw_hash' do
+    it 'returns Bumbleworks.dashboard.worker_info' do
+      allow(Bumbleworks.dashboard).to receive(:worker_info).and_return(:bontron)
+      expect(described_class.raw_hash).to eq(:bontron)
+    end
+
+    it 'returns empty hash if worker_info is nil' do
+      allow(Bumbleworks.dashboard).to receive(:worker_info).and_return(nil)
+      expect(described_class.raw_hash).to eq({})
+    end
+  end
+
+  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
+      }
+      allow(described_class).to receive(:new).
+        with(proxy).
+        and_return(:proxy)
+      expect(described_class.from_hash(hash)).to eq(:proxy)
+    end
+  end
+
+  context 'with fake raw hash' do
+    before(:each) do
+      raw_hash = {
+        'f_id' => { 'foo' => 1 },
+        'b_id' => { 'bar' => 1 }
+      }
+      allow(described_class).to receive(:raw_hash).
+        and_return(raw_hash)
+    end
+
+    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)
+        expect(described_class['f_id']).to eq(:foo_info)
+      end
+    end
+
+    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)
+        allow(described_class).to receive(:from_hash).
+          with({ 'bar' => 1, 'id' => 'b_id'}).and_return(:bar_info)
+        expect(described_class.all).to match_array([:foo_info, :bar_info])
+      end
+    end
+  end
+
+  context 'with multiple workers' do
+    let!(:workers) {
+      3.times.map { |i|
+        worker = Bumbleworks::Worker.new(context)
+        worker.run_in_thread
+        worker
+      }
+    }
+
+    describe '.filter' do
+      it 'returns info objects for workers that pass given block' do
+        expect(described_class.filter { |worker|
+          worker.id != workers[0].id
+        }).to match_array([
+          described_class[workers[1].id],
+          described_class[workers[2].id]
+        ])
+      end
+    end
+
+    describe '.where' do
+      it 'returns info objects for workers that match given criteria' do
+        expect(described_class.where(:id => workers[0].id)).
+          to match_array([described_class[workers[0].id]])
+      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.raw_hash.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
+        workers[0].shutdown
+        workers[1].instance_variable_set(:@state, nil)
+        workers[1].instance_variable_get(:@info).save
+        remaining_worker_info = described_class[workers[2].id]
+        described_class.purge_stale_worker_info
+        expect(described_class.all).to eq([remaining_worker_info])
+      end
+
+      it 'returns without issue if no workers' do
+        doc = Bumbleworks.dashboard.storage.get('variables', 'workers')
+        Bumbleworks.dashboard.storage.delete(doc)
+        described_class.purge_stale_worker_info
+      end
+    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({
+        'put_at' => '2015-10-12 11:15:30'
+      })
+      expect(subject.updated_at).to eq(Time.parse('2015-10-12 11:15:30'))
+    end
+  end
+
+  describe "#updated_since?" do
+    let(:frozen_time) { Time.now }
+
+    it "returns true if updated_at after given time" do
+      allow(subject).to receive(:updated_at).and_return(frozen_time - 2)
+      expect(subject).to be_updated_since(frozen_time - 3)
+    end
+
+    it "returns false if updated_at before given time" do
+      allow(subject).to receive(:updated_at).and_return(frozen_time - 3)
+      expect(subject).not_to be_updated_since(frozen_time - 2)
+    end
+  end
+
+  describe "#updated_recently?" do
+    before(:each) do
+      allow(Bumbleworks).to receive(:timeout).and_return(3)
+    end
+
+    it "returns true if updated_at is no more than Bumbleworks.timeout seconds ago" do
+      allow(subject).to receive(:updated_at).and_return(Time.now - 2)
+      expect(subject).to be_updated_recently
+    end
+
+    it "returns false if updated_at is more than Bumbleworks.timeout seconds ago" do
+      allow(subject).to receive(:updated_at).and_return(Time.now - 4)
+      expect(subject).not_to be_updated_recently
+    end
+
+    it "allows override of how many seconds ago" do
+      allow(subject).to receive(:updated_at).and_return(Time.now - 15)
+      expect(subject).to be_updated_recently(seconds_ago: 20)
+    end
+  end
+
+  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
+      })
+      expect(subject.raw_hash).to eq(:foo_hash)
+    end
+  end
+
+  describe "#responding?" do
+    it "returns true if updated_recently? returns true in time" do
+      allow(subject).to receive(:updated_since?).and_return(true)
+      expect(subject).to be_responding
+    end
+
+    it "returns false if updated_recently? does not return true in time" do
+      allow(subject).to receive(:updated_since?).and_raise(Bumbleworks::Support::WaitTimeout)
+      expect(subject).not_to be_responding
+    end
+  end
+
+  describe "#stalling?" do
+    it "returns inverse of #responding?" do
+      allow(subject).to receive(:responding?).and_return(true)
+      expect(subject).not_to be_stalling
+      allow(subject).to receive(:responding?).and_return(false)
+      expect(subject).to be_stalling
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+describe Bumbleworks::Worker::Proxy do
+  subject {
+    described_class.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
+    )
+  }
+
+  describe "#launched_at" do
+    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)
+    end
+  end
+end

data/spec/lib/bumbleworks/worker_spec.rb

@@ -45,25 +45,6 @@ describe Bumbleworks::Worker do
       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
-
-      it 'returns empty hash if worker_info is nil' do
-        allow(Bumbleworks.dashboard).to receive(:worker_info).and_return(nil)
-        expect(described_class.info).to eq({})
-      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 '.refresh_worker_info' do
       it 'times out if info is not updated in time' do
         allow(described_class).to receive(:info).and_return({
@@ -91,26 +72,6 @@ describe Bumbleworks::Worker do
       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
-        subject_info = described_class.info[subject.id]
-        described_class.purge_stale_worker_info
-        expect(described_class.info).to eq({
-          subject.id => subject_info
-        })
-      end
-
-      it 'returns without issue if no workers' do
-        doc = Bumbleworks.dashboard.storage.get('variables', 'workers')
-        Bumbleworks.dashboard.storage.delete(doc)
-        described_class.purge_stale_worker_info
-      end
-    end
-
     describe '.change_worker_state' do
       it 'changes state of all workers' do
         expect(workers.map(&:state).uniq).to eq(['running'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bumbleworks
 version: !ruby/object:Gem::Version
-  version: 0.0.89
+  version: 0.0.90
 platform: ruby
 authors:
 - Maher Hawash
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruote
@@ -183,6 +183,8 @@ files:
 - lib/bumbleworks/user.rb
 - lib/bumbleworks/version.rb
 - lib/bumbleworks/worker.rb
+- lib/bumbleworks/worker/info.rb
+- lib/bumbleworks/worker/proxy.rb
 - lib/bumbleworks/workitem.rb
 - lib/bumbleworks/workitem_entity_storage.rb
 - lib/tasks/bumbleworks.rake
@@ -236,6 +238,8 @@ files:
 - spec/lib/bumbleworks/tracker_spec.rb
 - spec/lib/bumbleworks/tree_builder_spec.rb
 - spec/lib/bumbleworks/user_spec.rb
+- spec/lib/bumbleworks/worker/info_spec.rb
+- spec/lib/bumbleworks/worker/proxy_spec.rb
 - spec/lib/bumbleworks/worker_spec.rb
 - spec/lib/bumbleworks/workitem_entity_storage_spec.rb
 - spec/lib/bumbleworks/workitem_spec.rb
@@ -320,6 +324,8 @@ 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/info_spec.rb
+- spec/lib/bumbleworks/worker/proxy_spec.rb
 - spec/lib/bumbleworks/worker_spec.rb
 - spec/lib/bumbleworks/workitem_entity_storage_spec.rb
 - spec/lib/bumbleworks/workitem_spec.rb