fix(clap): print usage if command is missing

Byron · Byron · commit 63e23dd48f7f · 2015-04-29T22:08:47.000+02:00
Also, fixed config-dir substitution in flag's help message
diff --git a/src/mako/cli/lib/argparse.mako b/src/mako/cli/lib/argparse.mako
@@ -104,7 +104,7 @@ Configuration:
         CONFIG_DIR_FLAG,
         "A directory into which we will store our persistent data. Defaults to "
         "a user-writable directory that we will create during the first invocation."
-        "[default: ${CONFIG_DIR}]",
+        "[default: %s" % CONFIG_DIR,
         'folder',
     ))
 
diff --git a/src/mako/cli/lib/engine.mako b/src/mako/cli/lib/engine.mako
@@ -69,12 +69,14 @@ impl<'n, 'a> Engine<'n, 'a> {
                     % endfor # each method
                     _ => {
                         err.issues.push(CLIError::MissingMethodError("${mangle_subcommand(resource)}".to_string()));
+                        writeln!(io::stderr(), "{}\n", opt.usage()).ok();
                     }
                 }
             },
 % endfor # each resource
             _ => {
                 err.issues.push(CLIError::MissingCommandError);
+                writeln!(io::stderr(), "{}\n", ${SOPT}.usage()).ok();
             }
         }
 
diff --git a/src/rust/cli/cmn.rs b/src/rust/cli/cmn.rs
@@ -351,7 +351,7 @@ impl fmt::Display for CLIError {
                 writeln!(f, "'{}' does not match {}pattern <key>=<value>", kv, hashmap_info)
             },
             CLIError::MissingCommandError => writeln!(f, "Please specify the main sub-command"),
-            CLIError::MissingMethodError(ref cmd) => writeln!(f, "Please specify the method to call on the {} command", cmd),
+            CLIError::MissingMethodError(ref cmd) => writeln!(f, "Please specify the method to call on the '{}' command", cmd),
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,14 @@ impl<'n, 'a> Engine<'n, 'a> {`
`69`	`69`	`% endfor # each method`
`70`	`70`	`_ => {`
`71`	`71`	`err.issues.push(CLIError::MissingMethodError("${mangle_subcommand(resource)}".to_string()));`
	`72`	`+ writeln!(io::stderr(), "{}\n", opt.usage()).ok();`
`72`	`73`	`}`
`73`	`74`	`}`
`74`	`75`	`},`
`75`	`76`	`% endfor # each resource`
`76`	`77`	`_ => {`
`77`	`78`	`err.issues.push(CLIError::MissingCommandError);`
	`79`	`+ writeln!(io::stderr(), "{}\n", ${SOPT}.usage()).ok();`
`78`	`80`	`}`
`79`	`81`	`}`
`80`	`82`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ impl fmt::Display for CLIError {`
`351`	`351`	`writeln!(f, "'{}' does not match {}pattern <key>=<value>", kv, hashmap_info)`
`352`	`352`	`},`
`353`	`353`	`CLIError::MissingCommandError => writeln!(f, "Please specify the main sub-command"),`
`354`		`- CLIError::MissingMethodError(ref cmd) => writeln!(f, "Please specify the method to call on the {} command", cmd),`
	`354`	`+ CLIError::MissingMethodError(ref cmd) => writeln!(f, "Please specify the method to call on the '{}' command", cmd),`
`355`	`355`	`}`
`356`	`356`	`}`
`357`	`357`	`}`