backburner 0.4.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b489b60308b955b398ce8a9936c0bfca96588e
-  data.tar.gz: 6a22f67c5502cd730139c4a857d4417552419c57
+  metadata.gz: 89f6987a5f81f904f8e2dd8d48bad8deea664a7e
+  data.tar.gz: d0a1cdf8c5cd0087f60d4c29da334f40ebc00a3f
 SHA512:
-  metadata.gz: c751606af667cdeadbfd9d270d5aae80ccc42a9f9f968607f4a02d783207b3db4171ab9cc207e44b38a435024a68b6e6bfcb319973788940f819f6d05b49843a
-  data.tar.gz: 5bacb2a1f9c613addac6a7ad3e4c45d9358fdd523092faf50f696fbbb3aede4d0676bddd875caa4fca84d36995bf9bfbd3aafe43fc33fda6e9458539dd6d3421
+  metadata.gz: 19fc5c5d7086baf5ca15cc8cf93d0a429cd858ac30fbdfe86719322bd8704edacfb008d3568eae6f5c6c1a029e7831a0ef6052345cb934d7fea45cca90e60103
+  data.tar.gz: 3da11501d42cecb97fae3428cdf9d3f9e7403f0eab8801e581ff90685a79646a12f4ee7d95811efd5b4339995f97ff96bca7d13fe8ca8372b99b52047d28a2b2

data/.travis.yml

@@ -2,7 +2,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - rbx-19mode
+  - rbx-2
 before_install:
   - curl -L https://github.com/kr/beanstalkd/archive/v1.9.tar.gz | tar xz -C /tmp
   - cd /tmp/beanstalkd-1.9/
@@ -11,11 +11,11 @@ before_install:
   - cd $TRAVIS_BUILD_DIR
 matrix:
   allow_failures:
-    - rvm: rbx-19mode
+    - rvm: rbx-2
 script:
   - bundle install
   - bundle exec rake test
 gemfile: Gemfile
 notifications:
   recipients:
-    - nesquena@gmail.com
+    - nesquena@gmail.com

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Version 1.0.0 (April 26 2015)
+
+ * NEW Updating to Beaneater 1.0 (@alup)
+
 ## Version 0.4.6 (October 26 2014)
 
  * NEW Add job to on_error handler if the handler has a 4th argument (@Nitrodist)

data/README.md

@@ -229,7 +229,7 @@ Backburner.work
 This will process jobs in all queues but you can also restrict processing to specific queues:
 
 ```ruby
-Backburner.work('newsletter-sender,push-notifier')
+Backburner.work('newsletter-sender', 'push-notifier')
 ```
 
 The Backburner worker also exists as a rake task:
@@ -241,7 +241,7 @@ require 'backburner/tasks'
 so you can run:
 
 ```
-$ QUEUES=newsletter-sender,push-notifier rake backburner:work
+$ QUEUE=newsletter-sender,push-notifier rake backburner:work
 ```
 
 You can also run the backburner binary for a convenient worker:
