Fix Version Files Not Working With Whitespaces (#199)

Author: beeequeue

README.md

@@ -98,3 +98,12 @@ task build:release
 ```
 
 You can find all the commands in the [Taskfile](./Taskfile.yml).
+
+## Publish new version
+
+1. Up version number in `Cargo.toml`
+2. Create tag on commit updating the version with said version (`vX.X.X`)
+3. Push both
+4. Wait for CI to create draft release for tag
+5. Edit draft release notes
+6. Publish

src/constants.rs

@@ -0,0 +1,27 @@
+#[cfg(windows)]
+pub const EXEC_EXT: &str = ".cmd";
+#[cfg(not(windows))]
+pub const EXEC_EXT: &str = "";
+
+#[cfg(target_os = "windows")]
+pub const PLATFORM: &str = "win";
+#[cfg(target_os = "macos")]
+pub const PLATFORM: &str = "darwin";
+#[cfg(target_os = "linux")]
+pub const PLATFORM: &str = "linux";
+
+#[cfg(target_os = "windows")]
+pub const EXT: &str = ".zip";
+#[cfg(target_os = "macos")]
+pub const EXT: &str = ".tar.gz";
+#[cfg(target_os = "linux")]
+pub const EXT: &str = ".tar.gz";
+
+#[cfg(target_arch = "x86_64")]
+pub const ARCH: &str = "x64";
+#[cfg(target_arch = "x86")]
+pub const ARCH: &str = "x86";
+#[cfg(target_arch = "aarch64")]
+pub const ARCH: &str = "arm64";
+
+pub const X64: &str = "x64";

src/files/mod.rs

@@ -51,7 +51,7 @@ pub fn get_version_file() -> Option<VersionFile> {
         let contents = fs::read_to_string(existing_file);
 
         if let Ok(contents) = contents {
-            let parse_result = Range::parse(contents);
+            let parse_result = Range::parse(contents.trim());
 
             if let Ok(parse_result) = parse_result {
                 return Some(VersionFile::Nvmrc(parse_result));

src/main.rs

@@ -16,10 +16,10 @@ use crate::subcommand::{
 };
 
 mod archives;
+mod constants;
 mod files;
 mod node_version;
 mod subcommand;
-mod utils;
 
 #[derive(Parser, Clone, Debug)]
 enum Subcommands {

src/node_version.rs

@@ -9,30 +9,11 @@ use anyhow::{Context, Result};
 use node_semver::{Range, Version};
 use serde::Deserialize;
 
-use crate::{utils, Config};
-
-#[cfg(target_os = "windows")]
-const PLATFORM: &str = "win";
-#[cfg(target_os = "macos")]
-const PLATFORM: &str = "darwin";
-#[cfg(target_os = "linux")]
-const PLATFORM: &str = "linux";
-
-#[cfg(target_os = "windows")]
-const EXT: &str = ".zip";
-#[cfg(target_os = "macos")]
-const EXT: &str = ".tar.gz";
-#[cfg(target_os = "linux")]
-const EXT: &str = ".tar.gz";
-
-#[cfg(target_arch = "x86_64")]
-const ARCH: &str = "x64";
-#[cfg(target_arch = "x86")]
-const ARCH: &str = "x86";
-#[cfg(target_arch = "aarch64")]
-const ARCH: &str = "arm64";
-
-const X64: &str = "x64";
+use crate::{
+    constants,
+    constants::{ARCH, EXT, PLATFORM, X64},
+    Config,
+};
 
 pub trait NodeVersion {
     fn version(&self) -> &Version;
@@ -149,6 +130,7 @@ impl OnlineNodeVersion {
     #[cfg(target_os = "macos")]
     fn has_arm(&self) -> bool {
         for file in self.files.iter() {
+            // We check for both ARM _and_ OSX since we don't want to fall back to x64 on other platforms.
             if file.contains("osx") && file.contains("arm64") {
                 return true;
             }
@@ -218,8 +200,8 @@ impl InstalledNodeVersion {
             read_link(config.get_shims_dir()).expect("Could not read installation dir");
 
         let mut required_files = vec![version_dir; 2];
-        required_files[0].set_file_name(format!("node{}", utils::exec_ext()));
-        required_files[1].set_file_name(format!("npm{}", utils::exec_ext()));
+        required_files[0].set_file_name(format!("node{}", constants::EXEC_EXT));
+        required_files[1].set_file_name(format!("npm{}", constants::EXEC_EXT));
 
         if let Some(missing_file) = required_files.iter().find(|file| !file.exists()) {
             anyhow::bail!(

src/subcommand/install.rs

@@ -6,12 +6,12 @@ use node_semver::Range;
 use ureq;
 
 use crate::{
-    archives, files,
+    archives, constants, files,
     node_version::{
         filter_version_req, parse_range, InstalledNodeVersion, NodeVersion, OnlineNodeVersion,
     },
     subcommand::{switch::SwitchCommand, Action},
-    utils, Config,
+    Config,
 };
 
 #[derive(Parser, Clone, Debug)]
@@ -80,7 +80,7 @@ impl Action<InstallCommand> for InstallCommand {
             if let Err(e) = std::process::Command::new(
                 install_path
                     .join("bin")
-                    .join(format!("corepack{}", utils::exec_ext())),
+                    .join(format!("corepack{}", constants::EXEC_EXT)),
             )
             .arg("enable")
             .output()