sidekiq 0.10.1 → 0.11.0

data/Changes.md

@@ -1,3 +1,16 @@
+HEAD
+-----------
+
+- Client-side API changes, added sidekiq\_options for Sidekiq::Worker.
+  As a side effect of this change, the client API works on Ruby 1.8.
+  It's not officially supported but should work [#103]
+- NO POLL!  Sidekiq no longer polls Redis, leading to lower network
+  utilization and lower latency for message processing.  As a side
+  effect of this change, queue weights are no longer supported. If you
+  wish to process multiple queues, list them in the order you want
+  them processed: `sidekiq -q critical -q high -q default -q low`
+- Add --version CLI option
+
 0.10.1
 -----------
 

data/bin/sidekiq

@@ -1,13 +1,6 @@
 #!/usr/bin/env ruby
 
-begin
-  require 'sidekiq/cli'
-rescue LoadError
-  # Better way to do this in dev?
-  dir = File.expand_path(File.dirname(__FILE__) + '/../lib') 
-  $LOAD_PATH << dir if File.exist?("#{dir}/sidekiq.rb")
-  require 'sidekiq/cli'
-end
+require_relative '../lib/sidekiq/cli'
 
 begin
   cli = Sidekiq::CLI.instance

data/examples/config.yml

@@ -5,5 +5,5 @@
 :verbose:      false
 :concurrency:  25
 :queues:
-  - [often, 2]
-  - [seldom, 1]
+  - often
+  - seldom

data/examples/por.rb

@@ -2,12 +2,12 @@ require 'sidekiq'
 
 # If your client is single-threaded, we just need a single connection in our Redis connection pool
 Sidekiq.configure_client do |config|
-  config.redis = Sidekiq::RedisConnection.create(:namespace => 'x', :size => 1, :url => 'redis://redis.host:1234/14')
+  config.redis = { :namespace => 'x', :size => 1, :url => 'redis://redis.host:1234/14' }
 end
 
 # Sidekiq server is multi-threaded so our Redis connection pool size defaults to concurrency (-c)
 Sidekiq.configure_server do |config|
-  config.redis = Sidekiq::RedisConnection.create(:namespace => 'x', :url => 'redis://redis.host:1234/14')
+  config.redis = { :namespace => 'x', :url => 'redis://redis.host:1234/14' }
 end
 
 # Start up sidekiq via

data/examples/sinkiq.rb

@@ -5,8 +5,10 @@
 # and then browse to http://localhost:4567
 #
 require 'sinatra'
-require 'sidekiq/worker'
-$redis = Sidekiq::RedisConnection.create
+require 'sidekiq'
+require 'redis'
+
+$redis = Redis.connect
 
 class SinatraWorker
   include Sidekiq::Worker

data/lib/sidekiq/cli.rb

@@ -18,9 +18,12 @@ end
 require 'yaml'
 require 'singleton'
 require 'optparse'
+require 'celluloid'
+
 require 'sidekiq'
 require 'sidekiq/util'
 require 'sidekiq/manager'
+require 'sidekiq/retry'
 
 module Sidekiq
   class CLI
@@ -96,7 +99,6 @@ module Sidekiq
 
     def validate!
       options[:queues] << 'default' if options[:queues].empty?
-      options[:queues].shuffle!
 
       if !File.exist?(options[:require]) ||
          (File.directory?(options[:require]) && !File.exist?("#{options[:require]}/config/application.rb"))
@@ -113,9 +115,8 @@ module Sidekiq
       opts = {}
 
       @parser = OptionParser.new do |o|
-        o.on "-q", "--queue QUEUE,WEIGHT", "Queue to process, with optional weight" do |arg|
-          (q, weight) = arg.split(",")
-          parse_queues(opts, q, weight)
+        o.on "-q", "--queue QUEUE", "Queue to process" do |arg|
+          parse_queues(opts, arg)
         end
 
         o.on "-v", "--verbose", "Print more verbose output" do
@@ -145,6 +146,11 @@ module Sidekiq
         o.on '-C', '--config PATH', "path to YAML config file" do |arg|
           opts[:config_file] = arg
         end
+
+        o.on '-V', '--version', "Print version and exit" do |arg|
+          puts "Sidekiq #{Sidekiq::VERSION}"
+          die(0)
+        end
       end
 
       @parser.banner = "sidekiq [options]"
@@ -169,15 +175,13 @@ module Sidekiq
       if cli[:config_file] && File.exist?(cli[:config_file])
         opts = YAML.load_file cli[:config_file]
         queues = opts.delete(:queues) || []
-        queues.each { |pair| parse_queues(opts, *pair) }
+        queues.each { |name, _| parse_queues(opts, name) }
       end
       opts
     end
 
-    def parse_queues(opts, q, weight)
-      (weight || 1).to_i.times do
-        (opts[:queues] ||= []) << q
-      end
+    def parse_queues(opts, q)
+      (opts[:queues] ||= []) << q
     end
 
   end

data/lib/sidekiq/client.rb

@@ -1,5 +1,4 @@
 require 'multi_json'
-require 'redis'
 
 require 'sidekiq/middleware/chain'
 require 'sidekiq/middleware/client/unique_jobs'
@@ -7,10 +6,6 @@ require 'sidekiq/middleware/client/unique_jobs'
 module Sidekiq
   class Client
 
-    def self.middleware
-      raise "Sidekiq::Client.middleware is now Sidekiq.client_middleware"
-    end
-
     def self.default_middleware
       Middleware::Chain.new do |m|
         m.add Middleware::Client::UniqueJobs
@@ -25,22 +20,25 @@ module Sidekiq
       Sidekiq.redis { |x| x.smembers('queues') }
     end
 
+    # DEPRECATED
     def self.queue_mappings
       @queue_mappings ||= {}
     end
 
     # Example usage:
-    # Sidekiq::Client.push('my_queue', 'class' => MyWorker, 'args' => ['foo', 1, :bat => 'bar'])
-    def self.push(queue=nil, item)
-      raise(ArgumentError, "Message must be a Hash of the form: { 'class' => SomeClass, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash)
+    # Sidekiq::Client.push('queue' => 'my_queue', 'class' => MyWorker, 'args' => ['foo', 1, :bat => 'bar'])
+    def self.push(item)
+      raise(ArgumentError, "Message must be a Hash of the form: { 'class' => SomeWorker, 'args' => ['bob', 1, :foo => 'bar'] }") unless item.is_a?(Hash)
       raise(ArgumentError, "Message must include a class and set of arguments: #{item.inspect}") if !item['class'] || !item['args']
+      raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item['class'].ancestors.inspect}") if !item['class'].is_a?(Class) || !item['class'].respond_to?('get_sidekiq_options')
 
-      queue = queue || queue_mappings[item['class'].to_s] || 'default'
-
-      item['class'] = item['class'].to_s if !item['class'].is_a?(String)
+      item['retry'] = !!item['class'].get_sidekiq_options['retry']
+      queue = item['queue'] || item['class'].get_sidekiq_options['queue'] || queue_mappings[item['class'].to_s] || 'default'
+      worker_class = item['class']
+      item['class'] = item['class'].to_s
 
       pushed = false
-      Sidekiq.client_middleware.invoke(item, queue) do
+      Sidekiq.client_middleware.invoke(worker_class, item, queue) do
         payload = MultiJson.encode(item)
         Sidekiq.redis do |conn|
           conn.multi do
@@ -53,16 +51,14 @@ module Sidekiq
       pushed
     end
 
-    # Please use .push if possible instead.
-    #
-    # Example usage:
+    # Redis compatibility helper.  Example usage:
     #
     #   Sidekiq::Client.enqueue(MyWorker, 'foo', 1, :bat => 'bar')
     #
     # Messages are enqueued to the 'default' queue.
     #
     def self.enqueue(klass, *args)
-      push(nil, { 'class' => klass.name, 'args' => args })
+      push('class' => klass, 'args' => args)
     end
   end
 end

data/lib/sidekiq/extensions/generic_proxy.rb

@@ -1,6 +1,6 @@
 module Sidekiq
   module Extensions
-    class Proxy < ::BasicObject
+    class Proxy < (RUBY_VERSION < '1.9' ? Object : BasicObject)
       def initialize(performable, target)
         @performable = performable
         @target = target

data/lib/sidekiq/fetch.rb

@@ -0,0 +1,46 @@
+require 'sidekiq'
+require 'celluloid'
+
+module Sidekiq
+  ##
+  # The Fetcher blocks on Redis, waiting for a message to process
+  # from the queues.  It gets the message and hands it to the Manager
+  # to assign to a ready Processor.
+  class Fetcher
+    include Celluloid
+    include Sidekiq::Util
+
+    TIMEOUT = 1
+
+    def initialize(mgr, queues)
+      @cmd = queues.map { |q| "queue:#{q}" }
+      @mgr = mgr
+
+      # One second timeout for blpop.
+      @cmd << TIMEOUT
+    end
+
+    # Fetching is straightforward: the Manager makes a fetch
+    # request for each idle processor when Sidekiq starts and
+    # then issues a new fetch request every time a Processor
+    # finishes a message.
+    #
+    # Because we have to shut down cleanly, we can't block
+    # forever and we can't loop forever.  Instead we reschedule
+    # a new fetch if the current fetch turned up nothing.
+    def fetch
+      watchdog('Fetcher#fetch died') do
+        queue = nil
+        msg = nil
+        Sidekiq.redis { |conn| (queue, msg) = conn.blpop(*@cmd) }
+
+        if msg
+          @mgr.assign!(msg, queue.gsub(/\Aqueue:/, ''))
+        else
+          after(0) { fetch }
+        end
+      end
+    end
+
+  end
+end

data/lib/sidekiq/manager.rb

@@ -1,16 +1,15 @@
 require 'celluloid'
-require 'redis'
 require 'multi_json'
 
 require 'sidekiq/util'
 require 'sidekiq/processor'
-require 'connection_pool/version'
+require 'sidekiq/fetch'
 
 module Sidekiq
 
   ##
   # The main router in the system.  This
-  # manages the processor state and fetches messages
+  # manages the processor state and accepts messages
   # from Redis to be dispatched to an idle processor.
   #
   class Manager
@@ -24,46 +23,50 @@ module Sidekiq
       logger.info "Running in #{RUBY_DESCRIPTION}"
       logger.debug { options.inspect }
       @count = options[:concurrency] || 25
-      @queues = options[:queues]
       @done_callback = nil
 
       @done = false
       @busy = []
+      @fetcher = Fetcher.new(current_actor, options[:queues])
       @ready = @count.times.map { Processor.new_link(current_actor) }
     end
 
     def stop(options={})
-      shutdown = options[:shutdown]
-      timeout = options[:timeout]
+      watchdog('Manager#stop died') do
+        shutdown = options[:shutdown]
+        timeout = options[:timeout]
 
-      @done = true
-      @ready.each { |x| x.terminate if x.alive? }
-      @ready.clear
+        @done = true
 
-      redis do |conn|
-        workers = conn.smembers('workers')
-        workers.each do |name|
-          conn.srem('workers', name) if name =~ /:#{process_id}-/
-        end
-      end
+        @fetcher.terminate if @fetcher.alive?
+        @ready.each { |x| x.terminate if x.alive? }
+        @ready.clear
 
-      if shutdown
-        if @busy.empty?
-          # after(0) needed to avoid deadlock in Celluoid after USR1 + TERM
-          return after(0) { signal(:shutdown) }
-        else
-          logger.info { "Pausing #{timeout} seconds to allow workers to finish..." }
+        redis do |conn|
+          workers = conn.smembers('workers')
+          workers.each do |name|
+            conn.srem('workers', name) if name =~ /:#{process_id}-/
+          end
         end
 
-        after(timeout) do
-          @busy.each { |x| x.terminate if x.alive? }
-          signal(:shutdown)
+        if shutdown
+          if @busy.empty?
+            # after(0) needed to avoid deadlock in Celluoid after USR1 + TERM
+            return after(0) { signal(:shutdown) }
+          else
+            logger.info { "Pausing #{timeout} seconds to allow workers to finish..." }
+          end
+
+          after(timeout) do
+            @busy.each { |x| x.terminate if x.alive? }
+            signal(:shutdown)
+          end
         end
       end
     end
 
     def start
