strip-ansi 0.2.2 → 2.0.1

package/cli.js

@@ -2,38 +2,46 @@
 'use strict';
 var fs = require('fs');
 var pkg = require('./package.json');
-var strip = require('./');
-var input = process.argv[2];
+var stripAnsi = require('./');
+var argv = process.argv.slice(2);
+var input = argv[0];
 
 function help() {
 	console.log([
-		pkg.description,
 		'',
-		'Usage',
-		'  $ strip-ansi <input-file> > <output-file>',
-		'  $ cat <input-file> | strip-ansi > <output-file>',
+		'  ' + pkg.description,
 		'',
-		'Example',
-		'  $ strip-ansi unicorn.txt > unicorn-stripped.txt'
+		'  Usage',
+		'    strip-ansi <input-file> > <output-file>',
+		'    cat <input-file> | strip-ansi > <output-file>',
+		'',
+		'  Example',
+		'    strip-ansi unicorn.txt > unicorn-stripped.txt'
 	].join('\n'));
 }
 
-if (process.argv.indexOf('--help') !== -1) {
+function init(data) {
+	process.stdout.write(stripAnsi(data));
+}
+
+if (argv.indexOf('--help') !== -1) {
 	help();
 	return;
 }
 
-if (process.argv.indexOf('--version') !== -1) {
+if (argv.indexOf('--version') !== -1) {
 	console.log(pkg.version);
 	return;
 }
 
-if (input) {
-	process.stdout.write(strip(fs.readFileSync(input, 'utf8')));
+if (!input && process.stdin.isTTY) {
+	help();
 	return;
 }
 
-process.stdin.setEncoding('utf8');
-process.stdin.on('data', function (data) {
-	process.stdout.write(strip(data));
-});
+if (input) {
+	init(fs.readFileSync(input, 'utf8'));
+} else {
+	process.stdin.setEncoding('utf8');
+	process.stdin.on('data', init);
+}

package/index.js

@@ -1,5 +1,5 @@
 'use strict';
-var ansiRegex = require('ansi-regex');
+var ansiRegex = require('ansi-regex')();
 
 module.exports = function (str) {
 	return typeof str === 'string' ? str.replace(ansiRegex, '') : str;

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "strip-ansi",
-  "version": "0.2.2",
+  "version": "2.0.1",
   "description": "Strip ANSI escape codes",
   "license": "MIT",
-  "bin": {
-    "strip-ansi": "cli.js"
-  },
   "repository": "sindresorhus/strip-ansi",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
     "url": "http://sindresorhus.com"
   },
+  "bin": {
+    "strip-ansi": "cli.js"
+  },
   "engines": {
     "node": ">=0.10.0"
   },
@@ -48,7 +48,7 @@
     "text"
   ],
   "dependencies": {
-    "ansi-regex": "^0.1.0"
+    "ansi-regex": "^1.0.0"
   },
   "devDependencies": {
     "mocha": "*"

package/readme.md

@@ -15,7 +15,7 @@ $ npm install --save strip-ansi
 ```js
 var stripAnsi = require('strip-ansi');
 
-stripAnsi('\x1b[4mcake\x1b[0m');
+stripAnsi('\u001b[4mcake\u001b[0m');
 //=> 'cake'
 ```
 
@@ -29,12 +29,12 @@ $ npm install --global strip-ansi
 ```sh
 $ strip-ansi --help
 
-Usage
-  $ strip-ansi <input-file> > <output-file>
-  $ cat <input-file> | strip-ansi > <output-file>
+  Usage
+    strip-ansi <input-file> > <output-file>
+    cat <input-file> | strip-ansi > <output-file>
 
-Example
-  $ strip-ansi unicorn.txt > unicorn-stripped.txt
+  Example
+    strip-ansi unicorn.txt > unicorn-stripped.txt
 ```