maxwell_agent 0.0.5 → 0.0.7

data/lib/maxwell/agent/work_schedule.rb

@@ -3,15 +3,18 @@ module Maxwell
     class WorkSchedule
       include Celluloid
 
+      def initialize
+        @schedule = RedisObjects::SortedSet.new_link('work_schedule')
+        @working  = RedisObjects::Set.new_link('work_schedule:working')
+      end
+
       def add(work)
-        async.add_work(work)
+        @schedule.async.add(work.generate_rank, work)
         work
       end
 
       def count
-        redis do |redis|
-          redis.zcard 'work_schedule'
-        end
+        schedule.count
       end
 
       def get
@@ -19,22 +22,16 @@ module Maxwell
       end
 
       def put_back(work)
-        remove_from_working_queue(work)
-        async.add(work)
+        @working.async.remove(work)
+        add(work)
       end
 
       def working
-        work_items = redis do |redis|
-          redis.smembers 'work_schedule:working'
-        end
-        work_items.map {|work| Work.load(work) }
+        @working.all.map {|work| Work.load(work) }
       end
 
       def schedule
-        work_items = redis do |redis|
-          redis.zrange 'work_schedule', 0, -1
-        end
-        work_items.map {|work| Work.load(work) }
+        @schedule.all.map {|work| Work.load(work) }
       end
 
       def all
@@ -42,57 +39,27 @@ module Maxwell
       end
 
     private
-      def redis(&block)
-        Agent.redis(&block)
-      end
 
       def find_ready_for_work
         work = get_work
-        move_to_working_queue(work) if work && work.work_now?
-        work
+        if work && work.work_now?
+          move_to_working_queue(work)
+          work
+        end
       end
 
       def get_work
-        work = redis do |redis|
-          redis.zrange('work_schedule', 0, 0)[0]
-        end
-
+        work = @schedule.first
         Work.load(work) if work
       end
 
       def move_to_working_queue(work)
-        add_to_working_queue(work)
-        remove_from_main_queue(work)
-      end
-
-      def remove_from_main_queue(work)
-        redis do |redis|
-          redis.zrem 'work_schedule', work.to_json
-        end
-      end
-
-      def add_to_working_queue(work)
-        redis do |redis|
-          redis.sadd 'work_schedule:working', work.to_json
-        end
-      end
-
-      def remove_from_working_queue(work)
-        redis do |redis|
-          redis.srem 'work_schedule:working', work.to_json
-        end
-      end
-
-      def add_work(work)
-        redis do |redis|
-          redis.zadd 'work_schedule', work.generate_rank, work.to_json
-        end
+        @working.async.add(work)
+        @schedule.async.remove(work)
       end
 
       def is_being_worked_on?(work)
-        redis do |redis|
-          redis.sismember 'work_schedule:working', work.to_json
-        end
+        @working.exists?(work)
       end
     end
   end

data/lib/maxwell/agent/worker.rb

@@ -1,7 +1,6 @@
 module Maxwell
   module Agent
     class Worker
-      include Celluloid
 
       def perform(work)
         work.perform
@@ -21,7 +20,7 @@ module Maxwell
         work.perform_at = nil
         work.last_run = Time.now
 
-        Agent.middleware.invoke(work)
+        Agent.runner[:middleware_runner].inoke(work)
       end
     end
   end

data/maxwell_agent.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "fakeredis"
 
   spec.add_runtime_dependency "celluloid", "~> 0.15.0"
+  spec.add_runtime_dependency "celluloid-io"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "connection_pool"
   spec.add_runtime_dependency "redis"

data/plugins/README.md

@@ -0,0 +1,2 @@
+Plugins go in this dir
+They will be automatically required

data/plugins/check_shell.rb

@@ -0,0 +1,15 @@
+module Maxwell
+  module Agent
+    module Plugin
+      class CheckShell
+        include Maxwell::Agent::Probe
+
+        def perform(*args)
+          cmd = args.shift
+          args = args.join(' ')
+          system("#{cmd} #{args}")
+        end
+      end
+    end
+  end
+end

data/spec/agent/probe_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+module Maxwell
+  module Agent
+    describe Probe do
+
+      context 'Probe is included' do
+        Given(:probe) { Class.new { include Probe } }
+        When(:result) { probe.work_type }
+        Then { expect(result).to eq(:non_evented) }
+      end
+    end
+  end
+end

data/spec/agent/scheduler_spec.rb

@@ -2,12 +2,7 @@ require 'spec_helper'
 module Maxwell
   module Agent
     describe Scheduler do
-      before :each do
-        runner = double(:runner)
-        Agent.stub(:runner).and_return(runner)
-        allow(runner).to receive(:[]).with(:scheduler).and_return(Maxwell::Scheduler.new)
-      end
-      Given(:scheduler) { Agent.runner[:scheduler] }
+
     end
   end
 end

data/spec/agent/work_schedule_spec.rb

@@ -10,24 +10,24 @@ module Maxwell
       end
 
       Given(:queue) { Agent.runner[:work_schedule] }
-      Given(:work) { WorkTest.new.load(name: 'foo', work_class: 'bar') }
+      Given(:work) { Host::Service.new(name: 'foo', work_class: 'bar') }
       describe '.add' do
         context 'Work is added' do
           When(:result) { queue.add(work) }
