Skip to content
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

solve #306, and bin in $PATH make sense now #307

Closed
wants to merge 15 commits into from
Closed

solve #306, and bin in $PATH make sense now #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6c33af8
solve #306, and bin in $PATH make sense now
zhiyelee Dec 14, 2014
e44c764
Merge branch 'master' into buginfo
zhiyelee Dec 24, 2014
ab2885e
Merge branch 'master' into buginfo
zhiyelee Dec 24, 2014
efa2d82
fix windows platform
zhiyelee Dec 24, 2014
2ee5c66
Binary might not be called "node". For example, on ubuntu it's sometimes
zhiyelee Dec 25, 2014
0d676c5
add tests
zhiyelee Dec 25, 2014
6929462
fix test error
zhiyelee Dec 25, 2014
c6807fd
Merge pull request #319 from zhiyelee/v2.6.0
zhiyelee Dec 29, 2014
c936e47
solve #306, and bin in $PATH make sense now
zhiyelee Dec 14, 2014
c366dd8
fix windows platform
zhiyelee Dec 24, 2014
8980da6
Binary might not be called "node". For example, on ubuntu it's sometimes
zhiyelee Dec 25, 2014
ffc24d0
add tests
zhiyelee Dec 25, 2014
0062ba7
fix test error
zhiyelee Dec 25, 2014
2f811a6
Merge branch 'buginfo' of github.com:zhiyelee/commander.js into buginfo
zhiyelee Jan 8, 2015
505983b
fix test errors
zhiyelee Jan 8, 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
20 changes: 17 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ var spawn = require('child_process').spawn;
var path = require('path');
var dirname = path.dirname;
var basename = path.basename;
var fs = require('fs');

/**
* Expose the root command.
Expand Down Expand Up @@ -460,13 +461,26 @@ Command.prototype.executeSubCommand = function(argv, args, unknown) {
var dir = dirname(argv[1]);
var bin = basename(argv[1], '.js') + '-' + args[0];

// check for ./<bin> first
// prefer local `./<bin>` to bin in the $PATH
var local = path.join(dir, bin);
try {
// for versions before node v0.8 when there weren't `fs.existsSync`
if (fs.statSync(local).isFile()) {
bin = local;
}
} catch (e) {}

// run it
args = args.slice(1);
args.unshift(local);
var proc = spawn('node', args, { stdio: 'inherit', customFds: [0, 1, 2] });

var proc;
if (process.platform !== 'win32') {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the commit, bin file must have shebang itself

proc = spawn(bin, args, { stdio: 'inherit'});
} else {
args.unshift(local);
proc = spawn(process.execPath, args, { stdio: 'inherit'});
}

proc.on('error', function(err) {
if (err.code == "ENOENT") {
console.error('\n %s(1) does not exist, try --help\n', bin);
Expand Down
20 changes: 20 additions & 0 deletions test/test.command.executableSubcommand.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
var program = require('../')
, util = require('util')
, should = require('should');

var oldError = console.error;
var err = '';
console.error = function (tpl, s) {
err = util.format(tpl, s);
};
program
.command('exec [options]', 'this is my command');

program.parse('node test exec a'.split(' '));

program.runningCommand.on('error', function() {
err.should.equal('\n test-exec(1) does not exist, try --help\n');
});

// @todo test `EACCES` error