Merge branch 'master' into qa

* master:
  actually implement the brozzler-list-jobs --job option

brozzler/cli.py

@@ -411,11 +411,25 @@ def brozzler_list_jobs():
     configure_logging(args)
 
     rr = rethinker(args)
-    reql = rr.table('jobs').order_by('id')
-    if not args.all:
-        reql = reql.filter({'status': 'ACTIVE'})
-    logging.debug('querying rethinkdb: %s', reql)
-    results = reql.run()
+    if args.job is not None:
+        try:
+            job_id = int(args.job)
+        except ValueError:
+            job_id = args.job
+        reql = rr.table('jobs').get(job_id)
+        logging.debug('querying rethinkdb: %s', reql)
+        result = reql.run()
+        if result:
+            results = [reql.run()]
+        else:
+            logging.error('no such job with id %s', repr(job_id))
+            sys.exit(1)
+    else:
+        reql = rr.table('jobs').order_by('id')
+        if args.active:
+            reql = reql.filter({'status': 'ACTIVE'})
+        logging.debug('querying rethinkdb: %s', reql)
+        results = reql.run()
     if args.yaml:
         yaml.dump_all(
                 results, stream=sys.stdout, explicit_start=True,

setup.py

@@ -32,7 +32,7 @@ def find_package_data(package):
 
 setuptools.setup(
         name='brozzler',
-        version='1.1b9.dev207',
+        version='1.1b9.dev208',
         description='Distributed web crawling with browsers',
         url='https://github.com/internetarchive/brozzler',
         author='Noah Levitt',