resque 1.2.0 → 1.2.1

data/HISTORY.md

@@ -1,3 +1,13 @@
+## 1.2.1 (2009-12-07)
+
+* Added `rake resque:workers` task for starting multiple workers.
+* 1.9.x compatibility
+* Bugfix: Yajl decoder doesn't care about valid UTF-8
+* config.ru loads RESQUECONFIG if the ENV variable is set.
+* `resque-web` now sets RESQUECONFIG
+* Job objects know if they are equal.
+* Jobs can be re-queued using `Job#recreate`
+
 ## 1.2.0 (2009-11-25)
 
 * If USR1 is sent and no child is found, shutdown.

data/README.markdown

@@ -280,6 +280,21 @@ queues created on the fly, you can use a splat:
 Queues will be processed in alphabetical order.
 
 
+### Running Multiple Workers
+
+At GitHub we use god to start and stop multiple workers. A sample god
+configuration file is included under `examples/god`. We recommend this
+method.
+
+If you'd like to run multiple workers in development mode, you can do
+so using the `resque:workers` rake task:
+
+    $ COUNT=5 QUEUE=* rake resque:workers
+
+This will spawn five Resque workers, each in its own thread. Hitting
+ctrl-c should be sufficient to stop them all.
+
+
 ### Forking
 
 On certain platforms, when a Resque worker reserves a job it

data/bin/resque-web

@@ -30,18 +30,15 @@ Common options:
       --version            Show version
 usage
 else
-  if !ENV['CONFIG']&&ARGV[-1]&&ARGV[-1][0]!=?-&&(ARGV[-2]?ARGV[-2][0]!=?-:true)
+  if !ENV['RESQUECONFIG']&&ARGV[-1]&&ARGV[-1][0]!=?-&&(ARGV[-2]?ARGV[-2][0]!=?-:true)
     if File.file?(file = File.expand_path(ARGV[-1]))
       ARGV.delete_at(-1)
-      ENV['CONFIG'] = file
+      ENV['RESQUECONFIG'] = file
     else
       abort "** Can't find #{file}"
     end
   end
 
-  args = ARGV
-  ENV['RUBYLIB'] = ENV['RUBYLIB'].to_s + ':' + __DIR__ + '/../lib'
-  args.unshift '-e', 'require "resque";load ENV["CONFIG"] if ENV["CONFIG"]'
-  args.push File.expand_path(File.dirname(__FILE__) + "/../config.ru")
-  exec "rackup", *args
+  ARGV.push File.expand_path(File.dirname(__FILE__) + "/../config.ru")
+  exec "rackup", *ARGV
 end

data/config.ru

@@ -4,5 +4,11 @@ require 'logger'
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/lib')
 require 'resque/server'
 
+# Set the RESQUECONFIG env variable if you've a `resque.rb` or similar
+# config file you want loaded on boot.
+if ENV['RESQUECONFIG'] && File.exists?(File.expand_path(ENV['RESQUECONFIG']))
+  load File.expand_path(ENV['RESQUECONFIG'])
+end
+
 use Rack::ShowExceptions
 run Resque::Server.new

data/lib/resque/helpers.rb

@@ -21,7 +21,7 @@ module Resque
       return unless object
 
       if defined? Yajl
-        Yajl::Parser.parse(object)
+        Yajl::Parser.parse(object, :check_utf8 => false)
       else
         JSON(object)
       end

data/lib/resque/job.rb

@@ -81,10 +81,23 @@ module Resque
         :queue     => queue
     end
 
+    # Creates an identical job, essentially placing this job back on
+    # the queue.
+    def recreate
+      self.class.create(queue, payload_class, *args)
+    end
+
     # String representation
     def inspect
       obj = @payload
       "(Job{%s} | %s | %s)" % [ @queue, obj['class'], obj['args'].inspect ]
     end
+
+    # Equality
+    def ==(other)
+      queue == other.queue &&
+        payload_class = other.payload_class &&
+        args == other.args
+    end
   end
 end

data/lib/resque/tasks.rb

@@ -4,7 +4,7 @@
 namespace :resque do
   task :setup
 
-  desc "Start a Resque Ranger"
+  desc "Start a Resque worker"
   task :work => :setup do
     require 'resque'
 
@@ -23,4 +23,17 @@ namespace :resque do
 
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
+
+  desc "Start multiple Resque workers"
+  task :workers do
+    threads = []
+
+    ENV['COUNT'].to_i.times do
+      threads << Thread.new do
+        system "rake resque:work"
+      end
+    end
+
+    threads.each { |thread| thread.join }
+  end
 end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = '1.2.0'
+  Version = '1.2.1'
 end

data/test/resque_test.rb

@@ -25,6 +25,15 @@ context "Resque" do
     assert_equal '/tmp', job.args[1]
   end
 
+  test "can re-queue jobs" do
+    Resque::Job.create(:jobs, 'some-job', 20, '/tmp')
+
+    job = Resque.reserve(:jobs)
+    job.recreate
+
+    assert_equal job, Resque.reserve(:jobs)
+  end
+
   test "can put jobs on a queue by way of an ivar" do
     assert_equal 0, Resque.size(:ivar)
     assert Resque.enqueue(SomeIvarJob, 20, '/tmp')
@@ -47,6 +56,13 @@ context "Resque" do
     assert_equal '(Job{jobs} | SomeJob | [20, "/tmp"])', job.inspect
   end
 
+  test "jobs can test for equality" do
+    assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
+    assert Resque::Job.create(:jobs, 'some-job', 20, '/tmp')
+    job = Resque.reserve(:jobs)
+    assert_equal job, Resque.reserve(:jobs)
+  end
+
   test "can put jobs on a queue by way of a method" do
     assert_equal 0, Resque.size(:method)
     assert Resque.enqueue(SomeMethodJob, 20, '/tmp')

data/test/test_helper.rb

@@ -23,14 +23,19 @@ end
 #
 
 at_exit do
-  unless $! || Test::Unit.run?
-    status = Test::Unit::AutoRunner.run
-    pid = `ps -e -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)
-    exit status
+  next if $!
+
+  if defined?(MiniTest)
+    exit_code = MiniTest::Unit.new.run(ARGV)
+  else
+    exit_code = Test::Unit::AutoRunner.run
   end
+
+  pid = `ps -e -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)
+  exit exit_code
 end
 
 puts "Starting redis for testing at localhost:9736..."
@@ -39,7 +44,7 @@ Resque.redis = 'localhost:9736'
 
 
 ##
-# test/spec/mini 2
+# test/spec/mini 3
 # http://gist.github.com/25455
 # chris@ozmm.org
 #
@@ -54,6 +59,7 @@ def context(*args, &block)
     def self.setup(&block) define_method(:setup, &block) end
     def self.teardown(&block) define_method(:teardown, &block) end
   end
+  (class << klass; self end).send(:define_method, :name) { name.gsub(/\W/,'_') }
   klass.class_eval &block
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resque
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Chris Wanstrath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -08:00
+date: 2009-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency