From e1b4153712b958e878a85ebf117d2689e8ad15ab Mon Sep 17 00:00:00 2001
From: James Kafader <jkafader@archive.org>
Date: Tue, 3 Oct 2017 16:13:42 -0700
Subject: [PATCH] clean up small items, typos, change command name, clean up
 tests in re: exit code testing.

---
 doublethink/cli.py | 6 +++---
 setup.py           | 2 +-
 tests/test_cli.py  | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/doublethink/cli.py b/doublethink/cli.py
index fab424c..630ef6a 100644
--- a/doublethink/cli.py
+++ b/doublethink/cli.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 '''
-doublethink/orm.py - rethinkdb ORM Command Line Interface
+doublethink/cli.py - doublethink Command Line Tools
 
 Copyright (C) 2017 Internet Archive
 
@@ -30,7 +30,7 @@ def purge_stale_services(argv=None):
     argv = argv or sys.argv
     arg_parser = argparse.ArgumentParser(
             prog=os.path.basename(argv[0]),
-            description='purge-stale-services: utility to periodically purge stale entries from the "services" table.')
+            description='doublethink-purge-stale-services: utility to periodically purge stale entries from the "services" table.')
 
     arg_parser.add_argument("-d", "--rethinkdb-db", required=True,
         dest="database",
@@ -55,4 +55,4 @@ def purge_stale_services(argv=None):
     rethinker = doublethink.Rethinker(servers=args.servers, db=args.database)
     registry = doublethink.services.ServiceRegistry(rethinker)
     registry.purge_stale_services()
-    sys.exit(0)
\ No newline at end of file
+    return 0
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 3e28469..f4b5174 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setuptools.setup(
         'README.rst', mode='r', encoding='utf-8').read(),
     entry_points={
             'console_scripts': [
-                'purge-stale-services=doublethink.cli:purge_stale_services',
+                'doublethink-purge-stale-services=doublethink.cli:purge_stale_services',
             ]
     },
 )
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 45c88b4..f26c6bd 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -50,14 +50,15 @@ def rr():
 
 def test_cli(capsys, rr):
     entrypoint = pkg_resources.get_entry_map(
-            'doublethink')['console_scripts']['purge-stale-services']
+            'doublethink')['console_scripts']['doublethink-purge-stale-services']
     callable = entrypoint.resolve()
     with pytest.raises(SystemExit) as exit:
-        callable(['purge-stale-services'])
+        callable(['doublethink-purge-stale-services'])
     print(dir(exit))
     assert exit.value.code != 0
     out, err = capsys.readouterr()
     with pytest.raises(SystemExit) as exit:
-        callable(['purge-stale-services', '-d', 'test'])
+        # this wrap with sys.exit matches what occurs in the generated command
+        sys.exit(callable(['doublethink-purge-stale-services', '-d', 'test']))
     assert exit.value.code == 0
     out, err = capsys.readouterr()