diff --git a/package-scripts.js b/package-scripts.js index ea51440..bc8c004 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -40,7 +40,7 @@ module.exports = { }, validate: { description: 'This runs several scripts to make sure things look good before committing or on clean install', - script: 'p-s -p lint,build,cover && p-s check-coverage', + script: 'dist/bin/p-s.js -p lint,build,cover && p-s check-coverage', }, addContributor: { description: 'When new people contribute to the project, run this', diff --git a/src/bin-utils.js b/src/bin-utils.js index 9aaf12c..c0bba14 100644 --- a/src/bin-utils.js +++ b/src/bin-utils.js @@ -43,15 +43,15 @@ export {getScriptsAndArgs, help, getModuleRequirePath, preloadModule, loadConfig /****** implementations ******/ function getScriptsAndArgs(program) { - let scripts, args, parallel - if (isEmpty(program.parallel)) { - scripts = program.args[0].split(',') - args = getArgs(program.args.slice(1), program.rawArgs, scripts) - parallel = false - } else { + let scripts = [] + let args = '' + const parallel = !isEmpty(program.parallel) + if (parallel) { scripts = program.parallel.split(',') args = getArgs(program.args, program.rawArgs, scripts) - parallel = true + } else if (!isEmpty(program.args)) { + scripts = program.args[0].split(',') + args = getArgs(program.args.slice(1), program.rawArgs, scripts) } return {scripts, args, parallel} } diff --git a/src/bin-utils.test.js b/src/bin-utils.test.js index 232bdcb..6390b99 100644 --- a/src/bin-utils.test.js +++ b/src/bin-utils.test.js @@ -32,6 +32,15 @@ test('getScriptsAndArgs: passes args to scripts', t => { t.is(args, '--watch --verbose') }) +test('getScriptsAndArgs: returns empty scripts and args if not parallel and no args', t => { + const {args, scripts} = getScriptsAndArgs({ + args: [], + rawArgs: ['node', 'p-s'], + }) + t.is(scripts.length, 0) + t.is(args, '') +}) + test('preloadModule: resolves a relative path', t => { const relativePath = '../test/fixtures/my-module' const val = preloadModule(relativePath) diff --git a/src/bin/p-s.js b/src/bin/p-s.js index e37e7cc..d2adda3 100755 --- a/src/bin/p-s.js +++ b/src/bin/p-s.js @@ -21,14 +21,14 @@ program .on('--help', onHelp) .parse(process.argv) -if (program.args.length < 1) { +const scriptsAndArgs = getScriptsAndArgs(program) +if (scriptsAndArgs.scripts.length < 1) { program.outputHelp() } else { loadAndRun() } function loadAndRun() { - const scriptsAndArgs = getScriptsAndArgs(program) const psConfig = getPSConfig() runPackageScript({