sidekiq 2.0.0 → 2.0.1

data/Changes.md

@@ -1,3 +1,17 @@
+2.0.1
+-----------
+
+- Add "Clear Workers" button to UI.  If you kill -9 Sidekiq, the workers
+  set can fill up with stale entries.
+- Update sidekiq/testing to support new scheduled jobs API:
+
+   ```ruby
+   require 'sidekiq/testing'
+   DirectWorker.perform_in(10.seconds, 1, 2)
+   assert_equal 1, DirectWorker.jobs.size
+   assert_in_delta 10.seconds.from_now.to_f, DirectWorker.jobs.last['at'], 0.01
+   ```
+
 2.0.0
 -----------
 

data/lib/sidekiq/testing.rb

@@ -30,6 +30,16 @@ module Sidekiq
         true
       end
 
+      alias_method :perform_in_old, :perform_in
+      alias_method :perform_at_old, :perform_at
+      def perform_in(interval, *args)
+        int = interval.to_f
+        ts = (int < 1_000_000_000 ? Time.now.to_f + int : int)
+        jobs << { 'class' => self.name, 'args' => args, 'at' => ts }
+        true
+      end
+      alias_method :perform_at, :perform_in
+
       def jobs
         @pushed ||= []
       end

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/sidekiq/web.rb

@@ -36,6 +36,15 @@ module Sidekiq
 
     helpers do
 
+      def reset_worker_list
+        Sidekiq.redis do |conn|
+          workers = conn.smembers('workers')
+          workers.each do |name|
+            conn.srem('workers', name)
+          end
+        end
+      end
+
       def workers
         @workers ||= begin
           Sidekiq.redis do |conn|
@@ -127,6 +136,11 @@ module Sidekiq
       slim :queue
     end
 
+    post "/reset" do
+      reset_worker_list
+      redirect root_path
+    end
+
     post "/queues/:name" do
       Sidekiq.redis do |conn|
         conn.del("queue:#{params[:name]}")

data/test/test_testing.rb

@@ -53,9 +53,11 @@ class TestTesting < MiniTest::Unit::TestCase
     after do
       # Undo override
       Sidekiq::Worker::ClassMethods.class_eval do
-        remove_method :perform_async
-        alias_method :perform_async, :perform_async_old
-        remove_method :perform_async_old
+        %w(async at in).each do |token|
+          remove_method :"perform_#{token}"
+          alias_method :"perform_#{token}", :"perform_#{token}_old"
+          remove_method :"perform_#{token}_old"
+        end
       end
     end
 
@@ -63,6 +65,11 @@ class TestTesting < MiniTest::Unit::TestCase
       assert_equal 0, DirectWorker.jobs.size
       assert DirectWorker.perform_async(1, 2)
       assert_equal 1, DirectWorker.jobs.size
+      assert DirectWorker.perform_in(10, 1, 2)
+      assert_equal 2, DirectWorker.jobs.size
+      assert DirectWorker.perform_at(10, 1, 2)
+      assert_equal 3, DirectWorker.jobs.size
+      assert_in_delta 10.seconds.from_now.to_f, DirectWorker.jobs.last['at'], 0.01
     end
 
     it 'stubs the delay call on mailers' do

data/web/views/index.slim

@@ -30,6 +30,8 @@
             td= msg['payload']['class']
             td= msg['payload']['args'].inspect[0..100]
             td== relative_time(Time.parse(msg['run_at']))
+      form action="#{root_path}reset" method="post"
+         button.btn type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list
 
     #queues.tab-pane
       table class="table table-striped table-bordered"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70308439006360 !ruby/object:Gem::Requirement
+  requirement: &70196173811640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70308439006360
+  version_requirements: *70196173811640
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70308439005860 !ruby/object:Gem::Requirement
+  requirement: &70196173810860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308439005860
+  version_requirements: *70196173810860
 - !ruby/object:Gem::Dependency
   name: connection_pool
-  requirement: &70308439005040 !ruby/object:Gem::Requirement
+  requirement: &70196173808820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308439005040
+  version_requirements: *70196173808820
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &70308438999880 !ruby/object:Gem::Requirement
+  requirement: &70196173808020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.11.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308438999880
+  version_requirements: *70196173808020
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70308438998500 !ruby/object:Gem::Requirement
+  requirement: &70196173807440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *70308438998500
+  version_requirements: *70196173807440
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70308438997400 !ruby/object:Gem::Requirement
+  requirement: &70196173806860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70308438997400
+  version_requirements: *70196173806860
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70308438996900 !ruby/object:Gem::Requirement
+  requirement: &70196173806360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308438996900
+  version_requirements: *70196173806360
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &70308438996320 !ruby/object:Gem::Requirement
+  requirement: &70196173805420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308438996320
+  version_requirements: *70196173805420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70308438995720 !ruby/object:Gem::Requirement
+  requirement: &70196173804720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70308438995720
+  version_requirements: *70196173804720
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70308438994740 !ruby/object:Gem::Requirement
+  requirement: &70196173803700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70308438994740
+  version_requirements: *70196173803700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70308438992940 !ruby/object:Gem::Requirement
+  requirement: &70196173802600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70308438992940
+  version_requirements: *70196173802600
 description: Simple, efficient message processing for Ruby
 email:
 - mperham@gmail.com