Skip to content

Add options to control the output of the module and the npm process #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marco-c wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add options to control the output of the module and the npm process #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e953af9
Allow defining a custom logging function
Nov 11, 2015
0095bf1
Allow defining the stdio option for the npm process
Nov 11, 2015
56f8ebf
Fix tests
Nov 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,16 @@ var through2 = require('through2'),
}
};

var log = builtInLog;

module.exports = exports = function install(opts) {
var toRun = [],
count = 0;

if (opts && opts.log) {
log = opts.log;
}

return through2({
objectMode: true
},
Expand Down Expand Up @@ -69,7 +75,7 @@ module.exports = exports = function install(opts) {
return cb();
} else {
toRun.forEach(function(command) {
commandRunner.run(command, function(err) {
commandRunner.run(command, opts, function(err) {
if (err) {
log(err.message, ', run `' + gutil.colors.yellow(formatCommand(command)) + '` manually');
return cb(err);
Expand All @@ -88,7 +94,7 @@ module.exports = exports = function install(opts) {
}
};

function log() {
function builtInLog() {
if (isTest()) {
return;
}
Expand Down
7 changes: 5 additions & 2 deletions lib/commandRunner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
var which = require('which'),
childProcess = require('child_process');

exports.run = function run (command, cb) {
exports.run = function run (command, opts, cb) {
which(command.cmd, function(err, cmdpath){
if (err) {
cb(new Error('Can\'t install! `' + command.cmd + '` doesn\'t seem to be installed.'));
return;
}
var cmd = childProcess.spawn(cmdpath, command.args, {stdio: 'inherit', cwd: command.cwd || process.cwd()});
var cmd = childProcess.spawn(cmdpath, command.args, {
stdio: opts && opts.npmStdio ? opts.npmStdio : 'inherit',
cwd: command.cwd || process.cwd()
});
cmd.on('close', function (code) {
if (code !== 0) {
return cb(new Error(command.cmd + ' exited with non-zero code ' + code));
Expand Down
2 changes: 1 addition & 1 deletion test/install_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ describe('gulp-install', function () {
});

function mockRunner () {
var mock = function mock (cmd, cb) {
var mock = function mock (cmd, opts, cb) {
mock.called += 1;
mock.commands.push(cmd);
cb();
Expand Down