beanstalk_farmer 0.2.1 → 0.2.2

data/README.md

@@ -1,4 +1,4 @@
-# Beanstalk Farmer [![Build Status](http://travis-ci.org/jherdman/beanstalk_farmer.png)](http://travis-ci.org/jherdman/beanstalk_farmer)
+# Beanstalk Farmer
 
 Farmer is a simple library that helps you manage your Beanstalk job queue. Its
 API is heavily inspired by [Stalker](https://github.com/han/stalker), to help
@@ -16,7 +16,8 @@ For usage examples, see the examples directory in the source code.
 
 ##  Development
 
-* [Continuous integration](http://travis-ci.org/#!/jherdman/beanstalk_farmer)
+* [![Build Status](http://travis-ci.org/jherdman/beanstalk_farmer.png)](http://travis-ci.org/jherdman/beanstalk_farmer)
+* [![Maintenance Status](http://stillmaintained.com/jherdman/beanstalk_farmer.png)](http://stillmaintained.com/jherdman/beanstalk_farmer)
 
 ## Shout Outs
 

data/lib/beanstalk_farmer/errors.rb

@@ -0,0 +1,9 @@
+module BeanstalkFarmer
+  # Raised when a job cannot complete in time
+  class TimedOut < StandardError
+  end
+
+  # Raised when a connection cannot be made
+  class NotConnectedError < StandardError
+  end
+end

data/lib/beanstalk_farmer/job.rb

@@ -5,9 +5,6 @@ module BeanstalkFarmer
   class Job
     include BeanstalkFarmer
 
-    # Raised when a job cannot complete in time
-    class OutOfTimeError < Timeout::Error; end
-
     attr_accessor :name, :args, :job
 
     # @param [Beanstalk::Job] job A Beanstalk job that has been reserved to be
@@ -30,7 +27,7 @@ module BeanstalkFarmer
       end
     rescue Timeout::Error
       logger.error "JOB (#{name}) out of time"
-      raise OutOfTimeError, "#{name} could not finish in #{job.ttr} seconds"
+      raise TimedOut, "#{name} could not finish in #{job.ttr} seconds"
     ensure
       job.delete
       logger.info "JOB (#{name}) done"

data/lib/beanstalk_farmer/runner.rb

@@ -21,8 +21,11 @@ module BeanstalkFarmer
     end
 
     # Reserves a job, and works it
-    def reserve_and_work_job
-      job = service.reserve
+    #
+    # @param [Integer] timeout (nil) The optional timeout to use when
+    #   reserving a job
+    def reserve_and_work_job(timeout=nil)
+      job = service.reserve(timeout)
       job.work
     end
 

data/lib/beanstalk_farmer/service.rb

@@ -86,6 +86,8 @@ module BeanstalkFarmer
     # @return [Farmer::Job] a Farmer Job to work
     def reserve(timeout=nil)
       Job.new(connection.reserve(timeout))
+    rescue Beanstalk::TimedOut => e
+      raise TimedOut, e.message
     end
 
     private
@@ -98,9 +100,4 @@ module BeanstalkFarmer
       @connection = nil
     end
   end
-
-  ## Errors
-
-  # Raised when a connection cannot be made
-  class NotConnectedError < Beanstalk::NotConnected; end
 end

data/lib/beanstalk_farmer/version.rb

@@ -1,3 +1,3 @@
 module BeanstalkFarmer
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/beanstalk_farmer.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'beanstalk_farmer/errors'
 
 ##
 # Automatically loads classes as needed, provides logger, etc.

data/spec/beanstalk_farmer/job_spec.rb

@@ -46,7 +46,7 @@ describe BeanstalkFarmer::Job do
 
     it 'times out if the job has run out of time' do
       Timeout.should_receive(:timeout).with(job.ttr) { raise Timeout::Error }
-      expect { subject.work }.to raise_error(BeanstalkFarmer::Job::OutOfTimeError)
+      expect { subject.work }.to raise_error(BeanstalkFarmer::TimedOut)
     end
 
     it 'deletes the job' do

data/spec/beanstalk_farmer/service_spec.rb

@@ -80,5 +80,13 @@ describe BeanstalkFarmer::Service, :beanstalk_required do
       subject.connection.should_receive(:reserve).with(30) { job }
       subject.reserve(30)
     end
+
+    it 'raises an exception if the reserved job runs out of time' do
+      subject.connection.stub(:reserve).and_raise(Beanstalk::TimedOut)
+
+      expect {
+        subject.reserve(30)
+      }.to raise_error(BeanstalkFarmer::TimedOut)
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: beanstalk_farmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - James Herdamn
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 Z
+date: 2011-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: beanstalk-client
@@ -79,6 +79,7 @@ extra_rdoc_files: []
 files: 
 - lib/beanstalk_farmer/config.rb
 - lib/beanstalk_farmer/dsl.rb
+- lib/beanstalk_farmer/errors.rb
 - lib/beanstalk_farmer/job.rb
 - lib/beanstalk_farmer/runner.rb
 - lib/beanstalk_farmer/service.rb
@@ -109,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -599220295651760896
+      hash: -1883747192443942397
       segments: 
       - 0
       version: "0"
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -599220295651760896
+      hash: -1883747192443942397
       segments: 
       - 0
       version: "0"