-      dispatch(true)
+      @ready.each { dispatch }
     end
 
     def when_done(&blk)
@@ -71,7 +74,7 @@ module Sidekiq
     end
 
     def processor_done(processor)
-      watchdog('sidekiq processor_done crashed!') do
+      watchdog('Manager#processor_done died') do
         @done_callback.call(processor) if @done_callback
         @busy.delete(processor)
         if stopped?
@@ -85,53 +88,36 @@ module Sidekiq
     end
 
     def processor_died(processor, reason)
-      @busy.delete(processor)
+      watchdog("Manager#processor_died died") do
+        @busy.delete(processor)
 
-      unless stopped?
-        @ready << Processor.new_link(current_actor)
-        dispatch
-      else
-        signal(:shutdown) if @busy.empty?
+        unless stopped?
+          @ready << Processor.new_link(current_actor)
+          dispatch
+        else
+          signal(:shutdown) if @busy.empty?
+        end
       end
     end
 
-    private
-
-    def find_work(queue)
-      msg = redis { |x| x.lpop("queue:#{queue}") }
-      if msg
+    def assign(msg, queue)
+      watchdog("Manager#assign died") do
         processor = @ready.pop
         @busy << processor
         processor.process!(MultiJson.decode(msg), queue)
       end
-      !!msg
     end
 
-    def dispatch(schedule = false)
-      watchdog("Fatal error in sidekiq, dispatch loop died") do
-        return if stopped?
-
-        # This is a safety check to ensure we haven't leaked
-        # processors somehow.
-        raise "BUG: No processors, cannot continue!" if @ready.empty? && @busy.empty?
+    private
 
-        # Dispatch loop
-        loop do
-          break logger.debug('no processors') if @ready.empty?
-          found = false
-          @ready.size.times do
-            found ||= find_work(@queues.sample)
-          end
-          break unless found
-        end
+    def dispatch
+      return if stopped?
+      # This is a safety check to ensure we haven't leaked
+      # processors somehow.
+      raise "BUG: No processors, cannot continue!" if @ready.empty? && @busy.empty?
+      raise "No ready processor!?" if @ready.empty?
 
-        # This is the polling loop that ensures we check Redis every
-        # second for work, even if there was nothing to do this time
-        # around.
-        after(1) do
-          dispatch(schedule)
-        end if schedule
-      end
+      @fetcher.fetch!
     end
 
     def stopped?

data/lib/sidekiq/middleware/client/unique_jobs.rb

@@ -7,23 +7,27 @@ module Sidekiq
       class UniqueJobs
         HASH_KEY_EXPIRATION = 30 * 60
 
-        def call(item, queue)
-          payload_hash = Digest::MD5.hexdigest(MultiJson.encode(item))
-          unique = false
+        def call(worker_class, item, queue)
+          enabled = worker_class.get_sidekiq_options['unique']
+          if enabled
+            payload_hash = Digest::MD5.hexdigest(MultiJson.encode(item))
+            unique = false
 
-          Sidekiq.redis do |conn|
-            conn.watch(payload_hash)
+            Sidekiq.redis do |conn|
+              conn.watch(payload_hash)
 
-            if conn.get(payload_hash)
-              conn.unwatch
-            else
-              unique = conn.multi do
-                conn.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
+              if conn.get(payload_hash)
+                conn.unwatch
+              else
+                unique = conn.multi do
+                  conn.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
+                end
               end
             end
+            yield if unique
+          else
+            yield
           end
-
-          yield if unique
         end
 
       end

data/lib/sidekiq/middleware/server/retry_jobs.rb

@@ -27,6 +27,8 @@ module Sidekiq
         def call(worker, msg, queue)
           yield
         rescue => e
+          raise unless msg['retry']
+
           msg['queue'] = queue
           msg['error_message'] = e.message
           msg['error_class'] = e.class.name

data/lib/sidekiq/redis_connection.rb

