quebert 1.0.1 → 1.0.2

data/Gemfile

@@ -8,8 +8,8 @@ group :development do
 end
 
 group :test do
-  gem 'ruby-debug',   :platform => :ruby_18
-  gem 'ruby-debug19', :platform => :ruby_19
+  # gem 'ruby-debug',   :platform => :ruby_18
+  # gem 'ruby-debug19', :platform => :ruby_19
   gem 'activerecord', '2.3.5'
   gem 'sqlite3-ruby'
   gem 'guard-rspec'

data/lib/quebert.rb

@@ -1,10 +1,10 @@
 require 'quebert/version'
 
 module Quebert
+  autoload :Logging,            'quebert/logging'
   autoload :Serializer,         'quebert/serializer'
   autoload :Configuration,      'quebert/configuration'
   autoload :Timeout,            'quebert/timeout'
-  autoload :Logging,            'quebert/logging'
   autoload :Job,                'quebert/job'
   autoload :Controller,         'quebert/controller'
   autoload :Backend,            'quebert/backend'

data/lib/quebert/async_sender/instance.rb

@@ -4,7 +4,7 @@ module Quebert
     module Instance
       class InstanceJob < Job
         def perform(klass, init_args, meth, *args)
-          Support.constantize(klass).new(init_args).send(meth, *args)
+          Support.constantize(klass).new(*init_args).send(meth, *args)
         end
       end
       

data/lib/quebert/backend/beanstalk.rb

@@ -29,8 +29,11 @@ module Quebert
         end
       end
       
+      def initialize(host, *args)
+        super Array(host), *args
+      end
       def self.configure(opts={})
-        opts[:host] ||= '127.0.0.1:11300'
+        opts[:host] ||= ['127.0.0.1:11300']
         new(opts[:host], opts[:tube])
       end
     end

data/lib/quebert/controller/beanstalk.rb

@@ -68,7 +68,7 @@ module Quebert
     protected
       def retry_with_delay
         delay = TIMEOUT_RETRY_DELAY_SEED + TIMEOUT_RETRY_GROWTH_RATE**beanstalk_job.stats["releases"].to_i
-        
+
         if delay > MAX_TIMEOUT_RETRY_DELAY
           beanstalk_job.bury
           log "Max retry delay exceeded. Burrying job."

data/lib/quebert/job.rb

@@ -11,6 +11,11 @@ module Quebert
     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 
+    # 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 = 1
+
     NotImplemented = Class.new(StandardError)
     
     Action  = Class.new(Exception)
@@ -58,7 +63,7 @@ module Quebert
     end
     
     def enqueue
-      self.class.backend.put self, @priority, @delay, @ttr
+      self.class.backend.put self, @priority, @delay, @ttr + QUEBERT_TTR_BUFFER
     end
     
     def to_json

data/lib/quebert/logging.rb

@@ -1,8 +1,6 @@
-require 'logger'
-
 module Quebert
   module Logging
-   protected
+    protected
     def logger
       @logger ||= Quebert.logger
     end

data/lib/quebert/version.rb

@@ -1,3 +1,3 @@
 module Quebert
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/quebert.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "beanstalk-client"
   
-  s.add_development_dependency 'rspec', '1.3.0'
+  s.add_development_dependency 'rspec', '2.7.0'
 end

data/spec/async_sender_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe AsyncSender::Class do
   
@@ -31,7 +31,7 @@ describe AsyncSender::Class do
   
   it "should async send instance methods" do
     Greeter.new("brad").async_send(:hi, 'stunning')
-    @q.reserve.perform.should eql(Greeter.new("brad").send(:hi, 'stunning'))
+    @q.reserve.perform.should eql(Greeter.new("brad").hi('stunning'))
   end
   
 end

data/spec/backend_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Backend do
   it "should have register backends" do

data/spec/command_line_runner_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe CommandLineRunner do
   before(:all) do
