ci: properly log execution from subprocess

hansl · hansl · commit d57e3e9ba377 · 2018-06-05T17:55:15.000-07:00
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
@@ -6,11 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { logging } from '@angular-devkit/core';
-import { execSync } from 'child_process';
+import { execSync, spawnSync } from 'child_process';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import { Writable } from 'stream';
 import { packages } from '../lib/packages';
 import build from './build';
 
@@ -32,25 +31,18 @@ function _copy(from: string, to: string) {
 }
 
 
-function _exec(command: string, opts: { cwd?: string }, logger: logging.Logger) {
-  const infoLoggerStream = new Writable({
-    write(chunk, _encoding, callback) {
-      logger.info(chunk.toString());
-      callback();
-    },
-  });
-  const errorLoggerStream = new Writable({
-    write(chunk, _encoding, callback) {
-      logger.error(chunk.toString());
-      callback();
-    },
-  });
-
+function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
   logger.debug(`Running command "${JSON.stringify(command)}"...`);
-  execSync(command, {
+  const { stdout, stderr, status, error } = spawnSync(command, args, {
     ...opts,
-    stdio: [0, infoLoggerStream, errorLoggerStream],
   });
+
+  logger.error(stderr.toString());
+  if (status != 0) {
+    logger.fatal(error.message);
+    throw error;
+  }
+  logger.info(stdout.toString());
 }
 
 
@@ -70,10 +62,9 @@ export default function(opts: SnapshotsOptions, logger: logging.Logger) {
   const message = execSync(`git log --format="%h %s" -n1`).toString().trim();
 
   const githubToken = fs.readFileSync(opts.githubTokenFile, 'utf-8');
-
   logger.info('Setting up global git name.');
-  _exec(`git config --global user.email "circleci@angular.io"`, {}, logger);
-  _exec(`git config --global user.name "Angular Builds"`, {}, logger);
+  _exec('git', ['config', '--global', 'user.email', 'circleci@angular.io'], {}, logger);
+  _exec('git', ['config', '--global', 'user.name', 'Angular Builds'], {}, logger);
 
 
   // Run build.
@@ -94,23 +85,23 @@ export default function(opts: SnapshotsOptions, logger: logging.Logger) {
     publishLogger.debug('Temporary directory: ' + root);
 
     const url = `https://github.com/${pkg.snapshotRepo}.git`;
-    _exec(`git clone ${JSON.stringify(url)}`, { cwd: root }, publishLogger);
+    _exec('git', ['clone', url], { cwd: root }, publishLogger);
 
     const destPath = path.join(root, path.basename(pkg.snapshotRepo));
     _copy(pkg.dist, destPath);
 
-    _exec(`git config credential.helper "store --file=.git/credentials"`, { cwd: destPath },
-          publishLogger);
+    _exec('git', ['config', 'credential.helper', 'store --file=.git/credentials'],
+          { cwd: root }, publishLogger);
     fs.writeFileSync(path.join(destPath, '.git/credentials'), `https://${githubToken}@github.com`);
 
     // Make sure that every snapshots is unique.
     fs.writeFileSync(path.join(destPath, 'uniqueId'), '' + new Date());
 
     // Commit and push.
-    _exec(`git add -A`, { cwd: destPath }, publishLogger);
-    _exec(`git commit -am ${JSON.stringify(message)}`, { cwd: destPath }, publishLogger);
-    _exec(`git tag ${pkg.snapshotHash}`, { cwd: destPath }, publishLogger);
-    _exec(`git push origin`, { cwd: destPath }, publishLogger);
-    _exec(`git push --tags origin`, { cwd: destPath }, publishLogger);
+    _exec('git', ['add', '.'], { cwd: destPath }, publishLogger);
+    _exec('git', ['commit', '-am', message], { cwd: destPath }, publishLogger);
+    _exec('git', ['tag', pkg.snapshotHash], { cwd: destPath }, publishLogger);
+    _exec('git', ['push', 'origin'], { cwd: destPath }, publishLogger);
+    _exec('git', ['push', '--tags', 'origin'], { cwd: destPath }, publishLogger);
   }
 }
