supports-color 1.3.1 → 2.0.0

package/index.js

@@ -1,21 +1,28 @@
 'use strict';
 var argv = process.argv;
 
+var terminator = argv.indexOf('--');
+var hasFlag = function (flag) {
+	flag = '--' + flag;
+	var pos = argv.indexOf(flag);
+	return pos !== -1 && (terminator !== -1 ? pos < terminator : true);
+};
+
 module.exports = (function () {
 	if ('FORCE_COLOR' in process.env) {
 		return true;
 	}
 
-	if (argv.indexOf('--no-color') !== -1 ||
-		argv.indexOf('--no-colors') !== -1 ||
-		argv.indexOf('--color=false') !== -1) {
+	if (hasFlag('no-color') ||
+		hasFlag('no-colors') ||
+		hasFlag('color=false')) {
 		return false;
 	}
 
-	if (argv.indexOf('--color') !== -1 ||
-		argv.indexOf('--colors') !== -1 ||
-		argv.indexOf('--color=true') !== -1 ||
-		argv.indexOf('--color=always') !== -1) {
+	if (hasFlag('color') ||
+		hasFlag('colors') ||
+		hasFlag('color=true') ||
+		hasFlag('color=always')) {
 		return true;
 	}
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "supports-color",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "description": "Detect whether a terminal supports color",
   "license": "MIT",
-  "repository": "sindresorhus/supports-color",
+  "repository": "chalk/supports-color",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
@@ -13,9 +13,6 @@
     "Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
     "Joshua Appelman <jappelman@xebia.com> (jbnicolai.com)"
   ],
-  "bin": {
-    "supports-color": "cli.js"
-  },
   "engines": {
     "node": ">=0.8.0"
   },
@@ -23,12 +20,9 @@
     "test": "mocha"
   },
   "files": [
-    "index.js",
-    "cli.js"
+    "index.js"
   ],
   "keywords": [
-    "cli",
-    "bin",
     "color",
     "colour",
     "colors",

package/readme.md

@@ -1,4 +1,4 @@
-# supports-color [![Build Status](https://travis-ci.org/sindresorhus/supports-color.svg?branch=master)](https://travis-ci.org/sindresorhus/supports-color)
+# supports-color [![Build Status](https://travis-ci.org/chalk/supports-color.svg?branch=master)](https://travis-ci.org/chalk/supports-color)
 
 > Detect whether a terminal supports color
 
@@ -25,20 +25,10 @@ It obeys the `--color` and `--no-color` CLI flags.
 For situations where using `--color` is not possible, add an environment variable `FORCE_COLOR` with any value to force color. Trumps `--no-color`.
 
 
-## CLI
+## Related
 
-```
-$ npm install --global supports-color
-```
-
-```
-$ supports-color --help
-
-  Usage
-    supports-color
-
-  Exits with code 0 if color is supported and 1 if not
-```
+- [supports-color-cli](https://github.com/chalk/supports-color-cli) - CLI for this module
+- [chalk](https://github.com/chalk/chalk) - Terminal string styling done right
 
 
 ## License

package/cli.js

@@ -1,29 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-var pkg = require('./package.json');
-var supportsColor = require('./');
-var argv = process.argv.slice(2);
-
-function help() {
-	console.log([
-		'',
-		'  ' + pkg.description,
-		'',
-		'  Usage',
-		'    supports-color',
-		'',
-		'  Exits with code 0 if color is supported and 1 if not'
-	].join('\n'));
-}
-
-if (argv.indexOf('--help') !== -1) {
-	help();
-	return;
-}
-
-if (argv.indexOf('--version') !== -1) {
-	console.log(pkg.version);
-	return;
-}
-
-process.exit(supportsColor ? 0 : 1);