quebert 1.0.9 → 1.11.0

data/Gemfile

@@ -14,5 +14,4 @@ group :test do
   gem 'sqlite3-ruby'
   gem 'guard-rspec'
   gem 'rb-fsevent'
-  gem 'growl'
 end

data/Guardfile

@@ -1,7 +1,4 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 1, :cli => '--colour --format nested' do
+guard 'rspec', :version => 2, :cli => '--colour --format nested' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/quebert/backend/beanstalk.rb

@@ -1,36 +1,48 @@
-require 'beanstalk-client'
+require 'beaneater'
 
 module Quebert
   module Backend
     
     # Manage jobs on a Beanstalk queue out of process
-    class Beanstalk < Beanstalk::Pool
+    class Beanstalk
       def put(job, *args)
-        super job.to_json, *args
+        priority, delay, ttr = args
+        opts = {}
+        opts[:pri]   = priority unless priority.nil?
+        opts[:delay] = delay    unless delay.nil?
+        opts[:ttr]   = ttr      unless ttr.nil?
+        @tube.put job.to_json, opts
       end
-      
-      def reserve_with_controller
-        Controller::Beanstalk.new(reserve_without_controller, self)
+
+      def reserve_without_controller(timeout=nil)
+        @tube.reserve timeout
       end
-      alias :reserve_without_controller :reserve
-      alias :reserve :reserve_with_controller
-      
+
+      def reserve(timeout=nil)
+        Controller::Beanstalk.new reserve_without_controller(timeout), self
+      end
+
+      def peek(state)
+        @tube.peek state
+      end
+
       # For testing purposes... I think there's a better way to do this though.
       def drain!
-        while peek_ready do
+        while peek(:ready) do
           reserve_without_controller.delete
         end
-        while peek_delayed do
+        while peek(:delayed) do
           reserve_without_controller.delete
         end
-        while job = peek_buried do
-          last_conn.kick 1 # what? Why the 1? it kicks them all?
+        while peek(:buried) do
+          @tube.kick
           reserve_without_controller.delete
         end
       end
       
-      def initialize(host, *args)
-        super Array(host), *args
+      def initialize(host, tube)
+        @pool = Beaneater::Pool.new Array(host)
+        @tube = @pool.tubes[tube]
       end
       def self.configure(opts={})
         opts[:host] ||= ['127.0.0.1:11300']

data/lib/quebert/command_line_runner.rb

@@ -1,45 +1,47 @@
+require 'optparse'
+
 module Quebert
   class CommandLineRunner
-    
+
     attr_accessor :arguments, :command, :options
-    
+
     def initialize(argv)
       @argv = argv
-      
+
       # Default options values
       @options = {
         :chdir  => Dir.pwd
       }
-      
+
       parse!
     end
-    
+
     def parser
       @parser ||= OptionParser.new do |opts|
         opts.banner = "Usage: quebert [options]"
-        
+
         opts.separator ""
