Support cargo owner add

src/bin/cargo/commands/owner.rs

@@ -6,24 +6,73 @@ use cargo_credential::Secret;
 pub fn cli() -> Command {
     subcommand("owner")
         .about("Manage the owners of a crate on the registry")
-        .arg(Arg::new("crate").value_name("CRATE").action(ArgAction::Set))
+        .arg(Arg::new("crate").hide(true))
+        .arg_required_else_help(true)
+        .args_conflicts_with_subcommands(true)
+        .override_usage(
+            "\
+       cargo[EXE] owner add    <OWNER_NAME> [CRATE_NAME] [OPTIONS]
+       cargo[EXE] owner remove <OWNER_NAME> [CRATE_NAME] [OPTIONS]
+       cargo[EXE] owner list   [CRATE_NAME] [OPTIONS]",
+        )
         .arg(
             multi_opt(
                 "add",
                 "LOGIN",
                 "Name of a user or team to invite as an owner",
             )
-            .short('a'),
+            .short('a')
+            .hide(true),
         )
         .arg(
             multi_opt(
                 "remove",
                 "LOGIN",
                 "Name of a user or team to remove as an owner",
             )
-            .short('r'),
+            .short('r')
+            .hide(true),
         )
-        .arg(flag("list", "List owners of a crate").short('l'))
+        .arg(flag("list", "List owners of a crate").short('l').hide(true))
+        .subcommands([
+            Command::new("add")
+                .about("Name of a user or team to invite as an owner")
+                .args([
+                    Arg::new("add")
+                        .required(true)
+                        .value_delimiter(',')
+                        .value_name("OWNER_NAME")
+                        .help("Name of the owner you want to invite"),
+                    Arg::new("crate")
+                        .value_name("CRATE_NAME")
+                        .help("Crate name that you want to manage the owner"),
+                ])
+                .args(&add_registry_args())
+                .override_usage("cargo owner add <OWNER_NAME> [CRATE_NAME] [OPTIONS]"),
+            Command::new("remove")
+                .about("Name of a user or team to remove as an owner")
+                .args([
+                    Arg::new("remove")
+                        .required(true)
+                        .value_delimiter(',')
+                        .value_name("OWNER_NAME")
+                        .help("Name of the owner you want to remove"),
+                    Arg::new("crate")
+                        .value_name("CRATE_NAME")
+                        .help("Crate name that you want to manage the owner"),
+                ])
+                .args(&add_registry_args())
+                .override_usage("cargo owner remove <OWNER_NAME> [CRATE_NAME] [OPTIONS]"),
+            Command::new("list")
+                .about("List owners of a crate")
+                .arg(
+                    Arg::new("crate")
+                        .value_name("CRATE_NAME")
+                        .help("Crate name which you want to list all owner names"),
+                )
+                .args(&add_registry_args())
+                .override_usage("cargo owner list [CRATE_NAME] [OPTIONS]"),
+        ])
         .arg_index("Registry index URL to modify owners for")
         .arg_registry("Registry to modify owners for")
         .arg(opt("token", "API token to use when authenticating").value_name("TOKEN"))
@@ -33,19 +82,70 @@ pub fn cli() -> Command {
         ))
 }
 
+fn add_registry_args() -> [Arg; 3] {
+    [
+        opt("index", "Registry index URL to modify owners for")
+            .value_name("INDEX")
+            .conflicts_with("registry"),
+        opt("registry", "Registry to modify owners for").value_name("REGISTRY"),
+        opt("token", "API token to use when authenticating").value_name("TOKEN"),
+    ]
+}
+
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
+    let (to_add, to_remove, list) = match args.subcommand() {
+        Some(("add", subargs)) => (
+            subargs
+                .get_many::<String>("add")
+                .map(|xs| xs.cloned().collect::<Vec<String>>()),
+            None,
+            false,
+        ),
+        Some(("remove", subargs)) => (
+            None,
+            subargs
+                .get_many::<String>("remove")
+                .map(|xs| xs.cloned().collect()),
+            false,
+        ),
+        Some(("list", _)) => (None, None, true),
+        _ => (
+            args.get_many::<String>("add")
+                .map(|xs| xs.cloned().collect::<Vec<String>>()),
+            args.get_many::<String>("remove")
+                .map(|xs| xs.cloned().collect()),
+            args.flag("list"),
+        ),
+    };
+
+    let common_args = args.subcommand().map(|(_, args)| args).unwrap_or(args);
+
+    if (to_add.clone(), to_remove.clone(), list) == (None, None, false) {
+        return Err(CliError::new(
+            anyhow::format_err!(
+                " please enter correct subcommand or parameter.\n            
+enter `cargo owner --help` for help."
+            ),
+            101,
+        ));
+    }
+
     let opts = OwnersOptions {
-        krate: args.get_one::<String>("crate").cloned(),
-        token: args.get_one::<String>("token").cloned().map(Secret::from),
-        reg_or_index: args.registry_or_index(config)?,
-        to_add: args
-            .get_many::<String>("add")
-            .map(|xs| xs.cloned().collect()),
-        to_remove: args
-            .get_many::<String>("remove")
-            .map(|xs| xs.cloned().collect()),
-        list: args.flag("list"),
+        krate: common_args.clone().get_one::<String>("crate").cloned(),
+        token: common_args
+            .get_one::<String>("token")
+            .cloned()
+            .map(Secret::from),
+        reg_or_index: args
+            .subcommand()
+            .map_or(args.registry_or_index(config), |v| {
+                v.1.registry_or_index(config)
+            })?,
+        to_add,
+        to_remove,
+        list,
     };
+
     ops::modify_owners(config, &opts)?;
     Ok(())
 }

src/doc/man/cargo-owner.md

@@ -6,9 +6,9 @@ cargo-owner --- Manage the owners of a crate on the registry
 
 ## SYNOPSIS
 
-`cargo owner` [_options_] `--add` _login_ [_crate_]\
-`cargo owner` [_options_] `--remove` _login_ [_crate_]\
-`cargo owner` [_options_] `--list` [_crate_]
+`cargo owner` `add` _login_ [_crate_] [_options_]\
+`cargo owner` `remove` _login_ [_crate_] [_options_]\
+`cargo owner` `list` [_crate_] [_options_]
 
 ## DESCRIPTION
 
@@ -27,22 +27,28 @@ information about owners and publishing.
 
 ## OPTIONS
 
-### Owner Options
+### Subcommand
 
 {{#options}}
 
-{{#option "`-a`" "`--add` _login_..." }}
+{{#option "`add` _login_..." }}
 Invite the given user or team as an owner.
 {{/option}}
 
-{{#option "`-r`" "`--remove` _login_..." }}
+{{#option "`remove` _login_..." }}
 Remove the given user or team as an owner.
 {{/option}}
 
-{{#option "`-l`" "`--list`" }}
+{{#option "`list`" }}
 List owners of a crate.
 {{/option}}
 
+{{/options}}
+
+### Owner Options
+
+{{#options}}
+
 {{> options-token }}
 
 {{> options-index }}
@@ -67,15 +73,15 @@ List owners of a crate.
 
 1. List owners of a package:
 
-       cargo owner --list foo
+       cargo owner list foo
 
 2. Invite an owner to a package:
 
-       cargo owner --add username foo
+       cargo owner add username foo
 
 3. Remove an owner from a package:
 
-       cargo owner --remove username foo
+       cargo owner remove username foo
 
 ## SEE ALSO
 {{man "cargo" 1}}, {{man "cargo-login" 1}}, {{man "cargo-publish" 1}}

src/doc/man/generated_txt/cargo-owner.txt

@@ -4,9 +4,9 @@ NAME
        cargo-owner — Manage the owners of a crate on the registry
 
 SYNOPSIS
-       cargo owner [options] --add login [crate]
-       cargo owner [options] --remove login [crate]
-       cargo owner [options] --list [crate]
+       cargo owner add login [crate] [options]
+       cargo owner remove login [crate] [options]
+       cargo owner list [crate] [options]
 
 DESCRIPTION
        This command will modify the owners for a crate on the registry. Owners
@@ -24,16 +24,17 @@ DESCRIPTION
        for more information about owners and publishing.
 
 OPTIONS
-   Owner Options
-       -a, --add login…
+   Subcommand
+       add login…
            Invite the given user or team as an owner.
 
-       -r, --remove login…
+       remove login…
            Remove the given user or team as an owner.
 
-       -l, --list
+       list
            List owners of a crate.
 
+   Owner Options
        --token token
            API token to use when authenticating. This overrides the token
            stored in the credentials file (which is created by cargo-login(1)).
@@ -131,15 +132,15 @@ EXIT STATUS
 EXAMPLES
        1. List owners of a package:
 
-              cargo owner --list foo
+              cargo owner list foo
 
        2. Invite an owner to a package:
 
-              cargo owner --add username foo
+              cargo owner add username foo
 
        3. Remove an owner from a package:
 
-              cargo owner --remove username foo
+              cargo owner remove username foo
 
 SEE ALSO
        cargo(1), cargo-login(1), cargo-publish(1)

src/doc/src/commands/cargo-owner.md

@@ -6,9 +6,9 @@ cargo-owner --- Manage the owners of a crate on the registry
 
 ## SYNOPSIS
 
-`cargo owner` [_options_] `--add` _login_ [_crate_]\
-`cargo owner` [_options_] `--remove` _login_ [_crate_]\
-`cargo owner` [_options_] `--list` [_crate_]
+`cargo owner` `add` _login_ [_crate_] [_options_]\
+`cargo owner` `remove` _login_ [_crate_] [_options_]\
+`cargo owner` `list` [_crate_] [_options_]
 
 ## DESCRIPTION
 
@@ -27,25 +27,28 @@ information about owners and publishing.
 
 ## OPTIONS
 
-### Owner Options
+### Subcommand
 
 <dl>
 
-<dt class="option-term" id="option-cargo-owner--a"><a class="option-anchor" href="#option-cargo-owner--a"></a><code>-a</code></dt>
-<dt class="option-term" id="option-cargo-owner---add"><a class="option-anchor" href="#option-cargo-owner---add"></a><code>--add</code> <em>login</em>…</dt>
+<dt class="option-term" id="option-cargo-owner-add"><a class="option-anchor" href="#option-cargo-owner-add"></a><code>add</code> <em>login</em>…</dt>
 <dd class="option-desc">Invite the given user or team as an owner.</dd>
 
 
-<dt class="option-term" id="option-cargo-owner--r"><a class="option-anchor" href="#option-cargo-owner--r"></a><code>-r</code></dt>
-<dt class="option-term" id="option-cargo-owner---remove"><a class="option-anchor" href="#option-cargo-owner---remove"></a><code>--remove</code> <em>login</em>…</dt>
+<dt class="option-term" id="option-cargo-owner-remove"><a class="option-anchor" href="#option-cargo-owner-remove"></a><code>remove</code> <em>login</em>…</dt>
 <dd class="option-desc">Remove the given user or team as an owner.</dd>
 
 
-<dt class="option-term" id="option-cargo-owner--l"><a class="option-anchor" href="#option-cargo-owner--l"></a><code>-l</code></dt>
-<dt class="option-term" id="option-cargo-owner---list"><a class="option-anchor" href="#option-cargo-owner---list"></a><code>--list</code></dt>
+<dt class="option-term" id="option-cargo-owner-list"><a class="option-anchor" href="#option-cargo-owner-list"></a><code>list</code></dt>
 <dd class="option-desc">List owners of a crate.</dd>
 
 
+</dl>
+
+### Owner Options
+
+<dl>
+
 <dt class="option-term" id="option-cargo-owner---token"><a class="option-anchor" href="#option-cargo-owner---token"></a><code>--token</code> <em>token</em></dt>
 <dd class="option-desc">API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by <a href="cargo-login.html">cargo-login(1)</a>).</p>
@@ -162,15 +165,15 @@ details on environment variables that Cargo reads.
 
 1. List owners of a package:
 
-       cargo owner --list foo
+       cargo owner list foo
 
 2. Invite an owner to a package:
 
-       cargo owner --add username foo
+       cargo owner add username foo
 
 3. Remove an owner from a package:
 
-       cargo owner --remove username foo
+       cargo owner remove username foo
 
 ## SEE ALSO
 [cargo(1)](cargo.html), [cargo-login(1)](cargo-login.html), [cargo-publish(1)](cargo-publish.html)

src/doc/src/reference/publishing.md

@@ -186,22 +186,22 @@ may change over time! The owner of a crate is the only person allowed to publish
 new versions of the crate, but an owner may designate additional owners.
 
 ```console
-$ cargo owner --add github-handle
-$ cargo owner --remove github-handle
-$ cargo owner --add github:rust-lang:owners
-$ cargo owner --remove github:rust-lang:owners
+$ cargo owner add github-handle
+$ cargo owner remove github-handle
+$ cargo owner add github:rust-lang:owners
+$ cargo owner remove github:rust-lang:owners
 ```
 
 The owner IDs given to these commands must be GitHub user names or GitHub teams.
 
-If a user name is given to `--add`, that user is invited as a “named” owner, with
+If a user name is given to `add`, that user is invited as a “named” owner, with
 full rights to the crate. In addition to being able to publish or yank versions
 of the crate, they have the ability to add or remove owners, *including* the
 owner that made *them* an owner. Needless to say, you shouldn’t make people you
 don’t fully trust into a named owner. In order to become a named owner, a user
 must have logged into [crates.io] previously.
 
-If a team name is given to `--add`, that team is invited as a “team” owner, with
+If a team name is given to `add`, that team is invited as a “team” owner, with
 restricted right to the crate. While they have permission to publish or yank
 versions of the crate, they *do not* have the ability to add or remove owners.
 In addition to being more convenient for managing groups of owners, teams are

src/etc/_cargo

@@ -217,9 +217,12 @@ _cargo() {
                 owner)
                     _arguments -s -S $common $registry \
                         '(-a --add)'{-a,--add}'[specify name of a user or team to invite as an owner]:name' \
+                        '(add)'{add}'[specify name of a user or team to invite as an owner]:name' \
                         '--index=[specify registry index]:index' \
                         '(-l --list)'{-l,--list}'[list owners of a crate]' \
+                        '(list)'{list}'[list owners of a crate]' \
                         '(-r --remove)'{-r,--remove}'[specify name of a user or team to remove as an owner]:name' \
+                        '(remove)'{remove}'[specify name of a user or team to remove as an owner]:name' \
                         '--token=[specify API token to use when authenticating]:token' \
                         '*: :_guard "^-*" "crate"'
                         ;;