sidekiq-dynamic-queues 0.5.4 → 0.5.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.5 (06/13/2013)
+------------------
+
+fix celluloid dependency bug <280892e> [Michael Wu]
+fix integration tests <c715333> [Matt Conway]
+
 0.5.4
 -----
 

data/lib/sidekiq-dynamic-queues.rb

@@ -1,3 +1,8 @@
 require 'sidekiq'
 require 'sidekiq/dynamic_queues/attributes'
-require 'sidekiq/dynamic_queues/fetch'
+
+module Sidekiq
+  module DynamicQueues
+    autoload :Fetch, 'sidekiq/dynamic_queues/fetch'
+  end
+end

data/lib/sidekiq/dynamic_queues/fetch.rb

@@ -1,4 +1,4 @@
-require 'sidekiq/fetch'
+require 'forwardable'
 
 module Sidekiq
   module DynamicQueues

data/lib/sidekiq/dynamic_queues/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module DynamicQueues
-    VERSION = "0.5.4"
+    VERSION = "0.5.5"
   end
 end

data/spec/queues_spec.rb

@@ -240,12 +240,21 @@ describe "Dynamic Queues" do
       SomeJob.result.should eq [2] 
     end
 
-    it "finds work on dynamic queue that doesn't exist till after" do
+    it "finds work on dynamic queue that doesn't exist till after sidekiq is waiting for jobs" do
       watch_queues(*%w[default])
       manager = run_queues("*", :async => true)
-      sleep 0.2
+      # give run_queues a chance to block on only the default queue given above
+      sleep 0.1 
+      
       enqueue_on("other", SomeJob, 1)
-      manager.wait(:shutdown)
+      
+      # sidekiq brpop's with a timeout of 1, so we need to wait longer than
+      # that for it to re-evaluate the dynamic queues
+      sleep 2
+      timeout(5) do
+        manager.async.stop(:shutdown => true, :timeout => 1)
+        manager.wait(:shutdown)
+      end
       SomeJob.result.should eq [1] 
     end
 

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
 require 'rspec'
 require 'sidekiq-dynamic-queues'
+require 'celluloid'
+require 'sidekiq'
+require 'sidekiq/fetch'
+require 'sidekiq/cli'
+require 'sidekiq/manager'
+
+Sidekiq.logger.level = Logger::DEBUG
+Celluloid.logger = Sidekiq.logger = nil
 
 # No need to start redis when running in Travis
 unless ENV['CI']
@@ -45,10 +53,6 @@ def dump_redis
   return result
 end
 
-require 'sidekiq'
-require 'celluloid'
-require 'sidekiq/cli'
-require 'sidekiq/manager'
 
 Sidekiq.configure_client do |config|
   config.redis = { :namespace => 'sidekiq',
@@ -61,9 +65,6 @@ Sidekiq.configure_server do |config|
                    :url => 'redis://localhost:6379/1' }
 end
 
-Celluloid.logger = nil
-Sidekiq.logger = nil
-#Celluloid.logger = Sidekiq.logger
 
 def enqueue_on(queue, job_class, *job_args)
   job_class.client_push('class' => job_class, 'args' => job_args, 'queue' => queue)
@@ -71,26 +72,26 @@ end
 
 def run_queues(*queues)
   options = queues.last.is_a?(Hash) ? queues.pop : {}
-  options = {:async => false, :job_count => 1}.merge(options)
-  
+  options = {:async => false, :timeout => 5}.merge(options)
   Sidekiq::Fetcher.instance_eval { @done = false }
   manager = Sidekiq::Manager.new({:queues=>queues, :concurrency=>1, :timeout=>1})
 
-  job_count = 0
-  manager.when_done do
-    job_count += 1
-    yield if block_given?
-    if job_count >= options[:job_count].to_i
-      manager.stop(:shutdown => true, :timeout => 0)
+  manager.start
+  
+  unless options[:async]
+    # give up control so jobs can start running before we call stop
+    # Manager.when_done only gets called for jobs that succeed, not jobs that raise
+    sleep 0.1
+    manager.async.stop(:shutdown => true, :timeout => 1)
+
+    timeout(options[:timeout]) do
+      manager.wait(:shutdown)
     end
   end
-  manager.start
   
-  manager.wait(:shutdown) unless options[:async]
   manager
 end
 
-
 class SomeJob
   include Sidekiq::Worker
   

metadata

@@ -2,14 +2,14 @@
 name: sidekiq-dynamic-queues
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Matt Conway
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq