Merge pull request #17 from rosen-vladimirov/vladimirov/fix-getting-path-on-win

fix: get path on Windows from executable name

Author: rosen-vladimirov

.gitignore

@@ -38,4 +38,5 @@ jspm_packages
 
 xunit.xml
 *.tgz
-!integration-tests/local-module/local-module-1.0.0.tgz
+!integration-tests/local-module/local-module-1.0.0.tgz
+!integration-tests/local-module-2/local-module-2-1.0.0.tgz

integration-tests/linux.js

@@ -7,8 +7,8 @@ describe("Integration tests", () => {
     });
 
     it("finds correct path to executable when package name and executable name differ", () => {
-        const pathToPackage = require("../").getPath("local-module", "lm");
-        assert.deepEqual(pathToPackage.replace(/\/node\/18\..+?\..+?\//, "/node/NODE_VERSION/"), "/opt/hostedtoolcache/node/NODE_VERSION/x64/lib/node_modules/local-module")
+        const pathToPackage = require("../").getPath("local-module-2", "lm2");
+        assert.deepEqual(pathToPackage.replace(/\/node\/18\..+?\..+?\//, "/node/NODE_VERSION/"), "/opt/hostedtoolcache/node/NODE_VERSION/x64/lib/node_modules/local-module-2")
     });
 
     it("finds correct path to executable when only package name is used", () => {

integration-tests/linux.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/bash
 
 npm i -g ./local-module/local-module-1.0.0.tgz
+npm i -g ./local-module-2/local-module-2-1.0.0.tgz
 ../node_modules/mocha/bin/_mocha --recursive --reporter spec-xunit-file --timeout 1500 linux.js

integration-tests/local-module-2/local-module-2-1.0.0.tgz

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+console.log("Successfully run local-module-2");

integration-tests/local-module-2/local.js

@@ -0,0 +1,15 @@
+{
+    "name": "local-module-2",
+    "version": "1.0.0",
+    "description": "Local package used for testing, with executable name that is not the same as package name",
+    "main": "index.js",
+    "bin": {
+      "lm2": "./local.js"
+    },
+    "scripts": {
+      "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "author": "Rosen Vladimirov",
+    "license": "Apache-2.0"
+  }
+  

integration-tests/local-module-2/package.json

@@ -1 +1 @@
-npm i -g local-module\local-module-1.0.0.tgz && node ..\node_modules\mocha\bin\_mocha --recursive --reporter spec-xunit-file --timeout 5000 windows.js
+npm i -g local-module\local-module-1.0.0.tgz && npm i -g local-module-2\local-module-2-1.0.0.tgz && node ..\node_modules\mocha\bin\_mocha --recursive --reporter spec-xunit-file --timeout 5000 windows.js

integration-tests/windows.cmd

@@ -7,8 +7,8 @@ describe("Integration tests", () => {
     });
 
     it("finds correct path to executable when package name and executable name differ", () => {
-        const pathToPackage = require("../").getPath("local-module", "lm");
-        assert.deepEqual(pathToPackage.replace(/\/node\/18\..+?\..+?\//, "/node/NODE_VERSION/"), "C:\\npm\\prefix\\node_modules\\local-module");
+        const pathToPackage = require("../").getPath("local-module-2", "lm2");
+        assert.deepEqual(pathToPackage.replace(/\/node\/18\..+?\..+?\//, "/node/NODE_VERSION/"), "C:\\npm\\prefix\\node_modules\\local-module-2");
     });
 
     it("finds correct path to executable when only package name is used", () => {

integration-tests/windows.js

@@ -125,7 +125,7 @@ const getVerifiedPath = (suggestedPath, packageName) => {
 
 const getPathFromExecutableNameOnWindows = (packageName, executableName) => {
 	try {
-		const whereResult = (spawnSyncWrapper("where", executableName) || "").split("\n");
+		const whereResult = (spawnSyncWrapper("where", [executableName]) || "").split("\n");
 
 		for (const line of whereResult) {
 			const pathToExecutable = line && line.trim();