resque 1.2.1 → 1.2.3

data/HISTORY.md

@@ -1,3 +1,14 @@
+## 1.2.3 (2009-12-15)
+
+* Bugfix: Fixed `rand` seeding in child processes.
+* Bugfix: Better JSON encoding/decoding without Yajl.
+* Bugfix: Avoid `ps` flag error on Linux
+* Add `PREFIX` observance to `rake` install tasks.
+
+## 1.2.2 (2009-12-08)
+
+* Bugfix: Job equality was not properly implemented.
+
 ## 1.2.1 (2009-12-07)
 
 * Added `rake resque:workers` task for starting multiple workers.

data/README.markdown

@@ -497,6 +497,13 @@ install and run Redis for you:
     $ rake redis:install dtach:install
     $ rake redis:start
 
+Or, if you don't have admin access on your machine:
+
+    $ git clone git://github.com/defunkt/resque.git
+    $ cd resque
+    $ PREFIX=<your_prefix> rake redis:install dtach:install
+    $ rake redis:start
+
 You now have Redis running on 6379. Wait a second then hit ctrl-\ to
 detach and keep it running in the background.
 
@@ -507,7 +514,7 @@ together. But, it's not that hard.
 Resque Dependencies
 -------------------
 
-    gem install redis redis-namespace yajl-ruby --source=http://gemcutter.org
+    gem install redis redis-namespace yajl-ruby
 
 If you cannot install `yajl-ruby` (JRuby?), you can install the `json`
 gem and Resque will use it instead.
@@ -520,7 +527,7 @@ Installing Resque
 
 First install the gem.
 
-    $ gem install resque --source=http://gemcutter.org
+    $ gem install resque
 
 Next include it in your application.
 
@@ -550,7 +557,7 @@ don't want to load your app every time rake runs.
 
 First install the gem.
 
-   $ gem install resque --source=http://gemcutter.org
+    $ gem install resque
 
 Next include it in your application.
 

data/lib/resque.rb

@@ -102,8 +102,6 @@ module Resque
 
   # Given a queue name, completely deletes the queue.
   def remove_queue(queue)
-    @watched_queues ||= {}
-    @watched_queues.delete(queue.to_s)
     redis.srem(:queues, queue.to_s)
     redis.del("queue:#{queue}")
   end
@@ -111,8 +109,6 @@ module Resque
   # Used internally to keep track of which queues we've created.
   # Don't call this directly.
   def watch_queue(queue)
-    @watched_queues ||= {}
-    return if @watched_queues[queue]
     redis.sadd(:queues, queue.to_s)
   end
 

data/lib/resque/helpers.rb

@@ -12,7 +12,7 @@ module Resque
       if defined? Yajl
         Yajl::Encoder.encode(object)
       else
-        JSON(object)
+        object.to_json
       end
     end
 
@@ -23,7 +23,7 @@ module Resque
       if defined? Yajl
         Yajl::Parser.parse(object, :check_utf8 => false)
       else
-        JSON(object)
+        JSON.parse(object)
       end
     end
 

data/lib/resque/job.rb

@@ -96,7 +96,7 @@ module Resque
     # Equality
     def ==(other)
       queue == other.queue &&
-        payload_class = other.payload_class &&
+        payload_class == other.payload_class &&
         args == other.args
     end
   end

data/lib/resque/version.rb

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

data/lib/resque/worker.rb

@@ -114,6 +114,7 @@ module Resque
           log "got: #{job.inspect}"
 
           if @child = fork
+            rand # Reseeding
             procline = "resque: Forked #{@child} at #{Time.now.to_i}"
             $0 = procline
             log! procline
@@ -245,7 +246,7 @@ module Resque
     def kill_child
       if @child
         log! "Killing child at #{@child}"
-        if system("ps -ho pid,state -p #{@child}")
+        if system("ps -o pid,state -p #{@child}")
           Process.kill("KILL", @child) rescue nil
         else
           log! "Child #{@child} not found, restarting."

data/tasks/redis.rake

@@ -9,7 +9,12 @@ class RedisRunner
   end
 
   def self.redisconfdir
-    '/etc/redis.conf'
+    server_dir = File.dirname(`which redis-server`)
+    conf_file = "#{server_dir}/../etc/redis.conf"
+    unless File.exists? conf_file
+      conf_file = "#{server_dir}/../../etc/redis.conf"
+    end
+    conf_file
   end
 
   def self.dtach_socket
@@ -65,17 +70,19 @@ namespace :redis do
     RedisRunner.attach
   end
 
-  desc 'Install the lastest verison of Redis from Github (requires git, duh)'
+  desc 'Install the latest verison of Redis from Github (requires git, duh)'
   task :install => [:about, :download, :make] do
+    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = '/usr/bin'
     %w(redis-benchmark redis-cli redis-server).each do |bin|
-      sh "sudo cp /tmp/redis/#{bin} /usr/bin/"
+      sh "cp /tmp/redis/#{bin} #{bin_dir}"
     end
 
-    puts "Installed redis-benchmark, redis-cli and redis-server to /usr/bin/"
+    puts "Installed redis-benchmark, redis-cli and redis-server to #{bin_dir}"
 
-    unless File.exists?('/etc/redis.conf')
-      sh 'sudo cp /tmp/redis/redis.conf /etc/'
-      puts "Installed redis.conf to /etc/ \n You should look at this file!"
+    ENV['PREFIX'] and conf_dir = "#{ENV['PREFIX']}/etc" or conf_dir = '/etc'
+    unless File.exists?("#{conf_dir}")
+      sh "cp /tmp/redis/redis.conf #{conf_dir}"
+      puts "Installed redis.conf to #{conf_dir} \n You should look at this file!"
     end
   end
 
@@ -115,11 +122,12 @@ namespace :dtach do
       system('tar xzf dtach-0.8.tar.gz')
     end
 
+    ENV['PREFIX'] and bin_dir = "#{ENV['PREFIX']}/bin" or bin_dir = "/usr/bin"
     Dir.chdir('/tmp/dtach-0.8/')
     sh 'cd /tmp/dtach-0.8/ && ./configure && make'
-    sh 'sudo cp /tmp/dtach-0.8/dtach /usr/bin/'
+    sh "cp /tmp/dtach-0.8/dtach #{bin_dir}"
 
-    puts 'Dtach successfully installed to /usr/bin.'
+    puts "Dtach successfully installed to #{bin_dir}"
   end
 end
 

data/test/resque_test.rb

@@ -59,8 +59,15 @@ context "Resque" do
   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)
+    assert_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
+
+    assert Resque::Job.create(:jobs, 'SomeMethodJob', 20, '/tmp')
+    assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
+    assert_not_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
+
+    assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
+    assert Resque::Job.create(:jobs, 'SomeJob', 30, '/tmp')
+    assert_not_equal Resque.reserve(:jobs), Resque.reserve(:jobs)
   end
 
   test "can put jobs on a queue by way of a method" do

metadata

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