sidekiq 3.2.6 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b589aea06c5a40ae600d780a9ae6eb89766d8195
-  data.tar.gz: 0648e289e18aa26e8887bb5041a40fb2886080f5
+  metadata.gz: dea6136861d61b466dbeec68ffc57022140dddeb
+  data.tar.gz: a8eae3c0c21c3006571739e68f5978bffd1312c6
 SHA512:
-  metadata.gz: 8f02a8ad25930c5123c8a6c52a0d173bd452e8442b6642fe02743ed7b5f1f29f791208dde1e4de257fe126e2909d072f934d28f5517334c350f87bcfab29eee9
-  data.tar.gz: c28264360d2ddd2d0e868d17d8e3b0b8327f8cf6b84a3a845199be63bfb7d57ce2e85596d981da7e7abb8f71d6290b9ade4364ef8157ad99663edbfa1cdb24df
+  metadata.gz: a5c6decc852e45640a6b9526b38f1457fb75fe5fb439f53f0d30b8108f50c4817e20398833188ebfdbabc0f88e15f362654256f1ef3457f7ac2554ce083ff87a
+  data.tar.gz: 692dbde9798b2bca0d0db7c62cd47912ba43e6422ba2d159009715a904c9ca277875d69b7271aeefbc01be4f3c23e7a2ca7098a76843c97b027a31d46a34300b

data/.gitignore

@@ -9,3 +9,4 @@ coverage/
 vendor/
 .bundle/
 .sass-cache/
+tmp/

data/.travis.yml

@@ -8,5 +8,11 @@ rvm:
   - 2.1
   - 2.2
 matrix:
+  global:
+    - BUNDLE_JOBS=4
   allow_failures:
     - rvm: rbx-2
+before_install:
+  # Only use 1 job until Travis fixes the rbx --jobs issue.
+  - if [ "$TRAVIS_RUBY_VERSION" == "rbx-2" ] ; then export BUNDLE_JOBS=1 ; fi
+install: bundle install --retry=3

data/Changes.md

@@ -1,7 +1,14 @@
-HEAD
+3.3.0
 -----------
 
