Move the interactive part of the CLI to a separate file (#60)

sindresorhus · Mar 25, 2019 · 4a5bf79 · 4a5bf79
1 parent 9a9fb6b
commit 4a5bf79
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 112 deletions.
diff --git a/cli-interactive.js b/cli-interactive.js
@@ -0,0 +1,114 @@
+'use strict';
+const chalk = require('chalk');
+const inquirer = require('inquirer');
+const psList = require('ps-list');
+const numSort = require('num-sort');
+const escExit = require('esc-exit');
+const cliTruncate = require('cli-truncate');
+const pidFromPort = require('pid-from-port');
+const fkill = require('fkill');
+
+const commandLineMargins = 4;
+
+const nameFilter = (input, proc) => {
+	const isPort = input[0] === ':';
+
+	if (isPort) {
+		return proc.ports.find(x => x.startsWith(input.slice(1)));
+	}
+
+	return proc.name.toLowerCase().includes(input.toLowerCase());
+};
+
+const filterProcesses = (input, processes, flags) => {
+	const filters = {
+		name: proc => input ? nameFilter(input, proc) : true,
+		verbose: proc => input ? proc.cmd.toLowerCase().includes(input.toLowerCase()) : true
+	};
+
+	return processes
+		.filter(proc => !(
+			proc.name.endsWith('-helper') ||
+			proc.name.endsWith('Helper') ||
+			proc.name.endsWith('HelperApp')
+		))
+		.filter(flags.verbose ? filters.verbose : filters.name)
+		.sort((a, b) => numSort.asc(a.pid, b.pid))
+		.map(proc => {
+			const lineLength = process.stdout.columns || 80;
+			const ports = proc.ports.slice(0, 4).map(x => `:${x}`).join(' ').trim();
+			const margins = commandLineMargins + proc.pid.toString().length + ports.length;
+			const length = lineLength - margins;
+			const name = cliTruncate(flags.verbose ? proc.cmd : proc.name, length, {position: 'middle'});
+
+			return {
+				name: `${name} ${chalk.dim(proc.pid)} ${chalk.dim.magenta(ports)}`,
+				value: proc.pid
+			};
+		});
+};
+
+const handleFkillError = async processes => {
+	const suffix = processes.length > 1 ? 'es' : '';
+
+	if (process.stdout.isTTY === false) {
+		console.error(`Error killing process${suffix}. Try \`fkill --force ${processes.join(' ')}\``);
+		process.exit(1); // eslint-disable-line unicorn/no-process-exit
+	} else {
+		const answer = await inquirer.prompt([{
+			type: 'confirm',
+			name: 'forceKill',
+			message: 'Error killing process. Would you like to use the force?'
+		}]);
+
+		if (answer.forceKill === true) {
+			await fkill(processes, {
+				force: true,
+				ignoreCase: true
+			});
+		}
+	}
+};
+
+const listProcesses = async (processes, flags) => {
+	inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
+
+	const answer = await inquirer.prompt([{
+		name: 'processes',
+		message: 'Running processes:',
+		type: 'autocomplete',
+		pageSize: 10,
+		source: async (answers, input) => filterProcesses(input, processes, flags)
+	}]);
+
+	try {
+		await fkill(answer.processes);
+	} catch (_) {
+		handleFkillError(answer.processes);
+	}
+};
+
+const init = async flags => {
+	escExit();
+
+	const getPortsFromPid = (value, list) => {
+		const ports = [];
+
+		for (const [key, listValue] of list.entries()) {
+			if (value === listValue) {
+				ports.push(String(key));
+			}
+		}
+
+		return ports;
+	};
+
+	const [pids, processes] = await Promise.all([
+		pidFromPort.list(),
+		psList({all: false})
+	]);
+	const procs = processes.map(proc => ({...proc, ports: getPortsFromPid(proc.pid, pids)}));
+	listProcesses(procs, flags);
+};
+
+module.exports = {init, handleFkillError};
diff --git a/cli.js b/cli.js
@@ -2,13 +2,6 @@
 'use strict';
 const meow = require('meow');
 const fkill = require('fkill');
-const chalk = require('chalk');
-const inquirer = require('inquirer');
-const psList = require('ps-list');
-const numSort = require('num-sort');
-const escExit = require('esc-exit');
-const cliTruncate = require('cli-truncate');
-const pidFromPort = require('pid-from-port');
 
 const cli = meow(`
 	Usage
@@ -48,111 +41,8 @@ const cli = meow(`
 	}
 });
 