@@ -1,4 +1,5 @@
 require 'connection_pool'
+require 'redis'
 require 'redis/namespace'
 
 module Sidekiq

data/lib/sidekiq/retry.rb

@@ -1,5 +1,7 @@
 require 'sidekiq'
+require 'sidekiq/util'
 require 'celluloid'
+require 'multi_json'
 
 module Sidekiq
   ##

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

data/lib/sidekiq/web.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'slim'
 require 'sprockets'
+require 'multi_json'
 
 module Sidekiq
   class SprocketsMiddleware
@@ -41,7 +42,7 @@ module Sidekiq
         Sidekiq.redis do |conn|
           workers = conn.smembers('workers')
           workers.each do |name|
-            conn.srem('workers', name) # if name =~ /:#{process_id}-/
+            conn.srem('workers', name)
           end
         end
       end
@@ -107,7 +108,7 @@ module Sidekiq
       end
 
       def relative_time(time)
-        "<time datetime=\"#{time.getutc.iso8601}\">#{time}</time>"
+        %{<time datetime="#{time.getutc.iso8601}">#{time}</time>}
       end
     end
 

data/lib/sidekiq/worker.rb

@@ -26,12 +26,35 @@ module Sidekiq
 
     module ClassMethods
       def perform_async(*args)
-        Sidekiq::Client.push('class' => self.name, 'args' => args)
+        Sidekiq::Client.push('class' => self, 'args' => args)
       end
 
       def queue(name)
+        puts "DEPRECATED: `queue :name` is now `sidekiq_options :queue => :name`"
         Sidekiq::Client.queue_mappings[self.name] = name.to_s
       end
+
+      ##
+      # Allows customization for this type of Worker.
+      # Legal options:
+      #
+      #   :unique - enable the UniqueJobs middleware for this Worker, default *true*
+      #   :queue - use a named queue for this Worker, default 'default'
+      #   :retry - enable the RetryJobs middleware for this Worker, default *true*
+      def sidekiq_options(opts={})
+        @sidekiq_options = get_sidekiq_options.merge(stringify_keys(opts || {}))
+      end
+
+      def get_sidekiq_options # :nodoc:
+        @sidekiq_options || { 'unique' => true, 'retry' => true, 'queue' => 'default' }
+      end
+
+      def stringify_keys(hash) # :nodoc:
+        hash.keys.each do |key|
+          hash[key.to_s] = hash.delete(key)
+        end
+        hash
+      end
     end
   end
 end

data/myapp/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 platforms :ruby do
-    gem 'sqlite3'
+  gem 'sqlite3'
 end
 
 platforms :jruby do

data/sidekiq.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis'
   gem.add_dependency                  'redis-namespace'
   gem.add_dependency                  'connection_pool', '~> 0.9.0'
-  gem.add_dependency                  'celluloid'
+  gem.add_dependency                  'celluloid', '~> 0.10.0'
   gem.add_dependency                  'multi_json'
   gem.add_development_dependency      'minitest'
   gem.add_development_dependency      'sinatra'

data/test/config.yml

@@ -5,5 +5,5 @@
 :pidfile:      /tmp/sidekiq-config-test.pid
 :concurrency:  50
 :queues:
-  - [often, 2]
-  - [seldom, 1]
+  - often
+  - seldom

data/test/test_cli.rb

@@ -45,9 +45,9 @@ class TestCli < MiniTest::Unit::TestCase
       assert_equal 30, Sidekiq.options[:timeout]
     end
 
-    it 'handles weights' do
-      @cli.parse(['sidekiq', '-q', 'foo,3', '-q', 'bar', '-r', './test/fake_env.rb'])
-      assert_equal %w(bar foo foo foo), Sidekiq.options[:queues].sort
+    it 'handles multiple queues' do
+      @cli.parse(['sidekiq', '-q', 'foo', '-q', 'bar', '-r', './test/fake_env.rb'])
+      assert_equal %w(foo bar), Sidekiq.options[:queues]
     end
 
     it 'sets verbose' do
@@ -110,8 +110,7 @@ class TestCli < MiniTest::Unit::TestCase
       end
 
       it 'sets queues' do
-        assert_equal 2, Sidekiq.options[:queues].select{ |q| q == 'often' }.length
-        assert_equal 1, Sidekiq.options[:queues].select{ |q| q == 'seldom' }.length
+        assert_equal %w(often seldom), Sidekiq.options[:queues]
       end
     end
 
@@ -133,8 +132,8 @@ class TestCli < MiniTest::Unit::TestCase
                     '-c', '100',
                     '-r', @tmp_lib_path,
                     '-P', @tmp_path,
-                    '-q', 'often,7',
-                    '-q', 'seldom,3'])
+                    '-q', 'often',
+                    '-q', 'seldom'])
       end
 
       after do
