ConsoleUtils: attempt to match singleton params

It is not practical to require users to know the names of script
parameters to call the script.

If script params are mapped with =, great. If not, we can try to match
them with the parameters of the script.

NB: this requires that script parameters be written in a reasonable
ordering, such that user-supplied params come before system-supplied
params.

Author: hinerm

src/main/java/org/scijava/command/console/RunArgument.java

@@ -100,7 +100,7 @@ private void run(final String commandToRun, final String optionString) {
 			return;
 
 		// TODO: parse the optionString a la ImageJ1
-		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(optionString, logService);
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(optionString, info, logService);
 
 		try {
 			commandService.run(info, true, inputMap).get();

src/main/java/org/scijava/console/ConsoleUtils.java

@@ -31,9 +31,13 @@
 package org.scijava.console;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
+import org.scijava.command.CommandInfo;
 import org.scijava.log.LogService;
+import org.scijava.module.ModuleInfo;
+import org.scijava.module.ModuleItem;
 
 /**
  * Helper class for {@link ConsoleArgument}s.
@@ -43,24 +47,40 @@
 public final class ConsoleUtils {
 
 	public static Map<String, Object> parseParameterString(final String parameterString) {
-		return parseParameterString(parameterString, null);
+		return parseParameterString(parameterString, (CommandInfo)null);
+	}
+
+	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info) {
+		return parseParameterString(parameterString, info, null);
 	}
 
 	public static Map<String, Object> parseParameterString(final String parameterString, final LogService logService) {
+		return parseParameterString(parameterString, null, logService);
+	}
+
+	public static Map<String, Object> parseParameterString(final String parameterString, final ModuleInfo info, final LogService logService) {
 		final Map<String, Object> inputMap = new HashMap<String, Object>();
 
 		if (!parameterString.isEmpty()) {
+			Iterator<ModuleItem<?>> inputs = null;
+			if (info != null) {
+				inputs = info.inputs().iterator();
+			}
 			final String[] pairs = parameterString.split(",");
 			for (final String pair : pairs) {
 				final String[] split = pair.split("=");
 				if (split.length == 2)
 					inputMap.put(split[0], split[1]);
+				else if (inputs != null && inputs.hasNext() && split.length == 1) {
+					inputMap.put(inputs.next().getName(), split[0]);
+				}
 				else if (logService != null)
 					logService.error("Parameters must be formatted as a comma-separated list of key=value pairs");
 
 			}
 		}
 
 		return inputMap;
+
 	}
 }

src/main/java/org/scijava/script/console/RunScriptArgument.java

@@ -40,6 +40,7 @@
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.script.ScriptInfo;
 import org.scijava.script.ScriptService;
 
 /**
@@ -97,11 +98,12 @@ private void run(final String scriptToRun, final String paramString) {
 		if (script == null)
 			return;
 
-		// TODO: parse the optionString a la ImageJ1
-		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, logService);
+		final ScriptInfo info = scriptService.getScript(script);
+
+		final Map<String, Object> inputMap = ConsoleUtils.parseParameterString(paramString, info, logService);
 
 		try {
-			scriptService.run(script, true, inputMap).get();
+			scriptService.run(info, true, inputMap).get();
 		} catch (final Exception exc) {
 			logService.error(exc);
 		}