Refine CLI parameters and output

Author: mikera

convex-cli/src/main/java/convex/cli/Main.java

@@ -77,7 +77,7 @@ public class Main extends ACommand {
 	@Option(names = { "-k","--key" }, 
 			defaultValue = "${env:CONVEX_KEY}", 
 			scope = ScopeType.INHERIT, 
-			description = "Keystore filename. Default: ${DEFAULT-VALUE}")
+			description = "Public key to use. Default: ${DEFAULT-VALUE}")
 	private String keySpec;
 
 	@Option(names = { "-p","--password" }, 
@@ -92,7 +92,10 @@ public class Main extends ACommand {
 			description = "Apply strict security. Will forbid actions with dubious security implications.")
 	private boolean paranoid;
 
-	@Option(names = {"--keystore-password" }, 
+	/**
+	 * Password for keystore. Option named to match Java keytool
+	 */
+	@Option(names = {"--storepass" }, 
 			scope = ScopeType.INHERIT, 
 			defaultValue = "${env:CONVEX_KEYSTORE_PASSWORD}", 
 			description = "Password to read/write to the Keystore")
@@ -112,7 +115,7 @@ public class Main extends ACommand {
 	@Option(names = { "-v","--verbose" }, 
 			scope = ScopeType.INHERIT, 
 			defaultValue = "${env:CONVEX_VERBOSE_LEVEL:-2}", 
-			description = "Specify verbosity level. Use -v0 to suppress user output. Default: ${DEFAULT-VALUE}")
+			description = "Specify verbosity level. Use -v0 to suppress user output, -v5 for all log output. Default: ${DEFAULT-VALUE}")
 	private Integer verbose;
 
 	public Main() {
@@ -173,7 +176,9 @@ public int mainExecute(String[] args) {
 			if (verbose == null)
 				verbose = 0;
 			if (verbose >= 0 && verbose < verboseLevels.length) {
-				// OK
+				// Set root logger level?
+				ch.qos.logback.classic.Logger root = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
+				root.setLevel(verboseLevels[verbose]);
 			} else {
 				commandLine.getErr().println("ERROR: Invalid verbosity level: " + verbose);
 				return ExitCodes.ERROR;
@@ -560,6 +565,11 @@ public EtchStore getEtchStore(String etchStoreFilename) {
 		}
 	}
 
+	/**
+	 * Prompt the user for a Y/N answer
+	 * @param string
+	 * @return
+	 */
 	public boolean question(String string) {
 		if (!isInteractive()) throw new CLIError("Can't ask user question in non-interactive mode: "+string);
 		try {
@@ -573,6 +583,11 @@ public boolean question(String string) {
 		return false;
 	}
 
+	/**
+	 * Prompt the user for String input
+	 * @param string
+	 * @return
+	 */
 	public String prompt(String string) {
 		if (!isInteractive()) throw new CLIError("Can't prompt for user input in non-interactive mode: "+string);
 

convex-cli/src/test/java/convex/cli/key/KeyExportTest.java

@@ -41,7 +41,7 @@ public void testKeyGenerateAndExport() {
 		// command key.generate
 		CLTester tester =  CLTester.run(
 			"key", "generate",
-			"--keystore-password", new String(KEYSTORE_PASSWORD),
+			"--storepass", new String(KEYSTORE_PASSWORD),
 			"--password", new String(KEY_PASSWORD),
 			"--keystore", KEYSTORE_FILENAME
 		);
@@ -62,7 +62,7 @@ public void testKeyGenerateAndExport() {
 		tester =  CLTester.run(
 			"key",
 			"export",
-			"--keystore-password", new String(KEYSTORE_PASSWORD),
+			"--storepass", new String(KEYSTORE_PASSWORD),
 			"--password", new String(KEY_PASSWORD),
 			"--keystore", KEYSTORE_FILENAME,
 			"--public-key", publicKey,
@@ -79,7 +79,7 @@ public void testKeyGenerateAndExport() {
 			"key",
 			"export",
 			"seed",
-			"--keystore-password", new String(KEYSTORE_PASSWORD),
+			"--storepass", new String(KEYSTORE_PASSWORD),
 			"--password", new String(KEY_PASSWORD),
 			"--keystore", KEYSTORE_FILENAME,
 			"--public-key", publicKey

convex-cli/src/test/java/convex/cli/key/KeyImportTest.java

@@ -41,7 +41,7 @@ public void testKeyImportPEM() {
 			"import",
 			"pem",
 			"-n",
-			"--keystore-password", new String(KEYSTORE_PASSWORD), 
+			"--storepass", new String(KEYSTORE_PASSWORD), 
 			"--keystore", KEYSTORE_FILENAME, 
 			"--text", pemText, 
 			"--import-password", new String(IMPORT_PASSWORD)
@@ -51,7 +51,7 @@ public void testKeyImportPEM() {
 		CLTester t2=CLTester.run(
 				"key" , 
 				"list",
-				"--keystore-password", new String(KEYSTORE_PASSWORD), 
+				"--storepass", new String(KEYSTORE_PASSWORD), 
 				"--keystore", KEYSTORE_FILENAME);
 
 		assertEquals(ExitCodes.SUCCESS,t2.getResult());
@@ -67,7 +67,7 @@ public void testKeyImportSeed() {
 			"key", 
 			"import",
 			"seed",
-			"--keystore-password", new String(KEYSTORE_PASSWORD), 
+			"--storepass", new String(KEYSTORE_PASSWORD), 
 			"--keystore", KEYSTORE_FILENAME, 
 			"--text", keyPair.getSeed().toString(), 
 			"--password", KEY_PASSWORD, 
@@ -81,7 +81,7 @@ public void testKeyImportSeed() {
 				"key" , 
 				"list",
 				"--password",KEY_PASSWORD,
-				"--keystore-password", new String(KEYSTORE_PASSWORD), 
+				"--storepass", new String(KEYSTORE_PASSWORD), 
 				"--keystore", KEYSTORE_FILENAME);
 
 		assertEquals(ExitCodes.SUCCESS,t2.getResult());
@@ -99,7 +99,7 @@ public void testKeyImportBIP39() {
 			"key", 
 			"import",
 			"bip39",
-			"--keystore-password", new String(KEYSTORE_PASSWORD), 
+			"--storepass", new String(KEYSTORE_PASSWORD), 
 			"--keystore", KEYSTORE_FILENAME, 
 			"--password",KEY_PASSWORD,
 			"--text", "elder mail trick garage hour enjoy attack fringe problem motion poem security caught false penalty", 
@@ -113,7 +113,7 @@ public void testKeyImportBIP39() {
 				"key" , 
 				"list",
 				"--password",KEY_PASSWORD,
-				"--keystore-password", new String(KEYSTORE_PASSWORD), 
+				"--storepass", new String(KEYSTORE_PASSWORD), 
 				"--keystore", KEYSTORE_FILENAME);
 
 		assertEquals(ExitCodes.SUCCESS,t2.getResult());

convex-cli/src/test/java/convex/cli/key/KeyTest.java

@@ -39,7 +39,7 @@ public void testKeyGenerateAndUse() throws IOException {
 				"key", 
 				"generate", 
 				"-p", KEY_PASSWORD, 
-				"--keystore-password", KEYSTORE_PASSWORD, 
+				"--storepass", KEYSTORE_PASSWORD, 
 				"--keystore", fileName);
 		tester.assertResult(0);
 		String key = tester.getOutput().trim();
@@ -50,11 +50,11 @@ public void testKeyGenerateAndUse() throws IOException {
 		assertTrue(fp.exists());
 
 		// command key.list
-		tester =  CLTester.run("key", "list", "--keystore-password", KEYSTORE_PASSWORD, "--keystore", fileName);
+		tester =  CLTester.run("key", "list", "--storepass", KEYSTORE_PASSWORD, "--keystore", fileName);
 		//tester.assertOutputMatch("^Index Public Key\\s+1");
 
 		// command key.list with non-existant keystore
-		tester =  CLTester.run("key", "list", "--keystore-password", KEYSTORE_PASSWORD, "--keystore","bad-keystore.pfx");
+		tester =  CLTester.run("key", "list", "--storepass", KEYSTORE_PASSWORD, "--keystore","bad-keystore.pfx");
 		assertNotEquals(ExitCodes.SUCCESS,tester.getResult());
 
 	}