resque-dynamic-queues 0.7.1 → 0.8.0

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  # - rbx-19mode
+script: bundle exec rspec spec

data/CHANGELOG

@@ -1,3 +1,24 @@
+0.8.0
+-----
+
+Merge pull request #5 from kcrayon/master <016ae7c> [Matt Conway]
+Add test for dynamic queue with negation <5f50574> [Chris Zutler]
+Moving shuffling into branch. <a4360eb> [Chris Zutler]
+Sort view of queues in web. <af53da5> [Chris Zutler]
+Merge pull request #1 from snmaynard/patch-2 <92b437c> [kcrayon]
+Shuffle the matching queues <f11585f> [Simon Maynard]
+Slightly smarther dynamic queue negation. <184fa03> [Chris Zutler]
+Add ability to blacklist dynamic queues. <d66b81b> [Chris Zutler]
+Fix code blocks <75b782f> [Matt Conway]
+Merge pull request #4 from billywatson/add_extra_tips_to_readme <25e6337> [Matt Conway]
+add require note and document custom rake task ex. <78b6d6c> [William Watson]
+only auto start/stop redis if not on CI <21ec8e0> [Matt Conway]
+fix for rbx <94407b4> [Matt Conway]
+fix for ruby 1.8 <2a50fbf> [Matt Conway]
+enable travis ci <e8c0c16> [Matt Conway]
+license date <bda1ae5> [Matt Conway]
+license <498c222> [Matt Conway]
+
 0.7.1
 -----
 

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2011 Matt Conway (matt@conwaysplace.com)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -4,46 +4,59 @@ Authored against Resque 1.15, so it at least works with that - try running the t
 
 Usage:
 
+If creating a gem of your own that uses resque-dynamic-queues, you may have to add an explicit require statement at the top of your Rakefile:
+
+    require 'resque-dynamic-queues'
+
 Start your workers with a QUEUE that can contain '\*' for zero-or more of any character, '!' to exclude the following pattern, or @key to look up the patterns from redis.  Some examples help:
 
-QUEUE='foo' rake resque:work
+    QUEUE='foo' rake resque:work
+
+Pulls jobs from the queue 'foo'
+
+    QUEUE='*' rake resque:work
 
-  Pulls jobs from the queue 'foo'
+Pulls jobs from any queue
 
-QUEUE='\*' rake resque:work
+    QUEUE='*foo' rake resque:work
 
-  Pulls jobs from any queue
+Pulls jobs from queues that end in foo
 
-QUEUE='\*foo' rake resque:work
+    QUEUE='*foo*' rake resque:work
 
-  Pulls jobs from queues that end in foo
+Pulls jobs from queues whose names contain foo
 
-QUEUE='\*foo\*' rake resque:work
+    QUEUE='*foo*,!foobar' rake resque:work
 
-  Pulls jobs from queues whose names contain foo
+Pulls jobs from queues whose names contain foo except the foobar queue
 
-QUEUE='\*foo\*,!foobar' rake resque:work
+    QUEUE='*foo*,!*bar' rake resque:work
 
-  Pulls jobs from queues whose names contain foo except the foobar queue
+Pulls jobs from queues whose names contain foo except queues whose names end in bar
 
-QUEUE='\*foo\*,!\*bar' rake resque:work
+    QUEUE='@key' rake resque:work
 
-  Pulls jobs from queues whose names contain foo except queues whose names end in bar
+Pulls jobs from queue names stored in redis (use Resque.set\_dynamic\_queue("key", ["queuename1", "queuename2"]) to set them)
 
-QUEUE='@key' rake resque:work
+    QUEUE='*,!@key' rake resque:work
 
-  Pulls jobs from queue names stored in redis (use Resque.set\_dynamic\_queue("key", ["queuename1", "queuename2"]) to set them)
+Pulls jobs from any queue execept ones stored in redis
 
-QUEUE='@' rake resque:work
+    QUEUE='@' rake resque:work
 
-  Pulls jobs from queue names stored in redis using the hostname of the worker
+Pulls jobs from queue names stored in redis using the hostname of the worker
 
-Resque.set\_dynamic\_queue("key", ["\*foo\*", "!\*bar"])
+    Resque.set_dynamic_queue("key", ["*foo*", "!*bar"])
+    QUEUE='@key' rake resque:work
 
-QUEUE='@key' rake resque:work
+Pulls jobs from queue names stored in redis, with wildcards/negations
 
-  Pulls jobs from queue names stored in redis, with wildcards/negations
+    task :custom_worker do
+      ENV['QUEUE'] = "*foo*,!*bar"
+      Rake::Task['resque:work'].invoke
+    end
 
+From a custom rake script
 
 
 There is also a tab in the resque-web UI that allows you to define the dynamic queues  To activate it, you need to require 'resque-dynamic-queues-server' in whatever initializer you use to bring up resque-web.

data/lib/resque/plugins/dynamic_queues/queues.rb

@@ -24,17 +24,21 @@ module Resque
           real_queues = Resque.queues
           matched_queues = []
 
