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

Fixed commandExists() not working for absolute path on windows #24

Merged
merged 5 commits into from
Apr 15, 2020
Merged

Fixed commandExists() not working for absolute path on windows #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33b3a6c
Replaced "dir" with "xcopy" for windows tests
Antyos Mar 28, 2020
35e018e
Fixed not working for absolute path on windows
Antyos Mar 28, 2020
47f13ad
Added test code for absolute path
Antyos Mar 28, 2020
acc029c
Fixed non-windows absolute path test
Antyos Apr 1, 2020
17594d5
Simplified absolute path tests between platforms
Antyos Apr 2, 2020
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
6 changes: 4 additions & 2 deletions lib/command-exists.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ var commandExistsUnix = function(commandName, cleanedCommandName, callback) {
}

var commandExistsWindows = function(commandName, cleanedCommandName, callback) {
if (/[\x00-\x1f<>:"\|\?\*]/.test(commandName)) {
// Regex from Julio from: https://stackoverflow.com/questions/51494579/regex-windows-path-validator
if (!(/^(?!(?:.*\s|.*\.|\W+)$)(?:[a-zA-Z]:)?(?:(?:[^<>:"\|\?\*\n])+(?:\/\/|\/|\\\\|\\)?)+$/m.test(commandName))) {
callback(null, false);
return;
}
Expand Down Expand Up @@ -93,7 +94,8 @@ var commandExistsUnixSync = function(commandName, cleanedCommandName) {
}

var commandExistsWindowsSync = function(commandName, cleanedCommandName, callback) {
if (/[\x00-\x1f<>:"\|\?\*]/.test(commandName)) {
// Regex from Julio from: https://stackoverflow.com/questions/51494579/regex-windows-path-validator
if (!(/^(?!(?:.*\s|.*\.|\W+)$)(?:[a-zA-Z]:)?(?:(?:[^<>:"\|\?\*\n])+(?:\/\/|\/|\\\\|\\)?)+$/m.test(commandName))) {
return false;
}
try {
Expand Down
33 changes: 25 additions & 8 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
var expect = require('expect.js');
var commandExists = require('..');
var commandExistsSync = commandExists.sync;
var resolve = require('path').resolve;
var isUsingWindows = process.platform == 'win32'

describe('commandExists', function(){
describe('async - callback', function() {
it('it should find a command named ls or dir', function(done){
it('it should find a command named ls or xcopy', function(done){
var commandToUse = 'ls'
if (isUsingWindows) {
commandToUse = 'dir'
commandToUse = 'xcopy'
}

commandExists(commandToUse, function(err, exists) {
Expand All @@ -30,10 +31,10 @@ describe('commandExists', function(){
});

describe('async - promise', function() {
it('it should find a command named ls or dir', function(done){
it('it should find a command named ls or xcopy', function(done){
var commandToUse = 'ls'
if (isUsingWindows) {
commandToUse = 'dir'
commandToUse = 'xcopy'
}

commandExists(commandToUse)
Expand All @@ -56,10 +57,10 @@ describe('commandExists', function(){
});

describe('sync', function() {
it('it should find a command named ls or dir', function(){
it('it should find a command named ls or xcopy', function(){
var commandToUse = 'ls'
if (isUsingWindows) {
commandToUse = 'dir'
commandToUse = 'xcopy'
}
expect(commandExistsSync(commandToUse)).to.be(true);
});
Expand All @@ -68,10 +69,10 @@ describe('commandExists', function(){
expect(commandExistsSync('fdsafdsafdsafdsafdsa')).to.be(false);
});

it('it should not find a command named ls or dir prefixed with some nonsense', function(){
it('it should not find a command named ls or xcopy prefixed with some nonsense', function(){
var commandToUse = 'fdsafdsa ls'
if (isUsingWindows) {
commandToUse = 'fdsafdsaf dir'
commandToUse = 'fdsafdsaf xcopy'
}
expect(commandExistsSync(commandToUse)).to.be(false);
});
Expand Down Expand Up @@ -127,4 +128,20 @@ describe('commandExists', function(){
});
}
});

describe('absolute path', function() {
it('it should report true if there is a command with that name in absolute path', function(done) {
var commandToUse = resolve('test/executable-script.js');
commandExists(commandToUse)
.then(function(command){
expect(command).to.be(commandToUse);
done();
});
});

it('it should report false if there is not a command with that name in absolute path', function() {
var commandToUse = resolve('executable-script.js');
expect(commandExists.sync(commandToUse)).to.be(false);
});
});
});