cli/unblock: Use clap

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

@@ -95,7 +95,10 @@ const COMMANDS: &[CommandItem] = &[
         about: crate::commands::seed::ABOUT,
     },
     CommandItem::Lexopt(crate::commands::follow::HELP),
-    CommandItem::Lexopt(crate::commands::unblock::HELP),
+    CommandItem::Clap {
+        name: "unblock",
+        about: crate::commands::unblock::ABOUT,
+    },
     CommandItem::Clap {
         name: "unfollow",
         about: crate::commands::unfollow::ABOUT,

crates/radicle-cli/src/commands/unblock.rs

@@ -1,98 +1,25 @@
-use std::ffi::OsString;
+mod args;
-
-use radicle::prelude::{NodeId, RepoId};
 
 use crate::terminal as term;
-use crate::terminal::args;
-use crate::terminal::args::{Args, Error, Help};
 
-pub const HELP: Help = Help {
+use term::args::BlockTarget;
-    name: "unblock",
-    description: "Unblock repositories or nodes to allow them to be seeded or followed",
-    version: env!("RADICLE_VERSION"),
-    usage: r#"
-Usage
 
-    rad unblock <rid> [<option>...]
+pub use args::Args;
-    rad unblock <nid> [<option>...]
+pub(crate) use args::ABOUT;
 
-    Unblock a repository or remote to allow it to be seeded or followed.
+pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
-
-Options
-
-    --help          Print help
-"#,
-};
-
-enum Target {
-    Node(NodeId),
-    Repo(RepoId),
-}
-
-impl std::fmt::Display for Target {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::Node(nid) => nid.fmt(f),
-            Self::Repo(rid) => rid.fmt(f),
-        }
-    }
-}
-
-pub struct Options {
-    target: Target,
-}
-
-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 target = None;
-
-        while let Some(arg) = parser.next()? {
-            match arg {
-                Long("help") | Short('h') => {
-                    return Err(Error::Help.into());
-                }
-                Value(val) if target.is_none() => {
-                    if let Ok(rid) = args::rid(&val) {
-                        target = Some(Target::Repo(rid));
-                    } else if let Ok(nid) = args::nid(&val) {
-                        target = Some(Target::Node(nid));
-                    } else {
-                        anyhow::bail!(
-                            "invalid repository or remote specified, see `rad unblock --help`"
-                        )
-                    }
-                }
-                _ => anyhow::bail!(arg.unexpected()),
-            }
-        }
-
-        Ok((
-            Options {
-                target: target.ok_or(anyhow::anyhow!(
-                    "a repository or remote to unblock must be specified, see `rad unblock --help`"
-                ))?,
-            },
-            vec![],
-        ))
-    }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
     let profile = ctx.profile()?;
     let mut policies = profile.policies_mut()?;
 
-    let updated = match options.target {
+    let updated = match args.target {
-        Target::Node(nid) => policies.unblock_nid(&nid)?,
+        BlockTarget::Node(nid) => policies.unblock_nid(&nid)?,
-        Target::Repo(rid) => policies.unblock_rid(&rid)?,
+        BlockTarget::Repo(rid) => policies.unblock_rid(&rid)?,
     };
 
     if updated {
-        term::success!("The 'block' policy for {} is removed", options.target);
+        term::success!("The 'block' policy for {} is removed", args.target);
     } else {
-        term::info!("No 'block' policy exists for {}", options.target)
+        term::info!("No 'block' policy exists for {}", args.target)
     }
     Ok(())
 }

crates/radicle-cli/src/commands/unblock/args.rs

@@ -0,0 +1,16 @@
+use clap::Parser;
+
+use crate::terminal::args::BlockTarget;
+
+pub(crate) const ABOUT: &str =
+    "Unblock repositories or nodes to allow them to be seeded or followed";
+
+#[derive(Parser, Debug)]
+#[command(about = ABOUT, disable_version_flag = true)]
+pub struct Args {
+    /// A Repository ID or Node ID to allow to be seeded or followed
+    ///
+    /// [example values: rad:z3Tr6bC7ctEg2EHmLvknUr29mEDLH, z6MkiswaKJ85vafhffCGBu2gdBsYoDAyHVBWRxL3j297fwS9]
+    #[arg(value_name = "RID|NID")]
+    pub(super) target: BlockTarget,
+}

crates/radicle-cli/src/main.rs

@@ -70,6 +70,7 @@ enum Commands {
     Publish(publish::Args),
     Seed(seed::Args),
     Stats(stats::Args),
+    Unblock(unblock::Args),
     Unfollow(unfollow::Args),
     Unseed(unseed::Args),
     Watch(watch::Args),
@@ -312,11 +313,9 @@ pub(crate) fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyho
             }
         }
         "unblock" => {
-            term::run_command_args::<unblock::Options, _>(
+            if let Some(Commands::Unblock(args)) = CliArgs::parse().command {
-                unblock::HELP,
+                term::run_command_fn(unblock::run, args);
-                unblock::run,
+            }
-                args.to_vec(),
-            );
         }
         "unfollow" => {
             if let Some(Commands::Unfollow(args)) = CliArgs::parse().command {