Merge remote-tracking branch 'origin/master' into add-simple-test

Conflicts:
 - jgo/jgo.py

Author: hanslovsky

jgo.sh

@@ -307,7 +307,7 @@ then
 	check cat
 	mainClass=$(cat "$workspace/mainClass")
 	launchJava
-	exit 0
+	exit $?
 fi
 
 # Synthesize a dummy Maven project.

jgo/jgo.py

@@ -189,7 +189,8 @@ def launch_java(
         *app_args,
         additional_jars=[],
         stdout=None,
-        stderr=None
+        stderr=None,
+        **subprocess_run_kwargs,
         ):
     java = executable_path('java')
     if not java:
@@ -198,7 +199,7 @@ def launch_java(
     cp = classpath_separator().join([os.path.join(jar_dir, '*')] + additional_jars)
     _logger.debug("class path: %s", cp)
     jvm_args = tuple(arg for arg in jvm_args) if jvm_args else tuple()
-    return subprocess.run((java, '-cp', cp) + jvm_args + (main_class,) + app_args, stdout=stdout, stderr=stderr)
+    return subprocess.run((java, '-cp', cp) + jvm_args + (main_class,) + app_args, stdout=stdout, stderr=stderr, **subprocess_run_kwargs)
 
 def run_and_combine_outputs(command, *args):
     return subprocess.check_output((command,) + args, stderr=subprocess.STDOUT)
@@ -213,7 +214,7 @@ def find_endpoint(argv, shortcuts={}):
             indices.append(index)
     return -1 if len(indices) == 0 else indices[-1]
 
-def jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
+def jgo_parser():
 
     epilog='''
 The endpoint should have one of the following formats:
@@ -246,18 +247,25 @@ def jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
     parser.add_argument('--ignore-jgorc', action='store_true', help='Ignore ~/.jgorc')
     parser.add_argument('--link-type', default=None, type=str, help='How to link from local maven repository into jgo cache. Defaults to the `links\' setting in ~/.jrunrc or \'auto\' if not specified.', choices=('hard', 'soft', 'copy', 'auto'))
 
+    return parser
+
+def jgo_main(argv=sys.argv[1:], stdout=None, stderr=None):
+
+    parser = jgo_parser()
 
     try:
-        return run(parser, argv=argv, stdout=stdout, stderr=stderr)
+        completed_process = run(parser, argv=argv, stdout=stdout, stderr=stderr)
+        completed_process.check_returncode()
     except subprocess.CalledProcessError as e:
-        _logger.error("Error in %s: %s", e.cmd, e)
+        _logger.error("Error in `%s': %d", ' '.join(e.cmd), e.returncode)
+        _logger.debug("Exception: %s", e)
         _logger.debug("Debug Trace:", exc_info=True)
         if e.stdout:
-            _logger.debug("\tMaven std out:")
+            _logger.debug("\tstd out:")
             for l in str(e.stdout).split('\\n'):
                 _logger.debug('\t\t%s', l)
         if e.stderr:
-            _logger.debug("Maven std err:")
+            _logger.debug("\tstd err:")
             for l in str(e.stderr).split('\\n'):
                 _logger.debug('\t\t%s', l)
         parser.print_help(file=sys.stderr)
@@ -547,7 +555,7 @@ def run(parser, argv=sys.argv[1:], stdout=None, stderr=None):
     try:
         with open(main_class_file, 'r') as f:
             main_class = f.readline()
-        return launch_java(workspace, jvm_args, main_class, *program_args, additional_jars=args.additional_jars, stdout=stdout, stderr=stderr)
+        return launch_java(workspace, jvm_args, main_class, *program_args, additional_jars=args.additional_jars, stdout=stdout, stderr=stderr, check=False)
     except FileNotFoundError:
         pass
 
@@ -573,8 +581,7 @@ def run(parser, argv=sys.argv[1:], stdout=None, stderr=None):
     with open(main_class_file, 'w') as f:
         f.write(main_class)
 
-
-    return launch_java(workspace, jvm_args, main_class, *program_args, additional_jars=args.additional_jars, stdout=stdout, stderr=stderr)
+    return launch_java(workspace, jvm_args, main_class, *program_args, additional_jars=args.additional_jars, stdout=stdout, stderr=stderr, check=False)
 
 
 

tests/test_parsington.py

@@ -18,9 +18,10 @@
 PARSINGTON_ENDPOINT = 'org.scijava:parsington:{}'.format(PARSINGTON_VERSION)
 
 def run_parsington(cache_dir, link_type, parsington_args):
+    parser = jgo.jgo.jgo_parser()
     argv = (IGNORE_JGORC, LINK_TYPE, link_type, PARSINGTON_ENDPOINT) + parsington_args
     os.environ[jgo.jgo.jgo_cache_dir_environment_variable()] = cache_dir
-    return jgo.jgo.jgo_main(argv=argv, stdout=subprocess.PIPE)
+    return jgo.jgo.run(parser=parser, argv=argv, stdout=subprocess.PIPE)
 
 def resolve_parsington(cache_dir, link_type, m2_repo):
     return jgo.resolve_dependencies(
@@ -92,6 +93,7 @@ def test_run_jgo(self):
 
         try:
             completed_process = run_parsington(cache_dir=tmp_dir, link_type='auto', parsington_args=('1+3',))
+            self.assertIsNotNone(completed_process)
             self.assertEqual(completed_process.returncode, 0, 'Expected return code zero.')
             self.assertEqual(completed_process.stdout.decode('ascii').strip(), str(1+3))
         finally: