Migrate cli implementation from clap to structopt

components/hab/src/cli.rs

@@ -80,7 +80,7 @@ use crate::cli::hab::{bldr::{ChannelCreate,
                             SvcStop,
                             SvcUnload,
                             Update as SvcUpdate},
-                      user::Key as UserKey,
+                      user::KeyGenerate as UserKeyGenerate,
                       Hab};
 use clap::{App,
            AppSettings,
@@ -107,6 +107,14 @@ pub const AFTER_HELP: &str =
      start      Alias for: 'svc start'\n    stop       Alias for: 'svc stop'\n    term       \
      Alias for: 'sup term'\n";
 
+#[derive(StructOpt)]
+#[structopt(name = "key", no_version, aliases = &["k", "ke"], settings = &[AppSettings::ArgRequiredElseHelp, AppSettings::SubcommandRequiredElseHelp])]
+/// Commands relating to Habitat user keys
+pub enum UserKey {
+    #[structopt(no_version, aliases = &["g", "ge", "gen", "gene", "gener", "genera", "generat"])]
+    Generate(UserKeyGenerate),
+}
+
 pub fn get(feature_flags: FeatureFlag) -> App<'static, 'static> {
     if feature_flags.contains(FeatureFlag::STRUCTOPT_CLI) {
         return Hab::clap();
@@ -322,9 +330,7 @@ pub fn get(feature_flags: FeatureFlag) -> App<'static, 'static> {
             (aliases: &["u", "us", "use"])
             (@setting ArgRequiredElseHelp)
             (@setting SubcommandRequiredElseHelp)
-            (subcommand: UserKey::clap().aliases(&["stu", "stud", "studi"])
-                                        .settings(&[AppSettings::ArgRequiredElseHelp, AppSettings::SubcommandRequiredElseHelp])
-            )
+            (subcommand: UserKey::clap())
         )
         (subcommand: alias_apply)
         (subcommand: alias_install)

components/hab/src/cli/hab/user.rs

@@ -10,16 +10,20 @@ pub enum User {
     Key(Key),
 }
 
-/// Commands relating to Habitat users
+/// Commands relating to Habitat user keys
 #[derive(ConfigOpt, StructOpt)]
 #[structopt(name = "key", no_version)]
 pub enum Key {
-    /// Generates a Habitat user key
-    Generate {
-        /// Name of the user key
-        #[structopt(name = "USER")]
-        user:           String,
-        #[structopt(flatten)]
-        cache_key_path: CacheKeyPath,
-    },
+    Generate(KeyGenerate),
+}
+
+/// Generates a Habitat user key
+#[derive(ConfigOpt, StructOpt)]
+#[structopt(name = "generate", no_version)]
+pub struct KeyGenerate {
+    /// Name of the user key
+    #[structopt(name = "USER")]
+    user:           String,
+    #[structopt(flatten)]
+    cache_key_path: CacheKeyPath,
 }