Updated plugin checking logic

* Fixes #6183
* Also changed a bunch of console.logs to process.stdout.write,
  so the command line output is cleaner

src/cli/upgrade-plugins.js

@@ -38,53 +38,49 @@ function getInstalledPlugins(callback) {
 	async.parallel({
 		files: async.apply(fs.readdir, path.join(dirname, 'node_modules')),
 		deps: async.apply(fs.readFile, path.join(dirname, 'package.json'), { encoding: 'utf-8' }),
+		bundled: async.apply(fs.readFile, path.join(dirname, 'install/package.json'), { encoding: 'utf-8' }),
 	}, function (err, payload) {
 		if (err) {
 			return callback(err);
 		}
 
 		var isNbbModule = /^nodebb-(?:plugin|theme|widget|rewards)-[\w-]+$/;
-		var moduleName;
+		var checklist;
-		var isGitRepo;
 
 		payload.files = payload.files.filter(function (file) {
 			return isNbbModule.test(file);
 		});
 
 		try {
-			payload.deps = JSON.parse(payload.deps).dependencies;
+			payload.deps = Object.keys(JSON.parse(payload.deps).dependencies);
-			payload.bundled = [];
+			payload.bundled = Object.keys(JSON.parse(payload.bundled).dependencies);
-			payload.installed = [];
 		} catch (err) {
 			return callback(err);
 		}
 
-		for (moduleName in payload.deps) {
+		payload.bundled = payload.bundled.filter(function (pkgName) {
-			if (isNbbModule.test(moduleName)) {
+			return isNbbModule.test(pkgName);
-				payload.bundled.push(moduleName);
+		});
-			}
+		payload.deps = payload.deps.filter(function (pkgName) {
-		}
+			return isNbbModule.test(pkgName);
+		});
 
 		// Whittle down deps to send back only extraneously installed plugins/themes/etc
-		payload.files.forEach(function (moduleName) {
+		checklist = payload.deps.filter(function (pkgName) {
-			try {
+			if (payload.bundled.includes(pkgName)) {
-				fs.accessSync(path.join(dirname, 'node_modules', moduleName, '.git'));
+				return false;
-				isGitRepo = true;
-			} catch (e) {
-				isGitRepo = false;
 			}
 
-			if (
+			// Ignore git repositories
-				payload.files.indexOf(moduleName) !== -1 &&	// found in `node_modules/`
+			try {
-				payload.bundled.indexOf(moduleName) === -1 &&	// not found in `package.json`
+				fs.accessSync(path.join(dirname, 'node_modules', pkgName, '.git'));
-				!fs.lstatSync(path.join(dirname, 'node_modules', moduleName)).isSymbolicLink() &&	// is not a symlink
+				return false;
-				!isGitRepo	// .git/ does not exist, so it is not a git repository
+			} catch (e) {
-			) {
+				return true;
-				payload.installed.push(moduleName);
 			}
 		});
 
-		getModuleVersions(payload.installed, callback);
+		getModuleVersions(checklist, callback);
 	});
 }
 
@@ -105,7 +101,7 @@ function getCurrentVersion(callback) {
 
 function checkPlugins(standalone, callback) {
 	if (standalone) {
-		console.log('Checking installed plugins and themes for updates... ');
+		process.stdout.write('Checking installed plugins and themes for updates... ');
 	}
 
 	async.waterfall([
@@ -117,7 +113,7 @@ function checkPlugins(standalone, callback) {
 			var toCheck = Object.keys(payload.plugins);
 
 			if (!toCheck.length) {
-				console.log('OK'.green + ''.reset);
+				process.stdout.write('  OK'.green + ''.reset);
 				return next(null, []);	// no extraneous plugins installed
 			}
 
@@ -127,10 +123,10 @@ function checkPlugins(standalone, callback) {
 				json: true,
 			}, function (err, res, body) {
 				if (err) {
-					console.log('error'.red + ''.reset);
+					process.stdout.write('error'.red + ''.reset);
 					return next(err);
 				}
-				console.log('OK'.green + ''.reset);
+				process.stdout.write('  OK'.green + ''.reset);
 
 				if (!Array.isArray(body) && toCheck.length === 1) {
 					body = [body];
@@ -172,11 +168,10 @@ function upgradePlugins(callback) {
 		}
 
 		if (found && found.length) {
-			console.log('\nA total of ' + String(found.length).bold + ' package(s) can be upgraded:');
+			process.stdout.write('\n\nA total of ' + String(found.length).bold + ' package(s) can be upgraded:\n\n');
 			found.forEach(function (suggestObj) {
-				console.log('  * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset);
+				process.stdout.write('  * '.yellow + suggestObj.name.reset + ' (' + suggestObj.current.yellow + ' -> '.reset + suggestObj.suggested.green + ')\n'.reset);
 			});
-			console.log('');
 		} else {
 			if (standalone) {
 				console.log('\nAll packages up-to-date!'.green + ''.reset);
@@ -190,7 +185,7 @@ function upgradePlugins(callback) {
 		prompt.start();
 		prompt.get({
 			name: 'upgrade',
-			description: 'Proceed with upgrade (y|n)?'.reset,
+			description: '\nProceed with upgrade (y|n)?'.reset,
 			type: 'string',
 		}, function (err, result) {
 			if (err) {
@@ -204,10 +199,12 @@ function upgradePlugins(callback) {
 					args.push(suggestObj.name + '@' + suggestObj.suggested);
 				});
 
-				cproc.execFile((process.platform === 'win32') ? 'npm.cmd' : 'npm', args, { stdio: 'ignore' }, callback);
+				cproc.execFile((process.platform === 'win32') ? 'npm.cmd' : 'npm', args, { stdio: 'ignore' }, function (err) {
+					callback(err, true);
+				});
 			} else {
-				console.log('Package upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade-plugins'.green + '".'.reset);
+				console.log('Package upgrades skipped'.yellow + '. Check for upgrades at any time by running "'.reset + './nodebb upgrade -p'.green + '".'.reset);
-				callback();
+				callback(null, true);
 			}
 		});
 	});

src/cli/upgrade.js

@@ -53,10 +53,12 @@ var steps = {
 function runSteps(tasks) {
 	tasks = tasks.map(function (key, i) {
 		return function (next) {
-			console.log(((i + 1) + '. ').bold + steps[key].message.yellow);
+			process.stdout.write('\n' + ((i + 1) + '. ').bold + steps[key].message.yellow);
-			return steps[key].handler(function (err) {
+			return steps[key].handler(function (err, inhibitOk) {
 				if (err) { return next(err); }
-				console.log('  OK'.green);
+				if (!inhibitOk) {
+					process.stdout.write('  OK'.green + '\n'.reset);
+				}
 				next();
 			});
 		};
@@ -73,7 +75,7 @@ function runSteps(tasks) {
 		var columns = process.stdout.columns;
 		var spaces = columns ? new Array(Math.floor(columns / 2) - (message.length / 2) + 1).join(' ') : '  ';
 
-		console.log('\n' + spaces + message.green.bold + '\n'.reset);
+		console.log('\n\n' + spaces + message.green.bold + '\n'.reset);
 
 		process.exit();
 	});

src/meta/build.js

@@ -99,6 +99,8 @@ function beforeBuild(targets, callback) {
 	var plugins = require('../plugins');
 	meta = require('../meta');
 
+	process.stdout.write('  started'.green + '\n'.reset);
+
 	async.series([
 		db.init,
 		meta.themes.setupPaths,
@@ -210,7 +212,7 @@ function build(targets, callback) {
 		}
 
 		winston.info('[build] Asset compilation successful. Completed in ' + totalTime + 'sec.');
-		callback();
+		callback(null, true);
 	});
 }
 

src/meta/package-install.js

@@ -30,6 +30,7 @@ function updatePackageFile() {
 exports.updatePackageFile = updatePackageFile;
 
 function npmInstallProduction() {
+	process.stdout.write('\n');
 	cproc.execSync('npm i --production', {
 		cwd: path.join(__dirname, '../../'),
 		stdio: [0, 1, 2],

src/upgrade.js

@@ -189,7 +189,7 @@ Upgrade.process = function (files, skipCount, callback) {
 			}, next);
 		},
 		function (next) {
-			console.log('Upgrade complete!\n'.green);
+			console.log('Schema update(s) complete!\n'.green);
 			setImmediate(next);
 		},
 	], callback);