added the method working to the Worker object

for more closely following the resque api

Author: Matt George

src/pyres/__init__.py

@@ -110,7 +110,8 @@ def workers(self):
         return Worker.all(self)
 
     def working(self):
-        raise NotImplementedError
+        from pyres.worker import Worker
+        return Worker.working(self)
 
     def remove_queue(self, queue):
         if queue in self._watched_queues:

src/pyres/worker.py

@@ -155,20 +155,33 @@ def all(cls, host="localhost:6379"):
 
     @classmethod
     def working(cls, host):
-        resq = ResQ(host)
+        if isinstance(host, basestring):
+            resq = ResQ(host)
+        elif isinstance(host, ResQ):
+            resq = host
         total = []
         for key in Worker.all(host):
-            if Worker.exists(key,resq):
-                total.append(key)
+            if Worker.exists(key, resq):
+                total.append('worker:%s' % key)
+        names = []
+        for key in total:
+            value = resq.redis.get(key)
+            if value:
+                w = Worker.find(key[7:], resq)
+                names.append(w)
+        #for key in resq.redis.mget(*total):
+        #    w = Worker.find(key[7:], resq)
+        #    if w:
+        #        names.append(w)
         #total = [id if Worker.exists(id,resq) for id in resq.redis.smembers('workers')]
-        names = [Worker.find(key[7:],resq) for key in resq._redis.mget(*total)] if total else []
+        #names = [Worker.find(key[7:],resq) for key in resq._redis.mget(*total)] if total else []
         return names
 
     @classmethod
     def find(cls, worker_id, resq):
         if Worker.exists(worker_id, resq):
             queues = worker_id.split(':')[-1].split(',')
-            worker = cls(queues,resq._server)
+            worker = cls(queues,resq)
             worker.id = worker_id
             return worker
         else:

src/tests.py

@@ -271,6 +271,17 @@ def test_get_job(self):
         print w2.job()
         assert w2.job() == {}
 
+    def test_working(self):
+        worker = Worker(['basic'])
+        self.resq.enqueue_from_string('tests.Basic','basic','test1')
+        worker.register_worker()
+        job = Job.reserve('basic', self.resq)
+        worker.working_on(job)
+        name = "%s:%s:%s" % (os.uname()[1],os.getpid(),'basic')
+        workers = Worker.working(self.resq)
+        assert len(workers) == 1
+        assert str(worker) == str(workers[0])
+        assert worker != workers[0]
 
 class StatTests(PyResTests):
     def test_incr(self):