feat(style-terminal-panel-title): Display state of child process in p…

…anel title
smollweide · Nov 2, 2017 · 3c0ffa4 · 3c0ffa4
1 parent aa52832
commit 3c0ffa4
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 18 deletions.
diff --git a/src/getTerminalPanel/index.js b/src/getTerminalPanel/index.js
@@ -12,6 +12,7 @@ const { program } = require('../commander');
 const themeSymbolMap = {
 	test: {
 		title: text => text,
+		titleStopped: text => text,
 		msg: text => text,
 		error: text => text,
 		titleSpace: ' ',
@@ -25,6 +26,7 @@ const themeSymbolMap = {
 	},
 	default: {
 		title: text => chalk.blue.bgWhite.bold(text),
+		titleStopped: text => chalk.red.bgWhite.bold(text),
 		msg: text => text,
 		error: text => chalk.red(text),
 		titleSpace: chalk.bgWhite(' '),
@@ -38,6 +40,7 @@ const themeSymbolMap = {
 	},
 	massive: {
 		title: text => chalk.blue.bgWhite.bold(text),
+		titleStopped: text => chalk.red.bgWhite.bold(text),
 		msg: text => text,
 		error: text => chalk.red(text),
 		titleSpace: chalk.bgWhite(' '),
@@ -51,6 +54,7 @@ const themeSymbolMap = {
 	},
 	minimal: {
 		title: text => chalk.blue.bgWhite.bold(text),
+		titleStopped: text => chalk.red.bgWhite.bold(text),
 		msg: text => text,
 		error: text => chalk.red(text),
 		titleSpace: chalk.bgWhite(' '),
@@ -114,10 +118,11 @@ function getLine({ filled, start, content, end, width }) {
 /**
  * @param {string} title - the title which will be displayed in start line
  * @param {number} width - the line width
+ * @param {boolean} isRunning - flag for the child process is running or not
  * @returns {string} - returns an start line
 **/
-function getStartLine(title, width) {
-	title = getThemeSymbol('title')(title);
+function getStartLine(title, width, isRunning) {
+	title = isRunning ? getThemeSymbol('title')(title) : getThemeSymbol('titleStopped')(title);
 	const separator = getThemeSymbol('separatorTop');
 	const titleSpace = getThemeSymbol('titleSpace');
 	const topLeft = getThemeSymbol('topLeft');
@@ -158,9 +163,10 @@ function getEndLine(width) {
  * @param {number} height - the panel height
  * @param {string} title - the title which will be displayed in start line
  * @param {Array<string>} lines - array with the content of the panel
+ * @param {boolean} isRunning - flag for is running or not
  * @returns {string} - returns an bordered panel
 **/
-function getTerminalPanel(width, height, title, lines) {
+function getTerminalPanel({ width, height, title, lines, isRunning = false }) {
 	width = parseInt(width, 10);
 	const out = [];
 	const rLines = lines.concat([]);
@@ -173,7 +179,7 @@ function getTerminalPanel(width, height, title, lines) {
 		shortenLines = rLines.concat([]);
 	}
 
-	out.push(getStartLine(title, width));
+	out.push(getStartLine(title, width, isRunning));
 	out.push(getEmptyLine(width));
 	while (availableLines > 0) {
 		if (shortenLines[renderedLines]) {

diff --git a/src/getTerminalPanel/index.spec.js b/src/getTerminalPanel/index.spec.js
@@ -6,15 +6,25 @@ describe('getTerminalPanel', () => {
 	describe('getTerminalPanel', () => {
 		it('default', () => {
 			const terminalPanel = JSON.stringify({
-				terminalPanel: getTerminalPanel(30, 10, 'title', ['npm run start', 'server started']),
+				terminalPanel: getTerminalPanel({
+					width: 30,
+					height: 10,
+					title: 'title',
+					lines: ['npm run start', 'server started'],
+				}),
 			});
 			// fs.writeFileSync('./src/getTerminalPanel/__snapshots__/get-terminal-panel-1.json', terminalPanel);
 			const expected = fs.readFileSync('./src/getTerminalPanel/__snapshots__/get-terminal-panel-1.json', 'utf8');
 			expect(terminalPanel).toEqual(expected);
 		});
 		it('more lines then available', () => {
 			const terminalPanel = JSON.stringify({
-				terminalPanel: getTerminalPanel(30, 5, 'title', ['npm run start', 'server started', 'a', 'b', 'c']),
+				terminalPanel: getTerminalPanel({
+					width: 30,
+					height: 5,
+					title: 'title',
+					lines: ['npm run start', 'server started', 'a', 'b', 'c'],
+				}),
 			});
 			// fs.writeFileSync('./src/getTerminalPanel/__snapshots__/get-terminal-panel-2.json', terminalPanel);
 			const expected = fs.readFileSync('./src/getTerminalPanel/__snapshots__/get-terminal-panel-2.json', 'utf8');

diff --git a/src/index.js b/src/index.js
@@ -5,9 +5,6 @@
 // TODOS
 // - terminal title
 // - don't ignore main script
-// - execute command on childProcess
-//   -> lerna-terminal~$ cmd utils p (jest)
-//   -> focused lerna-terminal~$ p (jest)
 // - generic usage
 
 const { runCommander } = require('./commander');

diff --git a/src/renderAllPanels/index.js b/src/renderAllPanels/index.js
@@ -33,12 +33,13 @@ function renderAllPanels({ _state, _log, _renderClear, _renderCmdPrefix, _dimens
 		if (!currentState[packageName].log) {
 			return;
 		}
-		renderArr[counterRow][counterColumn] = getTerminalPanel(
-			panelWidth,
-			panelHeight,
-			packageName,
-			currentState[packageName].log
-		);
+		renderArr[counterRow][counterColumn] = getTerminalPanel({
+			width: panelWidth,
+			height: panelHeight,
+			title: packageName,
+			lines: currentState[packageName].log,
+			isRunning: currentState[packageName].terminal.isRunning,
+		});
 		counterColumn += 1;
 		if (counterColumn >= boardColumns) {
 			counterColumn = 0;

diff --git a/src/renderAllPanels/index.spec.js b/src/renderAllPanels/index.spec.js
@@ -4,15 +4,27 @@ const { renderAllPanels } = require('./index');
 const state = {
 	utils: {
 		log: ['started'],
+		terminal: {
+			isRunning: true,
+		},
 	},
 	ui: {
 		log: ['row'],
+		terminal: {
+			isRunning: true,
+		},
 	},
 	ui2: {
 		log: ['row'],
+		terminal: {
+			isRunning: true,
+		},
 	},
 	ui3: {
 		log: ['row'],
+		terminal: {
+			isRunning: true,
+		},
 	},
 	dateTime: {},
 };

diff --git a/src/runNpmScript/index.js b/src/runNpmScript/index.js
@@ -23,6 +23,8 @@ function runNpmScript(
 	const run = cmd => {
 		const cmdArr = cmd.split(' ');
 
+		const childProcessObj = { isRunning: true };
+
 		const childProcess = _spawn(cmdArr[0], cmdArr.slice(1, cmdArr.length), {
 			shell: true,
 			cwd: packagePath,
@@ -34,10 +36,14 @@ function runNpmScript(
 		childProcess.stderr.on('data', data => {
 			onError(data.toString().replace(/\n$/, ''));
 		});
-		childProcess.on('exit', onExit);
+		childProcess.on('exit', () => {
+			childProcessObj.isRunning = false;
+			onExit();
+		});
 
-		return {
+		return Object.assign(childProcessObj, {
 			stop() {
+				childProcessObj.isRunning = false;
 				childProcess.kill('SIGINT');
 			},
 			start() {
@@ -48,7 +54,7 @@ function runNpmScript(
 				this.stop();
 				return run(newCmd);
 			},
-		};
+		});
 	};
 
 	return run(`npm run ${scriptName}`);