@@ -53,7 +53,7 @@ describe CommandLineRunner do
     it "should run config file" do
       clean_file './super_awesome.rb', "raise 'SuperAwesome'" do
         lambda{
-          CommandLineRunner.dispatch(%w(worker --config super_awesome.rb))
+          CommandLineRunner.dispatch(%w(worker --config ./super_awesome.rb))
         }.should raise_exception('SuperAwesome')
       end
     end

data/spec/configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Configuration do
   context "from hash" do
@@ -10,7 +10,7 @@ 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('@addrs').should eql(['localhost:11300'])
       backend.instance_variable_get('@default_tube').should eql('quebert-config-test')
     end
     

data/spec/consumer_spec.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'ruby-debug'
+require 'spec_helper'
 
 describe Controller::Base do
   it "should perform job" do
@@ -73,7 +72,8 @@ describe Controller::Beanstalk do
   end
 
   it "should retry a job with a delay and then bury" do
-    @q.put TimeoutJob.new
+    TimeoutJob.backend = @q
+    TimeoutJob.new.enqueue
     @q.peek_ready.should_not be_nil
     job = @q.reserve
     job.beanstalk_job.stats["releases"].should eql(0)

data/spec/job_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Quebert::Job do
   
@@ -73,7 +73,7 @@ describe Quebert::Job do
         job = @q.reserve
         job.beanstalk_job.pri.should eql(1)
         job.beanstalk_job.delay.should eql(2)
-        job.beanstalk_job.ttr.should eql(300)
+        job.beanstalk_job.ttr.should eql(300 + Job::QUEBERT_TTR_BUFFER)
       end
 
       it "should enqueue and honor beanstalk options" do
@@ -81,7 +81,7 @@ describe Quebert::Job do
         job = @q.reserve
         job.beanstalk_job.pri.should eql(1)
         job.beanstalk_job.delay.should eql(2)
-        job.beanstalk_job.ttr.should eql(300)
+        job.beanstalk_job.ttr.should eql(300 + Job::QUEBERT_TTR_BUFFER)
       end
     end
   end

data/spec/quebert_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Quebert do
   

data/spec/serializer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Serializer::ActiveRecord do
   context "persisted" do

data/spec/spec_helper.rb

@@ -5,13 +5,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'quebert'
-require 'spec'
-require 'spec/autorun'
+require 'quebert/logging'
 require 'logger'
 
-Spec::Runner.configure do |config|
-end
-
 include Quebert
 Quebert.config.logger = Logger.new('/dev/null') # Shhh...
 

data/spec/support/jobs.rb

@@ -17,10 +17,9 @@ class BuryJob < Quebert::Job
 end
 
 class TimeoutJob < Quebert::Job
-  def perform!
-    # 1 second TTR
-    @ttr = 1
+  def initialize
     super
+    @ttr = 1
   end
 
   def perform

data/spec/support_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Support::ClassRegistry do
   Super = Class.new

data/spec/worker_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe Worker do
   before(:each) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quebert
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Brad Gessler
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 -08:00
-default_executable: 
+date: 2012-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -56,12 +55,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
-        - 1
-        - 3
+        - 2
+        - 7
         - 0
-        version: 1.3.0
+        version: 2.7.0
   type: :development
   version_requirements: *id003
 description: A worker queue framework built around beanstalkd
@@ -77,6 +76,7 @@ files:
 - .document
 - .gitignore
 - .rbenv-version
+- .rspec
 - Gemfile
 - Guardfile
 - LICENSE
@@ -116,13 +116,11 @@ files:
 - spec/job_spec.rb
 - spec/quebert_spec.rb
 - spec/serializer_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/jobs.rb
 - spec/support_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: http://github.com/polleverywhere/quebert
 licenses: []
 
@@ -152,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quebert
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A worker queue framework built around beanstalkd
@@ -165,7 +163,6 @@ test_files:
 - spec/job_spec.rb
 - spec/quebert_spec.rb
 - spec/serializer_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/jobs.rb