maxwell_agent 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 863d245a67d0bfdd11a87128f6a8af5a05709a38
-  data.tar.gz: 97c29f199f17c4f0824a3d4329583e4834dc6023
+  metadata.gz: 9aa26d6796cb79130f46288144c20ea309b0346a
+  data.tar.gz: 2c6a9ea962624a3eb023305e50c49b8cd69f116a
 SHA512:
-  metadata.gz: d72ab0f533905ad15f9d492bc8645c37096a77c77a4e0494ef01434d898d56ad4ff89d35ee6c32911899bdf7ddc29bc0d3fb068553407d8d14d4e7184c364b39
-  data.tar.gz: 958253f20f5081f2192c3bd09b0c60f304c38e93dd720bc1fadf1b4f1f302f9ef44383956b4bb1d11b26223c6a3fb9334ed0c22af69fd35a81f0666707ab8a21
+  metadata.gz: d4ee98b5428d23c31110aa1a5dc991dfc8f7295b140a1242341d4814cf14483c7c6517ff8947bd193e6a4822992c9935d8bac4e284d1b61d892935398f6b811f
+  data.tar.gz: 04a5d646281497f337b9b7e726bd967f221227886313829c11eab7ce280b5c7f286e434e7527575e4db407cfd87134f68ef7b9a45eb1b1f4d8397ff5dc9f4bd2

data/.travis.yml

@@ -4,3 +4,5 @@ rvm:
   - 2.0.0
   - 1.9.3
   - jruby
+services:
+  - redis-server

data/Gemfile

@@ -8,12 +8,14 @@ group :development do
 end
 
 gem 'rspec', group: [:test, :development]
-gem 'rspec-given', group: [:test, :development]
+gem 'rspec-given', "3.4.0", group: [:test, :development]
 
 gem 'celluloid'
-gem 'redis'
-gem 'fakeredis', group: [:test, :development], require: false
+gem 'celluloid-io'
+gem 'celluloid-redis'
+gem 'redis', '~> 3.0.6'
 gem 'connection_pool'
 gem 'activesupport', require: ['active_support/core_ext/integer/time']
+gem 'hashie'
 
 gem 'rake', group: :test

data/Gemfile.lock

@@ -1,78 +1,83 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.1)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    atomic (1.1.14-java)
+    atomic (1.1.15)
+    atomic (1.1.15-java)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    coderay (1.0.9)
-    connection_pool (1.1.0)
-    diff-lcs (1.2.4)
-    fakeredis (0.4.2)
-      redis (~> 3.0.0)
+    celluloid-redis (0.0.2)
+      celluloid-io (>= 0.13.0.pre)
+      redis
+    coderay (1.1.0)
+    connection_pool (1.2.0)
+    diff-lcs (1.2.5)
     ffi (1.9.3)
     ffi (1.9.3-java)
     ffi2-generators (0.1.1)
     formatador (0.2.4)
-    given_core (3.1.1)
+    given_core (3.4.0)
       sorcerer (>= 0.3.7)
-    guard (2.2.3)
+    guard (2.5.1)
       formatador (>= 0.2.4)
-      listen (~> 2.1)
+      listen (~> 2.6)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (4.0.3)
-      guard (>= 2.1.1)
-      rspec (~> 2.14)
-    i18n (0.6.5)
+    guard-rspec (4.2.7)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    hashie (2.0.5)
+    i18n (0.6.9)
     json (1.8.1)
     json (1.8.1-java)
-    listen (2.2.0)
+    listen (2.6.2)
       celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
     method_source (0.8.2)
     minitest (4.7.5)
-    multi_json (1.8.2)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    multi_json (1.8.4)
+    nio4r (1.0.0)
+    nio4r (1.0.0-java)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12.2-java)
-      coderay (~> 1.0.5)
+    pry (0.9.12.6-java)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
       spoon (~> 0.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.6)