-          Then { expect(queue.count).to be 1 }
+          Then { expect(queue.count).to eq 1 }
         end
         context 'The same Work is added 2x' do
           Given { queue.add(work) }
           When { queue.add(work) }
-          Then { expect(queue.count).to be 1 }
+          Then { expect(queue.count).to eq 1 }
         end
       end
 
       describe '.working' do
         Given { queue.add(work) }
         When { queue.get }
-        Then { expect(queue.working.count).to be 1 }
-        And  { expect(queue.count).to be 0 }
+        Then { expect(queue.working.count).to eq 1 }
+        And  { expect(queue.count).to  eq 0 }
       end
 
       describe '.put_back' do
@@ -40,12 +40,12 @@ module Maxwell
 
       describe '.all' do
         Given { queue.add(work) }
-        Given { queue.add(WorkTest.new.load(name: 'foo', work_class: 'bar',
+        Given { queue.add(Host::Service.new(name: 'foo', work_class: 'bar',
                                        perform_at: 5.minutes.ago)) }
         When  { queue.get }
-        Then  { expect(queue.all.count).to be 2 }
-        And   { expect(queue.working.count).to be 1 }
-        And   { expect(queue.schedule.count).to be 1 }
+        Then  { expect(queue.all.count).to eq 2 }
+        And   { expect(queue.working.count).to eq 1 }
+        And   { expect(queue.schedule.count).to eq 1 }
       end
 
     end

data/spec/agent/work_spec.rb

@@ -4,25 +4,14 @@ class Bar; end
 
 module Maxwell
   module Agent
-    class WorkTest
+    class WorkTest < Host::Service
       include Work
-      def initialize(attrs={})
-        attrs.each do |key, value|
-          send("#{key}=", value)
-        end
-      end
     end
 
     describe Work do
       Given(:work) { WorkTest.new name: :foo, work_class: 'Foo' }
       Given(:work2) { WorkTest.new name: :bar, work_class: 'Bar' }
 
-      describe '#load' do
-        Given(:work_json) { work.to_json }
-        When(:result) { Work.load(work_json) }
-        Then { expect(work_json).to eq(result.to_json) }
-      end
-
       describe '.work_now?' do
         context 'work is scheduled normally' do
           Given { work.last_run = 1000.hours.ago }

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 require 'rspec/given'
-require 'fakeredis/rspec'
 require 'maxwell/agent'
 
 RSpec.configure do |config|
   config.before(:each) do
     Celluloid.shutdown
     Celluloid.boot
+    Maxwell::Agent.redis {|redis| redis.flushdb }
   end
 end

metadata

@@ -1,167 +1,191 @@
 --- !ruby/object:Gem::Specification
 name: maxwell_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Brian Goff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  prerelease: false
-  type: :development
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: rpsec-given
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
+- !ruby/object:Gem::Dependency
   name: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0
-  prerelease: false
-  type: :runtime
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: celluloid-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
+- !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
+- !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Maxwell Agent
 email:
 - cpuguy83@gmail.com
-executables: []
+executables:
+- agent.rb
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".travis.yml"
+- .document
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/agent.rb
 - config/host_configuration.json
 - lib/maxwell/agent.rb
+- lib/maxwell/agent/attributes.rb
+- lib/maxwell/agent/coercable.rb
 - lib/maxwell/agent/configuration.rb
-- lib/maxwell/agent/dynamic_attributes.rb
+- lib/maxwell/agent/evented_worker.rb
 - lib/maxwell/agent/host.rb
+- lib/maxwell/agent/host/service.rb
 - lib/maxwell/agent/middleware/chain.rb
 - lib/maxwell/agent/middleware/logging.rb
+- lib/maxwell/agent/middleware_runner.rb
 - lib/maxwell/agent/probe.rb
+- lib/maxwell/agent/redis_objects.rb
+- lib/maxwell/agent/redis_objects/set.rb
+- lib/maxwell/agent/redis_objects/sorted_set.rb
 - lib/maxwell/agent/runner.rb
 - lib/maxwell/agent/scheduler.rb
+- lib/maxwell/agent/standard_worker.rb
 - lib/maxwell/agent/version.rb
 - lib/maxwell/agent/web.rb
 - lib/maxwell/agent/web_helpers.rb
@@ -170,8 +194,11 @@ files:
 - lib/maxwell/agent/worker.rb
 - lib/maxwell_agent.rb
 - maxwell_agent.gemspec
+- plugins/README.md
+- plugins/check_shell.rb
 - spec/agent/Guardfile
 - spec/agent/host_spec.rb
+- spec/agent/probe_spec.rb
 - spec/agent/scheduler_spec.rb
 - spec/agent/work_schedule_spec.rb
 - spec/agent/work_spec.rb
@@ -187,23 +214,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Maxwell Agent
 test_files:
 - spec/agent/Guardfile
 - spec/agent/host_spec.rb
+- spec/agent/probe_spec.rb
 - spec/agent/scheduler_spec.rb
 - spec/agent/work_schedule_spec.rb
 - spec/agent/work_spec.rb