@@ -362,7 +362,7 @@ Backburner.work('newsletter-sender', :worker => Backburner::Workers::ThreadsOnFo
 or through associated rake tasks with:
 
 ```
-$ QUEUES=newsletter-sender,push-message THREADS=2 GARBAGE=1000 rake backburner:threads_on_fork:work
+$ QUEUE=newsletter-sender,push-message THREADS=2 GARBAGE=1000 rake backburner:threads_on_fork:work
 ```
 
 For more information on the threads_on_fork worker, check out the
@@ -461,7 +461,7 @@ and then you can start the rake task with:
 
 ```bash
 $ rake backburner:work
-$ QUEUES=newsletter-sender,push-notifier rake backburner:work
+$ QUEUE=newsletter-sender,push-notifier rake backburner:work
 ```
 
 The best way to deploy these rake tasks is using a monitoring library. We suggest [God](https://github.com/mojombo/god/)

data/backburner.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.version       = Backburner::VERSION
   s.license       = 'MIT'
 
-  s.add_runtime_dependency 'beaneater', '~> 0.3.1'
-  s.add_runtime_dependency 'dante', '~> 0.1.5'
+  s.add_runtime_dependency 'beaneater', '~> 1.0'
+  s.add_runtime_dependency 'dante', '> 0.1.5'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest', '3.2.0'

data/examples/god.rb

@@ -4,7 +4,7 @@ God.watch do |w|
   w.env = { 'PADRINO_ENV' => 'production', 'QUEUES' => 'newsletter-sender,push-message' }
   w.group    = 'backburner-workers'
   w.interval = 30.seconds
-  w.start = "bundle exec rake -f Rakefile backburner:start"
+  w.start = "bundle exec rake -f Rakefile backburner:work"
   w.log   = "/var/log/god/backburner-worker-1.log"
 
   # restart if memory gets too high
@@ -43,4 +43,4 @@ God.watch do |w|
       c.running = false
     end
   end
-end
+end

data/lib/backburner/connection.rb

@@ -10,6 +10,7 @@ module Backburner
     # `url` can be a string i.e 'localhost:3001' or an array of addresses.
     def initialize(url)
       @url = url
+      @beanstalk = nil
       connect!
     end
 
@@ -24,7 +25,7 @@ module Backburner
 
     # Connects to a beanstalk queue
     def connect!
-      @beanstalk ||= Beaneater::Pool.new(beanstalk_addresses)
+      @beanstalk ||= Beaneater.new(beanstalk_addresses)
     end
 
     # Returns the beanstalk queue addresses
@@ -33,8 +34,8 @@ module Backburner
     #   beanstalk_addresses => ["localhost:11300"]
     #
     def beanstalk_addresses
-      uris = self.url.is_a?(Array) ? self.url : self.url.split(/[\s,]+/)
-      uris.map { |uri| beanstalk_host_and_port(uri) }
+      uri = self.url.is_a?(Array) ? self.url.first : self.url
+      beanstalk_host_and_port(uri)
     end
 
     # Returns a host and port based on the uri_string given
@@ -48,4 +49,4 @@ module Backburner
       "#{uri.host}:#{uri.port || 11300}"
     end
   end # Connection
-end # Backburner
+end # Backburner

data/lib/backburner/queue.rb

@@ -1,6 +1,12 @@
 module Backburner
   module Queue
     def self.included(base)
+      base.instance_variable_set(:@queue_name, nil)
+      base.instance_variable_set(:@queue_priority, nil)
+      base.instance_variable_set(:@queue_respond_timeout, nil)
+      base.instance_variable_set(:@queue_jobs_limit, nil)
+      base.instance_variable_set(:@queue_garbage_limit, nil)
+      base.instance_variable_set(:@queue_retry_limit, nil)
       base.extend ClassMethods
       Backburner::Worker.known_queue_classes << base
     end

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "0.4.6"
+  VERSION = "1.0.0"
 end

data/lib/backburner/worker.rb

@@ -53,7 +53,7 @@ module Backburner
 
     # Returns the worker connection.
     # @example
-    #   Backburner::Worker.connection # => <Beaneater::Pool>
+    #   Backburner::Worker.connection # => <Beaneater::Connection>
     def self.connection
       @connection ||= Connection.new(Backburner.configuration.beanstalk_url)
     end
@@ -159,7 +159,7 @@ module Backburner
     def self.retryable_command(max_tries=8, &block)
       begin
         yield
-      rescue Beaneater::NotConnected => e
+      rescue Beaneater::NotConnected
         retry_connection!(max_tries)
         yield
       end

data/lib/backburner/workers/forking.rb

@@ -9,7 +9,7 @@ module Backburner
       #   @worker.prepare
       #
       def prepare
-        self.tube_names.map! { |name| expand_tube_name(name)  }
+        self.tube_names.map! { |name| expand_tube_name(name)  }.uniq!
         log_info "Working #{tube_names.size} queues: [ #{tube_names.join(', ')} ]"
         self.connection.tubes.watch!(*self.tube_names)
       end

data/lib/backburner/workers/simple.rb

@@ -9,7 +9,7 @@ module Backburner
       #   @worker.prepare
       #
       def prepare
-        self.tube_names.map! { |name| expand_tube_name(name)  }
+        self.tube_names.map! { |name| expand_tube_name(name)  }.uniq!
         log_info "Working #{tube_names.size} queues: [ #{tube_names.join(', ')} ]"
         self.connection.tubes.watch!(*self.tube_names)
       end

data/lib/backburner/workers/threads_on_fork.rb

@@ -1,7 +1,6 @@
 module Backburner
   module Workers
     class ThreadsOnFork < Worker
-
       class << self
         attr_accessor :shutdown
         attr_accessor :threads_number
@@ -18,7 +17,7 @@ module Backburner
             begin
               Process.kill(0, id)
               tmp_ids << id
-            rescue Errno::ESRCH => e
+            rescue Errno::ESRCH
             end
           end
           @child_pids = tmp_ids if @child_pids != tmp_ids
@@ -69,6 +68,7 @@ module Backburner
       # Custom initializer just to set @tubes_data
       def initialize(*args)
         @tubes_data = {}
+        @connection = nil
         super
         self.process_tube_options
       end
@@ -122,7 +122,7 @@ module Backburner
       def prepare
         self.tube_names ||= Backburner.default_queues.any? ? Backburner.default_queues : all_existing_queues
         self.tube_names = Array(self.tube_names)
-        tube_names.map! { |name| expand_tube_name(name)  }
+        tube_names.map! { |name| expand_tube_name(name)  }.uniq!
         tube_display_names = tube_names.map{|name| "#{name}:#{@tubes_data[name].values}"}
         log_info "Working #{tube_names.size} queues: [ #{tube_display_names.join(', ')} ]"
       end
@@ -253,7 +253,6 @@ module Backburner
       def connection
         @connection || super
       end
-
     end
   end
 end

data/test/connection_test.rb

@@ -11,23 +11,15 @@ describe "Backburner::Connection class" do
     end
 
     it "should setup beanstalk connection" do
-      assert_kind_of Beaneater::Pool, @connection.beanstalk
+      assert_kind_of Beaneater, @connection.beanstalk
     end
   end # initialize single connection
 
-  describe "for initialize with multiple urls" do
-    it "should support single string with commas" do
-      @connection = Backburner::Connection.new("beanstalk://localhost,beanstalk://localhost")
-      connections = @connection.beanstalk.connections
-      assert_equal 2, connections.size
-      assert_equal ['localhost:11300','localhost:11300'], connections.map(&:address)
-    end
-
-    it "should support array of connections" do
-      @connection = Backburner::Connection.new(['beanstalk://127.0.0.1:11300','beanstalk://localhost'])
-      connections = @connection.beanstalk.connections
-      assert_equal 2, @connection.beanstalk.connections.size
-      assert_equal ['127.0.0.1:11300','localhost:11300'], connections.map(&:address)
+  describe "for initialize with url" do
+    it "should delegate the address url correctly" do
+      @connection = Backburner::Connection.new("beanstalk://localhost")
+      connection = @connection.beanstalk.connection
+      assert_equal 'localhost:11300', connection.address
     end
   end # initialize
 
@@ -45,7 +37,7 @@ describe "Backburner::Connection class" do
     end
 
     it "delegate methods to beanstalk connection" do
-      assert_equal "localhost", @connection.connections.first.host
+      assert_equal "localhost", @connection.connection.host
     end
   end # delegator
 end # Connection

data/test/helpers_test.rb

@@ -40,7 +40,7 @@ describe "Backburner::Helpers module" do
   describe "for exception_message method" do
     it "prints out message about failure" do
       output = exception_message(RuntimeError.new("test"))
-      assert_match /Exception RuntimeError/, output
+      assert_match(/Exception RuntimeError/, output)
     end
   end # exception_message
 
@@ -161,4 +161,4 @@ describe "Backburner::Helpers module" do
       assert_equal 300, resolve_respond_timeout(nil)
     end
   end # resolve_respond_timeout
-end
+end

data/test/hooks_test.rb

@@ -12,22 +12,22 @@ describe "Backburner::Hooks module" do
       it "should support successful invocation" do
         out = silenced { @res = @hooks.invoke_hook_events(HookedObjectSuccess, :before_enqueue, 5, 6) }
         assert_equal [nil, nil], @res
-        assert_match /!!before_enqueue_foo!! \[5\, 6\]/, out
-        assert_match /!!before_enqueue_bar!! \[5\, 6\]/, out
+        assert_match(/!!before_enqueue_foo!! \[5\, 6\]/, out)
+        assert_match(/!!before_enqueue_bar!! \[5\, 6\]/, out)
       end
 
       it "should support fail case" do
         out = silenced { @res = @hooks.invoke_hook_events(HookedObjectBeforeEnqueueFail, :before_enqueue, 5, 6) }
         assert_equal false, @res
-        assert_match /!!before_enqueue_foo!! \[5\, 6\]/, out
+        assert_match(/!!before_enqueue_foo!! \[5\, 6\]/, out)
       end
     end # before_enqueue
 
     describe "with after_enqueue" do
       it "should support successful invocation" do
         out = silenced { @hooks.invoke_hook_events(HookedObjectSuccess, :after_enqueue, 7, 8) }
-        assert_match /!!after_enqueue_foo!! \[7\, 8\]/, out
-        assert_match /!!after_enqueue_bar!! \[7\, 8\]/, out
+        assert_match(/!!after_enqueue_foo!! \[7\, 8\]/, out)
+        assert_match(/!!after_enqueue_bar!! \[7\, 8\]/, out)
       end
 
       it "should support fail case" do
@@ -40,20 +40,20 @@ describe "Backburner::Hooks module" do
     describe "with before_perform" do
       it "should support successful invocation" do
         out = silenced { @hooks.invoke_hook_events(HookedObjectSuccess, :before_perform, 1, 2) }
-        assert_match /!!before_perform_foo!! \[1\, 2\]/, out
+        assert_match(/!!before_perform_foo!! \[1\, 2\]/, out)
       end
 
       it "should support fail case" do
         out = silenced { @res = @hooks.invoke_hook_events(HookedObjectBeforePerformFail, :before_perform, 5, 6) }
         assert_equal false, @res
-        assert_match /!!before_perform_foo!! \[5\, 6\]/, out
+        assert_match(/!!before_perform_foo!! \[5\, 6\]/, out)
       end
     end # before_perform
 
     describe "with after_perform" do
       it "should support successful invocation" do
         out = silenced { @hooks.invoke_hook_events(HookedObjectSuccess, :after_perform, 3, 4) }
-        assert_match /!!after_perform_foo!! \[3\, 4\]/, out
+        assert_match(/!!after_perform_foo!! \[3\, 4\]/, out)
       end
 
       it "should support fail case" do
@@ -66,7 +66,7 @@ describe "Backburner::Hooks module" do
     describe "with on_failure" do
       it "should support successful invocation" do
         out = silenced { @hooks.invoke_hook_events(HookedObjectSuccess, :on_failure, RuntimeError, 10) }
-        assert_match /!!on_failure_foo!! RuntimeError \[10\]/, out
+        assert_match(/!!on_failure_foo!! RuntimeError \[10\]/, out)
       end
     end # on_failure
   end # invoke_hook_events
@@ -79,13 +79,13 @@ describe "Backburner::Hooks module" do
             puts "!!FIRED!!"
           }
         end
-        assert_match /BEGIN.*?bar.*BEGIN.*cat.*FIRED.*END.*cat.*END.*bar/m, out
-        assert_match /!!BEGIN around_perform_bar!! \[7\, 8\]/, out
-        assert_match /!!BEGIN around_perform_cat!! \[7\, 8\]/, out
-        assert_match /!!FIRED!!/, out
-        assert_match /!!END around_perform_cat!! \[7\, 8\]/, out
-        assert_match /!!END around_perform_bar!! \[7\, 8\]/, out
+        assert_match(/BEGIN.*?bar.*BEGIN.*cat.*FIRED.*END.*cat.*END.*bar/m, out)
+        assert_match(/!!BEGIN around_perform_bar!! \[7\, 8\]/, out)
+        assert_match(/!!BEGIN around_perform_cat!! \[7\, 8\]/, out)
+        assert_match(/!!FIRED!!/, out)
+        assert_match(/!!END around_perform_cat!! \[7\, 8\]/, out)
+        assert_match(/!!END around_perform_bar!! \[7\, 8\]/, out)
       end
     end # successful
   end # around_hook_events
-end # Hooks
+end # Hooks

data/test/job_test.rb

@@ -68,7 +68,7 @@ describe "Backburner::Job module" do
       it "should process task" do
         @job = Backburner::Job.new(@task)
         out = silenced(1) { @job.process }
-        assert_match /Performed 56 in NestedDemo::TestJobC/, out
+        assert_match(/Performed 56 in NestedDemo::TestJobC/, out)
       end # process
     end # valid
 
@@ -111,4 +111,4 @@ describe "Backburner::Job module" do
       @job.bury
     end # bury
   end # simple delegation
-end
+end

data/test/logger_test.rb

@@ -17,7 +17,7 @@ describe "Backburner::Logger module" do
     it "can be configured to log to logger" do
       Backburner.configure { |config| config.logger = @logger }
       log_info("foo")
-      assert_match /I,.*?foo/, @strio.string
+      assert_match(/I,.*?foo/, @strio.string)
     end
 
     after do
@@ -34,11 +34,11 @@ describe "Backburner::Logger module" do
     it "can be configured to log to logger" do
       Backburner.configure { |config| config.logger = @logger }
       log_error("bar")
-      assert_match /E,.*?bar/, @strio.string
+      assert_match(/E,.*?bar/, @strio.string)
     end
 
     after do
       Backburner.configure { |config| config.logger = nil }
     end
   end # log_error
-end
+end

data/test/test_helper.rb

@@ -1,7 +1,11 @@
 require 'rubygems'
 require 'tempfile'
 require 'minitest/autorun'
-require 'mocha/setup'
+begin
+  require 'mocha/setup'
+rescue LoadError
+  require 'mocha'
+end
 $:.unshift File.expand_path("../../lib")
 require 'backburner'
 require File.expand_path('../helpers/templogger', __FILE__)

data/test/worker_test.rb

@@ -77,7 +77,7 @@ describe "Backburner::Worker module" do
   describe "for connection class method" do
     it "should return the beanstalk connection" do
       assert_equal "beanstalk://localhost", Backburner::Worker.connection.url
-      assert_kind_of Beaneater::Pool, Backburner::Worker.connection.beanstalk
+      assert_kind_of Beaneater, Backburner::Worker.connection.beanstalk
     end
   end # connection
 

data/test/workers/forking_worker_test.rb

@@ -9,12 +9,18 @@ describe "Backburner::Workers::Forking module" do
   end
 
   describe "for prepare method" do
+    it "should make tube names array always unique to avoid duplication" do
+      worker = @worker_class.new(["foo", "demo.test.foo"])
+      worker.prepare
+      assert_equal ["demo.test.foo"], worker.tube_names
+    end
+
     it "should watch specified tubes" do
       worker = @worker_class.new(["foo", "bar"])
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo", "demo.test.bar"], worker.tube_names
       assert_same_elements ["demo.test.foo", "demo.test.bar"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end # multiple
 
     it "should watch single tube" do
@@ -22,7 +28,7 @@ describe "Backburner::Workers::Forking module" do
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo"], worker.tube_names
       assert_same_elements ["demo.test.foo"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end # single
 
     it "should respect default_queues settings" do
@@ -31,7 +37,7 @@ describe "Backburner::Workers::Forking module" do
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo", "demo.test.bar"], worker.tube_names
       assert_same_elements ["demo.test.foo", "demo.test.bar"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end
 
     it "should assign based on all tubes" do
@@ -40,7 +46,7 @@ describe "Backburner::Workers::Forking module" do
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.bar"], worker.tube_names
       assert_same_elements ["demo.test.bar"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.bar/, out
+      assert_match(/demo\.test\.bar/, out)
     end # all assign
 
     it "should properly retrieve all tubes" do
@@ -48,7 +54,7 @@ describe "Backburner::Workers::Forking module" do
       out = capture_stdout { worker.prepare }
       assert_contains worker.tube_names, "demo.test.backburner-jobs"
       assert_contains @worker_class.connection.tubes.watched.map(&:name), "demo.test.backburner-jobs"
-      assert_match /demo\.test\.test-job/, out
+      assert_match(/demo\.test\.test-job/, out)
     end # all read
   end # prepare
 
@@ -174,6 +180,4 @@ describe "Backburner::Workers::Forking module" do
     end # retrying, succeeds
 
   end # practical tests
-
-
 end

data/test/workers/simple_worker_test.rb

@@ -9,12 +9,18 @@ describe "Backburner::Workers::Basic module" do
   end
 
   describe "for prepare method" do
+    it "should make tube names array always unique to avoid duplication" do
+      worker = @worker_class.new(["foo", "demo.test.foo"])
+      worker.prepare
+      assert_equal ["demo.test.foo"], worker.tube_names
+    end
+
     it "should watch specified tubes" do
       worker = @worker_class.new(["foo", "bar"])
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo", "demo.test.bar"], worker.tube_names
       assert_same_elements ["demo.test.foo", "demo.test.bar"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end # multiple
 
     it "should watch single tube" do
@@ -22,7 +28,7 @@ describe "Backburner::Workers::Basic module" do
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo"], worker.tube_names
       assert_same_elements ["demo.test.foo"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end # single
 
     it "should respect default_queues settings" do
@@ -31,7 +37,7 @@ describe "Backburner::Workers::Basic module" do
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo", "demo.test.bar"], worker.tube_names
       assert_same_elements ["demo.test.foo", "demo.test.bar"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end
 
     it "should assign based on all tubes" do
@@ -40,7 +46,7 @@ describe "Backburner::Workers::Basic module" do
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.bar"], worker.tube_names
       assert_same_elements ["demo.test.bar"], @worker_class.connection.tubes.watched.map(&:name)
-      assert_match /demo\.test\.bar/, out
+      assert_match(/demo\.test\.bar/, out)
     end # all assign
 
     it "should properly retrieve all tubes" do
@@ -48,7 +54,7 @@ describe "Backburner::Workers::Basic module" do
       out = capture_stdout { worker.prepare }
       assert_contains worker.tube_names, "demo.test.backburner-jobs"
       assert_contains @worker_class.connection.tubes.watched.map(&:name), "demo.test.backburner-jobs"
-      assert_match /demo\.test\.test-job/, out
+      assert_match(/demo\.test\.test-job/, out)
     end # all read
   end # prepare
 
@@ -139,9 +145,9 @@ describe "Backburner::Workers::Basic module" do
           worker.work_one_job
         end
       end
-      assert_match /attempt 1 of 2, retrying/, out.first
-      assert_match /Finished TestRetryJob/m, out.last
-      assert_match /attempt 2 of 2, burying/m, out.last
+      assert_match(/attempt 1 of 2, retrying/, out.first)
+      assert_match(/Finished TestRetryJob/m, out.last)
+      assert_match(/attempt 2 of 2, burying/m, out.last)
       assert_equal 2, $worker_test_count
       assert_equal false, $worker_success
     end # retry, bury
@@ -158,9 +164,9 @@ describe "Backburner::Workers::Basic module" do
           worker.work_one_job
         end
       end
-      assert_match /attempt 1 of 3, retrying/, out.first
-      assert_match /attempt 2 of 3, retrying/, out[1]
-      assert_match /Completed TestRetryJob/m, out.last
+      assert_match(/attempt 1 of 3, retrying/, out.first)
+      assert_match(/attempt 2 of 3, retrying/, out[1])
+      assert_match(/Completed TestRetryJob/m, out.last)
       refute_match(/failed/, out.last)
       assert_equal 3, $worker_test_count
       assert_equal true, $worker_success
@@ -175,14 +181,14 @@ describe "Backburner::Workers::Basic module" do
         worker.prepare
         worker.work_one_job
       end
-      assert_match /before_enqueue.*after_enqueue.*Working 1 queues/m, out
-      assert_match /!!before_enqueue_bar!! \[nil, :foo, 5\]/, out
-      assert_match /!!after_enqueue_bar!! \[nil, :foo, 5\]/, out
-      assert_match /!!before_perform_foo!! \[nil, "foo", 5\]/, out
-      assert_match /!!BEGIN around_perform_bar!! \[nil, "foo", 5\]/, out
-      assert_match /!!BEGIN around_perform_cat!! \[nil, "foo", 5\]/, out
-      assert_match /!!on_failure_foo!!.*HookFailError/, out
-      assert_match /attempt 1 of 1, burying/, out
+      assert_match(/before_enqueue.*after_enqueue.*Working 1 queues/m, out)
+      assert_match(/!!before_enqueue_bar!! \[nil, :foo, 5\]/, out)
+      assert_match(/!!after_enqueue_bar!! \[nil, :foo, 5\]/, out)
+      assert_match(/!!before_perform_foo!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!BEGIN around_perform_bar!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!BEGIN around_perform_cat!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!on_failure_foo!!.*HookFailError/, out)
+      assert_match(/attempt 1 of 1, burying/, out)
     end # event hooks, no retry
 
     it "should support event hooks with retry" do
@@ -197,26 +203,26 @@ describe "Backburner::Workers::Basic module" do
           worker.work_one_job
         end
       end
-      assert_match /before_enqueue.*after_enqueue.*Working 1 queues/m, out
-      assert_match /!!before_enqueue_bar!! \[nil, :foo, 5\]/, out
-      assert_match /!!after_enqueue_bar!! \[nil, :foo, 5\]/, out
-      assert_match /!!before_perform_foo!! \[nil, "foo", 5\]/, out
-      assert_match /!!BEGIN around_perform_bar!! \[nil, "foo", 5\]/, out
-      assert_match /!!BEGIN around_perform_cat!! \[nil, "foo", 5\]/, out
-      assert_match /!!on_failure_foo!!.*HookFailError/, out
-      assert_match /!!on_failure_foo!!.*retrying.*around_perform_bar.*around_perform_cat/m, out
-      assert_match /attempt 1 of 2, retrying/, out
-      assert_match /!!before_perform_foo!! \[nil, "foo", 5\]/, out
-      assert_match /!!END around_perform_bar!! \[nil, "foo", 5\]/, out
-      assert_match /!!END around_perform_cat!! \[nil, "foo", 5\]/, out
-      assert_match /!!after_perform_foo!! \[nil, "foo", 5\]/, out
-      assert_match /Finished HookedObjectSuccess/, out
+      assert_match(/before_enqueue.*after_enqueue.*Working 1 queues/m, out)
+      assert_match(/!!before_enqueue_bar!! \[nil, :foo, 5\]/, out)
+      assert_match(/!!after_enqueue_bar!! \[nil, :foo, 5\]/, out)
+      assert_match(/!!before_perform_foo!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!BEGIN around_perform_bar!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!BEGIN around_perform_cat!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!on_failure_foo!!.*HookFailError/, out)
+      assert_match(/!!on_failure_foo!!.*retrying.*around_perform_bar.*around_perform_cat/m, out)
+      assert_match(/attempt 1 of 2, retrying/, out)
+      assert_match(/!!before_perform_foo!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!END around_perform_bar!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!END around_perform_cat!! \[nil, "foo", 5\]/, out)
+      assert_match(/!!after_perform_foo!! \[nil, "foo", 5\]/, out)
+      assert_match(/Finished HookedObjectSuccess/, out)
     end # event hooks, with retry
 
     it "should support event hooks with stopping enqueue" do
       $hooked_fail_count = 0
       clear_jobs!('foo.bar.events.retry2')
-      out = silenced(2) do
+      silenced(2) do
         HookedObjectBeforeEnqueueFail.async(:queue => 'foo.bar.events.retry2').foo(5)
       end
       expanded_tube = [Backburner.configuration.tube_namespace, 'foo.bar.events.retry2'].join(".")
@@ -226,15 +232,15 @@ describe "Backburner::Workers::Basic module" do
     it "should support event hooks with stopping perform" do
       $hooked_fail_count = 0
       clear_jobs!('foo.bar.events.retry3')
-      expanded_tube = [Backburner.configuration.tube_namespace, 'foo.bar.events.retry3'].join(".")
+      [Backburner.configuration.tube_namespace, 'foo.bar.events.retry3'].join(".")
       out = silenced(2) do
         HookedObjectBeforePerformFail.async(:queue => 'foo.bar.events.retry3').foo(10)
         worker = @worker_class.new('foo.bar.events.retry3')
         worker.prepare
         worker.work_one_job
       end
-      assert_match /!!before_perform_foo!! \[nil, "foo", 10\]/, out
-      assert_match /before_perform_foo.*Completed/m, out
+      assert_match(/!!before_perform_foo!! \[nil, "foo", 10\]/, out)
+      assert_match(/before_perform_foo.*Completed/m, out)
       refute_match(/Fail ran!!/, out)
       refute_match(/HookFailError/, out)
     end # stopping perform
@@ -243,4 +249,4 @@ describe "Backburner::Workers::Basic module" do
       Backburner.configure { |config| config.max_job_retries = 0; config.retry_delay = 5 }
     end
   end # work_one_job
-end # Worker
+end # Worker

data/test/workers/threads_on_fork_worker_test.rb

@@ -68,18 +68,24 @@ describe "Backburner::Workers::ThreadsOnFork module" do
       Backburner.configure { |config| config.logger = false }
     end
 
+    it "should make tube names array always unique to avoid duplication" do
+      worker = @worker_class.new(["foo", "demo.test.foo"])
+      worker.prepare
+      assert_equal ["demo.test.foo"], worker.tube_names
+    end
+
     it "should watch specified tubes" do
       worker = @worker_class.new(["foo", "bar"])
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo", "demo.test.bar"], worker.tube_names
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end # multiple
 
     it "should watch single tube" do
       worker = @worker_class.new("foo")
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo"], worker.tube_names
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end # single
 
     it "should respect default_queues settings" do
@@ -87,7 +93,7 @@ describe "Backburner::Workers::ThreadsOnFork module" do
       worker = @worker_class.new
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.foo", "demo.test.bar"], worker.tube_names
-      assert_match /demo\.test\.foo/, out
+      assert_match(/demo\.test\.foo/, out)
     end
 
     it "should assign based on all tubes" do
@@ -95,14 +101,14 @@ describe "Backburner::Workers::ThreadsOnFork module" do
       worker = @worker_class.new
       out = capture_stdout { worker.prepare }
       assert_equal ["demo.test.bar"], worker.tube_names
-      assert_match /demo\.test\.bar/, out
+      assert_match(/demo\.test\.bar/, out)
     end # all assign
 
     it "should properly retrieve all tubes" do
       worker = @worker_class.new
       out = capture_stdout { worker.prepare }
       assert_contains worker.tube_names, "demo.test.test-job-fork"
-      assert_match /demo\.test\.test-job-fork/, out
+      assert_match(/demo\.test\.test-job-fork/, out)
     end # all read
   end # prepare
 
@@ -136,7 +142,7 @@ describe "Backburner::Workers::ThreadsOnFork module" do
       def worker.create_thread(*args, &block); block.call(*args) end
 
       out = silenced(2) { worker.start(false) }
-      refute_match /Catastrophic failure/, out
+      refute_match(/Catastrophic failure/, out)
     end
 
     it "fork_and_watch thread should log an error if exitstatus is != 99" do
@@ -153,7 +159,7 @@ describe "Backburner::Workers::ThreadsOnFork module" do
       end
       def worker.create_thread(*args, &block); block.call(*args) end
       out = silenced(2) { worker.start(false) }
-      assert_match /Catastrophic failure: tube demo\.test\.foo exited with code 0\./, out
+      assert_match(/Catastrophic failure: tube demo\.test\.foo exited with code 0\./, out)
     end
 
     describe "fork_inner" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Nathan Esquenazi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaneater
@@ -16,26 +16,26 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dante
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
@@ -88,6 +88,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -190,4 +191,3 @@ test_files:
 - test/workers/forking_worker_test.rb
 - test/workers/simple_worker_test.rb
 - test/workers/threads_on_fork_worker_test.rb
-has_rdoc: