Merge branch 'master' into 2.0

Conflicts:
	HISTORY.md

Author: defunkt

HISTORY.md

@@ -2,6 +2,41 @@
 
 * Resque now uses Unix Epoch Timestamps exclusively.
 
+## 1.9.4 (2010-06-14)
+
+* Bugfix: Multiple failure backend gets exception information when created
+
+## 1.9.3 (2010-06-14)
+
+* Bugfix: Resque#queues always returns an array
+
+## 1.9.2 (2010-06-13)
+
+* Bugfix: Worker.all returning nil fix
+* Bugfix: Make ps -o more cross platform friendly
+
+## 1.9.1 (2010-06-04)
+
+* Less strict JSON dependency
+* Included HISTORY.md in gem
+
+## 1.9.0 (2010-06-04)
+
+* Redis 2 support
+* Depend on redis-namespace 0.5.0
+* Added Resque::VERSION constant (alias of Resque::Version)
+* Bugfix: Specify JSON dependency
+* Bugfix: Hoptoad plugin now works on 1.9
+
+## 1.8.5 (2010-05-18)
+
+* Bugfix: Be more liberal in which Redis clients we accept.
+
+## 1.8.4 (2010-05-18)
+
+* Try to resolve redis-namespace dependency issue
+>>>>>>> master
+
 ## 1.8.3 (2010-05-17)
 
 * Depend on redis-rb ~> 1.0.7

lib/resque.rb

@@ -49,6 +49,15 @@ def redis
     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
@@ -100,7 +109,7 @@ def after_fork=(block)
   end
 
   def to_s
-    "Resque Client connected to #{redis.server}"
+    "Resque Client connected to #{redis_id}"
   end
 
 
@@ -154,7 +163,7 @@ def list_range(key, start = 0, count = 1)
 
   # Returns an array of all known Resque queues as strings.
   def queues
-    redis.smembers(:queues)
+    Array(redis.smembers(:queues))
   end
 
   # Given a queue name, completely deletes the queue.
@@ -273,7 +282,7 @@ def info
       :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

lib/resque/failure/multiple.rb

@@ -14,8 +14,10 @@ def self.configure
       end
 
       def initialize(*args)
+        super
         @backends = self.class.classes.map {|klass| klass.new(*args)}
       end
+
       def save
         @backends.each(&:save)
       end

lib/resque/server.rb

@@ -106,7 +106,7 @@ def show(page, layout = true)
       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 @@ def show(page, layout = true)
         show page
       end
     end
-    
+
     post "/queues/:id/remove" do
       Resque.remove_queue(params[:id])
       redirect u('queues')
@@ -150,7 +150,7 @@ def show(page, layout = true)
       Resque::Failure.clear
       redirect u('failed')
     end
-    
+
     get "/failed/requeue/:index" do
       Resque::Failure.requeue(params[:index])
       if request.xhr?

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>

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>

lib/resque/version.rb

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

lib/resque/worker.rb

@@ -24,7 +24,7 @@ class Worker
 
     # Returns an array of all worker objects.
     def self.all
-      redis.smembers(:workers).map { |id| find(id) }
+      Array(redis.smembers(:workers)).map { |id| find(id) }
     end
 
     # Returns an array of all worker objects currently processing
@@ -448,7 +448,7 @@ def hostname
     # Returns an array of string pids of all the other workers on this
     # machine. Useful when pruning dead workers on startup.
     def worker_pids
-      `ps -A -o pid,command | grep [r]esque`.split("\n").map do |line|
+      `ps -A -o pid,comm | grep [r]esque`.split("\n").map do |line|
         line.split(' ')[0]
       end
     end

resque.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email             = "[email protected]"
   s.authors           = [ "Chris Wanstrath" ]
 
-  s.files             = %w( README.markdown Rakefile LICENSE )
+  s.files             = %w( README.markdown Rakefile LICENSE HISTORY.md )
   s.files            += Dir.glob("lib/**/*")
   s.files            += Dir.glob("bin/**/*")
   s.files            += Dir.glob("man/**/*")
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "redis-namespace", "~> 0.5.0"
   s.add_dependency "vegas",           "~> 0.1.2"
   s.add_dependency "sinatra",         ">= 0.9.2"
-  s.add_dependency "json",            "~> 1.1.3"
+  s.add_dependency "json",            ">= 1.1.0"
 
   s.description = <<description
     Resque is a Redis-backed Ruby library for creating background jobs,

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