Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 12 additions & 89 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ envoy = "0.1.3"
fs_extra = "1.3"
fs-utils = { path = "crates/fs-utils" }
indicatif = "0.18.6"
node-semver = "2.2.0"
once_cell = "1.21.4"
regex = "1.13.1"
retry = "2.2.0"
Expand All @@ -31,6 +30,7 @@ tempfile = "3.27.0"
terminal_size = "0.4.4"
time = { version = "0.3.54", features = ["local-offset"] }
version-compare = "0.2.1"
semver = "1.0.28"

[target.'cfg(target_os = "linux")'.dependencies]
openssl = { version = "0.10.81", features = ["vendored"] }
7 changes: 2 additions & 5 deletions src/cli/install.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
use crate::{
node::Node,
utils::{help::node_version_parse, notice::Notice},
};
use crate::{module::NodeVersionResolver, node::Node, utils::notice::Notice};
use anyhow::Result;

#[derive(clap::Args)]
Expand All @@ -12,7 +9,7 @@ pub struct Install {

impl super::Command for Install {
fn run(self) -> Result<()> {
let version = node_version_parse(&self.version)?;
let version = NodeVersionResolver::parse(&self.version)?;
Node::new(version).ensure_fetched()?;

let _ = Notice::from_version().send();
Expand Down
11 changes: 4 additions & 7 deletions src/cli/list.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
use crate::{
module::{Context, Groups, Setting},
utils::help::node_version_parse,
};
use crate::module::{Context, Groups, NodeVersionResolver, Setting};
use anyhow::Result;
use fs_extra::dir::{ls, DirEntryAttr, DirEntryValue};
use fs_extra::dir::{DirEntryAttr, DirEntryValue, ls};
use std::{cmp::Ordering, collections::HashSet};
use version_compare::{compare, Cmp};
use version_compare::{Cmp, compare};

#[derive(clap::Args)]
pub struct List {
Expand Down Expand Up @@ -38,7 +35,7 @@ impl List {
DirEntryValue::String(s) => s,
_ => return None,
};
node_version_parse(version_str)
NodeVersionResolver::parse(version_str)
.ok()
.map(|_| version_str.to_string())
})
Expand Down
8 changes: 4 additions & 4 deletions src/cli/uninstall.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::{
module::Setting,
utils::{help::node_version_parse, notice::Notice},
module::{NodeVersionResolver, Setting},
utils::notice::Notice,
};
use anyhow::{bail, Result};
use anyhow::{Result, bail};
use console::style;
use fs_extra::dir;

Expand All @@ -14,7 +14,7 @@ pub struct Uninstall {

impl super::Command for Uninstall {
fn run(self) -> Result<()> {
let version = node_version_parse(&self.version)?;
let version = NodeVersionResolver::parse(&self.version)?;
let path = Setting::global()?
.get_directory()?
.join(&version.to_string());
Expand Down
19 changes: 8 additions & 11 deletions src/cli/use.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
use crate::{
module::{nvmd_home, Groups, Projects, Setting},
utils::{
help::{node_strict_available, node_version_parse},
notice::Notice,
},
module::{Groups, NodeVersionResolver, Projects, Setting, nvmd_home},
utils::{help::node_strict_available, notice::Notice},
};
use anyhow::{anyhow, bail, Result};
use anyhow::{Result, anyhow, bail};
use fs_extra::file::write_all;

#[derive(clap::Args)]
Expand Down Expand Up @@ -34,16 +31,16 @@ impl Use {
bail!("Group@{} can only be used for projects", &self.version)
}

let version = node_version_parse(&self.version)?;
if !node_strict_available(&version.to_string())? {
let version = NodeVersionResolver::resolve(&self.version)?;
if !node_strict_available(&version)? {
bail!("Node@v{} has not been installed", &version);
}

let default_path = nvmd_home()?.default_path();
write_all(default_path, &version.to_string())?;
write_all(default_path, &version)?;
eprintln!("Now using node v{}", &version);

let _ = Notice::from_current(version.to_string()).send();
let _ = Notice::from_current(version.clone()).send();

Ok(())
}
Expand All @@ -59,7 +56,7 @@ impl Use {
&self.version
)
})?,
None => node_version_parse(&self.version)?.to_string(),
None => NodeVersionResolver::resolve(&self.version)?,
};

if !node_strict_available(&version)? {
Expand Down
10 changes: 4 additions & 6 deletions src/cli/which.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::{module::Setting, utils::help::node_version_parse};
use anyhow::{bail, Result};
use crate::module::{NodeVersionResolver, Setting};
use anyhow::{Result, bail};

#[derive(clap::Args)]
pub struct Which {
Expand All @@ -9,10 +9,8 @@ pub struct Which {

impl super::Command for Which {
fn run(self) -> Result<()> {
let version = node_version_parse(&self.version)?;
let mut path = Setting::global()?
.get_directory()?
.join(&version.to_string());
let version = NodeVersionResolver::resolve(&self.version)?;
let mut path = Setting::global()?.get_directory()?.join(&version);
if cfg!(unix) {
path.push("bin");
}
Expand Down
10 changes: 5 additions & 5 deletions src/module/context.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::nvmd_home;
use crate::module::Setting;
use anyhow::{anyhow, bail, Context as AnyhowContext, Result};
use crate::module::{NodeVersionResolver, Setting};
use anyhow::{Context as AnyhowContext, Result, anyhow, bail};
use fs_extra::file::read_to_string;
use once_cell::sync::OnceCell;
use std::{
Expand Down Expand Up @@ -82,7 +82,7 @@ fn get_version() -> Result<Option<String>> {
if let Ok(env_version) = std::env::var("NVMD_NODE_VERSION") {
let v = env_version.trim();
if !v.is_empty() {
return Ok(Some(v.to_string()));
return Ok(Some(NodeVersionResolver::resolve(v)?));
}
}

Expand All @@ -92,7 +92,7 @@ fn get_version() -> Result<Option<String>> {
let content = read_to_string(&path)?;
let t = content.trim();
if !t.is_empty() {
return Ok(Some(t.to_string()));
return Ok(Some(NodeVersionResolver::resolve(t)?));
}
}

Expand All @@ -103,7 +103,7 @@ fn get_version() -> Result<Option<String>> {
let content = read_to_string(&default_path)?;
let t = content.trim();
if !t.is_empty() {
return Ok(Some(t.to_string()));
return Ok(Some(NodeVersionResolver::resolve(t)?));
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/module/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ mod home;
mod package;
mod project;
mod setting;
mod version;

pub use context::Context;
pub use group::Groups;
pub use home::nvmd_home;
pub use package::{PackageJson, Packages};
pub use project::Projects;
pub use setting::Setting;
pub use version::*;
Loading