@@ -159,8 +158,7 @@ class TestCli < MiniTest::Unit::TestCase
       end
 
       it 'sets queues' do
-        assert_equal 7, Sidekiq.options[:queues].select{ |q| q == 'often' }.length
-        assert_equal 3, Sidekiq.options[:queues].select{ |q| q == 'seldom' }.length
+        assert_equal %w(often seldom), Sidekiq.options[:queues]
       end
     end
   end

data/test/test_client.rb

@@ -9,19 +9,21 @@ class TestClient < MiniTest::Unit::TestCase
       Sidekiq.redis {|c| c.flushdb }
     end
 
+    class QueueWorker
+      include Sidekiq::Worker
+      sidekiq_options :queue => 'customqueue'
+    end
+
     it 'does not push duplicate messages when configured for unique only' do
-      Sidekiq.client_middleware.entries.clear
-      Sidekiq.client_middleware do |chain|
-        chain.add Sidekiq::Middleware::Client::UniqueJobs
-      end
-      10.times { Sidekiq::Client.push('customqueue', 'class' => 'Foo', 'args' => [1, 2]) }
+      QueueWorker.sidekiq_options :unique => true
+      10.times { Sidekiq::Client.push('class' => QueueWorker, 'args' => [1, 2]) }
       assert_equal 1, Sidekiq.redis {|c| c.llen("queue:customqueue") }
     end
 
     it 'does push duplicate messages when not configured for unique only' do
-      Sidekiq.client_middleware.remove(Sidekiq::Middleware::Client::UniqueJobs)
-      10.times { Sidekiq::Client.push('customqueue2', 'class' => 'Foo', 'args' => [1, 2]) }
-      assert_equal 10, Sidekiq.redis {|c| c.llen("queue:customqueue2") }
+      QueueWorker.sidekiq_options :unique => false
+      10.times { Sidekiq::Client.push('class' => QueueWorker, 'args' => [1, 2]) }
+      assert_equal 10, Sidekiq.redis {|c| c.llen("queue:customqueue") }
     end
   end
 
@@ -56,7 +58,7 @@ class TestClient < MiniTest::Unit::TestCase
 
     it 'pushes messages to redis' do
       @redis.expect :rpush, 1, ['queue:foo', String]
-      pushed = Sidekiq::Client.push('foo', 'class' => 'Foo', 'args' => [1, 2])
+      pushed = Sidekiq::Client.push('queue' => 'foo', 'class' => MyWorker, 'args' => [1, 2])
       assert pushed
       @redis.verify
     end
@@ -82,7 +84,7 @@ class TestClient < MiniTest::Unit::TestCase
     class QueuedWorker
       include Sidekiq::Worker
 
-      queue :flimflam
+      sidekiq_options :queue => :flimflam
     end
 
     it 'enqueues to the named queue' do

data/test/test_manager.rb

@@ -26,8 +26,8 @@ class TestManager < MiniTest::Unit::TestCase
     end
 
     it 'processes messages' do
-      Sidekiq::Client.push(:foo, 'class' => IntegrationWorker, 'args' => [1, 2])
-      Sidekiq::Client.push(:foo, 'class' => IntegrationWorker, 'args' => [1, 3])
+      Sidekiq::Client.push('queue' => :foo, 'class' => IntegrationWorker, 'args' => [1, 2])
+      Sidekiq::Client.push('queue' => :foo, 'class' => IntegrationWorker, 'args' => [1, 3])
 
       q = TimedQueue.new
       mgr = Sidekiq::Manager.new(:queues => [:foo], :concurrency => 2)

data/test/test_retry.rb

@@ -12,9 +12,21 @@ class TestRetry < MiniTest::Unit::TestCase
       def @redis.with; yield self; end
     end
 
+    it 'allows disabling retry' do
+      msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => false }
+      msg2 = msg.dup
+      handler = Sidekiq::Middleware::Server::RetryJobs.new
+      assert_raises RuntimeError do
+        handler.call('', msg2, 'default') do
+          raise "kerblammo!"
+        end
+      end
+      assert_equal msg, msg2
+    end
+
     it 'handles a new failed message' do
       @redis.expect :zadd, 1, ['retry', String, String]
-      msg = { 'class' => 'Bob', 'args' => [1,2,'foo'] }
+      msg = { 'class' => 'Bob', 'args' => [1,2,'foo'], 'retry' => true }
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
         handler.call('', msg, 'default') do
@@ -32,7 +44,7 @@ class TestRetry < MiniTest::Unit::TestCase
     it 'handles a recurring failed message' do
       @redis.expect :zadd, 1, ['retry', String, String]
       now = Time.now.utc
-      msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry_count"=>10}
+      msg = {"class"=>"Bob", "args"=>[1, 2, "foo"], 'retry' => true, "queue"=>"default", "error_message"=>"kerblammo!", "error_class"=>"RuntimeError", "failed_at"=>now, "retry_count"=>10}
       handler = Sidekiq::Middleware::Server::RetryJobs.new
       assert_raises RuntimeError do
         handler.call('', msg, 'default') do

data/test/test_web.rb

@@ -38,7 +38,7 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_match last_response.body, /default/
       refute_match last_response.body, /foo/
 
-      assert Sidekiq::Client.push(:foo, 'class' => WebWorker, 'args' => [1, 3])
+      assert Sidekiq::Client.push('queue' => :foo, 'class' => WebWorker, 'args' => [1, 3])
 
       get '/'
       assert_equal 200, last_response.status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70182756998440 !ruby/object:Gem::Requirement
+  requirement: &70099857099140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182756998440
+  version_requirements: *70099857099140
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70182756997620 !ruby/object:Gem::Requirement
+  requirement: &70099857098700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182756997620
+  version_requirements: *70099857098700
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70182756997120 !ruby/object:Gem::Requirement
+  requirement: &70099857098200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182756997120
+  version_requirements: *70099857098200
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70182756996700 !ruby/object:Gem::Requirement
+  requirement: &70099857097700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182756996700
+  version_requirements: *70099857097700
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70182756996240 !ruby/object:Gem::Requirement
+  requirement: &70099857097320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70182756996240
+  version_requirements: *70099857097320
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70182757019360 !ruby/object:Gem::Requirement
+  requirement: &70099857113240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182757019360
+  version_requirements: *70099857113240
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70182757018940 !ruby/object:Gem::Requirement
+  requirement: &70099857112820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182757018940
+  version_requirements: *70099857112820
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70182757018520 !ruby/object:Gem::Requirement
+  requirement: &70099857112400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182757018520
+  version_requirements: *70099857112400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70182757018100 !ruby/object:Gem::Requirement
+  requirement: &70099857111980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70182757018100
+  version_requirements: *70099857111980
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70182757017600 !ruby/object:Gem::Requirement
+  requirement: &70099857111480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70182757017600
+  version_requirements: *70099857111480
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70182757017040 !ruby/object:Gem::Requirement
+  requirement: &70099857110980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70182757017040
+  version_requirements: *70099857110980
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com
@@ -172,6 +172,7 @@ files:
 - lib/sidekiq/extensions/action_mailer.rb
 - lib/sidekiq/extensions/active_record.rb
 - lib/sidekiq/extensions/generic_proxy.rb
+- lib/sidekiq/fetch.rb
 - lib/sidekiq/manager.rb
 - lib/sidekiq/middleware/chain.rb
 - lib/sidekiq/middleware/client/unique_jobs.rb