resque 1.9.5 → 1.9.7

data/HISTORY.md

@@ -1,3 +1,14 @@
+## 1.9.7 (2010-07-09)
+
+* Improved memory usage in Job.destroy
+* redis-namespace 0.7.0 now required
+* Bugfix: Reverted $0 changes
+* Web Bugfix: Payload-less failures in the web ui work
+
+## 1.9.6 (2010-06-22)
+
+* Bugfix: Rakefile logging works the same as all the other logging
+
 ## 1.9.5 (2010-06-16)
 
 * Web Bugfix: Display the configured namespace on the stats page

data/lib/resque/job.rb

@@ -80,15 +80,14 @@ module Resque
       queue = "queue:#{queue}"
       destroyed = 0
 
-      redis.lrange(queue, 0, -1).each do |string|
-        json   = decode(string)
-
-        match  = json['class'] == klass
-        match &= json['args'] == args unless args.empty?
-
-        if match
-          destroyed += redis.lrem(queue, 0, string).to_i
+      if args.empty?
+        redis.lrange(queue, 0, -1).each do |string|
+          if decode(string)['class'] == klass
+            destroyed += redis.lrem(queue, 0, string).to_i
+          end
         end
+      else
+        destroyed += redis.lrem(queue, 0, encode(:class => klass, :args => args))
       end
 
       destroyed

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

@@ -28,9 +28,9 @@
           </div>
         </dd>
         <dt>Class</dt>
-        <dd><code><%= job['payload']['class'] %></code></dd>
+        <dd><code><%= job['payload'] ? job['payload']['class'] : 'nil' %></code></dd>
         <dt>Arguments</dt>
-        <dd><pre><%=h show_args(job['payload']['args']) %></pre></dd>
+        <dd><pre><%=h job['payload'] ? show_args(job['payload']['args']) : 'nil' %></pre></dd>
         <dt>Exception</td>
         <dd><code><%= job['exception'] %></code></dd>
         <dt>Error</dt>

data/lib/resque/tasks.rb

@@ -19,7 +19,7 @@ namespace :resque do
       abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
     end
 
-    puts "*** Starting worker #{worker}"
+    worker.log "Starting worker #{worker}"
 
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.9.5'
+  Version = VERSION = '1.9.7'
 end

data/tasks/redis.rake

@@ -93,7 +93,7 @@ namespace :redis do
     end
 
     %w(redis-benchmark redis-cli redis-server).each do |bin|
-      sh "cp /tmp/redis/#{bin} #{bin_dir}"
+      sh "cp /tmp/redis/src//#{bin} #{bin_dir}"
     end
 
     puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
@@ -105,8 +105,8 @@ namespace :redis do
   end
 
   task :make do
-    sh "cd /tmp/redis && make clean"
-    sh "cd /tmp/redis && make"
+    sh "cd /tmp/redis/src && make clean"
+    sh "cd /tmp/redis/src && make"
   end
 
   desc "Download package"

data/test/job_hooks_test.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/test_helper'
 context "Resque::Job before_perform" do
   include PerformJob
 
-  class BeforePerformJob
+  class ::BeforePerformJob
     def self.before_perform_record_history(history)
       history << :before_perform
     end
@@ -19,7 +19,7 @@ context "Resque::Job before_perform" do
     assert_equal history, [:before_perform, :perform]
   end
 
-  class BeforePerformJobFails
+  class ::BeforePerformJobFails
     def self.before_perform_fail_job(history)
       history << :before_perform
       raise StandardError
@@ -37,7 +37,7 @@ context "Resque::Job before_perform" do
     assert_equal history, [:before_perform], "Only before_perform was run"
   end
 
-  class BeforePerformJobAborts
+  class ::BeforePerformJobAborts
     def self.before_perform_abort(history)
       history << :before_perform
       raise Resque::Job::DontPerform
@@ -57,7 +57,7 @@ end
 context "Resque::Job after_perform" do
   include PerformJob
 
-  class AfterPerformJob
+  class ::AfterPerformJob
     def self.perform(history)
       history << :perform
     end
@@ -72,7 +72,7 @@ context "Resque::Job after_perform" do
     assert_equal history, [:perform, :after_perform]
   end
 
-  class AfterPerformJobFails
+  class ::AfterPerformJobFails
     def self.perform(history)
       history << :perform
     end
@@ -94,7 +94,7 @@ end
 context "Resque::Job around_perform" do
   include PerformJob
 
-  class AroundPerformJob
+  class ::AroundPerformJob
     def self.perform(history)
       history << :perform
     end
@@ -111,7 +111,7 @@ context "Resque::Job around_perform" do
     assert_equal history, [:start_around_perform, :perform, :finish_around_perform]
   end
 
-  class AroundPerformJobFailsBeforePerforming
+  class ::AroundPerformJobFailsBeforePerforming
     def self.perform(history)
       history << :perform
     end
@@ -131,7 +131,7 @@ context "Resque::Job around_perform" do
     assert_equal history, [:start_around_perform], "Only part of around_perform was run"
   end
 
-  class AroundPerformJobFailsWhilePerforming
+  class ::AroundPerformJobFailsWhilePerforming
     def self.perform(history)
       history << :perform
       raise StandardError
@@ -155,7 +155,7 @@ context "Resque::Job around_perform" do
     assert_equal history, [:start_around_perform, :perform, :ensure_around_perform], "Only part of around_perform was run"
   end
 
-  class AroundPerformJobDoesNotHaveToYield
+  class ::AroundPerformJobDoesNotHaveToYield
     def self.perform(history)
       history << :perform
     end
@@ -176,7 +176,7 @@ end
 context "Resque::Job on_failure" do
   include PerformJob
 
-  class FailureJobThatDoesNotFail
+  class ::FailureJobThatDoesNotFail
     def self.perform(history)
       history << :perform
     end
@@ -191,7 +191,7 @@ context "Resque::Job on_failure" do
     assert_equal history, [:perform]
   end
 
-  class FailureJobThatFails
+  class ::FailureJobThatFails
     def self.perform(history)
       history << :perform
       raise StandardError, "oh no"
@@ -209,7 +209,7 @@ context "Resque::Job on_failure" do
     assert_equal history, [:perform, "oh no"]
   end
 
-  class FailureJobThatFailsBadly
+  class ::FailureJobThatFailsBadly
     def self.perform(history)
       history << :perform
       raise SyntaxError, "oh no"
@@ -231,7 +231,7 @@ end
 context "Resque::Job all hooks" do
   include PerformJob
 
-  class VeryHookyJob
+  class ::VeryHookyJob
     def self.before_perform_record_history(history)
       history << :before_perform
     end
@@ -263,7 +263,7 @@ context "Resque::Job all hooks" do
     ]
   end
 
-  class VeryHookyJobThatFails
+  class ::VeryHookyJobThatFails
     def self.before_perform_record_history(history)
       history << :before_perform
     end

data/test/job_plugins_test.rb

@@ -21,7 +21,7 @@ context "Multiple plugins with multiple hooks" do
     end
   end
 
-  class ManyBeforesJob
+  class ::ManyBeforesJob
     extend Plugin1
     extend Plugin2
     def self.perform(history)
@@ -45,7 +45,7 @@ context "Resque::Plugin ordering before_perform" do
     end
   end
 
-  class BeforePerformJob
+  class ::BeforePerformJob
     extend BeforePerformPlugin
     def self.perform(history)
       history << :perform
@@ -71,7 +71,7 @@ context "Resque::Plugin ordering after_perform" do
     end
   end
 
-  class AfterPerformJob
+  class ::AfterPerformJob
     extend AfterPerformPlugin
     def self.perform(history)
       history << :perform
