updating the package with scripts for the web

and worker interfaces.

Also found that I hadn't updated the itty requirements

Author: Matt George

requirements.txt

@@ -1,4 +1,4 @@
 simplejson==2.0.9
-itty==0.6.1
+itty==0.6.2
 redis==0.6.0
 pystache==0.1.0

resweb/server.py

@@ -1,3 +1,4 @@
+import os
 from itty import *
 from pyres import ResQ
 from pyres.failure import Failure
@@ -68,4 +69,4 @@ def my_media(request, filename):
     #return Response(output, content_type=content_type(filename))
     #return static_file(request, filename=filename, root=my_root)
 
-run_itty()
+#run_itty()

resweb/views.py

@@ -1,8 +1,10 @@
 import pystache
 from pyres import ResQ
 from pyres.worker import Worker as Wrkr
+import os
+TEMPLATE_PATH = os.path.join(os.path.dirname(__file__), 'templates')
 class ResWeb(pystache.View):
-    template_path = 'templates'
+    template_path = TEMPLATE_PATH
     def __init__(self, host):
         super(ResWeb, self).__init__()
         self.resq = ResQ(host)

scripts/pyres_web

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+from resweb import server
+from itty import *
+def main():
+    from optparse import OptionParser
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage)
+    parser.add_option("--host",
+                    dest="host",
+                    default="localhost",
+                    metavar="HOST")
+    parser.add_option("--port",
+                    dest="port",
+                    type="int", 
+                    default=8080)
+    (options,args) = parser.parse_args()
+    run_itty(host=options.host, port=options.port)
+
+if __name__ == "__main__":
+    main()

scripts/pyres_worker

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+from pyres.worker import Worker
+def main():
+    from optparse import OptionParser
+    usage = "usage: %prog [options] arg1"
+    parser = OptionParser(usage=usage)
+    #parser.add_option("-q", dest="queue_list")
+    parser.add_option("--host", dest="host", default="localhost")
+    parser.add_option("--port",dest="port",type="int", default=6379)
+    (options,args) = parser.parse_args()
+    if len(args) != 1:
+        parser.print_help()
+        parser.error("Argument must be a comma seperated list of queues")
+    queues = args[0].split(',')
+    server = '%s:%s' % (options.host,options.port)
+    Worker.run(queues, server)
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -6,5 +6,7 @@
       author='Matt George',
       author_email='[email protected]',
       url='http://github.com/binarydud/pyres',
-      packages=['pyres', 'resweb']
+      packages=['pyres', 'resweb'],
+      package_data={'resweb': ['templates/*.mustache','media/*']},
+      scripts=['scripts/pyres_worker', 'scripts/pyres_web']
 )