chore: test snm pnpm install

Author: Yaxian

.gitignore

@@ -15,3 +15,5 @@ Cargo.lock
 .DS_Store
 .idea
 .idea
+
+node_modules

crates/cli/tests/snm_install_npm/.gitignore

@@ -0,0 +1 @@
+pnpm-lock.yaml

crates/cli/tests/snm_install_npm/.node-version

@@ -0,0 +1 @@
+18.19.0

crates/cli/tests/snm_install_npm/package-lock.json

@@ -0,0 +1,14 @@
+{
+  "name": "snm_install_postinstall",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "packageManager": "[email protected]",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {}
+}

crates/cli/tests/snm_install_npm/package.json

@@ -0,0 +1 @@
+pnpm-lock.yaml

crates/cli/tests/snm_install_pnpm/.gitignore

@@ -0,0 +1 @@
+18.19.0

crates/cli/tests/snm_install_pnpm/.node-version

@@ -0,0 +1,14 @@
+{
+  "name": "snm_install_postinstall",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "packageManager": "[email protected]",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {}
+}

crates/cli/tests/snm_install_pnpm/package.json

@@ -0,0 +1,46 @@
+#[cfg(test)]
+mod snm_install_test {
+    mod install_1 {
+        use std::env::{self, current_dir, set_current_dir};
+
+        use clap::Parser;
+        use cli::{execute_cli, SnmCli};
+        use std::fs;
+
+        #[tokio::test]
+        async fn test_pnpm_install() {
+            env::set_var("SNM_NODE_INSTALL_STRATEGY", "auto");
+            env::set_var("SNM_PACKAGE_MANAGER_INSTALL_STRATEGY", "auto");
+            let c_dir = current_dir().expect("get current dir error");
+            let test_dir = c_dir.join("tests").join("snm_install_pnpm");
+            set_current_dir(&test_dir).expect("set current dir error");
+
+            let cli = SnmCli::parse_from(["snm", "install"]);
+            let lock = &test_dir.join("pnpm-lock.yaml");
+            let _ = fs::remove_file(lock);
+
+            assert!(!lock.exists());
+            let res = execute_cli::execute_cli(cli).await;
+            assert!(res.is_ok());
+            assert!(lock.exists());
+        }
+
+        #[tokio::test]
+        async fn test_npm_install() {
+            env::set_var("SNM_NODE_INSTALL_STRATEGY", "auto");
+            env::set_var("SNM_PACKAGE_MANAGER_INSTALL_STRATEGY", "auto");
+            let c_dir = current_dir().expect("get current dir error");
+            let test_dir = c_dir.join("tests").join("snm_install_npm");
+            set_current_dir(&test_dir).expect("set current dir error");
+
+            let cli = SnmCli::parse_from(["snm", "install"]);
+            let lock = &test_dir.join("package-lock.json");
+            let _ = fs::remove_file(lock);
+
+            assert!(!lock.exists());
+            let res = execute_cli::execute_cli(cli).await;
+            assert!(res.is_ok());
+            assert!(lock.exists());
+        }
+    }
+}

crates/cli/tests/snm_install_test.rs

@@ -4,4 +4,5 @@ mod no_package_manager_property_test;
 #[path = "no_package_json/no_package_json_test.rs"]
 mod no_package_json_test;
 
-mod snm_cli_test;
+mod snm_cli_test;
+mod snm_install_test;

crates/cli/tests/tests.rs

@@ -297,13 +297,14 @@ impl DispatchManage {
         self.manager
             .decompress_download_file(&downloaded_file_path_buf, &runtime_dir_path_buf)?;
 
-        fs::remove_file(&downloaded_file_path_buf).expect(
-            format!(
+        let remove_result = fs::remove_file(&downloaded_file_path_buf);
+
+        if remove_result.is_err() {
+            print_warning!(
                 "download remove_file error {:?}",
                 &downloaded_file_path_buf.display()
-            )
-            .as_str(),
-        );
+            );
+        }
 
         Ok(())
     }

crates/snm_core/src/model/dispatch_manage.rs

@@ -34,25 +34,6 @@ where
         .as_str(),
     );
 
-    let old_base = get_target_dir(output_path);
-
-    let transform = |f: &PathBuf| -> Result<PathBuf, SnmError> {
-        let new_path = f
-            .strip_prefix(&old_base)
-            .expect("decompress_tgz strip_prefix error");
-        Ok(output_path.join(new_path))
-    };
-
-    rename(&old_base, &transform)?;
-
-    std::fs::remove_dir_all(&old_base).expect(
-        format!(
-            "decompress_tgz remove_dir_all error {:?}",
-            &old_base.display()
-        )
-        .as_str(),
-    );
-
     Ok(())
 }
 

crates/snm_core/src/utils/tarball.rs

@@ -260,12 +260,16 @@ impl ShimTrait for SnmNpm {
         bin_name: &str,
         version: &str,
     ) -> Result<PathBuf, SnmError> {
-        let package_json_buf_path = self
+        let mut package_json_buf_path = self
             .snm_config
             .get_node_modules_dir_path_buf()
             .join(self.prefix.to_string())
-            .join(&version)
-            .join("package.json");
+            .join(&version);
+
+        if !(&package_json_buf_path.join("package.json").exists()) {
+            package_json_buf_path = package_json_buf_path.join("package")
+        }
+        package_json_buf_path = package_json_buf_path.join("package.json");
 
         let mut hashmap = PackageJson::from_file_path(&package_json_buf_path)?.bin_to_hashmap()?;