os-locale - npm Package Compare versions

Comparing version 1.2.1 to 1.3.0

index.js

 'use strict';
 var childProcess = require('child_process');
-var execFileSync = require('exec-file-sync');
+var execFileSync = childProcess.execFileSync;
 var lcid = require('lcid');
+var defaultOpts = {spawn: true};
 var cache;
 
+function fallback() {
+	cache = 'en_US';
+	return cache;
+}
+
 function getEnvLocale() {
@@ -20,7 +26,9 @@ var env = process.env;
 function getLocale(str) {
-	return (str && str.replace(/[.:].*/, '')) || 'en_US';
+	return (str && str.replace(/[.:].*/, '')) || fallback();
 }
 
-module.exports = function (cb) {
-	if (cache || getEnvLocale()) {
+module.exports = function (cb, opts) {
+	opts = opts || defaultOpts;
+
+	if (cache || getEnvLocale() || opts.spawn === false) {
 		setImmediate(cb, null, cache);
@@ -33,7 +41,7 @@ return;
 			if (err) {
-				cb(err);
+				fallback();
 				return;
 			}
 
-			cache = stdout.trim() || 'en_US';
+			cache = stdout.trim() || fallback();
 			cb(null, cache);
@@ -46,3 +54,3 @@ });
 			if (err) {
-				cb(err);
+				fallback();
 				return;
@@ -52,3 +60,3 @@ }
 			var lcidCode = parseInt(stdout.replace('Locale', ''), 16);
-			cache = lcid.from(lcidCode) || 'en_US';
+			cache = lcid.from(lcidCode) || fallback();
 			cb(null, cache);
@@ -59,3 +67,3 @@ });
 			if (err) {
-				cb(err);
+				fallback();
 				return;
@@ -77,4 +85,6 @@ }
 
-module.exports.sync = function () {
-	if (cache || getEnvLocale()) {
+module.exports.sync = function (opts) {
+	opts = opts || defaultOpts;
+
+	if (cache || getEnvLocale() || !execFileSync || opts.spawn === false) {
 		return cache;
@@ -89,16 +99,23 @@ }
 		} catch (err) {
-			cache = 'en_US';
-			return cache;
+			return fallback();
 		}
 
 		var lcidCode = parseInt(stdout.replace('Locale', ''), 16);
-		cache = lcid.from(lcidCode) || 'en_US';
+		cache = lcid.from(lcidCode) || fallback();
 		return cache;
 	}
 
-	var res = parseLocale(execFileSync('locale', {encoding: 'utf8'}));
+	var res;
 
+	try {
+		res = parseLocale(execFileSync('locale', {encoding: 'utf8'}));
+	} catch (err) {}
+
 	if (!res && process.platform === 'darwin') {
-		cache = execFileSync('defaults', ['read', '-g', 'AppleLocale'], {encoding: 'utf8'}).trim() || 'en_US';
-		return cache;
+		try {
+			cache = execFileSync('defaults', ['read', '-g', 'AppleLocale'], {encoding: 'utf8'}).trim() || fallback();
+			return cache;
+		} catch (err) {
+			return fallback();
+		}
 	}
@@ -105,0 +122,0 @@

package.json

 {
   "name": "os-locale",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Get the system locale",
@@ -16,3 +16,3 @@ "license": "MIT",
   "scripts": {
-    "test": "xo && node test.js"
+    "test": "xo && ava"
   },
@@ -37,9 +37,9 @@ "files": [
   "dependencies": {
-    "exec-file-sync": "^2.0.0",
     "lcid": "^1.0.0"
   },
   "devDependencies": {
-    "ava": "0.0.4",
+    "ava": "*",
+    "require-uncached": "^1.0.2",
     "xo": "*"
   }
 }

readme.md

@@ -27,4 +27,20 @@ # os-locale [![Build Status](https://travis-ci.org/sindresorhus/os-locale.svg?branch=master)](https://travis-ci.org/sindresorhus/os-locale)
 
+## API
+
+### osLocale([options], callback(error, locale))
+
+### osLocale.sync([options])
+
+Returns the locale.
+
+#### options.spawn
+
+Type: `boolean`  
+Default: `true`
+
+Set to `false` to avoid spawning subprocesses and instead only resolve the locale from environment variables.
+
+
 ## License
 
 MIT © [Sindre Sorhus](http://sindresorhus.com)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

5073

increased by13.09%

Dependency count

1

decreased by-50%

Lines of code

96

increased by15.66%

Number of lines in readme file

46

increased by53.33%

Worsened metrics

Dev dependency count

3

increased by50%

Dependency changes

• - Removedexec-file-sync@^2.0.0

• - Removedbuffer-from@1.1.2(transitive)

• - Removedconcat-stream@1.6.2(transitive)

• - Removedcore-util-is@1.0.3(transitive)

• - Removedexec-file-sync@2.0.2(transitive)

• - Removedinherits@2.0.4(transitive)

• - Removedis-obj@1.0.1(transitive)

• - Removedisarray@1.0.0(transitive)

• - Removedobject-assign@4.1.1(transitive)

• - Removedos-shim@0.1.3(transitive)

• - Removedprocess-nextick-args@2.0.1(transitive)

• - Removedreadable-stream@2.3.8(transitive)

• - Removedsafe-buffer@5.1.2(transitive)

• - Removedspawn-sync@1.0.15(transitive)

• - Removedstring_decoder@1.1.1(transitive)

• - Removedtypedarray@0.0.6(transitive)

• - Removedutil-deprecate@1.0.2(transitive)