feat: pass command and args into spawn separately

Author: DOlufemi

lib/composer-cmds.ts

@@ -1,15 +1,17 @@
 import * as path from 'path';
 import * as childProcess from 'child_process';
+export const composerCmd = {command: 'composer', args: ['--version']};
+export const composerShowCmd = {command: 'composer', args: ['show', '-p']};
+export const pharCmd = {command: `php`, args:[`${path.resolve(path.resolve() + '/composer.phar')}`, 'show', '-p', '--format=json']
+};
 
-export const composerCmd = 'composer --version';
-export const composerShowCmd = 'composer show -p';
-export const pharCmd = `php ${path.resolve(path.resolve() + '/composer.phar')} show -p --format=json`;
-
-export function cmdReturnsOk(cmd): boolean {
-  return cmd && childProcess.spawnSync(cmd, { shell: false }).status === 0;
+export function cmdReturnsOk(cmd, args: string[] = []): boolean {
+  const spawnOptions: childProcess.SpawnOptions = { shell: false };
+  return cmd && childProcess.spawnSync(cmd, args,spawnOptions).status === 0;
 }
 
 // run a cmd in a specific folder and it's result should be there
-export function execWithResult(cmd, basePath): string {
-  return childProcess.spawnSync(cmd, { cwd: basePath, shell: false }).toString();
+export function execWithResult(cmd, basePath, args: string[] = []): string {
+  const spawnOptions: childProcess.SpawnOptions ={ cwd: basePath, shell: false }
+  return childProcess.spawnSync(cmd, args, spawnOptions).toString();
 }

lib/system-deps.ts

@@ -9,25 +9,25 @@ function isSet(variable): boolean {
 }
 
 export function systemDeps(basePath: string, options: PhpOptions): SystemPackages {
-  const composerOk = isSet(options.composerIsFine) ? options.composerIsFine : cmds.cmdReturnsOk(cmds.composerCmd);
+  const composerOk = isSet(options.composerIsFine) ? options.composerIsFine : cmds.cmdReturnsOk(cmds.composerCmd.command,cmds.composerCmd.args);
   const composerPharOk = isSet(options.composerPharIsFine) ?
-    options.composerPharIsFine : cmds.cmdReturnsOk(cmds.pharCmd);
+    options.composerPharIsFine : cmds.cmdReturnsOk(cmds.pharCmd.command, cmds.pharCmd.args);
 
   let finalVersionsObj = {};
 
   if (options.systemVersions && (Object.keys(options.systemVersions).length > 0)) {
     // give first preference to a stub
     finalVersionsObj = options.systemVersions;
   } else if (composerOk) {
-    const lines = cmds.execWithResult(cmds.composerShowCmd, basePath).split(os.EOL);
+    const lines = cmds.execWithResult(cmds.composerShowCmd.command, basePath, cmds.composerShowCmd.args).split(os.EOL);
     lines.forEach((line) => {
       const [part1, part2] = line.split(/\s+/);
       if (part2) {
         finalVersionsObj[part1] = part2;
       }
     });
   } else if (composerPharOk) {
-    const output = cmds.execWithResult(cmds.pharCmd, basePath);
+    const output = cmds.execWithResult(cmds.pharCmd.command, basePath, cmds.pharCmd.args);
     const versionsObj = JSON.parse(output).platform;
     versionsObj.forEach(({name, version}) => {
       finalVersionsObj[name] = version;