-          queue_names.each do |q|
+          while q = queue_names.shift
             q = q.to_s
 
-            if q =~ /^@(.*)/
-              key = $1.strip
+            if q =~ /^(!)?@(.*)/
+              key = $2.strip
               key = hostname if key.size == 0
-              queue_names.concat(Resque.get_dynamic_queue(key))
+
+              add_queues = Resque.get_dynamic_queue(key)
+              add_queues.map! { |q| q.gsub!(/^!/, '') || q.gsub!(/^/, '!') } if $1
+
+              queue_names.concat(add_queues)
               next
             end
 
-            if q[0] == '!'
+            if q =~ /^!/
               negated = true
               q = q[1..-1]
             end

data/lib/resque/plugins/dynamic_queues/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module DynamicQueues
-      VERSION = "0.7.1"
+      VERSION = "0.8.0"
     end
   end
 end

data/resque-dynamic-queues.gemspec

@@ -21,8 +21,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("resque", '~> 1.10')
+
+  s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 2.5')
   s.add_development_dependency('rack-test', '~> 0.5.4')
 
+  # Needed for testing newer resque on ruby 1.8.7
+  s.add_development_dependency('json')
+
 end
 

data/spec/queues_spec.rb

@@ -144,6 +144,28 @@ describe "Dynamic Queues" do
       worker.queues.should == ["bar", "foo"]
     end
 
+    it "can blacklist dynamic queues" do
+      Resque.watch_queue("high_x")
+      Resque.watch_queue("foo")
+      Resque.watch_queue("high_y")
+      Resque.watch_queue("superhigh_z")
+
+      Resque.set_dynamic_queue("mykey", ["foo"])
+      worker = Resque::Worker.new("*", "!@mykey")
+      worker.queues.should == ["high_x", "high_y", "superhigh_z"]
+    end
+
+    it "can blacklist dynamic queues with negation" do
+      Resque.watch_queue("high_x")
+      Resque.watch_queue("foo")
+      Resque.watch_queue("high_y")
+      Resque.watch_queue("superhigh_z")
+
+      Resque.set_dynamic_queue("mykey", ["!foo", "high_x"])
+      worker = Resque::Worker.new("!@mykey")
+      worker.queues.should == ["foo"]
+    end
+
     it "will not bloat the workers queue" do
       Resque.watch_queue("high_x")
       worker = Resque::Worker.new("@mykey")

data/spec/redis-test.conf

@@ -21,7 +21,7 @@ daemonize yes
 pidfile ./redis.pid
 
 # Accept connections on the specified port, default is 6379
-port 9736
+port 6379
 
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for incoming connections.

data/spec/spec_helper.rb

@@ -1,17 +1,29 @@
 require 'rspec'
 require 'resque-dynamic-queues'
 
-spec_dir = File.dirname(File.expand_path(__FILE__))
-REDIS_CMD = "redis-server #{spec_dir}/redis-test.conf"
+# No need to start redis when running in Travis
+unless ENV['CI']
 
-puts "Starting redis for testing at localhost:9736..."
-puts `cd #{spec_dir}; #{REDIS_CMD}`
-Resque.redis = 'localhost:9736'
-
-# Schedule the redis server for shutdown when tests are all finished.
-at_exit do
-  pid = File.read("#{spec_dir}/redis.pid").to_i rescue nil
-  system ("kill #{pid}") if pid != 0
+  begin
+    Resque.queues
+  rescue Errno::ECONNREFUSED
+    spec_dir = File.dirname(File.expand_path(__FILE__))
+    REDIS_CMD = "redis-server #{spec_dir}/redis-test.conf"
+    
+    puts "Starting redis for testing at localhost..."
+    puts `cd #{spec_dir}; #{REDIS_CMD}`
+    
+    # Schedule the redis server for shutdown when tests are all finished.
+    at_exit do
+      puts 'Stopping redis'
+      pid = File.read("#{spec_dir}/redis.pid").to_i rescue nil
+      system ("kill -9 #{pid}") if pid.to_i != 0
+      File.delete("#{spec_dir}/redis.pid") rescue nil
+      File.delete("#{spec_dir}/redis-server.log") rescue nil
+      File.delete("#{spec_dir}/dump.rdb") rescue nil
+    end
+  end
+  
 end
 
 class SomeJob

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-dynamic-queues
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2284670420 !ruby/object:Gem::Requirement
+  requirement: &70360381659380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '1.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2284670420
+  version_requirements: *70360381659380
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70360381658480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70360381658480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2284669920 !ruby/object:Gem::Requirement
+  requirement: &70360381656740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2284669920
+  version_requirements: *70360381656740
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2284669460 !ruby/object:Gem::Requirement
+  requirement: &70360381655900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +54,18 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2284669460
+  version_requirements: *70360381655900
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70360381655180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70360381655180
 description: A resque plugin for specifying the queues a worker pulls from with wildcards,
   negations, or dynamic look up from redis
 email:
@@ -53,8 +75,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - config.ru
@@ -91,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: resque-dynamic-queues
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A resque plugin for specifying the queues a worker pulls from with wildcards,