convert to spawn

Author: Kelly Selden

src/download-package.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const { createTmpDir } = require('./tmp');
 const npa = require('npm-package-arg');
-const run = require('./run');
+const { spawn } = require('./run');
 
 async function downloadPackage(name, url, range) {
   if (!range) {
@@ -17,11 +17,11 @@ async function downloadPackage(name, url, range) {
   }
 
   let newTmpDir = await createTmpDir();
-  let output = await run(`npm install ${url}`, { cwd: newTmpDir });
+  let { stdout } = await spawn('npm', ['install', url], { cwd: newTmpDir });
   // if (!name) {
-  //   name = output.match(/^\+ (.*)@\d\.\d\.\d.*$/m)[1];
+  //   name = stdout.match(/^\+ (.*)@\d\.\d\.\d.*$/m)[1];
   // }
-  let arg = output.match(/^\+ (.*)$/m)[1];
+  let arg = stdout.match(/^\+ (.*)$/m)[1];
   let parsed = npa(arg);
   name = parsed.name;
   let version = parsed.rawSpec;

src/get-start-and-end-commands.js

@@ -3,7 +3,7 @@
 const path = require('path');
 const fs = require('fs-extra');
 const execa = require('execa');
-const run = require('./run');
+const { spawn } = require('./run');
 const utils = require('./utils');
 const isDefaultBlueprint = require('./is-default-blueprint');
 const emberInstallAddon = require('./ember-install-addon');
@@ -260,7 +260,7 @@ module.exports.installAddonBlueprint = async function installAddonBlueprint({
   blueprint
 }) {
   // `not found: ember` without this
-  await run('npm install', { cwd: projectRoot });
+  await spawn('npm', ['install'], { cwd: projectRoot });
 
   let { ps } = await emberInstallAddon({
     cwd: projectRoot,

src/run.js

@@ -3,14 +3,18 @@
 const execa = require('execa');
 const debug = require('./debug');
 
-module.exports = async function run() {
-  debug(...arguments);
+function spawn(bin, args = [], options) {
+  debug(bin, ...args.map(arg => `"${arg}"`), options);
 
-  let { stdout } = await execa.command(...arguments);
+  let ps = execa(...arguments);
 
-  if (stdout) {
-    debug(stdout);
-  }
+  ps.stdout.on('data', data => {
+    debug(data.toString());
+  });
 
-  return stdout;
+  return ps;
+}
+
+module.exports = {
+  spawn
 };

src/stage-blueprint-file.js

@@ -1,15 +1,15 @@
 'use strict';
 
 const path = require('path');
-const run = require('./run');
+const { spawn } = require('./run');
 
 async function stageBlueprintFile({
   cwd,
   emberCliUpdateJsonPath
 }) {
   let relative = path.relative(cwd, emberCliUpdateJsonPath);
 
-  await run(`git add ${relative}`, {
+  await spawn('git', ['add', relative], {
     cwd
   });
 }

test/acceptance/ember-cli-update-test.js

@@ -16,7 +16,7 @@ const {
   assertCodemodRan
 } = require('../helpers/assertions');
 const { initBlueprint } = require('../helpers/blueprint');
-const run = require('../../src/run');
+const { spawn } = require('../../src/run');
 const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
 const overwriteBlueprintFiles = require('../../src/overwrite-blueprint-files');
 const { defaultTo } = require('../../src/constants');
@@ -408,7 +408,7 @@ describe(function() {
           relativeDir: location
         });
 
-        await run('npm install', { cwd: tmpPath });
+        await spawn('npm', ['install'], { cwd: tmpPath });
       }
     });
 

test/integration/install-test.js

@@ -10,7 +10,7 @@ const {
   fixtureCompare: _fixtureCompare
 } = require('git-fixtures');
 const install = require('../../src/install');
-const run = require('../../src/run');
+const { spawn } = require('../../src/run');
 const {
   assertNoStaged
 } = require('../helpers/assertions');
@@ -85,7 +85,7 @@ describe(install, function() {
           relativeDir: location
         });
 
-        await run('npm install', { cwd: tmpPath });
+        await spawn('npm', ['install'], { cwd: tmpPath });
       },
       async afterMerge() {
         await fs.remove(path.join(tmpPath, 'package-lock.json'));

test/integration/overwrite-blueprint-files-test.js

@@ -6,7 +6,7 @@ const {
   buildTmp
 } = require('git-fixtures');
 const overwriteBlueprintFiles = require('../../src/overwrite-blueprint-files');
-const run = require('../../src/run');
+const { spawn } = require('../../src/run');
 const { initBlueprint } = require('../helpers/blueprint');
 const loadSafeBlueprintFile = require('../../src/load-safe-blueprint-file');
 const sinon = require('sinon');
@@ -31,9 +31,9 @@ describe(overwriteBlueprintFiles, function() {
       relativeDir: location
     });
 
-    await run('npm install', { cwd: tmpPath });
+    await spawn('npm', ['install'], { cwd: tmpPath });
 
-    await run(`npm install ${blueprintPath}`, { cwd: tmpPath });
+    await spawn('npm', ['install', blueprintPath], { cwd: tmpPath });
 
     let ps = ember(['g', packageName], { cwd: tmpPath, stdin: 'pipe' });