feat(run-npm-scripts): allow multiple scriptNames

smollweide · Aug 8, 2018 · abbf9dc · abbf9dc
1 parent 448f351
commit abbf9dc
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # lerna-terminal [![build status](https://img.shields.io/travis/smollweide/lerna-terminal/master.svg)](https://travis-ci.org/smollweide/lerna-terminal)
 
-> Powerful cli ui for lerna - replace `lerna run <scriptName>` with `lerna-terminal <scriptName>`.
+> Powerful cli ui for lerna - replace `lerna run <scriptName>` with `lerna-terminal <scriptNames>`.
 
 ![kapture 2017-11-02 at 17 25 41](https://user-images.githubusercontent.com/2912007/32337702-08be4f34-bff3-11e7-808b-54c9bd09a0c9.gif)
 
@@ -20,7 +20,7 @@ $ npm install lerna-terminal
 $ lerna-terminal --help
 
   Usage
-    $ lerna-terminal <scriptName> [options]
+    $ lerna-terminal <scriptNames> [options]
 
   Options
     -V, --version                   Output the version number

diff --git a/src/commander/index.js b/src/commander/index.js
@@ -8,9 +8,9 @@ const packageData = require('../../package.json');
 function runCommander() {
 	program
 		.version(packageData.version)
-		.arguments('<scriptName>')
-		.action(scriptName => {
-			program.script = scriptName;
+		.arguments('<scriptNames>')
+		.action(scriptNames => {
+			program.scripts = scriptNames.split(',');
 		})
 		.option('-i, --ignoredPackages [string]', 'Add packages which should be ignored')
 		.option('-f, --focus [string]', 'Focus one subterminal initially')
@@ -19,7 +19,7 @@ function runCommander() {
 		.parse(process.argv);
 
 	/* istanbul ignore next */
-	if (!program.script) {
+	if (!program.scripts || !Array.isArray(program.scripts) || program.scripts.length < 1) {
 		throw new Error('--script is required');
 	}
 }

diff --git a/src/index.js b/src/index.js
@@ -5,15 +5,19 @@
 const { runCommander } = require('./commander');
 const { resizeListener } = require('./getDimensions');
 const { provideStore } = require('./store');
+const { getProgram } = require('./commander');
 const commandListener = require('./commandListener');
 const runNpmScripts = require('./runNpmScripts');
 const render = require('./render');
 const executeCmd = require('./executeCmd');
 const handleKillProcess = require('./handleKillProcess');
+const program = getProgram();
 
 runCommander();
 provideStore();
-runNpmScripts();
+program.scripts.forEach(scriptName => {
+	runNpmScripts(scriptName);
+});
 resizeListener(render);
 commandListener(executeCmd);
 handleKillProcess();
diff --git a/src/runNpmScripts/index.js b/src/runNpmScripts/index.js
@@ -17,19 +17,20 @@ const parseText = text => {
 };
 
 /**
+ * @param {string} scriptName - npm script name
  * @returns {Object} state
  **/
-function runNpmScripts() {
+function runNpmScripts(scriptName) {
 	const commands = getScriptCommands();
 	const program = getProgram();
 	const state = getState();
 
-	if (!commands[program.script]) {
+	if (!commands[scriptName]) {
 		throw new Error("the given script wasn't found!");
 	}
 
-	Object.keys(commands[program.script]).forEach(index => {
-		const packagePath = commands[program.script][index];
+	Object.keys(commands[scriptName]).forEach(index => {
+		const packagePath = commands[scriptName][index];
 		const packageName = path.basename(packagePath);
 		if (isIgnoredPackage(packagePath, program.ignoredPackages)) {
 			return;
@@ -38,7 +39,7 @@ function runNpmScripts() {
 			log: [],
 		};
 		state[packageName].terminal = runNpmScript({
-			scriptName: program.script,
+			scriptName,
 			packagePath,
 			onRecieve(text) {
 				if (text.search('\x1Bc') >= 0) {

diff --git a/src/runNpmScripts/index.spec.js b/src/runNpmScripts/index.spec.js
@@ -34,23 +34,23 @@ describe('runNpmScripts', () => {
 		getScriptCommands.mockImplementation(() => ({}));
 		getProgram.mockImplementation(() => ({ script: 'start' }));
 		expect(() => {
-			runNpmScripts();
+			runNpmScripts('start');
 		}).toThrow();
 	});
 	it('packages ignored', () => {
 		basename.mockImplementation(_path => _path.split('/')[4]);
 		getScriptCommands.mockImplementation(() => ({ start: ['/path/to/package/utils', '/path/to/package/ui'] }));
 		getProgram.mockImplementation(() => ({ script: 'start' }));
 		isIgnoredPackage.mockImplementation(() => true);
-		runNpmScripts();
+		runNpmScripts('start');
 	});
 	it('packages in state', () => {
 		getState.mockImplementation(() => ({}));
 		getScriptCommands.mockImplementation(() => ({ start: ['/path/to/package/utils', '/path/to/package/ui'] }));
 		isIgnoredPackage.mockImplementation(() => false);
 		basename.mockImplementation(_path => _path.split('/')[4]);
 		runNpmScript.mockImplementation(() => 'terminal');
-		expect(runNpmScripts()).toEqual({
+		expect(runNpmScripts('start')).toEqual({
 			ui: { log: [], terminal: 'terminal' },
 			utils: { log: [], terminal: 'terminal' },
 		});
@@ -67,7 +67,7 @@ describe('runNpmScripts', () => {
 			onRecieve('test\n');
 			onRecieve('test2');
 		});
-		expect(runNpmScripts().utils.log).toEqual(['test', '', 'test2']);
+		expect(runNpmScripts('start').utils.log).toEqual(['test', '', 'test2']);
 	});
 	it('package.terminal.onError -> update log', () => {
 		getState.mockImplementation(() => ({}));
@@ -81,7 +81,7 @@ describe('runNpmScripts', () => {
 			onError('test\n');
 			onError('test2');
 		});
-		expect(runNpmScripts().utils.log).toEqual(['test', '', 'test2']);
+		expect(runNpmScripts('start').utils.log).toEqual(['test', '', 'test2']);
 	});
 	it('package.terminal.onExit -> update log', () => {
 		getState.mockImplementation(() => ({}));
@@ -94,7 +94,7 @@ describe('runNpmScripts', () => {
 		runNpmScript.mockImplementation(({ onExit }) => {
 			onExit();
 		});
-		expect(runNpmScripts().utils.log).toEqual(['stop: utils']);
+		expect(runNpmScripts('start').utils.log).toEqual(['stop: utils']);
 	});
 	it('package.terminal.onRecieve \x1Bc -> clear log', () => {
 		getState.mockImplementation(() => ({}));
@@ -107,7 +107,7 @@ describe('runNpmScripts', () => {
 		runNpmScript.mockImplementation(({ onRecieve }) => {
 			onRecieve('\x1Bc');
 		});
-		expect(runNpmScripts().utils.log).toEqual(['']);
+		expect(runNpmScripts('start').utils.log).toEqual(['']);
 	});
 	it('package.terminal.onError \x1Bc -> clear log', () => {
 		getState.mockImplementation(() => ({}));
@@ -120,6 +120,6 @@ describe('runNpmScripts', () => {
 		runNpmScript.mockImplementation(({ onError }) => {
 			onError('\x1Bc');
 		});
-		expect(runNpmScripts().utils.log).toEqual(['']);
+		expect(runNpmScripts('start').utils.log).toEqual(['']);
 	});
 });