-- Deprecate delay extension for ActionMailer 4.2+ . [#1933]
+- Upgrade to Celluloid 0.16 [#2056]
+- Fix typo for generator test file name [dlackty, #2016]
+- Add Sidekiq::Middleware::Chain#prepend [seuros, #2029]
+
+3.2.6
+-----------
+
+- Deprecate delay extension for ActionMailer 4.2+ . [seuros, #1933]
 - Poll interval tuning now accounts for dead processes [epchris, #1984]
 - Add non-production environment to Web UI page titles [JacobEvelyn, #2004]
 

data/Gemfile

@@ -12,6 +12,10 @@ platforms :ruby do
   gem 'sqlite3'
 end
 
+platforms :mri_21 do
+  gem 'pry-byebug'
+end
+
 platforms :jruby do
   gem 'jruby-openssl'
   gem 'activerecord-jdbcsqlite3-adapter'

data/lib/generators/sidekiq/worker_generator.rb

@@ -29,7 +29,7 @@ module Sidekiq
         template_file = File.join(
             'spec/workers',
             class_path,
-            "#{file_name}_spec.rb"
+            "#{file_name}_worker_spec.rb"
         )
         template 'worker_spec.rb.erb', template_file
       end
@@ -38,7 +38,7 @@ module Sidekiq
         template_file = File.join(
             'test/workers',
             class_path,
-            "#{file_name}_test.rb"
+            "#{file_name}_worker_test.rb"
         )
         template 'worker_test.rb.erb', template_file
       end

data/lib/sidekiq/cli.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 $stdout.sync = true
 
 require 'yaml'
@@ -195,9 +196,8 @@ module Sidekiq
       @environment = cli_env || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
     end
 
-    def die(code)
-      exit(code)
-    end
+    alias_method :die, :exit
+    alias_method :☠, :exit
 
     def setup_options(args)
       opts = parse_options(args)

data/lib/sidekiq/launcher.rb

@@ -17,9 +17,10 @@ module Sidekiq
     attr_reader :manager, :poller, :fetcher
 
     def initialize(options)
-      @manager = Sidekiq::Manager.new_link options
+      @condvar = Celluloid::Condition.new
+      @manager = Sidekiq::Manager.new_link(@condvar, options)
       @poller = Sidekiq::Scheduled::Poller.new_link
-      @fetcher = Sidekiq::Fetcher.new_link @manager, options
+      @fetcher = Sidekiq::Fetcher.new_link(@manager, options)
       @manager.fetcher = @fetcher
       @done = false
       @options = options
@@ -49,7 +50,8 @@ module Sidekiq
         poller.terminate if poller.alive?
 
         manager.async.stop(:shutdown => true, :timeout => @options[:timeout])
-        manager.wait(:shutdown) if manager.alive?
+        @condvar.wait
+        manager.terminate
 
         # Requeue everything in case there was a worker who grabbed work while stopped
         # This call is a no-op in Sidekiq but necessary for Sidekiq Pro.

data/lib/sidekiq/manager.rb

@@ -22,11 +22,12 @@ module Sidekiq
 
     SPIN_TIME_FOR_GRACEFUL_SHUTDOWN = 1
 
-    def initialize(options={})
+    def initialize(condvar, options={})
       logger.debug { options.inspect }
       @options = options
       @count = options[:concurrency] || 25
       @done_callback = nil
+      @finished = condvar
 
       @in_progress = {}
       @threads = {}
@@ -183,7 +184,7 @@ module Sidekiq
             end
           end
 
-          signal_shutdown
+          @finished.signal
         end
       end
     end
@@ -204,11 +205,7 @@ module Sidekiq
 
     def shutdown
       requeue
-      signal_shutdown
-    end
-
-    def signal_shutdown
-      after(0) { signal(:shutdown) }
+      @finished.signal
     end
 
     def requeue

data/lib/sidekiq/middleware/chain.rb

@@ -89,6 +89,11 @@ module Sidekiq
         entries << Entry.new(klass, *args)
       end
 
+      def prepend(klass, *args)
+        remove(klass) if exists?(klass)
+        entries.insert(0, Entry.new(klass, *args))
+      end
+
       def insert_before(oldklass, newklass, *args)
         i = entries.index { |entry| entry.klass == newklass }
         new_entry = i.nil? ? Entry.new(newklass, *args) : entries.delete_at(i)

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.2.6"
+  VERSION = "3.3.0"
 end

data/sidekiq.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency                  'redis', '>= 3.0.6'
   gem.add_dependency                  'redis-namespace', '>= 1.3.1'
   gem.add_dependency                  'connection_pool', '>= 2.0.0'
-  gem.add_dependency                  'celluloid', '0.15.2'
+  gem.add_dependency                  'celluloid', '>= 0.16.0'
   gem.add_dependency                  'json'
   gem.add_development_dependency      'sinatra'
   gem.add_development_dependency      'minitest', '~> 5.3.3'

data/test/helper.rb

@@ -15,7 +15,7 @@ if ENV.has_key?("SIMPLECOV")
 end
 
 begin
-  require 'pry'
+  require 'pry-byebug'
 rescue LoadError
 end
 

data/test/test_cli.rb

@@ -31,9 +31,9 @@ class TestCli < Sidekiq::Test
     end
 
     it 'does not boot rails' do
-      refute defined?(::Rails)
+      refute defined?(::Rails::Application)
       @cli.parse(['sidekiq', '-r', './myapp'])
-      refute defined?(::Rails)
+      refute defined?(::Rails::Application)
     end
 
     it 'changes concurrency' do

data/test/test_manager.rb

@@ -9,8 +9,14 @@ class TestManager < Sidekiq::Test
       Sidekiq.redis {|c| c.flushdb }
     end
 
+    def new_manager(opts)
+      condvar = Minitest::Mock.new
+      condvar.expect(:signal, nil, [])
+      Sidekiq::Manager.new(condvar, opts)
+    end
+
     it 'creates N processor instances' do
-      mgr = Sidekiq::Manager.new(options)
+      mgr = new_manager(options)
       assert_equal options[:concurrency], mgr.ready.size
       assert_equal [], mgr.busy
     end
@@ -21,7 +27,7 @@ class TestManager < Sidekiq::Test
       processor.expect(:async, processor, [])
       processor.expect(:process, nil, [uow])
 
-      mgr = Sidekiq::Manager.new(options)
+      mgr = new_manager(options)
       mgr.ready << processor
       mgr.assign(uow)
       assert_equal 1, mgr.busy.size
@@ -33,7 +39,7 @@ class TestManager < Sidekiq::Test
       uow = Minitest::Mock.new
       uow.expect(:requeue, nil, [])
 
-      mgr = Sidekiq::Manager.new(options)
+      mgr = new_manager(options)
       mgr.fetcher = Sidekiq::BasicFetch.new({:queues => []})
       mgr.stop
       mgr.assign(uow)
@@ -41,7 +47,7 @@ class TestManager < Sidekiq::Test
     end
 
     it 'shuts down the system' do
-      mgr = Sidekiq::Manager.new(options)
+      mgr = new_manager(options)
       mgr.fetcher = Sidekiq::BasicFetch.new({:queues => []})
       mgr.stop
 
@@ -53,7 +59,7 @@ class TestManager < Sidekiq::Test
       fetcher = MiniTest::Mock.new
       fetcher.expect :async, fetcher, []
       fetcher.expect :fetch, nil, []
-      mgr = Sidekiq::Manager.new(options)
+      mgr = new_manager(options)
       mgr.fetcher = fetcher
       init_size = mgr.ready.size
       processor = mgr.ready.pop
@@ -69,7 +75,7 @@ class TestManager < Sidekiq::Test
       fetcher = MiniTest::Mock.new
       fetcher.expect :async, fetcher, []
       fetcher.expect :fetch, nil, []
-      mgr = Sidekiq::Manager.new(options)
+      mgr = new_manager(options)
       mgr.fetcher = fetcher
       init_size = mgr.ready.size
       processor = mgr.ready.pop
@@ -90,7 +96,7 @@ class TestManager < Sidekiq::Test
         @processor.expect(:async, @processor, [])
         @processor.expect(:process, nil, [uow])
 
-        @mgr = Sidekiq::Manager.new(options)
+        @mgr = new_manager(options)
         @mgr.ready << @processor
         @mgr.assign(uow)
 

data/test/test_middleware.rb

@@ -96,6 +96,15 @@ class TestMiddleware < Sidekiq::Test
       assert_equal 1, chain.count
     end
 
+    it 'correctly prepends middleware' do
+      chain = Sidekiq::Middleware::Chain.new
+      chain_entries = chain.entries
+      chain.add CustomMiddleware
+      chain.prepend YetAnotherCustomMiddleware
+      assert_equal YetAnotherCustomMiddleware, chain_entries.first.klass
+      assert_equal CustomMiddleware, chain_entries.last.klass
+    end
+
     it 'allows middleware to abruptly stop processing rest of chain' do
       recorder = []
       chain = Sidekiq::Middleware::Chain.new

data/test/test_worker_generator.rb

@@ -0,0 +1,17 @@
+require 'helper'
+require 'rails/generators/test_case'
+require 'generators/sidekiq/worker_generator'
+
+class WorkerGeneratorTest < Rails::Generators::TestCase
+  tests Sidekiq::Generators::WorkerGenerator
+  arguments %w(foo)
+  destination File.expand_path("../tmp", File.dirname(__FILE__))
+  setup :prepare_destination
+
+  test "worker is created and its test" do
+    run_generator
+
+    assert_file "app/workers/foo_worker.rb"
+    assert_file "test/workers/foo_worker_test.rb"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.3.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -56,16 +56,16 @@ dependencies:
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -232,6 +232,7 @@ files:
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
 - test/test_web.rb
+- test/test_worker_generator.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
 - web/assets/images/logo.png
@@ -372,3 +373,4 @@ test_files:
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
 - test/test_web.rb
+- test/test_worker_generator.rb