@@ -98,7 +98,7 @@ context "Resque::Plugin ordering around_perform" do
     end
   end
 
-  class AroundPerformJustPerformsJob
+  class ::AroundPerformJustPerformsJob
     extend AroundPerformPlugin1
     def self.perform(history)
       history << :perform
@@ -111,7 +111,7 @@ context "Resque::Plugin ordering around_perform" do
     assert_equal [:around_perform_plugin1, :perform], history
   end
 
-  class AroundPerformJob
+  class ::AroundPerformJob
     extend AroundPerformPlugin1
     def self.perform(history)
       history << :perform
@@ -135,7 +135,7 @@ context "Resque::Plugin ordering around_perform" do
     end
   end
 
-  class AroundPerformJob2
+  class ::AroundPerformJob2
     extend AroundPerformPlugin1
     extend AroundPerformPlugin2
     def self.perform(history)
@@ -159,7 +159,7 @@ context "Resque::Plugin ordering around_perform" do
     end
   end
 
-  class AroundPerformJob3
+  class ::AroundPerformJob3
     extend AroundPerformPlugin1
     extend AroundPerformPlugin2
     extend AroundPerformDoesNotYield
@@ -189,7 +189,7 @@ context "Resque::Plugin ordering around_perform" do
     end
   end
 
-  class AroundPerformJobWithReturnValue < GoodJob
+  class ::AroundPerformJobWithReturnValue < GoodJob
     extend AroundPerformGetsJobResult
   end
 
@@ -209,7 +209,7 @@ context "Resque::Plugin ordering on_failure" do
     end
   end
 
-  class FailureJob
+  class ::FailureJob
     extend OnFailurePlugin
     def self.perform(history)
       history << :perform

data/test/plugin_test.rb

@@ -19,33 +19,33 @@ context "Resque::Plugin finding hooks" do
   end
 
   test "before_perform hooks are found and sorted" do
-    assert_equal ["before_perform", "before_perform1", "before_perform2"], Resque::Plugin.before_hooks(SimplePlugin)
+    assert_equal ["before_perform", "before_perform1", "before_perform2"], Resque::Plugin.before_hooks(SimplePlugin).map {|m| m.to_s}
   end
 
   test "after_perform hooks are found and sorted" do
-    assert_equal ["after_perform", "after_perform1", "after_perform2"], Resque::Plugin.after_hooks(SimplePlugin)
+    assert_equal ["after_perform", "after_perform1", "after_perform2"], Resque::Plugin.after_hooks(SimplePlugin).map {|m| m.to_s}
   end
 
   test "around_perform hooks are found and sorted" do
-    assert_equal ["around_perform", "around_perform1", "around_perform2"], Resque::Plugin.around_hooks(SimplePlugin)
+    assert_equal ["around_perform", "around_perform1", "around_perform2"], Resque::Plugin.around_hooks(SimplePlugin).map {|m| m.to_s}
   end
 
   test "on_failure hooks are found and sorted" do
-    assert_equal ["on_failure", "on_failure1", "on_failure2"], Resque::Plugin.failure_hooks(SimplePlugin)
+    assert_equal ["on_failure", "on_failure1", "on_failure2"], Resque::Plugin.failure_hooks(SimplePlugin).map {|m| m.to_s}
   end
 end
 
 context "Resque::Plugin linting" do
-  module BadBefore
+  module ::BadBefore
     def self.before_perform; end
   end
-  module BadAfter
+  module ::BadAfter
     def self.after_perform; end
   end
-  module BadAround
+  module ::BadAround
     def self.around_perform; end
   end
-  module BadFailure
+  module ::BadFailure
     def self.on_failure; end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 5
-  version: 1.9.5
+  - 7
+  version: 1.9.7
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +02:00
+date: 2010-07-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 5
+        - 7
         - 0
-        version: 0.5.0
+        version: 0.7.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency