Support cargo owner add

src/bin/cargo/commands/owner.rs

@@ -6,25 +6,68 @@ use cargo::util::auth::Secret;
 pub fn cli() -> Command {
     subcommand("owner")
         .about("Manage the owners of a crate on the registry")
-        .arg_quiet()
         .arg(Arg::new("crate").action(ArgAction::Set))
-        .arg(
-            multi_opt(
-                "add",
-                "LOGIN",
-                "Name of a user or team to invite as an owner",
-            )
-            .short('a'),
-        )
-        .arg(
-            multi_opt(
-                "remove",
-                "LOGIN",
-                "Name of a user or team to remove as an owner",
-            )
-            .short('r'),
+        .arg_required_else_help(true)
+        .override_usage(
+            "\
+       cargo owner [OPTIONS] add    OWNER_NAME <CRATE_NAME>
+       cargo owner [OPTIONS] remove OWNER_NAME <CRATE_NAME>
+       cargo owner [OPTIONS] list   <CRATE_NAME>",
         )
-        .arg(flag("list", "List owners of a crate").short('l'))
+        .arg_quiet()
+        .subcommands([
+            Command::new("add")
+                .about("Name of a user or team to invite as an owner")
+                .override_usage(
+                    "\
+                   cargo owner [OPTIONS] add [OWNER_NAME] <CRATE_NAME>",
+                )
+                .arg_quiet()
+                .args([
+                    Arg::new("ownername")
+                        .action(ArgAction::Set)
+                        .required(true)
+                        .num_args(1)
+                        .value_delimiter(',')
+                        .value_name("OWNER_NAME"),
+                    Arg::new("cratename")
+                        .action(ArgAction::Set)
+                        .num_args(1)
+                        .value_name("CRATE_NAME"),
+                ]),
+            Command::new("remove")
+                .about("Name of a user or team to remove as an owner")
+                .override_usage(
+                    "\
+                   cargo owner [OPTIONS] remove [OWNER_NAME] <CRATE_NAME>",
+                )
+                .arg_quiet()
+                .args([
+                    Arg::new("ownername")
+                        .action(ArgAction::Set)
+                        .required(true)
+                        .num_args(1)
+                        .value_delimiter(',')
+                        .value_name("OWNER_NAME"),
+                    Arg::new("cratename")
+                        .action(ArgAction::Set)
+                        .num_args(1)
+                        .value_name("CRATE_NAME"),
+                ]),
+            Command::new("list")
+                .about("List owners of a crate")
+                .override_usage(
+                    "\
+                   cargo owner [OPTIONS] list <CRATE_NAME>",
+                )
+                .arg_quiet()
+                .arg(
+                    Arg::new("cratename")
+                        .action(ArgAction::Set)
+                        .num_args(1)
+                        .value_name("CRATE_NAME"),
+                ),
+        ])
         .arg(opt("index", "Registry index to modify owners for").value_name("INDEX"))
         .arg(opt("token", "API token to use when authenticating").value_name("TOKEN"))
         .arg(opt("registry", "Registry to use").value_name("REGISTRY"))
@@ -33,19 +76,24 @@ pub fn cli() -> Command {
 
 pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
     let registry = args.registry(config)?;
+
+    let Some((sc, arg)) = args.subcommand() else {
+    return Err(CliError::new(
+        anyhow::format_err!(
+            "you need to specify the subcommands to be operated: add, remove or list."
+        ),
+        101,
+    ));
+    };
+
     let opts = OwnersOptions {
-        krate: args.get_one::<String>("crate").cloned(),
         token: args.get_one::<String>("token").cloned().map(Secret::from),
         index: args.get_one::<String>("index").cloned(),
-        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"),
+        subcommand: Some(sc.to_owned()),
+        subcommand_arg: Some(arg.clone()),
         registry,
     };
+
     ops::modify_owners(config, &opts)?;
     Ok(())
 }

src/cargo/ops/registry.rs

@@ -39,6 +39,8 @@ use crate::util::{truncate_with_ellipsis, IntoUrl};
 use crate::util::{Progress, ProgressStyle};
 use crate::{drop_print, drop_println, version};
 
+use crate::util::command_prelude::ArgMatches;
+
 /// Registry settings loaded from config files.
 ///
 /// This is loaded based on the `--registry` flag and the config settings.
@@ -972,18 +974,21 @@ pub fn registry_logout(config: &Config, reg: Option<&str>) -> CargoResult<()> {
 }
 
 pub struct OwnersOptions {
-    pub krate: Option<String>,
     pub token: Option<Secret<String>>,
     pub index: Option<String>,
-    pub to_add: Option<Vec<String>>,
-    pub to_remove: Option<Vec<String>>,
-    pub list: bool,
+    pub subcommand: Option<String>,
+    pub subcommand_arg: Option<ArgMatches>,
     pub registry: Option<String>,
 }
 
 pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> {
-    let name = match opts.krate {
-        Some(ref name) => name.clone(),
+    let name = match opts
+        .subcommand_arg
+        .as_ref()
+        .unwrap()
+        .get_one::<String>("cratename")
+    {
+        Some(ref name) => name.clone().to_string(),
         None => {
             let manifest_path = find_root_manifest_for_wd(config.cwd())?;
             let ws = Workspace::new(&manifest_path, config)?;
@@ -1002,49 +1007,73 @@ pub fn modify_owners(config: &Config, opts: &OwnersOptions) -> CargoResult<()> {
         Some(mutation),
     )?;
 
-    if let Some(ref v) = opts.to_add {
-        let v = v.iter().map(|s| &s[..]).collect::<Vec<_>>();
-        let msg = registry.add_owners(&name, &v).with_context(|| {
-            format!(
-                "failed to invite owners to crate `{}` on registry at {}",
-                name,
-                registry.host()
-            )
-        })?;
+    match opts.subcommand.as_ref().map(|s| s.as_str()) {
+        Some("add") => {
+            let v = opts
+                .subcommand_arg
+                .as_ref()
+                .unwrap()
+                .get_many::<String>("ownername")
+                .map(|s| s.collect::<Vec<_>>())
+                .and_then(|t| Some(t.iter().map(|s| s.as_str()).collect::<Vec<_>>()))
+                .unwrap();
+            let msg = registry.add_owners(&name, &v).with_context(|| {
+                format!(
+                    "failed to invite owners to crate `{}` on registry at {}",
+                    name,
+                    registry.host()
+                )
+            })?;
 
-        config.shell().status("Owner", msg)?;
-    }
+            config.shell().status("Owner", msg)?;
+        }
 
-    if let Some(ref v) = opts.to_remove {
-        let v = v.iter().map(|s| &s[..]).collect::<Vec<_>>();
-        config
-            .shell()
-            .status("Owner", format!("removing {:?} from crate {}", v, name))?;
-        registry.remove_owners(&name, &v).with_context(|| {
-            format!(
-                "failed to remove owners from crate `{}` on registry at {}",
-                name,
-                registry.host()
-            )
-        })?;
-    }
+        Some("remove") => {
+            let v = opts
+                .subcommand_arg
+                .as_ref()
+                .unwrap()
+                .get_many::<String>("ownername")
+                .map(|s| s.collect::<Vec<_>>())
+                .and_then(|t| Some(t.iter().map(|s| s.as_str()).collect::<Vec<_>>()))
+                .unwrap();
+            config
+                .shell()
+                .status("Owner", format!("removing {:?} from crate {}", v, name))?;
+            registry.remove_owners(&name, &v).with_context(|| {
+                format!(
+                    "failed to remove owners from crate `{}` on registry at {}",
+                    name,
+                    registry.host()
+                )
+            })?;
+        }
 
-    if opts.list {
-        let owners = registry.list_owners(&name).with_context(|| {
-            format!(
-                "failed to list owners of crate `{}` on registry at {}",
-                name,
-                registry.host()
-            )
-        })?;
-        for owner in owners.iter() {
-            drop_print!(config, "{}", owner.login);
-            match (owner.name.as_ref(), owner.email.as_ref()) {
-                (Some(name), Some(email)) => drop_println!(config, " ({} <{}>)", name, email),
-                (Some(s), None) | (None, Some(s)) => drop_println!(config, " ({})", s),
-                (None, None) => drop_println!(config),
+        Some("list") => {
+            let owners = registry.list_owners(&name).with_context(|| {
+                format!(
+                    "failed to list owners of crate `{}` on registry at {}",
+                    name,
+                    registry.host()
+                )
+            })?;
+            for owner in owners.iter() {
+                drop_print!(config, "{}", owner.login);
+                match (owner.name.as_ref(), owner.email.as_ref()) {
+                    (Some(name), Some(email)) => drop_println!(config, " ({} <{}>)", name, email),
+                    (Some(s), None) | (None, Some(s)) => drop_println!(config, " ({})", s),
+                    (None, None) => drop_println!(config),
+                }
             }
         }
+
+        _ => {
+            anyhow::bail!(
+                "
+            You have entered an incorrect subcommand. \
+            Run the `--help` command to obtain more information."
+            );
+        }
     }
 
     Ok(())

src/doc/src/reference/publishing.md

@@ -169,15 +169,15 @@ 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

tests/testsuite/alt_registry.rs

@@ -760,7 +760,7 @@ fn no_api() {
         .with_stderr_contains(&err)
         .run();
 
-    p.cargo("owner --registry alternative --list")
+    p.cargo("owner --registry alternative list")
         .with_status(101)
         .with_stderr_contains(&err)
         .run();
@@ -1362,20 +1362,29 @@ fn both_index_and_registry() {
 #[cargo_test]
 fn both_index_and_default() {
     let p = project().file("src/lib.rs", "").build();
-    for cmd in &[
-        "publish",
-        "owner",
-        "search",
-        "yank --version 1.0.0",
-        "install foo",
-    ] {
+    for cmd in &["publish", "search", "yank --version 1.0.0", "install foo"] {
         p.cargo(cmd)
             .env("CARGO_REGISTRY_DEFAULT", "undefined")
             .arg(format!("--index=index_url"))
             .with_status(101)
             .with_stderr("[ERROR] invalid url `index_url`: relative URL without a base")
             .run();
     }
+    p.cargo("owner --index=index_url add someone")
+        .env("CARGO_REGISTRY_DEFAULT", "undefined")
+        .with_status(101)
+        .with_stderr("[ERROR] invalid url `index_url`: relative URL without a base")
+        .run();
+}
+
+#[cargo_test]
+fn owner_index_and_default() {
+    let p = project().file("src/lib.rs", "").build();
+    p.cargo("owner --index=index_url add someone")
+        .env("CARGO_REGISTRY_DEFAULT", "undefined")
+        .with_status(101)
+        .with_stderr("[ERROR] invalid url `index_url`: relative URL without a base")
+        .run();
 }
 
 #[cargo_test]

tests/testsuite/credential_process.rs

@@ -414,7 +414,7 @@ fn yank() {
 fn owner() {
     let (p, _t) = get_token_test();
 
-    p.cargo("owner --add username --registry alternative -Z credential-process")
+    p.cargo("owner --registry alternative -Z credential-process add username")
         .masquerade_as_nightly_cargo(&["credential-process"])
         .with_stderr(
             "\