test fixes...

This commit is contained in:
Spencer Alger
2014-03-27 18:26:42 -07:00
parent 913edeb728
commit af89a4917f
14 changed files with 9427 additions and 70 deletions

View File

@ -1,12 +1,12 @@
module.exports = spawn;
module.exports = _spawn;
var estream = require('event-stream');
var chalk = require('chalk');
var cp = require('child_process');
var spawn = require('child_process').spawn;
var path = require('path');
var root = path.resolve(__dirname, '../');
function spawn(cmd, args, opts, cb) {
function _spawn(cmd, args, opts, cb) {
opts = opts || {};
var conf = {
stdio: 'pipe'
@ -20,26 +20,26 @@ function spawn(cmd, args, opts, cb) {
}
console.log(chalk.white.bold((subdir ? subdir + ' ' : '') + '$ ') + cmd + ' ' + args.join(' '));
var proc = cp.spawn(cmd, args, opts);
var out = estream.split();
var cp = spawn(cmd, args, opts);
var split = estream.split();
if (opts.verbose) {
proc.stdout.pipe(out);
cp.stdout.pipe(split);
} else {
proc.stdout.resume();
cp.stdout.resume();
}
proc.stderr.pipe(out);
cp.stderr.pipe(split);
out
split
.pipe(estream.mapSync(function indent(line) {
return line ? ' ' + line + '\n' : '';
}))
.pipe(process.stdout);
if (typeof cb === 'function') {
proc.on('exit', cb);
cp.on('exit', cb);
}
return proc;
return cp;
}