Merge pull request #50 from scijava/rename-jgo_main

Rename jgo_main to _jgo_main

jgo/__init__.py

@@ -1,2 +1,2 @@
-from .jgo import resolve_dependencies, jgo_main as main
+from .jgo import resolve_dependencies, _jgo_main as main
 from .util import main_from_endpoint, maven_scijava_repository, add_jvm_args_as_necessary

jgo/jgo.py

@@ -270,7 +270,7 @@ def jgo_parser():
 
     return parser
 
-def jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
+def _jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
 
     LOG_FORMAT = '%(levelname)s %(asctime)s: %(message)s'
     logging.basicConfig(
@@ -280,8 +280,23 @@ def jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
 
     parser = jgo_parser()
 
-    completed_process = run(parser, argv=argv, stdout=stdout, stderr=stderr)
-    completed_process.check_returncode()
+    try:
+        completed_process = run(parser, argv=argv, stdout=stdout, stderr=stderr)
+        completed_process.check_returncode()
+
+    except HelpRequested:
+        pass
+        parser.print_help()
+
+    except NoEndpointProvided:
+        parser.print_usage()
+        _logger.error('No endpoint provided. Run `jgo --help\' for a detailed help message.')
+        return 254
+
+    except subprocess.CalledProcessError as e:
+        return e.returncode
+
+    return 0
 
 
 def jgo_cache_dir_environment_variable():

jgo/util.py

@@ -1,7 +1,7 @@
 import psutil
 import sys
 
-from .jgo import jgo_main as main
+from .jgo import _jgo_main as main
 
 def add_jvm_args_as_necessary(argv, gc_option='-XX:+UseConcMarkSweepGC'):
     """

setup.py

@@ -20,7 +20,7 @@
     test_suite='nose.collector',
     entry_points={
         'console_scripts': [
-            'jgo=jgo.jgo:jgo_main'
+            'jgo=jgo:main'
         ]
     },
     python_requires='>=3',