Merge pull request #679 from loco-rs/loco-cli-verbose

Loco cli verbose - support also text
loco-rs · Jul 30, 2024 · 81b44ef · 81b44ef
2 parents 95bf4d4 + 541d77c
commit 81b44ef
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/loco-cli/src/bin/main.rs b/loco-cli/src/bin/main.rs
@@ -4,13 +4,14 @@ use std::env;
 use std::path::PathBuf;
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::EnvFilter;
+
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 #[command(propagate_version = true)]
 struct Cli {
-    #[arg(global = true, short, long, action = clap::ArgAction::Count)]
+    #[arg(global = true, short, long, value_enum, default_value = "ERROR")]
     /// Verbosity level
-    verbose: u8,
+    verbose: LevelFilter,
 
     #[command(subcommand)]
     command: Commands,
@@ -32,14 +33,7 @@ fn main() -> eyre::Result<()> {
     tracing_subscriber::fmt()
         .with_env_filter(
             EnvFilter::builder()
-                .with_default_directive(match cli.verbose {
-                    // The default one for `from_default_env`
-                    0 => LevelFilter::ERROR.into(),
-                    1 => LevelFilter::WARN.into(),
-                    2 => LevelFilter::INFO.into(),
-                    3 => LevelFilter::DEBUG.into(),
-                    _ => LevelFilter::TRACE.into(),
-                })
+                .with_default_directive(cli.verbose.into())
                 .from_env_lossy(),
         )
         .init();

diff --git a/loco-cli/tests/cmd/cli.trycmd b/loco-cli/tests/cmd/cli.trycmd
@@ -5,9 +5,9 @@ Create a new Loco website
 Usage: loco[EXE] new [OPTIONS]
 
 Options:
-  -p, --path <PATH>  Local path to generate into [default: .]
-  -v, --verbose...   Verbosity level
-  -h, --help         Print help
-  -V, --version      Print version
+  -p, --path <PATH>        Local path to generate into [default: .]
+  -v, --verbose <VERBOSE>  Verbosity level [default: ERROR]
+  -h, --help               Print help
+  -V, --version            Print version
 
 ```