resque-queue-priority 0.6.0 → 0.6.1

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,8 @@
+0.6.0
+-----
+
+Allow multiple patterns per priority bucket, along with negation patterns
+
 0.5.3
 -----
 

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

@@ -2,6 +2,8 @@ A resque plugin for specifying the order a worker will prioritize queues in.
 
 Authored against Resque 1.17.1, so it at least works with that - try running the tests if you use a different version of resque
 
+[![Build Status](https://secure.travis-ci.org/wr0ngway/resque-queue-priority.png)](http://travis-ci.org/wr0ngway/resque-queue-priority)
+
 Usage:
 
 Start your workers with a QUEUE that contains many queue names - this plugin is most useful when using '\*' or a plugin like resque-dynamic-queues.

data/lib/resque/plugins/queue_priority/priority.rb

@@ -37,7 +37,7 @@ module Resque
             patterns.each do |pattern|
               pattern = pattern.strip
               
-              if pattern[0] == '!'
+              if pattern =~ /^!/
                 negated = true
                 pattern = pattern[1..-1]
               end

data/lib/resque/plugins/queue_priority/server.rb

@@ -18,7 +18,7 @@ module Resque
           app.post "/queuepriority" do
             priorities = params['priorities']
             Resque.priority_buckets = priorities
-            redirect url(:queuepriority)
+            redirect "/queuepriority"
           end
 
           app.helpers do

data/lib/resque/plugins/queue_priority/server/views/priorities.erb

@@ -3,7 +3,7 @@
   The list below orders queue name patterns by the priority you wish them to be executed in.  The "Fairly" option allows you to indicate you want the queues within that pattern space be selected in a fair (random) manner, i.e. like resque-fairly.  The 'default' pattern must always exist, and matches against all queues that aren't in any of the other patterns.
 </p>
 
-<form action="<%= url(:queuepriority) %>" method="POST" style="float:none; margin-top:10px">
+<form action="/queuepriority" method="POST" style="float:none; margin-top:10px">
 
   <table class="priorities">
     <tr>

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

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module QueuePriority
-      VERSION = "0.6.0"
+      VERSION = "0.6.1"
     end
   end
 end

data/resque-queue-priority.gemspec

@@ -21,9 +21,15 @@ 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')
+  # Needed for correct ordering when passing hash params to rack-test
+  s.add_development_dependency('orderedhash')
+
 end
 

data/spec/priority_spec.rb

@@ -84,10 +84,12 @@ describe "Queue Priority" do
     end
 
     it "should pick up all queues fairly" do
+      # do a bunch to reduce likyhood of random match causing test failure
+      50.times {|i| Resque.watch_queue("auto_#{i}") }
       Resque.priority_buckets = [{'pattern' => 'default', 'fairly' => true}]
       worker = Resque::Worker.new("*")
-      worker.queues.should_not == ["foo", "high_x", "high_y", "superhigh_z"]
-      worker.queues.sort.should == ["foo", "high_x", "high_y", "superhigh_z"]
+      worker.queues.should_not == Resque.queues.sort
+      worker.queues.sort.should == Resque.queues.sort
     end
 
     it "should prioritize simple pattern" do

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/server_spec.rb

@@ -5,6 +5,7 @@ require 'rack'
 require 'rack/test'
 require 'resque/server'
 require 'resque-queue-priority-server'
+require 'orderedhash'
 
 Sinatra::Base.set :environment, :test
 # ::Test::Unit::TestCase.send :include, Rack::Test::Methods
@@ -96,15 +97,18 @@ describe "Queue Priority pages" do
     it "should have form to edit queues" do
       get "/queuepriority"
 
-      last_response.body.should match /<form action="http:\/\/example.org\/queuepriority"/
+      last_response.body.should match /<form action="\/queuepriority"/
     end
 
     it "should update queues" do
       Resque.priority_buckets.should == [{'pattern' => 'default'}]
 
-      post "/queuepriority", {'priorities' => [{"pattern" => "foo"},
-                                              {"pattern" => "default"},
-                                              {"pattern" => "bar", "fairly" => "true"}]}
+      params = {'priorities' => [
+          OrderedHash["pattern", "foo"],
+          OrderedHash["pattern", "default"],
+          OrderedHash["pattern", "bar", "fairly", "true"]
+      ]}
+      post "/queuepriority", params 
 
       last_response.should be_redirect
       last_response['Location'].should match /queuepriority/

data/spec/spec_helper.rb

@@ -1,17 +1,29 @@
 require 'rspec'
 require 'resque-queue-priority'
 
-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-queue-priority
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-19 00:00:00.000000000Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2154438400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.10'
   type: :runtime
   prerelease: false
-  version_requirements: *2154438400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154437980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154437980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154437440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2154437440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2154436940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,44 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2154436940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: orderedhash
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A resque plugin for specifying the priority between queues that workers
   use to determine what to work on next
 email:
@@ -64,8 +116,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - config.ru
@@ -101,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: resque-queue-priority
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: A resque plugin for specifying the priority between queues that workers use