resque 1.12.0 → 1.13.0

data/HISTORY.md

@@ -1,3 +1,10 @@
+## 1.13.0 (2011-02-07)
+
+* Depend on redis-namespace >= 0.10
+* README tweaks
+* Use thread_safe option when setting redis url
+* Bugfix: worker pruning
+
 ## 1.12.0 (2011-02-03)
 
 * Added pidfile writing from `rake resque:work`

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009, 2010 Chris Wanstrath
+Copyright (c) Chris Wanstrath
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -535,7 +535,7 @@ together. But, it's not that hard.
 Resque Dependencies
 -------------------
 
-    gem install redis redis-namespace yajl-ruby
+    gem install redis redis-namespace yajl-ruby vegas sinatra
 
 If you cannot install `yajl-ruby` (JRuby?), you can install the `json`
 gem and Resque will use it instead.
@@ -759,7 +759,7 @@ Once you've made your great commits:
 1. [Fork][1] Resque
 2. Create a topic branch - `git checkout -b my_branch`
 3. Push to your branch - `git push origin my_branch`
-4. Create an [Issue][2] with a link to your branch
+4. Create a [Pull Request](http://help.github.com/pull-requests/) from your branch
 5. That's it!
 
 You might want to checkout our [Contributing][cb] wiki page for information

data/bin/resque

@@ -1,7 +1,40 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+begin
+  require 'redis-namespace'
+rescue LoadError
+  require 'rubygems'
+  require 'redis-namespace'
+end
 require 'resque'
+require 'optparse'
+
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: resque [options] COMMAND"
+
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-r", "--redis [HOST:PORT]", "Redis connection string") do |host|
+    Resque.redis = host
+  end
+
+  opts.on("-N", "--namespace [NAMESPACE]", "Redis namespace") do |namespace|
+    Resque.redis.namespace = namespace
+  end
+
+  opts.on("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+  opts.separator ""
+  opts.separator "Commands:"
+  opts.separator "  remove WORKER   Removes a worker"
+  opts.separator "  kill WORKER     Kills a worker"
+  opts.separator "  list            Lists known workers"
+end
 
 def kill(worker)
   abort "** resque kill WORKER_ID" if worker.nil?
@@ -34,11 +67,7 @@ def list
   end
 end
 
-if (i = ARGV.index('-r')) && ARGV[i+1]
-  Resque.redis = ARGV[i+1]
-  ARGV.delete_at(i)
-  ARGV.delete_at(i+1)
-end
+parser.parse!
 
 case ARGV[0]
 when 'kill'
@@ -48,10 +77,5 @@ when 'remove'
 when 'list'
   list
 else
-  puts "Usage: resque [-r redis_host:redis_port] COMMAND [option]"
-  puts
-  puts "Commands:"
-  puts "  remove WORKER   Removes a worker"
-  puts "  kill WORKER     Kills a worker"
-  puts "  list            Lists known workers"
+  puts parser.help
 end

data/lib/resque.rb

@@ -33,7 +33,7 @@ module Resque
   def redis=(server)
     if server.respond_to? :split
       if server =~ /redis\:\/\//
-        redis = Redis.connect(:url => server)
+        redis = Redis.connect(:url => server, :thread_safe => true)
       else
         server, namespace = server.split('/', 2)
         host, port, db = server.split(':')

data/lib/resque/errors.rb

@@ -4,7 +4,7 @@ module Resque
 
   # Raised when trying to create a job without a class
   class NoClassError < RuntimeError; end
-  
+
   # Raised when a worker was killed while processing a job.
   class DirtyExit < RuntimeError; end
 end

data/lib/resque/failure.rb

@@ -53,12 +53,12 @@ module Resque
     def self.url
       backend.url
     end
-    
+
     # Clear all failure jobs
     def self.clear
       backend.clear
     end
-    
+
     def self.requeue(index)
       backend.requeue(index)
     end

data/lib/resque/server/test_helper.rb

@@ -5,15 +5,15 @@ module Resque
   module TestHelper
     class Test::Unit::TestCase
       include Rack::Test::Methods
-      def app 
+      def app
         Resque::Server.new
       end 
 
       def self.should_respond_with_success
         test "should respond with success" do
           assert last_response.ok?, last_response.errors
-        end 
-      end 
+        end
+      end
     end
   end
 end

data/lib/resque/server/views/key_sets.erb

@@ -4,7 +4,6 @@
     Showing <%= start = params[:start].to_i %> to <%= start + 20 %> of <b><%=size = redis_get_size(key) %></b>
   </p>
 
-    
   <h1>Key "<%= key %>" is a <%= resque.redis.type key %></h1>
   <table>
     <% for row in redis_get_value_as_array(key, start) %>

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.12.0'
+  Version = VERSION = '1.13.0'
 end

data/lib/resque/worker.rb

@@ -470,7 +470,7 @@ module Resque
     # Returns an array of string pids of all the other workers on this
     # machine. Useful when pruning dead workers on startup.
     def worker_pids
-      `ps -A -o pid,command | grep [r]esque | grep -i "resque-web"`.split("\n").map do |line|
+      `ps -A -o pid,command | grep [r]esque | grep -v "resque-web"`.split("\n").map do |line|
         line.split(' ')[0]
       end
     end

data/test/job_hooks_test.rb

@@ -320,4 +320,3 @@ context "Resque::Job all hooks" do
     ]
   end
 end
-

data/test/resque-web_test.rb

@@ -51,4 +51,3 @@ context "on GET to /stats/resque" do
 
   should_respond_with_success
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 35
   prerelease: false
   segments: 
   - 1
-  - 12
+  - 13
   - 0
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 -08:00
+date: 2011-02-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,14 +24,14 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 55
         segments: 
         - 0
-        - 8
+        - 10
         - 0
-        version: 0.8.0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency