fullname - npm Package Compare versions

Comparing version 3.1.0 to 3.2.0

index.js

 'use strict';
+
+const mem = require('mem');
 const execa = require('execa');
 const passwdUser = require('passwd-user');
-let fullname;
-let first = true;
+const pAny = require('p-any');
+const pTry = require('p-try');
 
-function getEnvVar() {
-	const env = process.env;
+function checkEnv() {
+	return pTry(() => {
+		const env = process.env;
+		const fullname = env.GIT_AUTHOR_NAME ||
+			env.GIT_COMMITTER_NAME ||
+			env.HGUSER || // Mercurial
+			env.C9_USER; // Cloud9
 
-	return env.GIT_AUTHOR_NAME ||
-		env.GIT_COMMITTER_NAME ||
-		env.HGUSER || // Mercurial
-		env.C9_USER; // Cloud9
+		return fullname || Promise.reject();
+	});
 }
 
-module.exports = () => {
-	if (!first) {
-		return Promise.resolve(fullname);
-	}
+function checkAuthorName() {
+	return pTry(() => {
+		const fullname = require('rc')('npm')['init-author-name'];
+		return fullname || Promise.reject();
+	});
+}
 
-	first = false;
+function checkPasswd() {
+	return passwdUser()
+		.then(user => user.fullname || Promise.reject());
+}
 
-	if (fullname) {
-		return Promise.resolve(fullname);
-	}
+function checkGit() {
+	return execa.stdout('git', ['config', '--global', 'user.name'])
+		.then(fullname => fullname || Promise.reject());
+}
 
-	const envVar = getEnvVar();
+function checkOsaScript() {
+	return execa.stdout('osascript', ['-e', 'long user name of (system info)'])
+		.then(fullname => fullname || Promise.reject());
+}
 
-	if (envVar) {
-		fullname = envVar;
-		return Promise.resolve(fullname);
-	}
+function checkWmic() {
+	return execa.stdout('wmic', ['useraccount', 'where', 'name="%username%"', 'get', 'fullname'])
+		.then(stdout => {
+			const fullname = stdout.replace('FullName', '');
+			return fullname || Promise.reject();
+		});
+}
 
-	return Promise.resolve().then(() => {
-		fullname = require('rc')('npm')['init-author-name'];
+function checkGetEnt() {
+	return execa.shell('getent passwd $(whoami)').then(res => {
+		const fullname = (res.stdout.split(':')[4] || '').replace(/,.*/, '');
+		return fullname || Promise.reject();
+	});
+}
 
-		if (!fullname) {
-			return fallback().then(() => fullname);
-		}
-
-		return fullname;
-	}).catch(fallback).then(() => fullname).catch(() => {});
-};
-
 function fallback() {
 	if (process.platform === 'darwin') {
-		return passwdUser()
-			.then(user => {
-				fullname = user.fullname;
-				return fullname;
-			})
-			.catch(() => {
-				return execa.stdout('osascript', ['-e', 'long user name of (system info)']).then(stdout => {
-					fullname = stdout;
-					return fullname;
-				});
-			});
+		return pAny([checkPasswd(), checkOsaScript()]);
 	}
 
 	if (process.platform === 'win32') {
-		// try git first since fullname is usually not set by default in the system on Windows 7+
-		return execa('git', ['config', '--global', 'user.name'])
-			.then(res => {
-				fullname = res.stdout;
-
-				if (!fullname) {
-					throw new Error();
-				}
-			})
-			.catch(() => {
-				return execa.stdout('wmic', ['useraccount', 'where', 'name="%username%"', 'get', 'fullname'])
-					.then(stdout => {
-						fullname = stdout.replace('FullName', '');
-						return fullname;
-					});
-			});
+		// Fullname is usually not set by default in the system on Windows 7+
+		return pAny([checkGit(), checkWmic()]);
 	}
 
-	return passwdUser()
-		.then(user => {
-			fullname = user.fullname;
+	return pAny([checkPasswd(), checkGetEnt(), checkGit()]);
+}
 
-			if (!fullname) {
-				throw new Error();
-			}
-		})
-		.catch(() => {
-			return execa.shell('getent passwd $(whoami)')
-				.then(res => {
-					fullname = (res.stdout.split(':')[4] || '').replace(/,.*/, '');
+function getFullName() {
+	return checkEnv()
+		.catch(checkAuthorName)
+		.catch(fallback)
+		.catch(() => {});
+}
 
-					if (!fullname) {
-						throw new Error();
-					}
-				});
-		})
-		.catch(() => {
-			return execa.stdout('git', ['config', '--global', 'user.name'])
-				.then(stdout => {
-					fullname = stdout;
-					return fullname;
-				});
-		});
-}
+module.exports = mem(getFullName);

package.json

 {
   "name": "fullname",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Get the fullname of the current user",
@@ -38,2 +38,5 @@ "license": "MIT",
     "execa": "^0.4.0",
+    "mem": "^1.1.0",
+    "p-any": "^1.0.0",
+    "p-try": "^1.0.0",
     "passwd-user": "^2.1.0",
@@ -44,2 +47,4 @@ "rc": "^1.1.6"
     "ava": "*",
+    "mock-require": "^2.0.0",
+    "require-uncached": "^1.0.3",
     "xo": "*"
@@ -46,0 +51,0 @@ },

readme.md

@@ -12,3 +12,3 @@ # fullname [![Build Status](https://travis-ci.org/sindresorhus/fullname.svg?branch=master)](https://travis-ci.org/sindresorhus/fullname)
 
-Tested on OS X, Linux, and Windows.
+Tested on macOS, Linux, and Windows.
 
@@ -15,0 +15,0 @@

No alert changes

Worsened metrics

Total package byte prevSize

4818

decreased by-2.53%

Dependency count

6

increased by100%

Dev dependency count

4

increased by100%

Lines of code

64

decreased by-27.27%

Dependency changes

• + Addedmem@^1.1.0

• + Addedp-any@^1.0.0

• + Addedp-try@^1.0.0

• + Addedaggregate-error@1.0.0(transitive)

• + Addedclean-stack@1.3.0(transitive)

• + Addedindent-string@3.2.0(transitive)

• + Addedmem@1.1.0(transitive)

• + Addedmimic-fn@1.2.0(transitive)

• + Addedp-any@1.1.0(transitive)

• + Addedp-some@2.0.1(transitive)

• + Addedp-try@1.0.0(transitive)