-        
-        opts.on("-l", "--log FILE", "File to redirect output " +                      
+
+        opts.on("-l", "--log FILE", "File to redirect output " +
                                     "(default: #{@options[:log]})")                   { |file| @options[:log] = file }
-        opts.on("-P", "--pid FILE", "File to store PID " +                            
+        opts.on("-P", "--pid FILE", "File to store PID " +
                                     "(default: #{@options[:pid]})")                   { |file| @options[:pid] = file }
         opts.on("-C", "--config FILE", "Load options from config file")               { |file| @options[:config] = file }
         opts.on("-c", "--chdir DIR", "Change to dir before starting")                 { |dir| @options[:chdir] = File.expand_path(dir) }
       end
     end
-    
+
     # Parse the options.
     def parse!
       parser.parse! @argv
       @command   = @argv.shift
       @arguments = @argv
     end
-    
+
     def self.dispatch(args = ARGV)
       runner = new(args)
       params = runner.options
-      
+
       if dir = params[:chdir]
         Dir.chdir dir
       end
@@ -55,10 +57,10 @@ module Quebert
       if config = params[:config] || auto_config
         require config
       end
-      
+
       Worker.new.start
     end
-    
+
   private
     def self.auto_config
       rails_env_path = './config/environment.rb'

data/lib/quebert/controller/beanstalk.rb

@@ -52,7 +52,7 @@ module Quebert
           log "Job deleted", :error
         rescue Job::Release
           log "Releasing with priority: #{@job.priority} and delay: #{@job.delay}", :error 
-          beanstalk_job.release @job.priority, @job.delay
+          beanstalk_job.release :pri => @job.priority, :delay => @job.delay
           log "Job released", :error 
         rescue Job::Bury
           log "Burrying job", :error
@@ -86,10 +86,10 @@ module Quebert
             log "Job burried"
           else
             log "TTR exceeded. Releasing with priority: #{@job.priority} and delay: #{delay}"
-            beanstalk_job.release @job.priority, delay
+            beanstalk_job.release :pri => @job.priority, :delay => delay
             log "Job released"
           end
-        rescue ::Beanstalk::NotFoundError => e
+        rescue ::Beaneater::NotFoundError => e
           log "Job ran longer than allowed. Beanstalk already deleted it!!!!", :error
           # Sometimes the timer doesn't behave correctly and this job actually runs longer than
           # allowed. At that point the beanstalk job no longer exists anymore. Lets let it go and don't blow up.

data/lib/quebert/job.rb

@@ -6,20 +6,20 @@ module Quebert
 
     attr_reader :args
     attr_accessor :priority, :delay, :ttr
-    
+
     DEFAULT_JOB_PRIORITY = 65536
     DEFAULT_JOB_DELAY = 0
     DEFAULT_JOB_TTR = 10
 
-    # A buffer time in seconds added to the Beanstalk TTR for Quebert to do its own job cleanup 
+    # A buffer time in seconds added to the Beanstalk TTR for Quebert to do its own job cleanup
     # The job will perform based on the Beanstalk TTR, but Beanstalk hangs on to the job just a
     # little longer so that Quebert can bury the job or schedule a retry with the appropriate delay
     QUEBERT_TTR_BUFFER = 5
 
     NotImplemented = Class.new(StandardError)
-    
+
     Action  = Class.new(Exception)
-    
+
     Bury    = Class.new(Action)
     Delete  = Class.new(Action)
     Release = Class.new(Action)
@@ -28,7 +28,7 @@ module Quebert
 
     def initialize(*args)
       opts = args.last.is_a?(::Hash) ? args.pop : nil
-      
+
       @priority = DEFAULT_JOB_PRIORITY
       @delay = DEFAULT_JOB_DELAY
       @ttr = DEFAULT_JOB_TTR
@@ -36,7 +36,7 @@ module Quebert
       if opts
         beanstalk_opts = opts.delete(:beanstalk)
         args << opts unless opts.empty?
-        
+
         if beanstalk_opts
           @priority = beanstalk_opts[:priority] if beanstalk_opts[:priority]
           @delay = beanstalk_opts[:delay] if beanstalk_opts[:delay]
@@ -46,41 +46,37 @@ module Quebert
 
       @args = args.dup.freeze
     end
-    
+
     def perform(*args)
       raise NotImplemented
     end
-    
+
     # Runs the perform method that somebody else should be implementing
     def perform!
       # Honor the timeout and kill the job in ruby-space. Beanstalk
       # should be cleaning up this job and returning it to the queue
       # as well.
-      begin
-        Quebert::Timeout.timeout(@ttr){ perform(*args) }
-      rescue ::Timeout::Error => e
-        raise Job::Timeout, e.message, e.backtrace
-      end
+      Quebert::Timeout.timeout(@ttr, Job::Timeout){ perform(*args) }
     end
-    
+
     def enqueue
       self.class.backend.put self, @priority, @delay, @ttr + QUEBERT_TTR_BUFFER
     end
-    
+
     def to_json
       JSON.generate(Serializer::Job.serialize(self))
     end
-    
+
     def self.from_json(json)
       if hash = JSON.parse(json) and not hash.empty?
         Serializer::Job.deserialize(hash)
       end
     end
-    
+
     def self.backend=(backend)
       @backend = backend
     end
-    
+
     def self.backend
       @backend || Quebert.configuration.backend
     end
@@ -89,13 +85,13 @@ module Quebert
     def delete!
       raise Delete
     end
-    
+
     def release!
       raise Release
     end
-    
+
     def bury!
       raise Bury
     end
   end
-end
+end

data/lib/quebert/version.rb

@@ -1,3 +1,3 @@
 module Quebert
-  VERSION = "1.0.9"
-end
+  VERSION = "1.11.0"
+end

data/lib/quebert/worker.rb

@@ -3,29 +3,38 @@ module Quebert
     include Logging
 
     attr_accessor :exception_handler, :backend
-    
+
     def initialize
       yield self if block_given?
     end
-    
+
     # Start the worker backend and intercept exceptions if a handler is provided
     def start
       Signal.trap('TERM') { safe_stop }
       Signal.trap('INT') { safe_stop }
 
       logger.info "Worker started with #{backend.class.name} backend\n"
-      while @controller = backend.reserve do      
+      while @controller = backend.reserve do
         begin
           @controller.perform
-        rescue Exception => e
-          exception_handler ? exception_handler.call(e) : raise(e)
-        end        
+        rescue Exception => error
+          if exception_handler
+            exception_handler.call(
+              error,
+              :controller => @controller,
+              :pid => $$,
+              :worker => self
+            )
+          else
+            raise error
+          end
+        end
         @controller = nil
 
         stop if @terminate_sent
       end
     end
-    
+
     def safe_stop
       if @terminate_sent
         logger.info "Ok! I get the point. Shutting down immediately."
@@ -41,14 +50,14 @@ module Quebert
       logger.info "Worker stopping\n"
       exit 0
     end
-    
+
   protected
     def backend
       @backend ||= Quebert.config.backend
     end
-    
+
     def exception_handler
       @exception_handler ||= Quebert.config.worker.exception_handler
     end
   end
-end
+end

data/quebert.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "json"
-  s.add_runtime_dependency "beanstalk-client"
+  s.add_runtime_dependency "beaneater"
   
   s.add_development_dependency 'rspec', '2.7.0'
 end

data/spec/configuration_spec.rb

@@ -10,8 +10,10 @@ describe Configuration do
       backend = @config.backend
       backend.should be_instance_of(Quebert::Backend::Beanstalk)
       # Blech, gross nastiness in their lib, but we need to look in to see if this stuff as configed
-      backend.instance_variable_get('@addrs').should eql(['localhost:11300'])
-      backend.instance_variable_get('@default_tube').should eql('quebert-config-test')
+      pool = backend.instance_variable_get('@pool')
+      pool.connections.first.address.should eql('localhost:11300')
+      tube = backend.instance_variable_get('@tube')
+      tube.name.should eql('quebert-config-test')
     end
     
   end

data/spec/consumer_spec.rb

@@ -25,63 +25,63 @@ describe Controller::Beanstalk do
   
   it "should delete job off queue after succesful run" do
     @q.put Adder.new(1, 2)
-    @q.peek_ready.should_not be_nil
+    @q.peek(:ready).should_not be_nil
     @q.reserve.perform.should eql(3)
-    @q.peek_ready.should be_nil
+    @q.peek(:ready).should be_nil
   end
   
   it "should bury job if an exception occurs in job" do
     @q.put Exceptional.new
-    @q.peek_ready.should_not be_nil
+    @q.peek(:ready).should_not be_nil
     lambda{ @q.reserve.perform }.should raise_exception
-    @q.peek_buried.should_not be_nil
+    @q.peek(:buried).should_not be_nil
   end
   
   it "should bury an AR job if an exception occurs deserializing it" do
     @user = User.new(:first_name => "John", :last_name => "Doe", :email => "jdoe@gmail.com")
     @user.id = 1
     @q.put Serializer::ActiveRecord.serialize(@user)
-    @q.peek_ready.should_not be_nil
+    @q.peek(:ready).should_not be_nil
     lambda{ @q.reserve.perform }.should raise_exception
-    @q.peek_buried.should_not be_nil
+    @q.peek(:buried).should_not be_nil
   end
 
   context "job actions" do
     it "should delete job" do
       @q.put DeleteJob.new
-      @q.peek_ready.should_not be_nil
+      @q.peek(:ready).should_not be_nil
       @q.reserve.perform
-      @q.peek_ready.should be_nil
+      @q.peek(:ready).should be_nil
     end
     
     it "should release job" do
       @q.put ReleaseJob.new
-      @q.peek_ready.should_not be_nil
+      @q.peek(:ready).should_not be_nil
       @q.reserve.perform
-      @q.peek_ready.should_not be_nil
+      @q.peek(:ready).should_not be_nil
     end
     
     it "should bury job" do
       @q.put BuryJob.new
-      @q.peek_ready.should_not be_nil
-      @q.peek_buried.should be_nil
+      @q.peek(:ready).should_not be_nil
+      @q.peek(:buried).should be_nil
       @q.reserve.perform
-      @q.peek_ready.should be_nil
-      @q.peek_buried.should_not be_nil
+      @q.peek(:ready).should be_nil
+      @q.peek(:buried).should_not be_nil
     end
   end
 
   it "should retry a job with a delay and then bury" do
     TimeoutJob.backend = @q
     TimeoutJob.new.enqueue
-    @q.peek_ready.should_not be_nil
+    @q.peek(:ready).should_not be_nil
     job = @q.reserve
     job.beanstalk_job.stats["releases"].should eql(0)
     job.beanstalk_job.stats["delay"].should eql(0)
     lambda{job.perform}.should raise_exception(Quebert::Job::Timeout)
     
-    @q.peek_ready.should be_nil
-    beanstalk_job = @q.peek_delayed
+    @q.peek(:ready).should be_nil
+    beanstalk_job = @q.peek(:delayed)
     beanstalk_job.should_not be_nil
     beanstalk_job.stats["releases"].should eql(1)
     beanstalk_job.stats["delay"].should eql(Quebert::Controller::Beanstalk::TIMEOUT_RETRY_GROWTH_RATE**beanstalk_job.stats["releases"])
@@ -92,8 +92,8 @@ describe Controller::Beanstalk do
     Quebert::Controller::Beanstalk::MAX_TIMEOUT_RETRY_DELAY = 1
     lambda{@q.reserve.perform}.should raise_exception(Quebert::Job::Timeout)
     
-    @q.peek_ready.should be_nil
-    @q.peek_delayed.should be_nil
-    @q.peek_buried.should_not be_nil
+    @q.peek(:ready).should be_nil
+    @q.peek(:delayed).should be_nil
+    @q.peek(:buried).should_not be_nil
   end
 end

data/spec/worker_spec.rb

@@ -7,11 +7,11 @@ describe Worker do
       w.backend = @q
     end
   end
-  
+
   it "should start" do
     @w.start
   end
-  
+
   context "pluggable exception handler" do
     it "should raise exception if nothing is provided" do
       @q.put Exceptional.new
@@ -20,15 +20,14 @@ describe Worker do
 
     it "should default to Quebert.config.worker.exception_handler handler" do
       @q.put Exceptional.new
-      Quebert.config.worker.exception_handler = Proc.new{|e| e.should be_instance_of(Exception) }
-      @w.exception_handler = Proc.new{|e| e.should be_instance_of(Exception) }
+      Quebert.config.worker.exception_handler = Proc.new{|e, opts| e.should be_instance_of(Exception) }
       lambda{ @w.start }.should_not raise_exception
     end
-    
+
     it "should intercept exceptions" do
       @q.put Exceptional.new
-      @w.exception_handler = Proc.new{|e| e.should be_instance_of(Exception) }
+      @w.exception_handler = Proc.new{|e, opts| e.should be_instance_of(Exception) }
       lambda{ @w.start }.should_not raise_exception
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quebert
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: 
   segments: 
   - 1
+  - 11
   - 0
-  - 9
-  version: 1.0.9
+  version: 1.11.0
 platform: ruby
 authors: 
 - Brad Gessler
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-12-21 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -34,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: beanstalk-client
+  name: beaneater
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -121,6 +122,7 @@ files:
 - spec/support/jobs.rb
 - spec/support_spec.rb
 - spec/worker_spec.rb
+has_rdoc: true
 homepage: http://github.com/polleverywhere/quebert
 licenses: []
 
@@ -150,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quebert
-rubygems_version: 1.8.22
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A worker queue framework built around beanstalkd