Update CLI

Planeshifter · Planeshifter · commit ed55a76c4540 · 2017-11-28T22:41:20.000-05:00
diff --git a/lib/node_modules/@stdlib/string/pad/README.md b/lib/node_modules/@stdlib/string/pad/README.md
@@ -180,7 +180,7 @@ for ( i = 0; i < 100; i++ ) {
 ### Usage
 
 ```text
-Usage: padstr [options] <string> --len <length>
+Usage: padstr [options] [<string>] --len <length>
 
 Options:
 
@@ -205,6 +205,13 @@ $ padstr beep --len 10 --lpad b --rpad p
 bbbbeepppp
 ```
 
+To use as a [standard stream][standard-streams],
+
+```bash
+$ echo -n 'beep' | pad --len 9 --lpad a --rpad o
+aabeepoo0
+```
+
 </section>
 
 <!-- /.examples -->
@@ -219,6 +226,8 @@ bbbbeepppp
 
 [@stdlib/string/right-pad]: https://github.com/stdlib-js/stdlib/tree/develop/lib/node_modules/%40stdlib/string/right-pad
 
+[standard-streams]: https://en.wikipedia.org/wiki/Standard_streams
+
 </section>
 
 <!-- /.links -->
diff --git a/lib/node_modules/@stdlib/string/pad/bin/cli b/lib/node_modules/@stdlib/string/pad/bin/cli
@@ -3,100 +3,86 @@
 
 // MODULES //
 
-var fs = require( 'fs' );
-var path = require( 'path' );
-var parseArgs = require( 'minimist' );
-var notifier = require( 'update-notifier' );
-var opts = require( './opts.json' );
-var pkg = require( './../package.json' );
+var resolve = require( 'path' ).resolve;
+var readFileSync = require( '@stdlib/fs/read-file' ).sync;
+var CLI = require( '@stdlib/tools/cli' );
+var stdin = require( '@stdlib/utils/read-stdin' );
+var RE_EOL = require( '@stdlib/regexp/eol' );
 var pad = require( './../lib' );
 
 
-// FUNCTIONS //
+// MAIN //
 
 /**
-* Performs initialization tasks.
+* Main execution sequence.
 *
 * @private
-* @example
-* init();
+* @returns {void}
 */
-function init() {
+function main() {
+	var flags;
+	var args;
 	var opts;
-
-	// Check if newer versions exist for this package:
-	opts = {
-		'pkg': pkg
-	};
-	notifier( opts ).notify();
-
-	// Set the process title to allow the process to be more easily identified:
-	process.title = pkg.name;
-	process.stdout.on( 'error', process.exit );
-} // end FUNCTION init()
-
-/**
-* Prints usage information.
-*
-* @private
-* @example
-* help();
-* // => '...'
-*/
-function help() {
-	var fpath = path.join( __dirname, 'usage.txt' );
-	fs.createReadStream( fpath )
-		.pipe( process.stdout )
-		.on( 'close', onClose );
-
-	function onClose() {
-		process.exit( 0 );
+	var cli;
+	var len;
+	var str;
+
+	// Create a command-line interface:
+	cli = new CLI({
+		'pkg': require( './../package.json' ),
+		'options': require( './../etc/cli_opts.json' ),
+		'help': readFileSync( resolve( __dirname, '..', 'docs', 'usage.txt' ), {
+			'encoding': 'utf8'
+		})
+	});
+	args = cli.args();
+	flags = cli.flags();
+
+	if ( args.length ) {
+		str = args[ 0 ];
+	} else {
+		// Treat an empty value as an empty string:
+		str = '';
+	}
+	len = parseInt( flags.len, 10 );
+	opts = {};
+	if ( flags.lpad ) {
+		opts.lpad = flags.lpad;
+	}
+	if ( flags.rpad ) {
+		opts.rpad = flags.rpad;
+	}
+	if ( flags.cright ) {
+		opts.centerRight = flags.cright;
 	}
-} // end FUNCTION help()
-
-/**
-* Prints the package version.
-*
-* @private
-* @example
-* version();
-* // => '#.#.#'
-*/
-function version() {
-	var msg = pkg.version.toString()+'\n';
-	process.stdout.write( msg, 'utf8' );
-	process.exit( 0 );
-} // end FUNCTION version()
-
-
-// VARIABLES //
-
-var args;
-
-
-// MAIN //
-
-init();
-
-// Parse command-line arguments:
-args = parseArgs( process.argv.slice( 2 ), opts );
-
-if ( args.help ) {
-	return help();
-}
-if ( args.version ) {
-	return version();
-}
-
-opts = {};
-if ( args.lpad ) {
-	opts.lpad = args.lpad;
-}
-if ( args.rpad ) {
-	opts.rpad = args.rpad;
-}
-if ( args.cright ) {
-	opts.centerRight = args.cright;
-}
 
-console.log( pad( args._[0], parseInt( args.len, 10 ), opts ) );
+	// Check if we are receiving data from `stdin`...
+	if ( !process.stdin.isTTY ) {
+		return stdin( onRead );
+	}
+	console.log( pad( str, len, opts ) ); // eslint-disable-line no-console
+
+	/**
+	* Callback invoked upon reading from `stdin`.
+	*
+	* @private
+	* @param {(Error|null)} error - error object
+	* @param {Buffer} data - data
+	* @returns {void}
+	*/
+	function onRead( error, data ) {
+		/* eslint-disable no-console */
+		var lines;
+		var i;
+		if ( error ) {
+			process.exitCode = 1;
+			return console.error( 'Error: %s', error.message );
+		}
+		lines = data.toString().split( RE_EOL );
+		for ( i = 0; i < lines.length; i++ ) {
+			console.log( pad( lines[ i ], len, opts ) );
+		}
+	} // end FUNCTION onRead()
+} // end FUNCTION main()
+
+main();
diff --git a/lib/node_modules/@stdlib/string/pad/docs/usage.txt b/lib/node_modules/@stdlib/string/pad/docs/usage.txt
@@ -1,5 +1,5 @@
 
-Usage: padstr [options] <string> --len <length>
+Usage: padstr [options] [<string>] --len <length>
 
 Options:
 
diff --git a/lib/node_modules/@stdlib/string/pad/etc/cli_opts.json b/lib/node_modules/@stdlib/string/pad/etc/cli_opts.json
diff --git a/lib/node_modules/@stdlib/string/pad/test/fixtures/stdin_error.js.txt b/lib/node_modules/@stdlib/string/pad/test/fixtures/stdin_error.js.txt
@@ -0,0 +1,14 @@
+var resolve = require( 'path' ).resolve;
+var proxyquire = require( 'proxyquire' );
+
+var fpath = resolve( __dirname, '..', 'bin', 'cli' );
+
+process.stdin.isTTY = false;
+
+proxyquire( fpath, {
+	'@stdlib/utils/read-stdin': stdin
+});
+
+function stdin( clbk ) {
+	clbk( new Error( 'beep' ) );
+}
diff --git a/lib/node_modules/@stdlib/string/pad/test/test.cli.js b/lib/node_modules/@stdlib/string/pad/test/test.cli.js

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-Usage: padstr [options] <string> --len <length>`
	`2`	`+Usage: padstr [options] [<string>] --len <length>`
`3`	`3`
`4`	`4`	`Options:`
`5`	`5`