resque 1.8.5 → 1.8.6

data/lib/resque.rb

@@ -49,6 +49,15 @@ module Resque
     self.redis
   end
 
+  def redis_id
+    # support 1.x versions of redis-rb
+    if redis.respond_to?(:server)
+      redis.server
+    else
+      redis.client.id
+    end
+  end
+
   # The `before_first_fork` hook will be run in the **parent** process
   # only once, before forking to run the first job. Be careful- any
   # changes you make will be permanent for the lifespan of the
@@ -82,8 +91,8 @@ module Resque
   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.
@@ -97,7 +106,7 @@ module Resque
   end
 
   def to_s
-    "Resque Client connected to #{redis.server}"
+    "Resque Client connected to #{redis_id}"
   end
 
 
@@ -119,7 +128,7 @@ module Resque
     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
@@ -270,7 +279,8 @@ module Resque
       :workers   => workers.size.to_i,
       :working   => working.size,
       :failed    => Stat[:failed],
-      :servers   => [redis.server]
+      :servers   => [redis_id],
+      :environment  => defined?(RAILS_ENV) ? RAILS_ENV : (ENV['RACK_ENV'] || 'development')
     }
   end
 

data/lib/resque/failure/hoptoad.rb

@@ -83,7 +83,7 @@ module Resque
             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 @@ module Resque
       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

data/lib/resque/failure/redis.rb

@@ -9,7 +9,7 @@ module Resque
           :payload   => payload,
           :exception => exception.class.to_s,
           :error     => exception.to_s,
-          :backtrace => exception.backtrace,
+          :backtrace => Array(exception.backtrace),
           :worker    => worker.to_s,
           :queue     => queue
         }
@@ -24,11 +24,11 @@ module Resque
       def self.all(start = 0, count = 1)
         Resque.list_range(:failed, start, count)
       end
-      
+
       def self.clear
         Resque.redis.del(:failed)
       end
-      
+
       def self.requeue(index)
         item = all(index)
         item['retried_at'] = Time.now.strftime("%Y/%m/%d %H:%M:%S")

data/lib/resque/job.rb

@@ -140,8 +140,9 @@ module Resque
             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

data/lib/resque/server.rb

@@ -106,7 +106,7 @@ module Resque
       begin
         erb page.to_sym, {:layout => layout}, :resque => Resque
       rescue Errno::ECONNREFUSED
-        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis.server})"
+        erb :error, {:layout => false}, :error => "Can't connect to Redis! (#{Resque.redis_id})"
       end
     end
 
@@ -124,7 +124,7 @@ module Resque
         show page
       end
     end
-    
+
     post "/queues/:id/remove" do
       Resque.remove_queue(params[:id])
       redirect u('queues')
@@ -150,7 +150,7 @@ module Resque
       Resque::Failure.clear
       redirect u('failed')
     end
-    
+
     get "/failed/requeue/:index" do
       Resque::Failure.requeue(params[:index])
       if request.xhr?

data/lib/resque/server/test_helper.rb

@@ -11,7 +11,7 @@ module Resque
 
       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

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

@@ -37,7 +37,7 @@
 
 <div id="footer">
   <p>Powered by <a href="http://github.com/defunkt/resque">Resque</a> v<%=Resque::Version%></p>
-  <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis.server%></p>
+  <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis_id%></p>
 </div>
 
 </body>

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

@@ -22,7 +22,7 @@
 
 <% elsif params[:id] == 'redis' %>
 
-  <h1><%= resque.redis.server %></h1>
+  <h1><%= resque.redis_id %></h1>
   <table class='stats'>
   <% for key, value in resque.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>

data/lib/resque/version.rb

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

data/test/job_plugins_test.rb

@@ -177,6 +177,27 @@ context "Resque::Plugin ordering around_perform" do
     assert_equal false, result, "perform returned false"
     assert_equal [:around_perform, :around_perform0], history
   end
