Merge pull request #80 from bertjwregeer/enhancement/upgrade-to-clap-4

Upgrade to clap 4.x

Author: digitalresistor

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "barnacle"
-version = "0.1.1"
+version = "0.2.0"
 edition = "2021"
 authors = ["Bert JW Regeer <xistence@0x58.com>"]
 license = "ISC"
@@ -12,6 +12,6 @@ readme = "README.md"
 
 [dependencies]
 anyhow = "1.0"
-clap = { version = "3.1", features = ["derive", "env"] }
+clap = { version = "^4.0", features = ["derive", "env"] }
 minijinja = { version = "^0.23", features = ["source", "json", "urlencode"] }
 thiserror = "1.0"

Cargo.toml

@@ -2,21 +2,21 @@ use clap::Parser;
 use std::path::PathBuf;
 
 #[derive(Parser, Debug)]
-#[clap(author, version, about)]
+#[command(author, version, about)]
 pub struct Cli {
     /// Jinja2 template to render
-    #[clap(parse(from_os_str))]
+    #[arg()]
     pub template: PathBuf,
 
     /// The location to place the rendered file
-    #[clap(parse(from_os_str))]
+    #[arg()]
     pub output: PathBuf,
 
     /// The command + arguments to execute once template is rendered
-    #[clap(required(true))]
+    #[arg(required(true))]
     pub command: Vec<String>,
 
     /// Turn debugging information on
-    #[clap(short, long, parse(from_occurrences))]
-    pub verbose: usize,
+    #[arg(short, long, action = clap::ArgAction::Count)]
+    pub verbose: u8,
 }