cli/fork: Use clap — heartwood

heartwood

rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5

Radicle Heartwood Protocol & Stack

cli/fork: Use clap

Merged lorenz opened 7 months ago

See issue/7fb03f234030b91c38cc4f5b48bd30cf5fd6a1de.

Activity Changes +23 -51

4 files changed +23 -51 3992d519 → 7b8da0e7

modified crates/radicle-cli/src/commands/fork.rs

@@ -1,66 +1,23 @@

 use std::ffi::OsString;
 mod args;
 use anyhow::Context as _;
 use radicle::prelude::RepoId;
 use radicle::rad;
 use crate::terminal as term;
 use crate::terminal::args;
 use crate::terminal::args::{Args, Error, Help};
 pub const HELP: Help = Help {
     name: "fork",
     description: "Create a fork of a repository",
     version: env!("RADICLE_VERSION"),
     usage: r#"
 Usage
 pub use args::Args;
 pub(crate) use args::ABOUT;
     rad fork [<rid>] [<option>...]
 Options
     --help          Print help
 "#,
 };
 pub struct Options {
     rid: Option<RepoId>,
 }
 impl Args for Options {
     fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
         use lexopt::prelude::*;
         let mut parser = lexopt::Parser::from_args(args);
         let mut rid = None;
         if let Some(arg) = parser.next()? {
             match arg {
                 Long("help") | Short('h') => {
                     return Err(Error::Help.into());
                 }
                 Value(val) if rid.is_none() => {
                     rid = Some(args::rid(&val)?);
                 }
                 _ => anyhow::bail!(arg.unexpected()),
             }
         }
         Ok((Options { rid }, vec![]))
     }
 }
 pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
 pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
     let profile = ctx.profile()?;
     let signer = profile.signer()?;
     let storage = &profile.storage;
     let rid = match options.rid {
     let rid = match args.rid {
         Some(rid) => rid,
         None => {
             let (_, rid) =
                 radicle::rad::cwd().context("Current directory is not a Radicle repository")?;
             let (_, rid) = rad::cwd().context("Current directory is not a Radicle repository")?;
             rid
         }

added crates/radicle-cli/src/commands/fork/args.rs

@@ -0,0 +1,9 @@

 pub(crate) const ABOUT: &str = "Create a fork of a repository";
 #[derive(Debug, clap::Parser)]
 #[command(about = ABOUT, disable_version_flag = true)]
 pub struct Args {
     /// The Repository ID of the repository to fork
     #[arg(value_name = "RID")]
     pub(super) rid: Option<radicle::identity::RepoId>,
 }

modified crates/radicle-cli/src/commands/help.rs

@@ -42,7 +42,10 @@ const COMMANDS: &[CommandItem] = &[

     CommandItem::Lexopt(crate::commands::checkout::HELP),
     CommandItem::Lexopt(crate::commands::clone::HELP),
     CommandItem::Lexopt(crate::commands::config::HELP),
     CommandItem::Lexopt(crate::commands::fork::HELP),
     CommandItem::Clap {
         name: "fork",
         about: crate::commands::fork::ABOUT,
     },
     CommandItem::Lexopt(crate::commands::help::HELP),
     CommandItem::Lexopt(crate::commands::id::HELP),
     CommandItem::Lexopt(crate::commands::init::HELP),

modified crates/radicle-cli/src/main.rs

@@ -46,6 +46,7 @@ struct CliArgs {

 #[derive(Subcommand, Debug)]
 enum Commands {
     Clean(clean::Args),
     Fork(fork::Args),
     Issue(issue::Args),
     Path(path::Args),
     Stats(stats::Args),

@@ -206,7 +207,9 @@ pub(crate) fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyho

             term::run_command_args::<follow::Options, _>(follow::HELP, follow::run, args.to_vec());
         }
         "fork" => {
             term::run_command_args::<fork::Options, _>(fork::HELP, fork::run, args.to_vec());
             if let Some(Commands::Fork(args)) = CliArgs::parse().command {
                 term::run_command_fn(fork::run, args);
             }
         }
         "help" => {
             term::run_command_args::<help::Options, _>(help::HELP, help::run, args.to_vec());