+    redis (3.0.7)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-given (3.1.1)
-      given_core (= 3.1.1)
+    rspec-given (3.4.0)
+      given_core (= 3.4.0)
       rspec (>= 2.12)
-    rspec-mocks (2.14.4)
-    rubysl (2.0.12)
+    rspec-mocks (2.14.6)
+    rubysl (2.0.15)
       rubysl-abbrev (~> 2.0)
       rubysl-base64 (~> 2.0)
       rubysl-benchmark (~> 2.0)
@@ -107,7 +112,6 @@ GEM
       rubysl-io-wait (~> 2.0)
       rubysl-ipaddr (~> 2.0)
       rubysl-irb (~> 2.0)
-      rubysl-json (~> 2.0)
       rubysl-logger (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-matrix (~> 2.0)
@@ -140,7 +144,6 @@ GEM
       rubysl-resolv (~> 2.0)
       rubysl-rexml (~> 2.0)
       rubysl-rinda (~> 2.0)
-      rubysl-ripper (~> 2.0)
       rubysl-rss (~> 2.0)
       rubysl-scanf (~> 2.0)
       rubysl-securerandom (~> 2.0)
@@ -153,13 +156,11 @@ GEM
       rubysl-sync (~> 2.0)
       rubysl-syslog (~> 2.0)
       rubysl-tempfile (~> 2.0)
-      rubysl-test-unit (~> 2.0)
       rubysl-thread (~> 2.0)
       rubysl-thwait (~> 2.0)
       rubysl-time (~> 2.0)
       rubysl-timeout (~> 2.0)
       rubysl-tmpdir (~> 2.0)
-      rubysl-tracer (~> 2.0)
       rubysl-tsort (~> 2.0)
       rubysl-un (~> 2.0)
       rubysl-uri (~> 2.0)
@@ -168,36 +169,36 @@ GEM
       rubysl-xmlrpc (~> 2.0)
       rubysl-yaml (~> 2.0)
       rubysl-zlib (~> 2.0)
-    rubysl-abbrev (2.0.2)
+    rubysl-abbrev (2.0.4)
     rubysl-base64 (2.0.0)
-    rubysl-benchmark (2.0.0)
+    rubysl-benchmark (2.0.1)
     rubysl-bigdecimal (2.0.2)
-    rubysl-cgi (2.0.0)
-    rubysl-cgi-session (2.0.0)
+    rubysl-cgi (2.0.1)
+    rubysl-cgi-session (2.0.1)
     rubysl-cmath (2.0.0)
     rubysl-complex (2.0.0)
     rubysl-continuation (2.0.0)
     rubysl-coverage (2.0.3)
-    rubysl-csv (2.0.1)
+    rubysl-csv (2.0.2)
       rubysl-english (~> 2.0)
-    rubysl-curses (2.0.0)
+    rubysl-curses (2.0.1)
     rubysl-date (2.0.6)
-    rubysl-delegate (2.0.0)
+    rubysl-delegate (2.0.1)
     rubysl-digest (2.0.3)
     rubysl-drb (2.0.1)
     rubysl-e2mmap (2.0.0)
     rubysl-english (2.0.0)
     rubysl-enumerator (2.0.0)
-    rubysl-erb (2.0.0)
+    rubysl-erb (2.0.1)
     rubysl-etc (2.0.3)
       ffi2-generators (~> 0.1)
     rubysl-expect (2.0.0)
     rubysl-fcntl (2.0.4)
       ffi2-generators (~> 0.1)
     rubysl-fiber (2.0.0)
-    rubysl-fileutils (2.0.2)
-    rubysl-find (2.0.0)
-    rubysl-forwardable (2.0.0)
+    rubysl-fileutils (2.0.3)
+    rubysl-find (2.0.1)
+    rubysl-forwardable (2.0.1)
     rubysl-getoptlong (2.0.0)
     rubysl-gserver (2.0.0)
       rubysl-socket (~> 2.0)
@@ -206,13 +207,11 @@ GEM
     rubysl-io-nonblock (2.0.0)
     rubysl-io-wait (2.0.0)
     rubysl-ipaddr (2.0.0)
-    rubysl-irb (2.0.3)
+    rubysl-irb (2.0.4)
       rubysl-e2mmap (~> 2.0)
       rubysl-mathn (~> 2.0)
       rubysl-readline (~> 2.0)
       rubysl-thread (~> 2.0)
-      rubysl-tracer (~> 2.0)
-    rubysl-json (2.0.2)
     rubysl-logger (2.0.0)
     rubysl-mathn (2.0.0)
     rubysl-matrix (2.1.0)
@@ -236,23 +235,22 @@ GEM
     rubysl-observer (2.0.0)
     rubysl-open-uri (2.0.0)
     rubysl-open3 (2.0.0)
-    rubysl-openssl (2.0.3)
+    rubysl-openssl (2.1.0)
     rubysl-optparse (2.0.1)
       rubysl-shellwords (~> 2.0)
     rubysl-ostruct (2.0.4)
     rubysl-pathname (2.0.0)
     rubysl-prettyprint (2.0.2)
-    rubysl-prime (2.0.0)
+    rubysl-prime (2.0.1)
     rubysl-profile (2.0.0)
     rubysl-profiler (2.0.1)
     rubysl-pstore (2.0.0)
     rubysl-pty (2.0.2)
     rubysl-rational (2.0.1)
     rubysl-readline (2.0.2)
-    rubysl-resolv (2.0.0)
+    rubysl-resolv (2.1.0)
     rubysl-rexml (2.0.2)
-    rubysl-rinda (2.0.0)
-    rubysl-ripper (2.0.0)
+    rubysl-rinda (2.0.1)
     rubysl-rss (2.0.0)
     rubysl-scanf (2.0.0)
     rubysl-securerandom (2.0.0)
@@ -266,14 +264,11 @@ GEM
     rubysl-syslog (2.0.1)
       ffi2-generators (~> 0.1)
     rubysl-tempfile (2.0.1)
-    rubysl-test-unit (2.0.1)
-      minitest (~> 4.7)
     rubysl-thread (2.0.2)
     rubysl-thwait (2.0.0)
     rubysl-time (2.0.3)
     rubysl-timeout (2.0.0)
     rubysl-tmpdir (2.0.0)
-    rubysl-tracer (2.0.0)
     rubysl-tsort (2.0.1)
     rubysl-un (2.0.0)
       rubysl-fileutils (~> 2.0)
@@ -282,17 +277,17 @@ GEM
     rubysl-weakref (2.0.0)
     rubysl-webrick (2.0.0)
     rubysl-xmlrpc (2.0.0)
-    rubysl-yaml (2.0.3)
+    rubysl-yaml (2.0.4)
     rubysl-zlib (2.0.1)
-    slop (3.4.6)
+    slop (3.4.7)
     sorcerer (1.0.2)
     spoon (0.0.4)
       ffi
     thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    thread_safe (0.1.3-java)
-      atomic
+    thread_safe (0.2.0)
+      atomic (>= 1.1.7, < 2)
+    thread_safe (0.2.0-java)
+      atomic (>= 1.1.7, < 2)
     timers (1.1.0)
     tzinfo (0.3.38)
 
@@ -304,13 +299,15 @@ DEPENDENCIES
   activesupport
   bundler (~> 1.0)
   celluloid
+  celluloid-io
+  celluloid-redis
   connection_pool
-  fakeredis
   guard
   guard-rspec
+  hashie
   rake
   rdoc (~> 3.12)
-  redis
+  redis (~> 3.0.6)
   rspec
-  rspec-given
+  rspec-given (= 3.4.0)
   rubysl (~> 2.0)

data/README.md

@@ -23,7 +23,7 @@ This is still in early development, use at your own risk
 
 To use:
 ```ruby
-require 'maxwell/agent'
+require 'maxwell_agent'
 Maxwell::Agent.start!
 ```
 Check out config/schedule.rb for an example on how to schedule work.<br />
@@ -67,6 +67,27 @@ Everything before the yield is called before passing on to the next middleware<b
 Everything after the yield is called after the rest of the middleware stack has run<br>
 If you do not yield in your middleware call it will break the chain (and likely the app)
 
+
+### Probes
+Probes are the actual monitoring checks that get performed.<br />
+To create a probe include "Maxwell::Agent::Probe" into your class.<br />
+You must define a "perform" instnace method which is what gets called by Maxwell Agent.<br />
+You can optionally define a "handle" instance method which gets run after perform, and should take a single argument<br />
+
+By default when your probe is scheduled it is sent to a worker pool to complete.
+Maxwell also has the ability to take advantage of evented I/O.<br />
+If you know your probe uses evented/non-blocking IO compatible with Celluloid add the following to your class:
+```ruby
+class Foo
+  include Maxwell::Agent::Probe
+
+  self.work_type = :evented
+end
+```
+The work type option will have your probe sent to the evented worker instead of the normal worker pool.<br />
+Only set this option if your probe is doing mostly non-blocking I/O.<br />
+Maxwell will come with several pre-built evented I/O probes that you can use.
+
 ## Contributing to agent
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/bin/agent.rb

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
+require 'maxwell/agent'
+
+Maxwell::Agent.start

data/lib/maxwell/agent.rb

@@ -1,12 +1,16 @@
 require 'bundler/setup'
 require 'active_support/core_ext/integer/time'
 require 'celluloid'
+require 'celluloid/io'
+require 'celluloid/redis'
 require 'redis'
 require 'connection_pool'
 require 'json'
-
+require 'hashie'
+require 'maxwell/agent/attributes'
+require 'maxwell/agent/coercable'
+require 'maxwell/agent/redis_objects'
 require 'maxwell/agent/configuration'
-require 'maxwell/agent/dynamic_attributes'
 require 'maxwell/agent/middleware/chain'
 require 'maxwell/agent/middleware/logging'
 require 'maxwell/agent/work'
@@ -62,7 +66,7 @@ module Maxwell
       def redis(&block)
         @redis ||= ConnectionPool.new(
           size: (configuration.worker_concurrency + 2)) {
-            Redis.new configuration.redis_options
+            Redis.new({driver: :celluloid}.merge(configuration.redis_options))
           }
         @redis.with(&block)
       end
@@ -85,8 +89,7 @@ module Maxwell
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/../plugins/*.rb'].each do |file|
+Dir[File.dirname(__FILE__) + '/../../plugins/*.rb'].each do |file|
   require file
 end
 

data/lib/maxwell/agent/attributes.rb

@@ -0,0 +1,5 @@
+module Maxwell
+  module Agent
+    class Attributes < Hashie::Mash;end
+  end
+end

data/lib/maxwell/agent/coercable.rb

@@ -0,0 +1,38 @@
+module Maxwell
+  module Agent
+    module Coercable
+      def self.included(base)
+        base.extend ClassMethods
+        base.instance_variable_set('@coercions', {})
+      end
+
+
+      def coerce_values!(attrs)
+        attrs.each do |key, value|
+          attrs[key] = coerce_value(key, value) if self.class.coercions[key]
+        end
+        attrs
+      end
+
+      def coerce_value(key, value)
+        coercion_class = self.class.coercions[key]
+        case
+          when coercion_class.is_a?(Proc) then coercion_class.call(value)
+          else coercion_class.new(value)
+        end
+      end
+
+      module ClassMethods
+        def coercions
+          @coercions ||= {}
+        end
+
+        def coerce(key, as)
+          @coercions[key] = as
+        end
+
+      end
+    end
+  end
+end
+