sidekiq-dynamic-queues 0.5.0 → 0.5.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm use jruby-1.7.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.1
+-----
+
+use jruby for dev <bc793df> [Matt Conway]
+hack to translate queues from sidekiq cli since it doesn't allow special characters <ba7b99a> [Matt Conway]
+
 0.5.0
 -----
 

data/lib/sidekiq/dynamic_queues/fetch.rb

@@ -11,7 +11,7 @@ module Sidekiq
       
       def initialize(options)
         super
-        @dynamic_queues = options[:queues]
+        @dynamic_queues = self.class.translate_from_cli(*options[:queues])
       end
   
       # overriding Sidekiq::BasicFetch#queues_cmd
@@ -77,6 +77,13 @@ module Sidekiq
 
         return matched_queues.collect { |q| "queue:#{q}" }.uniq.sort
       end
+
+      
+      def self.translate_from_cli(*queues)
+        queues.collect do |queue|
+          queue.gsub('.star.', '*').gsub('.at.', '@').gsub('.not.', '!')
+        end
+      end
       
     end
     

data/lib/sidekiq/dynamic_queues/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module DynamicQueues
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/spec/queues_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 describe "Dynamic Queues" do
 
   include Sidekiq::DynamicQueues::Attributes
+  Fetch = Sidekiq::DynamicQueues::Fetch
   
   def watch_queues(*queues)
     Sidekiq.redis do |r|
@@ -16,28 +17,6 @@ describe "Dynamic Queues" do
     Sidekiq.redis {|r| r.flushall }
   end
 
-  context "basic behavior still works" do
-
-    it "can work on different queues" do
-      SomeJob.perform_async(1)
-      run_queues("default")
-      SomeJob.result.should eq [1] 
-      enqueue_on("other", SomeJob, 2)
-      run_queues("other")
-      SomeJob.result.should eq [2] 
-    end
-
-    it "can work on multiple queues" do
-      SomeJob.perform_async(1)
-      run_queues("other", "default")
-      SomeJob.result.should eq [1] 
-      enqueue_on("other", SomeJob, 2)
-      run_queues("default", "other")
-      SomeJob.result.should eq [2] 
-    end
-
-  end
-
   context "attributes" do
 
     it "should always have a fallback pattern" do
@@ -72,12 +51,42 @@ describe "Dynamic Queues" do
       get_dynamic_queues.should == {'default' => ['*']}
     end
     
+  end
+  
+  context "#translate_from_cli" do
+    
+    it "passes through reqular queue name" do
+      translated = Fetch.translate_from_cli("foo", "baz.bar", "bo_o", "bu-m")
+      translated.should eq ["foo", "baz.bar", "bo_o", "bu-m"] 
+    end
+    
+    it "translates *" do
+      translated = Fetch.translate_from_cli(".star.", ".star.foo",
+                                            "foo.star.", "f.star.o")
+      translated.should eq ["*", "*foo", "foo*", "f*o"] 
+    end
+    
+    it "translates !" do
+      translated = Fetch.translate_from_cli(".not.", ".not.foo",
+                                            "foo.not.", "f.not.o")
+      translated.should eq ["!", "!foo", "foo!", "f!o"] 
+    end
+    
+    it "translates @" do
+      translated = Fetch.translate_from_cli(".at.", ".at.foo",
+                                            "foo.at.", "f.at.o")
+      translated.should eq ["@", "@foo", "foo@", "f@o"] 
+    end
+    
+    it "translates multiple" do
+      translated = Fetch.translate_from_cli(".not..star.", ".not..at.foo")
+      translated.should eq ["!*", "!@foo"] 
+    end
     
   end
   
   context "basic queue patterns" do
 
-    Fetch = Sidekiq::DynamicQueues::Fetch
     SFTO = Sidekiq::Fetcher::TIMEOUT
     
     before(:each) do
@@ -195,4 +204,44 @@ describe "Dynamic Queues" do
 
   end
 
+  context "integration" do
+    before(:all) do
+      Sidekiq.options[:fetch] = Sidekiq::DynamicQueues::Fetch
+      Sidekiq.options[:queue_refresh_timeout] = 0.01
+    end
+    
+    it "does use the correct fetch strategy" do
+      Sidekiq::Fetcher.strategy.should eq Sidekiq::DynamicQueues::Fetch
+    end
+
+    it "can work on different queues" do
+      SomeJob.perform_async(1)
+      run_queues("default")
+      SomeJob.result.should eq [1] 
+      enqueue_on("other", SomeJob, 2)
+      run_queues("other")
+      SomeJob.result.should eq [2]
+      
+    end
+
+    it "can work on multiple queues" do
+      SomeJob.perform_async(1)
+      run_queues("other", "default")
+      SomeJob.result.should eq [1] 
+      enqueue_on("other", SomeJob, 2)
+      run_queues("default", "other")
+      SomeJob.result.should eq [2] 
+    end
+
+    it "finds work on dynamic queue that doesn't exist till after" do
+      watch_queues(*%w[default])
+      manager = run_queues("*", :async => true)
+      sleep 0.2
+      enqueue_on("other", SomeJob, 1)
+      manager.wait(:shutdown)
+      SomeJob.result.should eq [1] 
+    end
+
+  end
+  
 end

data/spec/spec_helper.rb

@@ -70,15 +70,24 @@ def enqueue_on(queue, job_class, *job_args)
 end
 
 def run_queues(*queues)
+  options = queues.last.is_a?(Hash) ? queues.pop : {}
+  options = {:async => false, :job_count => 1}.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
-    manager.async.stop(:shutdown => true, :timeout => 0)
+    job_count += 1
+    yield if block_given?
+    if job_count >= options[:job_count].to_i
+      manager.stop(:shutdown => true, :timeout => 0)
+    end
   end
-  manager.async.start
+  manager.start
   
-  manager.wait(:shutdown)
+  manager.wait(:shutdown) unless options[:async]
+  manager
 end
 
 

metadata

@@ -1,122 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-dynamic-queues
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  prerelease:
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt Conway
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.4
-description: A sidekiq plugin for specifying the queues a worker pulls from with wildcards,
-  negations, or dynamic look up from redis
+    none: false
+  prerelease: false
+  type: :development
+description: A sidekiq plugin for specifying the queues a worker pulls from with wildcards, negations, or dynamic look up from redis
 email:
 - matt@conwaysplace.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rvmrc"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -138,32 +144,33 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: sidekiq-dynamic-queues
-rubygems_version: 1.8.25
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
-summary: A sidekiq plugin for specifying the queues a worker pulls from with wildcards,
-  negations, or dynamic look up from redis
+summary: A sidekiq plugin for specifying the queues a worker pulls from with wildcards, negations, or dynamic look up from redis
 test_files:
 - spec/queues_spec.rb
 - spec/redis-test.conf
 - spec/server_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 
+has_rdoc: