From 9df1e0703d85be93c23bdec2a4978070267ef14e Mon Sep 17 00:00:00 2001
From: Jacob Rothstein <github@jacobrothstein.com>
Date: Fri, 1 Oct 2010 21:04:32 -0700
Subject: [PATCH] [ depend on github.com/mranney/node_redis ]

---
 bin/node-resque-worker |  1 +
 lib/resque.js          | 16 ++++++++++------
 package.json           |  9 +++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bin/node-resque-worker b/bin/node-resque-worker
index 613fceb..4578bfd 100755
--- a/bin/node-resque-worker
+++ b/bin/node-resque-worker
@@ -33,6 +33,7 @@ if (process.env.NODE_DEBUG)
 
 var resque = require ('../lib/resque')
     .connect (options)
+var resque = require ('resque').connect (options)
 
 resque.cleanStaleWorkers ()
 
diff --git a/lib/resque.js b/lib/resque.js
index 68ff5bd..d108e2c 100755
--- a/lib/resque.js
+++ b/lib/resque.js
@@ -1,6 +1,6 @@
 var resque = exports
 var EventEmitter = require ('events').EventEmitter
-var sys = require ('sys')
+var sys          = require ('sys')
 
 var processAlive = function (pid, cb) {
     require('child_process').exec (
@@ -11,12 +11,16 @@ var processAlive = function (pid, cb) {
     )
 }
 
+var connectToRedis = function (options) {
+    return require ('redis').createClient (options.port, options.host)
+}
+
+
 resque.connect = function (options) {
-    var options = options || {}
-    var redis = options.redis ||
-	require ('redis-client').createClient (options.port, options.host)
-    var namespace = options.namespace || 'resque'
-    var connection = {redis: redis, namespace: namespace}
+    var options    = options || {}
+    var redis      = options.redis || connectToRedis(options)
+    var namespace  = options.namespace || 'resque'
+    var connection = { redis: redis, namespace: namespace }
 
     var key = function () {
 	var args = Array.prototype.slice.apply (arguments)
diff --git a/package.json b/package.json
index dbfde7f..98b044d 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 { "name": "resque"
-, "version": "0.0.2"
+, "version": "0.0.3"
 , "keywords": [ "redis", "resque", "worker", "queue"]
 , "description": "resque (a redis-backed work queue) for node"
 , "contributors":
@@ -11,10 +11,7 @@
   , "url": "http://github.com/jbr/node-resque.git"
   }
 , "bugs": { "web": "http://github.com/jbr/node-resque/issues" }
-, "directories":
-  { "lib": "./lib"
-  , "test": "./bin"
-  }
-, "dependencies": { "redis-client": ">= 0.3.4" }
+, "dependencies": { "redis": ">= 0.3.2" }
+, "main": "./lib/resque"
 , "bin": { "node-resque-worker": "./bin/node-resque-worker" }
 }
\ No newline at end of file