RushXCommandLine now uses executeLifecycleCommand() instead of executeLifecycleCommandAsync().

pgonzal · pgonzal · commit 2968525812bb · 2018-06-08T13:39:47.000-07:00
NOTE: We will come back in a later PR and straighten out the API for launching processes
diff --git a/apps/rush-lib/src/cli/RushXCommandLine.ts b/apps/rush-lib/src/cli/RushXCommandLine.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as child_process from 'child_process';
 import * as colors from 'colors';
 import * as os from 'os';
 import * as path from 'path';
@@ -71,20 +70,19 @@ export class RushXCommandLine {
 
       const packageFolder: string = path.dirname(packageJsonFilePath);
 
-      const result: child_process.ChildProcess = Utilities.executeLifecycleCommandAsync(
-        scriptBody,
-        packageFolder,
-        packageFolder
+      const exitCode: number = Utilities.executeLifecycleCommand(scriptBody, {
+          workingDirectory: packageFolder,
+          initCwd: packageFolder,
+          handleOutput: false
+        }
       );
 
-      result.on('close', (code) => {
-        if (code) {
-          console.log(colors.red(`The script failed with exit code ${code}`));
-        }
+      if (exitCode > 0) {
+        console.log(colors.red(`The script failed with exit code ${exitCode}`));
+      }
+
+      process.exitCode = exitCode;
 
-        // Pass along the exit code of the child process
-        process.exitCode = code || 0;
-      });
     } catch (error) {
       console.log(colors.red('Error: ' + error.message));
     }
diff --git a/apps/rush-lib/src/logic/EventHooksManager.ts b/apps/rush-lib/src/logic/EventHooksManager.ts
@@ -28,10 +28,11 @@ export class EventHooksManager {
       console.log(os.EOL + colors.green(`Executing event hooks for ${Event[event]}`));
       scripts.forEach((script) => {
         try {
-          Utilities.executeLifecycleCommand(script,
-            process.cwd(),
-            this._commonTempFolder,
-            true
+          Utilities.executeLifecycleCommand(script, {
+              workingDirectory: process.cwd(),
+              initCwd: this._commonTempFolder,
+              handleOutput: true
+            }
           );
         } catch (error) {
           console.error(`${os.EOL} Event hook "${script}" failed. Run "rush" with --debug` +
diff --git a/apps/rush-lib/src/utilities/Utilities.ts b/apps/rush-lib/src/utilities/Utilities.ts
@@ -303,15 +303,16 @@ export class Utilities {
    * @param workingDirectory - working directory for running this command
    * @param initCwd = the folder containing a local .npmrc, which will be used
    *        for the INIT_CWD environment variable
-   * @param captureOutput - if true, map stdio to 'pipe' instead of the parent process's streams
-   * @beta
+   * @param handleOutput - if true, hide the process's output, but if there is a nonzero exit code
+   *   then show the stderr
    */
   public static executeLifecycleCommand(
-    command: string,
-    workingDirectory: string,
-    initCwd: string,
-    captureOutput: boolean = false
-  ): child_process.SpawnSyncReturns<Buffer> {
+    command: string, options: {
+      workingDirectory: string,
+      initCwd: string,
+      handleOutput: boolean
+    }
+  ): number {
     let shellCommand: string = process.env.comspec || 'cmd';
     let commandFlags: string = '/d /s /c';
     let useShell: boolean = true;
@@ -321,20 +322,22 @@ export class Utilities {
       useShell = false;
     }
 
-    const environment: IEnvironment = Utilities._createEnvironmentForRushCommand(initCwd);
+    const environment: IEnvironment = Utilities._createEnvironmentForRushCommand(options.initCwd);
 
     const result: child_process.SpawnSyncReturns<Buffer> = child_process.spawnSync(
       shellCommand,
       [commandFlags, command],
       {
-        cwd: workingDirectory,
+        cwd: options.workingDirectory,
         shell: useShell,
         env: environment,
-        stdio: captureOutput ? ['pipe', 'pipe', 'pipe'] : [0, 1, 2]
+        stdio: options.handleOutput ? ['pipe', 'pipe', 'pipe'] : [0, 1, 2]
       });
 
-    Utilities._processResult(result);
-    return result;
+    if (options.handleOutput) {
+      Utilities._processResult(result);
+    }
+    return result.status;
   }
 
   /**
