Merge branch 'master' into 2.0

Conflicts:
	HISTORY.md

Author: defunkt

CONTRIBUTORS

@@ -2,6 +2,20 @@
 
 * Resque now uses Unix Epoch Timestamps exclusively.
 
+## 1.8.3 (2010-05-17)
+
+* Depend on redis-rb ~> 1.0.7
+
+## 1.8.2 (2010-05-03)
+
+* Bugfix: Include "tasks/" dir in RubyGem
+
+## 1.8.1 (2010-04-29)
+
+* Bugfix: Multiple failure backend did not support requeue-ing failed jobs
+* Bugfix: Fix /failed when error has no backtrace
+* Bugfix: Add `Redis::DistRedis` as a valid client
+
 ## 1.8.0 (2010-04-07)
 
 * Jobs that never complete due to killed worker are now failed.

HISTORY.md

@@ -662,7 +662,7 @@ For a list of available plugins see
 
 If you'd like to write your own plugin, or want to customize Resque
 using hooks (such as `Resque.after_fork`), see
-[docs/HOOKS.md](http://github.com/defunkt/resque/blob/master/HOOKS.md).
+[docs/HOOKS.md](http://github.com/defunkt/resque/blob/master/docs/HOOKS.md).
 
 To clear all hooks, set nil or false:
 

README.markdown

@@ -9,7 +9,7 @@ $LOAD_PATH.unshift 'lib'
 require 'resque/tasks'
 
 def command?(command)
-  system("type #{command} > /dev/null")
+  system("type #{command} > /dev/null 2>&1")
 end
 
 
@@ -37,19 +37,11 @@ end
 
 
 #
-# Gem
+# Install
 #
 
 task :install => [ 'redis:install', 'dtach:install' ]
 
-begin
-  require 'mg'
-  MG.new("resque.gemspec")
-rescue LoadError
-  warn "mg not available."
-  warn "Install it with: gem i mg"
-end
-
 
 #
 # Documentation
@@ -58,7 +50,6 @@ end
 begin
   require 'sdoc_helpers'
 rescue LoadError
-  puts "sdoc support not enabled. Please gem install sdoc-helpers."
 end
 
 
@@ -67,9 +58,11 @@ end
 #
 
 desc "Push a new version to Gemcutter"
-task :publish => "gem:publish" do
+task :publish do
   require 'resque/version'
 
+  sh "gem build resque.gemspec"
+  sh "gem push resque-#{Resque::Version}.gem"
   sh "git tag v#{Resque::Version}"
   sh "git push origin v#{Resque::Version}"
   sh "git push origin master"

Rakefile

@@ -29,18 +29,15 @@ module Resque
   #   3. An instance of `Redis`, `Redis::Client`, `Redis::DistRedis`,
   #      or `Redis::Namespace`.
   def redis=(server)
-    case server
-    when String
+    if server.respond_to? :split
       host, port, db = server.split(':')
       redis = Redis.new(:host => host, :port => port,
         :thread_safe => true, :db => db)
       @redis = Redis::Namespace.new(:resque, :redis => redis)
-    when Redis, Redis::Client, Redis::DistRedis
-      @redis = Redis::Namespace.new(:resque, :redis => server)
-    when Redis::Namespace
-      @redis = server
+    elsif server.respond_to? :namespace=
+        @redis = server
     else
-      raise "I don't know what to do with #{server.inspect}"
+      @redis = Redis::Namespace.new(:resque, :redis => server)
     end
   end
 
@@ -87,8 +84,8 @@ def before_fork=(block)
   end
 
   # The `after_fork` hook will be run in the child process and is passed
-  # the current job. Any changes you make, therefor, will only live as
-  # long as the job currently being processes.
+  # the current job. Any changes you make, therefore, will only live as
+  # long as the job currently being processed.
   #
   # Call with a block to set the hook.
   # Call with no arguments to return the hook.
@@ -125,7 +122,7 @@ def pop(queue)
     decode redis.lpop("queue:#{queue}")
   end
 
-  # Returns an int representing the size of a queue.
+  # Returns an integer representing the size of a queue.
   # Queue name should be a string.
   def size(queue)
     redis.llen("queue:#{queue}").to_i
@@ -276,7 +273,8 @@ def info
       :workers   => workers.size.to_i,
       :working   => working.size,
       :failed    => Stat[:failed],
-      :servers   => [redis.server]
+      :servers   => [redis.server],
+      :environment  => defined?(RAILS_ENV) ? RAILS_ENV : (ENV['RACK_ENV'] || 'development')
     }
   end
 

lib/resque.rb

@@ -83,7 +83,7 @@ def xml
             x.url "http://github.com/defunkt/resque"
           end
           x.error do
-            x.class exception.class.name
+            x.tag! "class", exception.class.name
             x.message "#{exception.class.name}: #{exception.message}"
             x.backtrace do
               fill_in_backtrace_lines(x)
@@ -109,7 +109,7 @@ def xml
       end
 
       def fill_in_backtrace_lines(x)
-        exception.backtrace.each do |unparsed_line|
+        Array(exception.backtrace).each do |unparsed_line|
           _, file, number, method = unparsed_line.match(INPUT_FORMAT).to_a
           x.line :file => file,:number => number
         end

lib/resque/failure/hoptoad.rb

@@ -9,7 +9,7 @@ def save
           :payload   => payload,
           :exception => exception.class.to_s,
           :error     => exception.to_s,
-          :backtrace => exception.backtrace,
+          :backtrace => Array(exception.backtrace),
           :worker    => worker.to_s,
           :queue     => queue
         }

lib/resque/failure/redis.rb

@@ -140,8 +140,9 @@ def perform
             else
               lambda do
                 job.send(hook, *job_args) do
-                  job.perform(*job_args)
+                  result = job.perform(*job_args)
                   job_was_performed = true
+                  result
                 end
               end
             end

lib/resque/job.rb

@@ -11,7 +11,7 @@ def app
 
       def self.should_respond_with_success
         test "should respond with success" do
-          assert last_response.ok?
+          assert last_response.ok?, last_response.errors
         end 
       end 
     end

lib/resque/server/test_helper.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.8.0'
+  Version = '1.8.5'
 end