stalking 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,10 @@
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+
+install:
+  - "travis_retry bundle install"
+
+script: "bundle exec rake test"

data/Gemfile

@@ -2,3 +2,9 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in stalking.gemspec
 gemspec
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubysl', '~> 2.0'
+  gem 'psych'
+end

data/README.md

@@ -1,6 +1,9 @@
 
+[![Build Status](https://secure.travis-ci.org/mrkamel/stalking.png?branch=master)](http://travis-ci.org/mrkamel/stalking)
 [![Code Quality](https://codeclimate.com/github/mrkamel/stalking.png)](https://codeclimate.com/github/mrkamel/stalking)
+[![Gem Version](https://badge.fury.io/rb/stalking.svg)](http://badge.fury.io/rb/stalking)
 [![Still Maintained](http://stillmaintained.com/mrkamel/stalking.png)](http://stillmaintained.com/mrkamel/stalking)
+[![Dependency Status](https://gemnasium.com/mrkamel/stalking.png?travis)](https://gemnasium.com/mrkamel/stalking)
 
 # Stalking
 
@@ -21,12 +24,16 @@ minimal changes driven by design decisions and its additional feature set.
 
 Add this line to your application's Gemfile:
 
-    gem 'stalking', :git => 'git://github.com/mrkamel/stalking.git'
+    gem 'stalking'
 
 And then execute:
 
     $ bundle
 
+Or install it yourself as:
+
+    $ gem install stalking
+
 ## Usage
 
 Stalking provides two modes of operation, a producer and a consumer mode.
@@ -154,11 +161,11 @@ when a single server is down, of course require some time for the error
 detection and processing. This usually should not be a big issue, except there
 is some temporary lag between the producer and the beanstalkd server. The
 producer then has to wait for a timeout and while the producer is waiting for
-the timeout it will block your application. The default timeout is 500
-milliseconds, but you can change the timeout via:
+the timeout it will block your application. The default timeout is 1 second,
+but you can change the timeout via:
 
 ```ruby
-Stalking::Producer.new :timeout => 0.1 # Set timeout to 100 milliseconds
+Stalking::Producer.new :timeout => 0.5 # Set timeout to 500 milliseconds
 ```
 
 The optimal timeout for your setup depends on your network connection, the

data/lib/stalking/consumer.rb

@@ -3,9 +3,7 @@ module Stalking
   class Consumer
     def initialize(options = {}, &block)
       @servers = options[:servers] || ["localhost:11300"]
-
-      @logger = options[:logger]
-
+      @logger = options[:logger] || Stalking::NullLogger.new
       @handlers = Handlers.new
 
       if block_given?
@@ -34,29 +32,13 @@ module Stalking
         job = connection.reserve
 
         lock do
-          name, args = JSON.parse(job.body)
-
-          if handler = @handlers.job_handlers[name]
-            begin
-              Timeout::timeout(job.ttr - 1) do
-                handle @handlers.before_handlers, name, args
-
-                handler.call args
-
-                handle @handlers.after_handlers, name, args
-              end
-            rescue Beanstalk::NotConnected => e
-              raise e # Re-raise
-            rescue Timeout::Error, StandardError => e
-              handle_error e, name, args
-            end
-          end
+          perform job
 
           job.delete
         end
       end
     rescue EOFError, Beanstalk::NotConnected => e
-      @logger.andand.error e
+      @logger.fatal e
 
       sleep 1
 
@@ -64,11 +46,31 @@ module Stalking
 
       retry
     rescue => e
-      @logger.andand.error e
+      @logger.fatal e
 
       raise e
     end
 
+    def perform(job)
+      name, args = JSON.parse(job.body)
+
+      if handler = @handlers.job_handlers[name]
+        begin
+          Timeout::timeout(job.ttr - 1) do
+            handle @handlers.before_handlers, name, args
+
+            handler.call args
+
+            handle @handlers.after_handlers, name, args
+          end
+        rescue Beanstalk::NotConnected => e
+          raise e # Re-raise
+        rescue Timeout::Error, StandardError => e
+          handle_error e, name, args
+        end
+      end
+    end
+
     def looping
       continue = true
 
@@ -98,7 +100,7 @@ module Stalking
 
       @connection
     rescue Beanstalk::NotConnected => e
-      @logger.andand.error e
+      @logger.fatal e
 
       sleep 1
 

data/lib/stalking/null_logger.rb

@@ -0,0 +1,11 @@
+
+module Stalking
+  class NullLogger
+    def debug(*args); end
+    def info(*args); end
+    def warn(*args); end
+    def error(*args); end
+    def fatal(*args); end
+  end
+end
+

data/lib/stalking/producer.rb

@@ -6,7 +6,7 @@ module Stalking
       @pri = options[:pri] || 65536
       @delay = options[:delay] || 0
       @ttr = options[:ttr] || 120
-      @logger = options[:logger]
+      @logger = options[:logger] || Stalking::NullLogger.new
       @servers = options[:servers] || ["localhost:11300"]
       @tries = options[:tries] || [@servers.size, 2].max
 
@@ -14,7 +14,7 @@ module Stalking
     end
 
     def enqueue(name, args = {}, options = {})
-      @logger.andand.info "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect}"
+      @logger.info "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect}"
 
       # Send the job to a random server.
 
@@ -22,7 +22,7 @@ module Stalking
         return true if enqueue_at(server, name, args, options)
       end
 
-      @logger.andand.error "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect} failed"
+      @logger.error "Enqueue #{name.inspect} with #{args.inspect} and #{options.inspect} failed"
 
       # All servers are currently unavailable.
       # Enqueuing the job has failed.
@@ -43,7 +43,7 @@ module Stalking
     rescue Beanstalk::NotConnected, Timeout::Error, StandardError => e
       @connections[server] = nil # Reset the connection.
 
-      @logger.andand.error e
+      @logger.fatal e
 
       false
     end

data/lib/stalking/version.rb

@@ -1,3 +1,3 @@
 module Stalking
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/stalking.rb

@@ -2,9 +2,9 @@
 require "stalking/version"
 require "beanstalk-client"
 require "timeout"
-require "andand"
 require "json"
 
+require "stalking/null_logger"
 require "stalking/handlers"
 require "stalking/consumer"
 require "stalking/producer"

data/stalking.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "minitest"
+  s.add_development_dependency "bundler"
+  s.add_development_dependency "mocha"
 
   s.add_dependency "beanstalk-client"
   s.add_dependency "json_pure"
-  s.add_dependency "andand"
 end
 

data/test/stalking/consumer_test.rb

@@ -1,14 +1,7 @@
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+require File.expand_path("../../test_helper", __FILE__)
 
-require "stalking"
-require "test/unit"
-require "timeout"
-
-require File.expand_path("../beanstalk", __FILE__)
-require File.expand_path("../test_logger", __FILE__)
-
-class Stalking::ConsumerTest < Test::Unit::TestCase
+class Stalking::ConsumerTest < Minitest::Test
   def setup
     Beanstalk::Pool.clear!
   end

data/test/stalking/null_logger_test.rb

@@ -0,0 +1,29 @@
+
+require File.expand_path("../../test_helper", __FILE__)
+
+class Stalking::NullLoggerTest < Minitest::Test
+  def setup
+    @null_logger = Stalking::NullLogger.new
+  end
+
+  def test_debug
+    assert_nothing_raised { @null_logger.debug "Message" }
+  end
+
+  def test_info
+    assert_nothing_raised { @null_logger.info "Message" }
+  end
+
+  def test_warn
+    assert_nothing_raised { @null_logger.warn "Message" }
+  end
+
+  def test_error
+    assert_nothing_raised { @null_logger.error "Message" }
+  end
+
+  def test_fatal
+    assert_nothing_raised { @null_logger.fatal "Message" }
+  end
+end
+

data/test/stalking/producer_test.rb

@@ -1,12 +1,7 @@
 
-$:.unshift File.expand_path("../../lib", __FILE__)
+require File.expand_path("../../test_helper", __FILE__)
 
-require "stalking"
-require "test/unit"
-
-require File.expand_path("../test_logger", __FILE__)
-
-class Stalking::ProducerTest < Test::Unit::TestCase
+class Stalking::ProducerTest < Minitest::Test
   def setup
     Beanstalk::Pool.clear!
   end
@@ -24,37 +19,43 @@ class Stalking::ProducerTest < Test::Unit::TestCase
   end
 
   def test_reconnect
-    producer = Stalking::Producer.new(:servers => ["server1", "server2"])
+    servers = ["server1", "server2"]
+
+    producer = Stalking::Producer.new(:servers => servers)
 
     server1 = Beanstalk::Pool.new(["server1"])
     server2 = Beanstalk::Pool.new(["server2"])
 
-    srand 0
+    servers.expects(:shuffle).returns(["server1", "server2"]).once
 
     producer.enqueue "test", "up" => "true"
     assert_equal ['["test",{"up":"true"}]', 65536, 0, 120], server1.queues["test"].last
 
     server1.down!
 
+    servers.expects(:shuffle).returns(["server1", "server2"]).once
+
     producer.enqueue "test", "down" => "permanent"
     assert_equal ['["test",{"down":"permanent"}]', 65536, 0, 120], server2.queues["test"].last
   end
 
   def test_timeout
-    producer = Stalking::Producer.new(:servers => ["server1", "server2"])
+    servers = ["server1", "server2"]
+
+    producer = Stalking::Producer.new(:servers => servers)
 
     server1 = Beanstalk::Pool.new(["server1"])
     server2 = Beanstalk::Pool.new(["server2"])
 
-    srand 0
+    servers.expects(:shuffle).returns(["server1", "server2"]).once
 
     producer.enqueue "test", "up" => "true"
     assert_equal ['["test",{"up":"true"}]', 65536, 0, 120], server1.queues["test"].last
 
-    srand 0
-
     server1.delay = 5
 
+    servers.expects(:shuffle).returns(["server1", "server2"]).once
+
     producer.enqueue "test", "down" => "delayed"
     assert_equal ['["test",{"down":"delayed"}]', 65536, 0, 120], server2.queues["test"].last
   end

data/test/stalking/test_logger.rb

@@ -6,12 +6,24 @@ class TestLogger
     @entries = []
   end
 
+  def debug(entry)
+    @entries.push entry
+  end
+
   def info(entry)
     @entries.push entry
   end
 
+  def warn(entry)
+    @entries.push entry
+  end
+
   def error(entry)
     @entries.push entry
   end
+
+  def fatal(entry)
+    @entries.push entry
+  end
 end
 

data/test/test_helper.rb

@@ -0,0 +1,22 @@
+
+$:.unshift File.expand_path("../lib", __FILE__)
+
+require "stalking"
+require "timeout"
+require "minitest"
+require "minitest/autorun"
+require "mocha/mini_test"
+
+require File.expand_path("../stalking/beanstalk", __FILE__)
+require File.expand_path("../stalking/test_logger", __FILE__)
+
+module TestHelpers
+  def assert_nothing_raised
+    yield
+  rescue => e
+    raise "Exception #{e.message} should be raised"
+  end
+end
+
+Minitest::Test.send :include, TestHelpers
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stalking
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -28,14 +28,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,7 +44,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: beanstalk-client
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: andand
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -85,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,13 +126,16 @@ files:
 - lib/stalking.rb
 - lib/stalking/consumer.rb
 - lib/stalking/handlers.rb
+- lib/stalking/null_logger.rb
 - lib/stalking/producer.rb
 - lib/stalking/version.rb
 - stalking.gemspec
 - test/stalking/beanstalk.rb
 - test/stalking/consumer_test.rb
+- test/stalking/null_logger_test.rb
 - test/stalking/producer_test.rb
 - test/stalking/test_logger.rb
+- test/test_helper.rb
 homepage: https://github.com/mrkamel/stalking
 licenses:
 - MIT