-const commandLineMargins = 4;
-
-const nameFilter = (input, proc) => {
-	const isPort = input[0] === ':';
-
-	if (isPort) {
-		return proc.ports.find(x => x.startsWith(input.slice(1)));
-	}
-
-	return proc.name.toLowerCase().includes(input.toLowerCase());
-};
-
-const filterProcesses = (input, processes, flags) => {
-	const filters = {
-		name: proc => input ? nameFilter(input, proc) : true,
-		verbose: proc => input ? proc.cmd.toLowerCase().includes(input.toLowerCase()) : true
-	};
-
-	return processes
-		.filter(proc => !(
-			proc.name.endsWith('-helper') ||
-			proc.name.endsWith('Helper') ||
-			proc.name.endsWith('HelperApp')
-		))
-		.filter(flags.verbose ? filters.verbose : filters.name)
-		.sort((a, b) => numSort.asc(a.pid, b.pid))
-		.map(proc => {
-			const lineLength = process.stdout.columns || 80;
-			const ports = proc.ports.slice(0, 4).map(x => `:${x}`).join(' ').trim();
-			const margins = commandLineMargins + proc.pid.toString().length + ports.length;
-			const length = lineLength - margins;
-			const name = cliTruncate(flags.verbose ? proc.cmd : proc.name, length, {position: 'middle'});
-
-			return {
-				name: `${name} ${chalk.dim(proc.pid)} ${chalk.dim.magenta(ports)}`,
-				value: proc.pid
-			};
-		});
-};
-
-const handleFkillError = async processes => {
-	const suffix = processes.length > 1 ? 'es' : '';
-
-	if (process.stdout.isTTY === false) {
-		console.error(`Error killing process${suffix}. Try \`fkill --force ${processes.join(' ')}\``);
-		process.exit(1);
-	} else {
-		const answer = await inquirer.prompt([{
-			type: 'confirm',
-			name: 'forceKill',
-			message: 'Error killing process. Would you like to use the force?'
-		}]);
-
-		if (answer.forceKill === true) {
-			await fkill(processes, {
-				force: true,
-				ignoreCase: true
-			});
-		}
-	}
-};
-
-const listProcesses = async (processes, flags) => {
-	inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
-
-	const answer = await inquirer.prompt([{
-		name: 'processes',
-		message: 'Running processes:',
-		type: 'autocomplete',
-		pageSize: 10,
-		source: async (answers, input) => filterProcesses(input, processes, flags)
-	}]);
-
-	try {
-		await fkill(answer.processes);
-	} catch (_) {
-		handleFkillError(answer.processes);
-	}
-};
-
-const init = async flags => {
-	escExit();
-
-	const getPortsFromPid = (value, list) => {
-		const ports = [];
-
-		for (const [key, listValue] of list.entries()) {
-			if (value === listValue) {
-				ports.push(String(key));
-			}
-		}
-
-		return ports;
-	};
-
-	const [pids, processes] = await Promise.all([
-		pidFromPort.list(),
-		psList({all: false})
-	]);
-	const procs = processes.map(proc => ({...proc, ports: getPortsFromPid(proc.pid, pids)}));
-	listProcesses(procs, flags);
-};
-
 if (cli.input.length === 0) {
-	init(cli.flags);
+	require('./cli-interactive').init(cli.flags);
 } else {
 	const promise = fkill(cli.input, {...cli.flags, ignoreCase: true});
 
@@ -167,7 +57,7 @@ if (cli.input.length === 0) {
 				process.exit(1);
 			}
 
-			return handleFkillError(cli.input);
+			return require('./cli-interactive').handleFkillError(cli.input);
 		});
 	}
 }