Merge remote-tracking branch 'defunkt/master'

Conflicts:
	.gitignore
	bin/resque
	deps.rip
	lib/resque.rb
	lib/resque/failure/redis.rb
	lib/resque/server/public/ranger.js
	lib/resque/worker.rb
	resque-mongo.gemspec
	test/job_hooks_test.rb
	test/job_plugins_test.rb
	test/plugin_test.rb
	test/resque-web_test.rb
	test/resque_test.rb
	test/worker_test.rb

Author: Nicolas Fouché

Gemfile

@@ -0,0 +1,7 @@
+source :rubygems
+
+gemspec
+
+group :test do
+  gem "rack-test", "~> 0.5"
+end

Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    resque (1.13.0)
+      json (~> 1.4.6)
+      redis-namespace (>= 0.10.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    json (1.4.6)
+    rack (1.2.2)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    redis (2.1.1)
+    redis-namespace (0.10.0)
+      redis (< 3.0.0)
+    sinatra (1.2.1)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.2.2)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rack-test (~> 0.5)
+  resque!

HISTORY.md

@@ -1,3 +1,37 @@
+## 1.15.0 (2011-03-18)
+
+* Fallback to Redis.connect. Makes ENV variables and whatnot work.
+* Fixed Sinatra 1.2 compatibility
+
+## 1.14.0 (2011-03-17)
+
+* Sleep interval can now be a float
+* Added Resque.inline to allow in-process performing of jobs (for testing)
+* Fixed tests for Ruby 1.9.2
+* Added Resque.validate(klass) to validate a Job
+* Decode errors are no longer ignored to help debugging
+* Web: Sinatra 1.2 compatibility
+* Fixed after_enqueue hook to actually run in `Resque.enqueue`
+* Fixed very_verbose timestamps to use 24 hour time (AM/PM wasn't included)
+* Fixed monit example
+* Fixed Worker#pid
+
+## 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`
+* Added Worker#pid method
+* Added configurable location for `rake install`
+* Bugfix: Errors in failure backend are rescue'd
+* Bugfix: Non-working workers no longer counted in "working" count
+* Bugfix: Don't think resque-web is a worker
+
 ## 1.11.0 (2010-08-23)
 
 * Web UI: Group /workers page by hostnames

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 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

README.markdown

@@ -21,8 +21,9 @@ Also, check your mongo version: 1.3.0 or higher
 Resque
 ======
 
-Resque is a Redis-backed library for creating background jobs, placing
-those jobs on multiple queues, and processing them later.
+Resque (pronounced like "rescue") is a Redis-backed library for creating
+background jobs, placing those jobs on multiple queues, and processing
+them later.
 
 Background jobs can be any Ruby class or module that responds to
 `perform`. Your existing classes can easily be converted to background
@@ -254,6 +255,13 @@ variable.
 
     $ VVERBOSE=1 QUEUE=file_serve rake environment resque:work
 
+### Process IDs (PIDs)
+
+There are scenarios where it's helpful to record the PID of a resque
+worker process.  Use the PIDFILE option for easy access to the PID:
+
+    $ PIDFILE=./resque.pid QUEUE=file_serve rake environment resque:work
+
 
 ### Priorities and Queue Lists
 
@@ -439,7 +447,8 @@ You can also set the namespace directly using `resque-web`:
 Using Passenger? Resque ships with a `config.ru` you can use. See
 Phusion's guide:
 
-<http://www.modrails.com/documentation/Users%20guide.html#_deploying_a_rack_based_ruby_application>
+Apache: <http://www.modrails.com/documentation/Users%20guide%20Apache.html#_deploying_a_rack_based_ruby_application>
+Nginx: <http://www.modrails.com/documentation/Users%20guide%20Nginx.html#deploying_a_rack_app>
 
 ### Rack::URLMap
 
@@ -546,7 +555,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.
@@ -673,6 +682,11 @@ this way we can tell our Sinatra app about the config file:
 
 Now everyone is on the same page.
 
+Also, you could disable jobs queueing by setting 'inline' attribute.
+For example, if you want to run all jobs in the same process for cucumber, try:
+
+    Resque.inline = ENV['RAILS_ENV'] == "cucumber"
+
 
 Plugins and Hooks
 -----------------
@@ -770,7 +784,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

Rakefile

@@ -12,14 +12,22 @@ end
 # Tests
 #
 
+require 'rake/testtask'
+
 task :default => :test
 
-desc "Run the test suite"
-task :test do
-  rg = command?(:rg)
-  Dir['test/**/*_test.rb'].each do |f|
-    rg ? sh("rg #{f}") : ruby(f)
+if command?(:rg)
+  desc "Run the test suite with rg"
+  task :test do
+    Dir['test/**/*_test.rb'].each do |f|
+      sh("rg #{f}")
+    end
   end
+else
+  Rake::TestTask.new do |test|
+    test.libs << "test"
+    test.test_files = FileList['test/**/*_test.rb']
+  end  
 end
 
 if command? :kicker

bin/resque

@@ -1,7 +1,34 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 require 'resque'
+require 'optparse'
+
+parser = OptionParser.new do |opts|
+  opts.banner = "Usage: resque [options] COMMAND"
+
+  opts.separator ""
+  opts.separator "Options:"
+
+  opts.on("-m", "--mongo [HOST:PORT]", "Redis connection string") do |host|
+    Resque.mongo = 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 +61,7 @@ def list
   end
 end
 
-if (i = ARGV.index('-r')) && ARGV[i+1]
-  Resque.mongo = ARGV[i+1]
-  ARGV.delete_at(i)
-  ARGV.delete_at(i+1)
-end
+parser.parse!
 
 case ARGV[0]
 when 'kill'
@@ -48,10 +71,5 @@ when 'remove'
 when 'list'
   list
 else
-  puts "Usage: resque [-r mongo_host:mongo_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

deps.rip

@@ -54,7 +54,7 @@ Great, now let's check out the Resque frontend. Either click on 'View
 Resque' in your web browser or run:
 
     $ open http://localhost:9292/resque/
-    
+
 You should see the Resque web frontend. 404 page? Don't forget the
 trailing slash!
 

examples/demo/README.markdown

@@ -1,6 +1,6 @@
 check process resque_worker_QUEUE
   with pidfile /data/APP_NAME/current/tmp/pids/resque_worker_QUEUE.pid
-  start program = "/bin/sh -c 'cd /data/APP_NAME/current; RAILS_ENV=production QUEUE=queue_name VERBOSE=1 nohup rake environment resque:work& > log/resque_worker_QUEUE.log && echo $! > tmp/pids/resque_worker_QUEUE.pid'" as uid deploy and gid deploy
+  start program = "/bin/sh -c 'cd /data/APP_NAME/current; nohup rake environment resque:work RAILS_ENV=production QUEUE=queue_name VERBOSE=1 PIDFILE=tmp/pids/resque_worker_QUEUE.pid & > log/resque_worker_QUEUE.log" as uid deploy and gid deploy
   stop program = "/bin/sh -c 'cd /data/APP_NAME/current && kill -s QUIT `cat tmp/pids/resque_worker_QUEUE.pid` && rm -f tmp/pids/resque_worker_QUEUE.pid; exit 0;'"
   if totalmem is greater than 300 MB for 10 cycles then restart  # eating up memory?
   group resque_workers

examples/monit/resque.monit

@@ -145,6 +145,7 @@ def to_s
     "Resque Client connected to #{@con.primary[0]}:#{@con.primary[1]}/#{@db.name}/#{@mongo.name}"
   end
 
+
   def add_indexes
     @mongo.create_index([[:queue,1],[:date, 1]])
     @mongo.create_index :queue
@@ -154,6 +155,18 @@ def add_indexes
     @failures.create_index :queue
   end
 
+  # If 'inline' is true Resque will call #perform method inline
+  # without queuing it into Redis and without any Resque callbacks.
+  # The 'inline' is false Resque jobs will be put in queue regularly.
+  def inline?
+    @inline
+  end
+  alias_method :inline, :inline?
+
+  def inline=(inline)
+    @inline = inline
+  end
+
   #
   # queue manipulation
   #
@@ -247,6 +260,10 @@ def watch_queue(queue)
   # This method is considered part of the `stable` API.
   def enqueue(klass, *args)
     Job.create(queue_from_class(klass), klass, *args)
+
+    Plugin.after_enqueue_hooks(klass).each do |hook|
+      klass.send(hook, *args)
+    end
   end
 
   # This method can be used to conveniently remove a job from a queue.
@@ -296,6 +313,23 @@ def reserve(queue)
     Job.reserve(queue)
   end
 
+  # Validates if the given klass could be a valid Resque job
+  #
+  # If no queue can be inferred this method will raise a `Resque::NoQueueError`
+  #
+  # If given klass is nil this method will raise a `Resque::NoClassError`
+  def validate(klass, queue = nil)
+    queue ||= queue_from_class(klass)
+
+    if !queue
+      raise NoQueueError.new("Jobs must be placed onto a queue.")
+    end
+
+    if klass.to_s.empty?
+      raise NoClassError.new("Jobs must be given a class.")
+    end
+  end
+
 
   #
   # worker shortcuts

lib/resque.rb

@@ -4,7 +4,7 @@ class NoQueueError < RuntimeError; end
 
   # 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

lib/resque/errors.rb

@@ -65,14 +65,18 @@ def self.search_results(start = 0, count = 1, squery)
     def self.url
       backend.url
     end
-    
+
     # Clear all failure jobs
     def self.clear
       backend.clear
     end
-    
+
     def self.requeue(index)
       backend.requeue(index)
     end
+
+    def self.remove(index)
+      backend.remove(index)
+    end
   end
 end

lib/resque/failure.rb

@@ -62,6 +62,9 @@ def self.clear
       def self.requeue(index)
       end
 
+      def self.remove(index)
+      end
+
       # Logging!
       def log(message)
         @worker.log(message)