alvis
/
fnm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Show log level options in help and error message (#537)

remotes/origin/add-with-shims
Lucas Weng 3 years ago committed by GitHub
parent
4f910e464e
commit
f4e4d552d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 52
      docs/commands.md
  2. 3
      src/config.rs
  3. 11
      src/log_level.rs

52
docs/commands.md
Unescape View File

@ -23,8 +23,8 @@ OPTIONS: @@ -23,8 +23,8 @@ OPTIONS:
The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -63,7 +63,9 @@ OPTIONS: @@ -63,7 +63,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -91,7 +93,9 @@ OPTIONS: @@ -91,7 +93,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -118,7 +122,9 @@ OPTIONS: @@ -118,7 +122,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -151,8 +157,8 @@ OPTIONS: @@ -151,8 +157,8 @@ OPTIONS:
The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -197,8 +203,8 @@ OPTIONS: @@ -197,8 +203,8 @@ OPTIONS:
The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -237,8 +243,8 @@ OPTIONS: @@ -237,8 +243,8 @@ OPTIONS:
The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -277,7 +283,9 @@ OPTIONS: @@ -277,7 +283,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -304,7 +312,9 @@ OPTIONS: @@ -304,7 +312,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -328,7 +338,9 @@ OPTIONS: @@ -328,7 +338,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -352,7 +364,9 @@ OPTIONS: @@ -352,7 +364,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -389,8 +403,8 @@ OPTIONS: @@ -389,8 +403,8 @@ OPTIONS:
The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]
@ -420,7 +434,9 @@ OPTIONS: @@ -420,7 +434,9 @@ OPTIONS:
Override the architecture of the installed Node binary. Defaults to arch of fnm binary [env: FNM_ARCH]
[default: x64]
--fnm-dir <base-dir> The root directory of fnm installations [env: FNM_DIR]
--log-level <log-level> The log level of fnm commands [env: FNM_LOGLEVEL] [default: info]
--log-level <log-level>
The log level of fnm commands [env: FNM_LOGLEVEL] [default: info] [possible values: quiet, info, all,
error]
--node-dist-mirror <node-dist-mirror>
https://nodejs.org/dist/ mirror [env: FNM_NODE_DIST_MIRROR] [default: https://nodejs.org/dist]

3
src/config.rs
Unescape View File

@ -42,7 +42,8 @@ pub struct FnmConfig { @@ -42,7 +42,8 @@ pub struct FnmConfig {
env = "FNM_LOGLEVEL",
default_value = "info",
global = true,
hide_env_values = true
hide_env_values = true,
possible_values = LogLevel::possible_values()
)]
log_level: LogLevel,

11
src/log_level.rs
Unescape View File

@ -24,6 +24,10 @@ impl LogLevel { @@ -24,6 +24,10 @@ impl LogLevel {
Box::from(std::io::sink())
}
}
pub fn possible_values() -> &'static [&'static str; 4] {
&["quiet", "info", "all", "error"]
}
}
impl Into<&'static str> for LogLevel {
@ -37,17 +41,14 @@ impl Into<&'static str> for LogLevel { @@ -37,17 +41,14 @@ impl Into<&'static str> for LogLevel {
}
impl std::str::FromStr for LogLevel {
type Err = String;
type Err = &'static str;
fn from_str(s: &str) -> Result<LogLevel, Self::Err> {
match s {
"quiet" => Ok(Self::Quiet),
"info" | "all" => Ok(Self::Info),
"error" => Ok(Self::Error),
loglevel => Err(format!(
"Unrecognized log level {:?}. Supported levels are 'quiet', 'info' and 'error'.",
loglevel
)),
_ => Err("Unsupported log level"),
}
}
}

Write Preview
Loading…
Cancel
Save