From 419e031490942e5d08f8cd5af13ecdd4203dad29 Mon Sep 17 00:00:00 2001 From: Eran Tiktin Date: Sat, 25 Jul 2015 23:14:36 +0300 Subject: [PATCH] Update msgs style for consistency Added some color. Fixed spacing issues etc. --- bin/old-alias | 3 ++- lib/npm-check-updates.js | 32 ++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/bin/old-alias b/bin/old-alias index 8fe3415d..b3b2980a 100644 --- a/bin/old-alias +++ b/bin/old-alias @@ -1,5 +1,6 @@ #!/usr/bin/env node -console.log('You can now use "ncu" for less typing!'); +var chalk = require('chalk'); +console.log('You can now use ' + chalk.blue('ncu') + ' for less typing!'); require('./npm-check-updates'); diff --git a/lib/npm-check-updates.js b/lib/npm-check-updates.js index 9843cad9..37d42965 100644 --- a/lib/npm-check-updates.js +++ b/lib/npm-check-updates.js @@ -123,7 +123,7 @@ function analyzeProjectDependencies(pkgData, pkgFile) { var newPkgData = vm.updatePackageData(pkgData, current, upgraded, latest, options); writePackageFile(pkgFile, newPkgData) .then(function () { - print('\n' + pkgFile + " upgraded"); + print('\n' + pkgFile + ' upgraded. Update the dependencies by running ' + chalk.blue('npm update')); }); } else { print('Run with ' + chalk.blue('-u') + ' to upgrade your package.json\n'); @@ -163,11 +163,12 @@ function toDependencyTable(args, options) { function printUpgrades(args) { print(''); if (_.isEmpty(args.upgraded)) { + var smiley = chalk.yellow(':)'); if(options.global) { - print("All global packages are up-to-date :)"); + print('All global packages are up-to-date ' + smiley); } else { - print("All dependencies match the " + (options.greatest ? 'greatest' : 'latest') + " package versions :)"); + print('All dependencies match the ' + (options.greatest ? 'greatest' : 'latest') + ' package versions ' + smiley); } } else { @@ -178,28 +179,36 @@ function printUpgrades(args) { }) var isSatisfied = _.propertyOf(satisfied); var unsatisfiedUpgraded = cint.filterObject(args.upgraded, cint.not(isSatisfied)); + var numUnsatisfied = Object.keys(unsatisfiedUpgraded).length; var satisfiedUpgraded = cint.filterObject(args.upgraded, isSatisfied); // print unsatisfied table - var unsatisfiedTable = toDependencyTable({ - from: args.current, - to: unsatisfiedUpgraded - }, { greatest: options.greatest }); - print(unsatisfiedTable.toString()); + if (numUnsatisfied > 0) { + var unsatisfiedTable = toDependencyTable({ + from: args.current, + to: unsatisfiedUpgraded + }, { greatest: options.greatest }); + print(unsatisfiedTable.toString()); + } // filter out installed packages that match the latest satisfiedUpgraded = cint.filterObject(satisfiedUpgraded, function (dep) { return !args.latest || args.latest[dep] !== args.installed[dep]; }); + var numSatisfied = Object.keys(satisfiedUpgraded).length; // print satisfied table (if any exist) - if(Object.keys(satisfiedUpgraded).length > 0) { + if(numSatisfied > 0) { var count = Object.keys(satisfiedUpgraded).length; var satisfiedTable = toDependencyTable({ from: args.current, to: satisfiedUpgraded }, { greatest: options.greatest }); - print('\nThe following ' + (count === 1 ? 'dependency is' : 'depencencies are') + ' satisfied by ' + (count === 1 ? 'its' : 'their') + ' declared version range, but the installed version' + (count === 1 ? ' is' : 's are') + ' behind. Update without modifying your package.json by running ' + chalk.blue('npm update') + '. Upgrade your package.json by running ' + chalk.blue('ncu -ua') + '.\n') + if (numUnsatisfied > 0) { + // adding some space between the unsatisfied to the satisfied + print(''); + } + print('The following ' + (count === 1 ? 'dependency is' : 'dependencies are') + ' satisfied by ' + (count === 1 ? 'its' : 'their') + ' declared version range, but the installed version' + (count === 1 ? ' is' : 's are') + ' behind. Update without modifying your package.json by running ' + chalk.blue('npm update') + '. Upgrade your package.json by running ' + chalk.blue('ncu -ua') + '\n') print(satisfiedTable.toString()); } } @@ -217,8 +226,7 @@ function programInit() { options.upgrade = options.upgrade || options.upgradeAll; if (options.global && options.upgrade) { - print("npm-check-updates cannot update global packages."); - print("Run 'npm install -g [package]' to upgrade a global package."); + print(chalk.blue('ncu') + ' cannot upgrade global packages. Run ' + chalk.blue('npm install -g [package]') + ' to update a global package'); process.exit(1); }