+
+  module AroundPerformGetsJobResult
+    @@result = nil
+    def last_job_result
+      @@result
+    end
+
+    def around_perform_gets_job_result(*args)
+      @@result = yield
+    end
+  end
+
+  class AroundPerformJobWithReturnValue < GoodJob
+    extend AroundPerformGetsJobResult
+  end
+
+  test "the job is aborted if an around_perform hook does not yield" do
+    result = perform_job(AroundPerformJobWithReturnValue, 'Bob')
+    assert_equal true, result, "perform returned true"
+    assert_equal 'Good job, Bob', AroundPerformJobWithReturnValue.last_job_result
+  end
 end
 
 context "Resque::Plugin ordering on_failure" do

data/test/redis-test.conf

@@ -113,20 +113,3 @@ databases 16
 # single TCP packet. Uses a bit more CPU but most of the times it is a win
 # in terms of number of queries per second. Use 'yes' if unsure.
 glueoutputbuf yes
-
-# Use object sharing. Can save a lot of memory if you have many common
-# string in your dataset, but performs lookups against the shared objects
-# pool so it uses more CPU and can be a bit slower. Usually it's a good
-# idea.
-#
-# When object sharing is enabled (shareobjects yes) you can use
-# shareobjectspoolsize to control the size of the pool used in order to try
-# object sharing. A bigger pool size will lead to better sharing capabilities.
-# In general you want this value to be at least the double of the number of
-# very common strings you have in your dataset.
-#
-# WARNING: object sharing is experimental, don't enable this feature
-# in production before of Redis 1.0-stable. Still please try this feature in
-# your development environment so that we can test it better.
-shareobjects no
-shareobjectspoolsize 1024

data/test/resque_test.rb

@@ -216,7 +216,7 @@ context "Resque" do
     assert_equal 3, stats[:queues]
     assert_equal 3, stats[:processed]
     assert_equal 1, stats[:failed]
-    assert_equal ['localhost:9736'], stats[:servers]
+    assert_equal [Resque.redis.respond_to?(:server) ? 'localhost:9736' : 'redis://localhost:9736/0'], stats[:servers]
   end
 
   test "decode bad json" do

data/test/test_helper.rb

@@ -31,7 +31,7 @@ at_exit do
     exit_code = Test::Unit::AutoRunner.run
   end
 
-  pid = `ps -e -o pid,command | grep [r]edis-test`.split(" ")[0]
+  pid = `ps -A -o pid,command | grep [r]edis-test`.split(" ")[0]
   puts "Killing test redis server..."
   `rm -f #{dir}/dump.rdb`
   Process.kill("KILL", pid.to_i)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  hash: 61
   prerelease: false
   segments: 
   - 1
   - 8
-  - 5
-  version: 1.8.5
+  - 6
+  version: 1.8.6
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -15,71 +14,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -07:00
+date: 2010-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: redis-namespace
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
-        - 1
         - 0
+        - 5
         - 0
-        version: 1.0.0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: redis-namespace
+  name: vegas
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
-        - 4
-        - 0
-        version: 0.4.0
+        - 1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: vegas
+  name: sinatra
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
-        - 1
+        - 9
         - 2
-        version: 0.1.2
+        version: 0.9.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
         segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id004
 description: "    Resque is a Redis-backed Ruby library for creating background jobs,\n    placing those jobs on multiple queues, and processing them later.\n\n    Background jobs can be any Ruby class or module that responds to\n    perform. Your existing classes can easily be converted to background\n    jobs or you can create new classes specifically to do work. Or, you\n    can do both.\n\n    Resque is heavily inspired by DelayedJob (which rocks) and is\n    comprised of three parts:\n\n    * A Ruby library for creating, querying, and processing jobs\n    * A Rake task for starting a worker which processes jobs\n    * A Sinatra app for monitoring queues, jobs, and workers.\n"
@@ -144,7 +135,7 @@ files:
 - tasks/redis.rake
 - tasks/resque.rake
 has_rdoc: true
-homepage: http://github.com/defunkt/mustache
+homepage: http://github.com/defunkt/resque
 licenses: []
 
 post_install_message: 
@@ -153,27 +144,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Resque is a Redis-backed queueing system.