.gitattributes

@@ -1,2 +1 @@
-* text=auto
-*.js text eol=lf
+* text=auto eol=lf

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+yarn.lock

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-  - '6'
-  - '4'
+  - '10'
+  - '8'

check.js

@@ -6,17 +6,23 @@ const options = JSON.parse(process.argv[2]);
 
 updateNotifier = new updateNotifier.UpdateNotifier(options);
 
-updateNotifier.checkNpm().then(update => {
+(async () => {
+	// Exit process when offline
+	setTimeout(process.exit, 1000 * 30);
+
+	const update = await updateNotifier.checkNpm();
+
 	// Only update the last update check time on success
 	updateNotifier.config.set('lastUpdateCheck', Date.now());
 
 	if (update.type && update.type !== 'latest') {
 		updateNotifier.config.set('update', update);
 	}
 
-	// Call process exit explicitly to terminate the child process
-	// Otherwise the child process will run forever, according to the Node.js docs
+	// Call process exit explicitly to terminate the child process,
+	// otherwise the child process will run forever, according to the Node.js docs
 	process.exit();
-}).catch(() => {
+})().catch(error => {
+	console.error(error);
 	process.exit(1);
 });

index.js

@@ -1,23 +1,28 @@
 'use strict';
-const spawn = require('child_process').spawn;
+const {spawn} = require('child_process');
 const path = require('path');
-const format = require('util').format;
+const {format} = require('util');
 const importLazy = require('import-lazy')(require);
 
 const configstore = importLazy('configstore');
 const chalk = importLazy('chalk');
 const semverDiff = importLazy('semver-diff');
 const latestVersion = importLazy('latest-version');
 const isNpm = importLazy('is-npm');
+const isInstalledGlobally = importLazy('is-installed-globally');
+const isYarnGlobal = importLazy('is-yarn-global');
+const hasYarn = importLazy('has-yarn');
 const boxen = importLazy('boxen');
 const xdgBasedir = importLazy('xdg-basedir');
+const isCi = importLazy('is-ci');
+
 const ONE_DAY = 1000 * 60 * 60 * 24;
 
 class UpdateNotifier {
-	constructor(options) {
-		options = options || {};
+	constructor(options = {}) {
 		this.options = options;
 		options.pkg = options.pkg || {};
+		options.distTag = options.distTag || 'latest';
 
 		// Reduce pkg to the essential keys. with fallback to deprecated options
 		// TODO: Remove deprecated options at some point far into the future
@@ -36,7 +41,9 @@ class UpdateNotifier {
 		this.hasCallback = typeof options.callback === 'function';
 		this.callback = options.callback || (() => {});
 		this.disabled = 'NO_UPDATE_NOTIFIER' in process.env ||
-			process.argv.indexOf('--no-update-notifier') !== -1;
+			process.argv.includes('--no-update-notifier') ||
+			isCi();
+		this.shouldNotifyInNpmScript = options.shouldNotifyInNpmScript;
 
 		if (!this.disabled && !this.hasCallback) {
 			try {
@@ -47,25 +54,31 @@ class UpdateNotifier {
 					// after the set interval, so not to bother users right away
 					lastUpdateCheck: Date.now()
 				});
-			} catch (err) {
+			} catch (error) {
 				// Expecting error code EACCES or EPERM
-				const msg =
+				const message =
 					chalk().yellow(format(' %s update check failed ', options.pkg.name)) +
 					format('\n Try running with %s or get access ', chalk().cyan('sudo')) +
 					'\n to the local update config store via \n' +
 					chalk().cyan(format(' sudo chown -R $USER:$(id -gn $USER) %s ', xdgBasedir().config));
 
 				process.on('exit', () => {
-					console.error('\n' + boxen()(msg, {align: 'center'}));
+					console.error('\n' + boxen()(message, {align: 'center'}));
 				});
 			}
 		}
 	}
+
 	check() {
 		if (this.hasCallback) {
-			this.checkNpm()
-				.then(update => this.callback(null, update))
-				.catch(err => this.callback(err));
+			(async () => {
+				try {
+					this.callback(null, await this.checkNpm());
+				} catch (error) {
+					this.callback(error);
+				}
+			})();
+
 			return;
 		}
 
@@ -94,37 +107,55 @@ class UpdateNotifier {
 			stdio: 'ignore'
 		}).unref();
 	}
-	checkNpm() {
-		return latestVersion()(this.packageName).then(latestVersion => {
-			return {
-				latest: latestVersion,
-				current: this.packageVersion,
-				type: semverDiff()(this.packageVersion, latestVersion) || 'latest',
-				name: this.packageName
-			};
-		});
+
+	async checkNpm() {
+		const {distTag} = this.options;
+		const latest = await latestVersion()(this.packageName, {version: distTag});
+
+		return {
+			latest,
+			current: this.packageVersion,
+			type: semverDiff()(this.packageVersion, latest) || distTag,
+			name: this.packageName
+		};
 	}
-	notify(opts) {
-		if (!process.stdout.isTTY || isNpm() || !this.update) {
+
+	notify(options) {
+		const suppressForNpm = !this.shouldNotifyInNpmScript && isNpm().isNpm;
+		if (!process.stdout.isTTY || suppressForNpm || !this.update) {
 			return this;
 		}
 
-		opts = Object.assign({isGlobal: true}, opts);
+		options = {
+			isGlobal: isInstalledGlobally(),
+			isYarnGlobal: isYarnGlobal()(),
+			...options
+		};
+
+		let installCommand;
+
+		if (options.isYarnGlobal) {
+			installCommand = `yarn global add ${this.packageName}`;
+		} else if (hasYarn()()) {
+			installCommand = `yarn add ${this.packageName}`;
+		} else {
+			installCommand = `npm i ${options.isGlobal ? '-g ' : ''}${this.packageName}`;
+		}
 
-		opts.message = opts.message || 'Update available ' + chalk().dim(this.update.current) + chalk().reset(' → ') +
-			chalk().green(this.update.latest) + ' \nRun ' + chalk().cyan('npm i ' + (opts.isGlobal ? '-g ' : '') + this.packageName) + ' to update';
+		options.message = options.message || 'Update available ' + chalk().dim(this.update.current) + chalk().reset(' → ') +
+			chalk().green(this.update.latest) + ' \nRun ' + chalk().cyan(installCommand) + ' to update';
 
-		opts.boxenOpts = opts.boxenOpts || {
+		options.boxenOpts = options.boxenOpts || {
 			padding: 1,
 			margin: 1,
 			align: 'center',
 			borderColor: 'yellow',
 			borderStyle: 'round'
 		};
 
-		const message = '\n' + boxen()(opts.message, opts.boxenOpts);
+		const message = '\n' + boxen()(options.message, options.boxenOpts);
 
-		if (opts.defer === false) {
+		if (options.defer === false) {
 			console.error(message);
 		} else {
 			process.on('exit', () => {

license

@@ -0,0 +1,9 @@
+Copyright Google
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package.json

@@ -1,52 +1,57 @@
 {
-  "name": "update-notifier",
-  "version": "2.2.0",
-  "description": "Update notifications for your CLI app",
-  "license": "BSD-2-Clause",
-  "repository": "yeoman/update-notifier",
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "engines": {
-    "node": ">=4"
-  },
-  "scripts": {
-    "test": "xo && mocha --timeout 20000"
-  },
-  "files": [
-    "index.js",
-    "check.js"
-  ],
-  "keywords": [
-    "npm",
-    "update",
-    "updater",
-    "notify",
-    "notifier",
-    "check",
-    "checker",
-    "cli",
-    "module",
-    "package",
-    "version"
-  ],
-  "dependencies": {
-    "boxen": "^1.0.0",
-    "chalk": "^1.0.0",
-    "configstore": "^3.0.0",
-    "import-lazy": "^2.1.0",
-    "is-npm": "^1.0.0",
-    "latest-version": "^3.0.0",
-    "semver-diff": "^2.0.0",
-    "xdg-basedir": "^3.0.0"
-  },
-  "devDependencies": {
-    "clear-module": "^2.1.0",
-    "fixture-stdout": "^0.2.1",
-    "mocha": "*",
-    "strip-ansi": "^3.0.1",
-    "xo": "^0.18.2"
-  }
+	"name": "update-notifier",
+	"version": "3.0.0",
+	"description": "Update notifications for your CLI app",
+	"license": "BSD-2-Clause",
+	"repository": "yeoman/update-notifier",
+	"author": {
+		"name": "Sindre Sorhus",
+		"email": "sindresorhus@gmail.com",
+		"url": "https://sindresorhus.com"
+	},
+	"engines": {
+		"node": ">=8"
+	},
+	"scripts": {
+		"test": "xo && ava --timeout=20s -s"
+	},
+	"files": [
+		"index.js",
+		"check.js"
+	],
+	"keywords": [
+		"npm",
+		"update",
+		"updater",
+		"notify",
+		"notifier",
+		"check",
+		"checker",
+		"cli",
+		"module",
+		"package",
+		"version"
+	],
+	"dependencies": {
+		"boxen": "^3.0.0",
+		"chalk": "^2.0.1",
+		"configstore": "^4.0.0",
+		"has-yarn": "^2.1.0",
+		"import-lazy": "^2.1.0",
+		"is-ci": "^2.0.0",
+		"is-installed-globally": "^0.1.0",
+		"is-npm": "^3.0.0",
+		"is-yarn-global": "^0.3.0",
+		"latest-version": "^5.0.0",
+		"semver-diff": "^2.0.0",
+		"xdg-basedir": "^3.0.0"
+	},
+	"devDependencies": {
+		"ava": "^1.3.1",
+		"clear-module": "^3.1.0",
+		"fixture-stdout": "^0.2.1",
+		"mock-require": "^3.0.3",
+		"strip-ansi": "^5.2.0",
+		"xo": "^0.24.0"
+	}
 }