Allow Resque to use DistRedis

Author: ashleym1972

lib/resque.rb

@@ -26,6 +26,7 @@ module Resque
   #   1. A 'hostname:port' string
   #   2. A 'hostname:port:db' string (to select the Redis db)
   #   3. An instance of `Redis`
+  #   4. An instance of `DistRedis`
   def redis=(server)
     case server
     when String
@@ -34,6 +35,7 @@ def redis=(server)
         :thread_safe => true, :db => db)
       @redis = Redis::Namespace.new(:resque, :redis => redis)
     when Redis
+    when DistRedis
       @redis = Redis::Namespace.new(:resque, :redis => server)
     else
       raise "I don't know what to do with #{server.inspect}"
@@ -229,7 +231,8 @@ def info
   # Returns an array of all known Resque keys in Redis. Redis' KEYS operation
   # is O(N) for the keyspace, so be careful - this can be slow for big databases.
   def keys
-    redis.keys("*").map do |key|
+    redis_keys = redis.keys("*").flatten
+    redis_keys.map do |key|
       key.sub('resque:', '')
     end
   end

test/resque_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
+# require 'dist_redis'
 
 context "Resque" do
   setup do
@@ -9,6 +10,10 @@
     Resque.push(:people, { 'name' => 'mark' })
   end
 
+  # test "can use DistRedis" do
+  #   assert Resque.redis = DistRedis.new({:hosts => ['localhost:9736', 'localhost:9736']})
+  # end
+
   test "can put jobs on a queue" do
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')
     assert Resque::Job.create(:jobs, 'SomeJob', 20, '/tmp')