sidekiq 3.5.4 → 4.0.0

data/test/test_scheduled.rb

@@ -37,7 +37,7 @@ class TestScheduled < Sidekiq::Test
         @scheduled.schedule (Time.now - 60).to_f, @future_2
         @scheduled.schedule (Time.now - 60).to_f, @future_3
 
-        @poller.poll
+        @poller.enqueue
 
         assert_equal 0, Sidekiq::Queue.new("queue_1").size
         assert_equal 1, Sidekiq::Queue.new("queue_2").size
@@ -62,7 +62,7 @@ class TestScheduled < Sidekiq::Test
       end
 
       Time.stub(:now, enqueued_time) do
-        @poller.poll
+        @poller.enqueue
 
         Sidekiq.redis do |conn|
           %w(queue:queue_1 queue:queue_2 queue:queue_4 queue:queue_5).each do |queue_name|

data/test/test_testing_fake.rb

@@ -54,6 +54,7 @@ class TestTesting < Sidekiq::Test
 
     after do
       Sidekiq::Testing.disable!
+      Sidekiq::Queues.clear_all
     end
 
     it 'stubs the async call' do
@@ -93,7 +94,7 @@ class TestTesting < Sidekiq::Test
     it 'stubs the enqueue_to call' do
       assert_equal 0, EnqueuedWorker.jobs.size
       assert Sidekiq::Client.enqueue_to('someq', EnqueuedWorker, 1, 2)
-      assert_equal 1, EnqueuedWorker.jobs.size
+      assert_equal 1, Sidekiq::Queues['someq'].size
     end
 
     it 'executes all stored jobs' do
@@ -263,6 +264,68 @@ class TestTesting < Sidekiq::Test
     it 'can execute a job' do
       DirectWorker.execute_job(DirectWorker.new, [2, 3])
     end
+  end
+
+  describe 'queue testing' do
+    before do
+      require 'sidekiq/testing'
+      Sidekiq::Testing.fake!
+    end
+
+    after do
+      Sidekiq::Testing.disable!
+      Sidekiq::Queues.clear_all
+    end
 
+    class QueueWorker
+      include Sidekiq::Worker
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    class AltQueueWorker
+      include Sidekiq::Worker
+      sidekiq_options queue: :alt
+      def perform(a, b)
+        a + b
+      end
+    end
+
+    it 'finds enqueued jobs' do
+      assert_equal 0, Sidekiq::Queues["default"].size
+
+      QueueWorker.perform_async(1, 2)
+      QueueWorker.perform_async(1, 2)
+      AltQueueWorker.perform_async(1, 2)
+
+      assert_equal 2, Sidekiq::Queues["default"].size
+      assert_equal [1, 2], Sidekiq::Queues["default"].first["args"]
+
+      assert_equal 1, Sidekiq::Queues["alt"].size
+    end
+
+    it 'clears out all queues' do
+      assert_equal 0, Sidekiq::Queues["default"].size
+
+      QueueWorker.perform_async(1, 2)
+      QueueWorker.perform_async(1, 2)
+      AltQueueWorker.perform_async(1, 2)
+
+      Sidekiq::Queues.clear_all
+
+      assert_equal 0, Sidekiq::Queues["default"].size
+      assert_equal 0, Sidekiq::Queues["alt"].size
+    end
+
+    it 'finds jobs enqueued by client' do
+      Sidekiq::Client.push(
+        'class' => 'NonExistentWorker',
+        'queue' => 'missing',
+        'args' => [1]
+      )
+
+      assert_equal 1, Sidekiq::Queues["missing"].size
+    end
   end
 end

data/web/assets/stylesheets/application.css

@@ -748,3 +748,7 @@ div.interval-slider input {
     max-width: 350px;
   }
 }
+
+.redis-url {
+  text-overflow: ellipsis;
+}

data/web/views/_footer.erb

@@ -6,16 +6,11 @@
             <p class="navbar-text" style="color:white;"><%= product_version %></p>
           </li>
           <li>
-            <p class="navbar-text redis-url">Redis: <%= redis_connection %></p>
+            <p class="navbar-text redis-url" title="<%= redis_connection_and_namespace %>"><%= redis_connection_and_namespace %></p>
           </li>
           <li>
-            <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
+            <p class="navbar-text"><%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
           </li>
-          <% if namespace %>
-              <li>
-                <p class="navbar-text redis-namespace"><%= t('Namespace') %>: <%= namespace %></p>
-              </li>
-          <% end %>
         </ul>
     </div>
   </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -31,73 +31,73 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.1
 - !ruby/object:Gem::Dependency
-  name: redis-namespace
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - 3.0-Upgrade.md
+- 4.0-Upgrade.md
 - COMM-LICENSE
 - Changes.md
 - Contributing.md
@@ -191,6 +192,7 @@ files:
 - Gemfile
 - LICENSE
 - Pro-2.0-Upgrade.md
+- Pro-3.0-Upgrade.md
 - Pro-Changes.md
 - README.md
 - Rakefile
@@ -202,7 +204,6 @@ files:
 - lib/generators/sidekiq/templates/worker_test.rb.erb
 - lib/generators/sidekiq/worker_generator.rb
 - lib/sidekiq.rb
-- lib/sidekiq/actor.rb
 - lib/sidekiq/api.rb
 - lib/sidekiq/cli.rb
 - lib/sidekiq/client.rb
@@ -239,12 +240,14 @@ files:
 - test/fake_env.rb
 - test/fixtures/en.yml
 - test/helper.rb
+- test/test_actors.rb
 - test/test_api.rb
 - test/test_cli.rb
 - test/test_client.rb
 - test/test_exception_handler.rb
 - test/test_extensions.rb
 - test/test_fetch.rb
+- test/test_launcher.rb
 - test/test_logging.rb
 - test/test_manager.rb
 - test/test_middleware.rb
@@ -378,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple, efficient background processing for Ruby
@@ -388,12 +391,14 @@ test_files:
 - test/fake_env.rb
 - test/fixtures/en.yml
 - test/helper.rb
+- test/test_actors.rb
 - test/test_api.rb
 - test/test_cli.rb
 - test/test_client.rb
 - test/test_exception_handler.rb
 - test/test_extensions.rb
 - test/test_fetch.rb
+- test/test_launcher.rb
 - test/test_logging.rb
 - test/test_manager.rb
 - test/test_middleware.rb

data/lib/sidekiq/actor.rb

@@ -1,39 +0,0 @@
-module Sidekiq
-  module Actor
-
-    module ClassMethods
-      def trap_exit(*args)
-      end
-      def new_link(*args)
-        new(*args)
-      end
-    end
-
-    module InstanceMethods
-      def current_actor
-        self
-      end
-      def after(interval)
-      end
-      def alive?
-        @dead = false unless defined?(@dead)
-        !@dead
-      end
-      def terminate
-        @dead = true
-      end
-      def defer
-        yield
-      end
-    end
-
-    def self.included(klass)
-      if $TESTING
-        klass.__send__(:include, InstanceMethods)
-        klass.__send__(:extend, ClassMethods)
-      else
-        klass.__send__(:include, Celluloid)
-      end
-    end
-  end
-end