fix: handle projects with wrappers that have whitespaces in the direc…

…tory names (#66)
snyk · May 8, 2019 · 6f90fe9 · 6f90fe9
1 parent bd1f293
commit 6f90fe9
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 9 deletions.
diff --git a/lib/index.ts b/lib/index.ts
@@ -333,18 +333,19 @@ ${chalk.red.bold(mainErrorMessage)}`;
 }
 
 function getCommand(root, targetFile) {
-  const isWin = /^win/.test(os.platform());
-  const wrapperScript = isWin ? 'gradlew.bat' : './gradlew';
+  const isWinLocal = /^win/.test(os.platform()); // local check, can be stubbed in tests
+  const quotLocal = isWinLocal ? '"' : '\'';
+  const wrapperScript = isWinLocal ? 'gradlew.bat' : './gradlew';
   // try to find a sibling wrapper script first
   let pathToWrapper = path.resolve(
     root, path.dirname(targetFile), wrapperScript);
   if (fs.existsSync(pathToWrapper)) {
-    return pathToWrapper;
+    return quotLocal + pathToWrapper + quotLocal;
   }
   // now try to find a wrapper in the root
   pathToWrapper = path.resolve(root, wrapperScript);
   if (fs.existsSync(pathToWrapper)) {
-    return pathToWrapper;
+    return quotLocal + pathToWrapper + quotLocal;
   }
   return 'gradle';
 }

diff --git a/...multi-project-gradle-wrapper/build.gradle → ...multi-project gradle wrapper/build.gradle b/...multi-project-gradle-wrapper/build.gradle → ...multi-project gradle wrapper/build.gradle
diff --git a/...wrapper/gradle/wrapper/gradle-wrapper.jar → ...wrapper/gradle/wrapper/gradle-wrapper.jar b/...wrapper/gradle/wrapper/gradle-wrapper.jar → ...wrapper/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...ures/multi-project-gradle-wrapper/gradlew → ...ures/multi-project gradle wrapper/gradlew b/...ures/multi-project-gradle-wrapper/gradlew → ...ures/multi-project gradle wrapper/gradlew
diff --git a/.../multi-project-gradle-wrapper/gradlew.bat → .../multi-project gradle wrapper/gradlew.bat b/.../multi-project-gradle-wrapper/gradlew.bat → .../multi-project gradle wrapper/gradlew.bat
diff --git a/...ti-project-gradle-wrapper/settings.gradle → ...ti-project gradle wrapper/settings.gradle b/...ti-project-gradle-wrapper/settings.gradle → ...ti-project gradle wrapper/settings.gradle
diff --git a/...oject-gradle-wrapper/subproj/build.gradle → ...oject gradle wrapper/subproj/build.gradle b/...oject-gradle-wrapper/subproj/build.gradle → ...oject gradle wrapper/subproj/build.gradle
diff --git a/test/system/darwin.test.ts b/test/system/darwin.test.ts
@@ -32,7 +32,7 @@ test('darwin with wrapper', async (t) => {
     t.fail('Expected failure');
   } catch {
     const cmd = (subProcess.execute as SinonStub).getCall(0).args[0];
-    const expectedCmd = path.join(rootWithWrapper, 'gradlew');
+    const expectedCmd = "'" + path.join(rootWithWrapper, 'gradlew') + "'";
     t.same(cmd, expectedCmd, 'invokes wrapper script');
   }
 });
@@ -46,7 +46,7 @@ test('darwin with wrapper in root', async (t) => {
     t.fail('Expected failure');
   } catch {
     const cmd = (subProcess.execute as SinonStub).getCall(0).args[0];
-    const expectedCmd = path.join(subWithWrapper, 'gradlew');
+    const expectedCmd = "'" + path.join(subWithWrapper, "gradlew") + "'";
     t.same(cmd, expectedCmd, 'invokes wrapper script');
   }
 });

diff --git a/test/system/multi-module.test.ts b/test/system/multi-module.test.ts
@@ -88,7 +88,7 @@ test('multi-project: only sub-project has deps, none returned for main', async (
 
 test('multi-project: using gradle via wrapper', async (t) => {
   const result = await inspect('.',
-    path.join(fixtureDir('multi-project-gradle-wrapper'), 'build.gradle'));
+    path.join(fixtureDir('multi-project gradle wrapper'), 'build.gradle'));
   t.match(result.package.name, '.',
     'returned project name is not sub-project');
   t.deepEqual(result.plugin.meta!.allDepRootNames, ['root-proj', 'subproj']);

diff --git a/test/system/windows.test.ts b/test/system/windows.test.ts
@@ -19,7 +19,7 @@ test('windows with wrapper in root', async (t) => {
     t.fail('Expected failure');
   } catch {
     const cmd = (subProcess.execute as SinonStub).getCall(0).args[0];
-    const expectedCmd = path.join(subWithWrapper, 'gradlew.bat');
+    const expectedCmd = '"' + path.join(subWithWrapper, 'gradlew.bat') + '"';
     t.same(cmd, expectedCmd, 'invokes wrapper bat');
   }
 });
@@ -33,7 +33,7 @@ test('windows with wrapper', async (t) => {
     t.fail('Expected failure');
   } catch {
     const cmd = (subProcess.execute as SinonStub).getCall(0).args[0];
-    const expectedCmd = path.join(rootWithWrapper, 'gradlew.bat');
+    const expectedCmd = '"' + path.join(rootWithWrapper, 'gradlew.bat') + '"';
     t.same(cmd, expectedCmd, 'invokes wrapper bat');
   }
 });