chore: migrate to clap v4 (#54)

Author: sassman

Cargo.lock

@@ -10,8 +10,9 @@ include = ["src/**/*", "LICENSE", "*.md"]
 [dependencies]
 env_logger = "0.10"
 log = "0.4"
-clap = { version = "3.2", features = ["derive", "std", "cargo"], default-features = false }
-clap-verbosity-flag = "1.0"
+clap = { version = "4.1", features = ["derive", "std", "cargo", "usage", "help"] }
+#clap_complete = "4.1"
+clap-verbosity-flag = "2.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9"
 dotenvy = { version = "0.15" }

curlz/Cargo.toml

@@ -5,13 +5,14 @@ use clap_verbosity_flag::{InfoLevel, Verbosity};
 use env_logger::Target;
 
 #[derive(Clone, Debug, Parser)]
-#[clap(author, version, about, long_about = None, arg_required_else_help(true))]
-#[clap(propagate_version = true)]
-#[clap(name = "curlz")]
+#[command(author, version, about, long_about = None )]
+#[clap(subcommand_required = true, arg_required_else_help = true)]
+#[command(propagate_version = true)]
+#[command(name = "curlz")]
 pub struct Cli {
-    #[clap(flatten)]
+    #[command(flatten)]
     verbose: Verbosity<InfoLevel>,
-    #[clap(subcommand)]
+    #[command(subcommand)]
     pub command: SubCommands,
 }
 

curlz/src/curlz/cli/execute.rs

@@ -1,8 +1,8 @@
 use clap::{Args, Subcommand};
 
 #[derive(Clone, Debug, Args)]
-#[clap(arg_required_else_help(true))]
-#[clap(args_conflicts_with_subcommands = true)]
+#[command(arg_required_else_help = true)]
+#[command(args_conflicts_with_subcommands = true)]
 pub struct BookmarkCli {
     #[clap(subcommand)]
     pub command: BookmarkCommands,

curlz/src/curlz/cli/sub_commands/bookmark.rs

@@ -8,7 +8,8 @@ use clap::Parser;
 use std::path::PathBuf;
 
 #[derive(Clone, Debug, Parser)]
-#[clap(author, version, about, long_about = None, arg_required_else_help(true))]
+#[clap(author, version, about, long_about = None)]
+#[command(arg_required_else_help = true)]
 pub struct HttpFileCli {
     /// Provide an `.env` or a yaml containing template variables
     #[clap(long = "env-file", value_parser, default_value = ".env")]

curlz/src/curlz/cli/sub_commands/http_file.rs

@@ -13,9 +13,9 @@ pub use http_file::*;
 
 #[derive(Clone, Debug, Subcommand)]
 pub enum SubCommands {
-    #[clap(alias("r"))]
+    #[command(alias("r"))]
     Request(RequestCli),
-    #[clap(alias("b"))]
+    #[command(alias("b"))]
     /// similar to git remote, we want to support `list`, `add`, `rename`, `remove` and `show`
     Bookmark(BookmarkCli),
     #[cfg(feature = "x-http-lang")]

curlz/src/curlz/cli/sub_commands/mod.rs

@@ -21,7 +21,8 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 #[derive(Clone, Debug, Parser)]
-#[clap(author, version, about, long_about = None, arg_required_else_help(true))]
+#[command(author, version, about, long_about = None)]
+#[clap(arg_required_else_help = true)]
 pub struct RequestCli {
     #[clap(flatten)]
     pub verbose: Verbosity<InfoLevel>,
@@ -78,7 +79,7 @@ pub struct RequestCli {
     #[clap(value_parser)]
     pub bookmark_or_url: Option<String>,
 
-    #[clap(value_parser, last = true, multiple = true)]
+    #[clap(value_parser, last = true)]
     pub raw: Vec<String>,
 }
 

curlz/src/curlz/cli/sub_commands/request.rs

@@ -8,10 +8,12 @@ mod testlib;
 
 #[test]
 fn should_show_usage_when_no_args_passed() {
-    binary()
-        .assert()
-        .failure()
-        .stderr(predicate::str::contains("USAGE:"));
+    #[cfg(windows)]
+    let pattern = predicate::str::contains("Usage: curlz.exe [OPTIONS] <COMMAND>");
+    #[cfg(not(windows))]
+    let pattern = predicate::str::contains("Usage: curlz [OPTIONS] <COMMAND>");
+
+    binary().assert().failure().stderr(pattern);
 }
 
 #[tokio::test]