cli - npm Package Compare versions

Comparing version 0.2.2-1 to 0.2.3-1

cli-min.js

@@ -23,2 +23,2 @@ /**
  */
- var cli=exports,argv,curr_opt,curr_val,full_opt,is_long,short_tags=[],opt_list,parsed={},usage,argv_parsed,daemon,daemon_arg,hide_status,show_debug;cli.app=null,cli.version=null,cli.argv=[],cli.argc=0,cli.options={},cli.args=[],cli.native={};var define_native=function(a){Object.defineProperty(cli.native,a,{enumerable:true,configurable:true,get:function(){delete cli.native[a];return cli.native[a]=require(a)}})};var natives=process.binding("natives");for(var module in natives)define_native(module);cli.output=cli.native.util.print,cli.exit=process.exit;var enable={help:true,version:false,daemon:false,status:false,timeout:false,catchall:false};cli.enable=function(){Array.prototype.slice.call(arguments).forEach(function(a){switch(a){case"daemon":try{daemon=require("daemon");if(typeof daemon.start!=="function")throw"Invalid module"}catch(b){cli.fatal("daemon.node not installed. Please run `npm install daemon`")}break;case"catchall":process.on("uncaughtException",function(a){cli.error("Uncaught exception: "+(a.msg||a))});break;case"help":case"version":case"status":case"autocomplete":case"timeout":break;default:cli.fatal("Unknown plugin \""+a+"\"")}enable[a]=true});return cli},cli.disable=function(){Array.prototype.slice.call(arguments).forEach(function(a){enable[a]&&(enable[a]=false)});return cli},cli.setArgv=function(a,b){a instanceof Array||(a=a.split(" ")),cli.app=a.shift(),!b&&"node"===cli.app&&(cli.app=a.shift()),cli.app=cli.native.path.basename(cli.app),argv_parsed=false,cli.args=cli.argv=argv=a,cli.argc=argv.length},cli.setArgv(process.argv),cli.next=function(){argv_parsed||(cli.args=[],argv_parsed=true),curr_val=null;if(short_tags.length){curr_opt=short_tags.shift(),full_opt="-"+curr_opt;return curr_opt}if(!argv.length)return false;curr_opt=argv.shift();if(curr_opt==="-"||curr_opt==="--"){while(argv.length)cli.args.push(argv.shift());return false}if(curr_opt[0]!=="-"){cli.args.push(curr_opt);return cli.next()}is_long=curr_opt[1]==="-",curr_opt=curr_opt.substr(is_long?2:1);if(!is_long&&curr_opt.length>1){short_tags=curr_opt.split("");return cli.next()}var a,b;if(is_long&&(a=curr_opt.indexOf("="))>=0){curr_val=curr_opt.substr(a+1),curr_opt=curr_opt.substr(0,a),b=curr_val.length;if(curr_val[0]==="\""&&curr_val[b-1]==="\""||curr_val[0]==="'"&&curr_val[b-1]==="'")curr_val=curr_val.substr(1,b-2);curr_val.match(/^[0-9]+$/)&&(curr_val=parseInt(curr_val,10))}full_opt=(is_long?"--":"-")+curr_opt;return curr_opt},cli.parse=function(a){var b,c,d=cli.options,e,f=!a;opt_list=a||{};while(o=cli.next()){e=false;for(opt in opt_list){if(!(opt_list[opt]instanceof Array))continue;opt_list[opt][0]===false&&(opt_list[opt][0]=opt);if(o===opt||o===opt_list[opt][0]){e=true;if(opt_list[opt].length===2){d[opt]=true;break}b=null,opt_list[opt].length===4&&(b=opt_list[opt][3]);if(opt_list[opt][2]instanceof Array){for(c=0,l=opt_list[opt][2].length;c<l;c++)typeof opt_list[opt][2][c]==="number"&&(opt_list[opt][2][c]+="");d[opt]=cli.getArrayValue(opt_list[opt][2],is_long?null:b);break}opt_list[opt][2].toLowerCase&&(opt_list[opt][2]=opt_list[opt][2].toLowerCase());switch(opt_list[opt][2]){case"string":case 1:case true:d[opt]=cli.getValue(b);break;case"int":case"number":case"num":case"time":case"seconds":case"secs":case"minutes":case"mins":case"x":case"n":d[opt]=cli.getInt(b);break;case"float":case"decimal":d[opt]=cli.getFloat(b);break;case"path":case"file":case"directory":case"dir":d[opt]=cli.getPath(b,opt_list[opt][2]);break;case"email":d[opt]=cli.getEmail(b);break;case"url":case"uri":case"domain":case"host":d[opt]=cli.getUrl(b,opt_list[opt][2]);break;case"ip":d[opt]=cli.getIp(b);break;case"bool":case"boolean":case"on":d[opt]=true;case"false":case"off":case false:case 0:d[opt]=false;default:cli.fatal("Unknown opt type \""+opt_list[opt][2]+"\"")}break}}if(!e){if(enable.version&&(o==="v"||o==="version"))typeof cli.version==="undefined"&&cli.parsePackageJson(),console.log(cli.app+" v"+cli.version),process.exit();else{if(enable.daemon&&(o==="d"||o==="daemon")){daemon_arg=cli.getArrayValue(["start","stop","restart","pid","log"],is_long?null:"start");continue}if(enable.catchall&&(o==="c"||o==="catch"))continue;if(enable.status&&(o==="s"||o==="silent"||o==="debug")){hide_status=o==="s"||o==="silent",show_debug=o==="debug";continue}if(enable.timeout&&(o==="t"||o==="timeout")){var g=cli.getInt();setTimeout(function(){cli.fatal("Process timed out after "+g+"s")},g*1e3);continue}}if(f){d[o]=curr_val||true;continue}if(enable.help&&(o==="h"||o==="help")){cli.getUsage();continue}cli.fatal("Unknown option "+full_opt)}}for(opt in opt_list){b=opt_list[opt].length===4?opt_list[opt][3]:null;if(opt_list[opt]instanceof Array)typeof d[opt]==="undefined"&&(d[opt]=b);else{d[opt]=opt_list[opt];continue}}cli.argc=cli.args.length;return d},["info","error","ok","debug","fatal"].forEach(function(a){cli[a]=function(b){switch(a){case"info":b="\u001b[33mINFO\u001b[0m: "+b;break;case"debug":b="\u001b[36mDEBUG\u001b[0m: "+b;break;case"error":case"fatal":b="\u001b[31mERROR\u001b[0m: "+b;break;case"ok":b="\u001b[32mOK\u001b[0m: "+b}a==="fatal"&&(console.error(b),process.exit(1));enable.status&&(hide_status||!show_debug&&a==="debug")||(a==="error"?console.error(b):console.log(b))}}),cli.setApp=function(a,b){a.indexOf("package.json")!==-1?cli.parsePackageJson(a):(cli.app=a,cli.version=b);return cli},cli.parsePackageJson=function(a){var b=function(a){var b=JSON.parse(cli.native.fs.readFileSync(a,"utf8"));cli.version=b.version};var c=function(a,b,c){for(var d=0,e=a.length;d<e;d++)try{b(a[d]);return}catch(f){d===e-1&&cli.fatal(c)}};try{if(a)return b(a);c([__dirname+"/package.json",__dirname+"/../package.json",__dirname+"/../../package.json"],b)}catch(d){cli.fatal("Could not detect "+cli.app+" version")}},cli.setUsage=function(a){usage=a;return cli};var pad=function(a,b){typeof b==="undefined"&&(b=a,a="");if(a.length<b){b-=a.length;while(b--)a+=" "}return a};cli.getUsage=function(){var a,b,c,d,e=[],f=25;var g=function(a,b,c){var d=a.length,e=80-d,f="";if(b.length<=e)return b;var g=b.split(" "),h=0,i;while(g.length)f+=(i=g.shift())+" ",h+=i.length,g.length&&h+g[0].length>e&&(f+="\n"+pad(d),h=0);return f};usage=usage||cli.app+" [OPTIONS] [ARGS]",console.log("\u001b[1mUsage\u001b[0m:\n  "+usage),console.log("\n\u001b[1mOptions\u001b[0m: ");for(opt in opt_list){opt.length===1?(long=opt_list[opt][0],a=opt):(long=opt,a=opt_list[opt][0]),b=opt_list[opt][1].trim(),type=opt_list[opt].length>=3?opt_list[opt][2]:null,c=opt_list[opt].length===4?opt_list[opt][3]:null,a===long?a.length===1?d="  -"+a:d="      --"+long:d="  -"+a+", --"+long,d+=" ";if(type){type instanceof Array&&(b+=". VALUE must be either ["+type.join("|")+"]",type="VALUE");if(type===true||type===1)type=long.toUpperCase();type=type.toUpperCase();if(type==="FLOAT"||type==="INT")type="NUMBER";d+=c?"["+type+"]":type}d=pad(d,f),d+=g(d,b),d+=c?" (Default is "+c+")":"",console.log(d),e.push(a),e.push(long)}enable.timeout&&e.indexOf("t")===-1&&e.indexOf("timeout")===-1&&console.log(pad("  -t, --timeout N",f)+"Exit if the process takes longer than N seconds"),enable.status&&(e.indexOf("s")===-1&&e.indexOf("silent")===-1&&console.log(pad("  -s, --silent",f)+"Hide all console status messages"),e.indexOf("debug")===-1&&console.log(pad("      --debug",f)+"Show debug information")),enable.catchall&&e.indexOf("c")===-1&&e.indexOf("catch")===-1&&console.log(pad("  -c, --catch",f)+"Catch unanticipated errors"),enable.daemon&&e.indexOf("d")===-1&&e.indexOf("daemon")===-1&&console.log(pad("  -d, --daemon [ARG]",f)+"Daemonize the process. Control the daemon using [start, stop, restart, log, pid]"),enable.version&&e.indexOf("v")===-1&&e.indexOf("version")===-1&&console.log(pad("  -v, --version",f)+"Display the current version"),enable.help&&e.indexOf("h")===-1&&e.indexOf("help")===-1&&console.log(pad("  -h, --help",f)+"Display help and usage details"),process.exit()},cli.getOptError=function(a,b){var c=full_opt+" expects "+a+". Use `"+cli.app+" "+full_opt+(is_long?"=":" ")+b+"`";return c},cli.getValue=function(a,b,c){c=c||cli.getOptError("a value","VALUE");var d;try{if(curr_val){b&&(curr_val=b(curr_val));return curr_val}if(short_tags.length)throw"Short tags";if(!argv.length||argv[0][0]==="-")throw"No value";d=argv.shift(),d.match(/^[0-9]+$/)&&(d=parseInt(d,10)),b&&(d=b(d))}catch(e){d&&argv.unshift(d);return a||cli.fatal(c)}return d},cli.getInt=function(a){return cli.getValue(a,function(a){if(typeof a==="number")return a;if(!a.match(/^(?:-?(?:0|[1-9][0-9]*))$/))throw"Invalid int";return parseInt(a)},cli.getOptError("a number","NUMBER"))},cli.getFloat=function(a){return cli.getValue(a,function(a){if(!a.match(/^(?:-?(?:0|[1-9][0-9]*))?(?:\.[0-9]*)?$/))throw"Invalid float";return parseFloat(a,10)},cli.getOptError("a number","NUMBER"))},cli.getUrl=function(a,b){b=b||"url";return cli.getValue(a,function(a){if(!a.match(/^(?:(?:ht|f)tp(?:s?)\:\/\/|~\/|\/)?(?:\w+:\w+@)?((?:(?:[-\w\d{1-3}]+\.)+(?:com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|edu|co\.uk|ac\.uk|it|fr|tv|museum|asia|local|travel|[a-z]{2})?)|((\b25[0-5]\b|\b[2][0-4][0-9]\b|\b[0-1]?[0-9]?[0-9]\b)(\.(\b25[0-5]\b|\b[2][0-4][0-9]\b|\b[0-1]?[0-9]?[0-9]\b)){3}))(?::[\d]{1,5})?(?:(?:(?:\/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|\/)+|\?|#)?(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?:#(?:[-\w~!$ |\/.,*:;=]|%[a-f\d]{2})*)?$/))throw"Invalid URL";return a},cli.getOptError("a "+b,b.toUpperCase()))},cli.getEmail=function(a){return cli.getValue(a,function(a){if(!a.match(/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-](?!\.)){0,61}[a-zA-Z0-9]?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-](?!$)){0,61}[a-zA-Z0-9]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/))throw"Invalid email";return a},cli.getOptError("an email","EMAIL"))},cli.getIp=function(a){return cli.getValue(a,function(a){if(!a.match(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/))throw"Invalid IP";return a},cli.getOptError("an IP","IP"))},cli.getPath=function(a,b){b=b||"path";return cli.getValue(a,function(a){if(a.match(/[?*:;{}]/))throw"Invalid path";return a},cli.getOptError("a "+b,b.toUpperCase()))},cli.getArrayValue=function(a,b){return cli.getValue(b,function(b){if(a.indexOf(b)===-1)throw"Unexpected value";return b},cli.getOptError("either ["+a.join("|")+"]","VALUE"))},cli.withStdin=function(a,b){typeof a==="function"&&(b=a,a="utf8");var c=process.openStdin(),d="";c.setEncoding(a),c.on("data",function(a){d+=a}),c.on("end",function(){b.apply(cli,[d])})},cli.withStdinLines=function(a){cli.withStdin(function(b){var c=b.indexOf("\r\n")!==-1?"\r\n":"\n";a.apply(cli,[b.split(c),c])})},cli.withInput=function(a,b,c){typeof b==="function"?(c=b,b="utf8"):typeof a==="function"&&(c=a,b="utf8",a="stdin");if(a==="stdin")a=process.openStdin();else try{a=cli.native.fs.createReadStream(a),a.on("error",cli.fatal)}catch(d){return cli.fatal(d)}a.setEncoding(b);var e=[],f,g;a.on("data",function(a){if(!f){if(!g)if(a.indexOf("\r\n")!==-1)g="\r\n";else if(a.indexOf("\n")!==-1)g="\n";else{last_line=a;return}e=a.split(g),a=f?null:e.pop();while(e.length)c.apply(cli,[e.shift(),g,false])}}),a.on("end",function(){f=true,data.length&&c.apply(cli,[data,g||"",false]),c.apply(cli,[null,null,true])})},cli.daemon=function(a,b){typeof daemon==="undefined"&&cli.fatal("Daemon is not initialized"),typeof a==="function"&&(b=a,a="start");var c="/tmp/"+cli.app+".pid",d="/tmp/"+cli.app+".log";var e=function(){daemon.run(d,c,function(a){if(a)return cli.error("Error starting daemon: "+a);b()})};var f=function(){try{cli.native.fs.readFileSync(c)}catch(a){return cli.error("Daemon is not running")}daemon.stop(c,function(a,b){if(a&&a.errno===3)return cli.error("Daemon is not running");if(a)return cli.error("Error stopping daemon: "+a.errno);cli.ok("Successfully stopped daemon with pid: "+b)})};switch(a){case"stop":f();break;case"restart":daemon.stop(c,function(){e()});break;case"log":try{console.log(cli.native.fs.readFileSync(d,"utf8"))}catch(g){return cli.error("No daemon log file")}break;case"pid":try{var h=cli.native.fs.readFileSync(c,"utf8");cli.native.fs.statSync("/proc/"+h),cli.info(h)}catch(g){return cli.error("Daemon is not running")}break;default:e()}},cli.main=function(a){var b=function(){a.apply(cli,[cli.args,cli.options])};enable.daemon&&daemon_arg?cli.daemon(daemon_arg,b):b()},cli.createServer=function(){var a=function(a,b,c){if(c){console.error(c.stack),b.writeHead(500,{"Content-Type":"text/plain"});return b.end(c.stack+"\n")}b.writeHead(404,{"Content-Type":"text/plain"}),b.end("Not Found\n")};var b=error=a,c=Array.prototype.slice.call(arguments);c.length&&c[0]instanceof Array&&(c=c[0]),c.reverse().forEach(function(a){var c=b;b=function(b,d){try{a(b,d,function(a){if(a)return error(b,d,a);c(b,d)})}catch(e){error(b,d,e)}}});return cli.native.http.createServer(b)},cli.exec=function(a,b,c){cli.native.child_process.exec(a,function(a,d,e){a=a||e;if(a){if(c)return c(a);return cli.fatal("exec() failed\n"+a)}b&&b(d.split("\n"))})};var last_progress_call,progress_len=74;cli.progress=function(a){if(!(a<0||a>1)){var b=(new Date).getTime();if(last_progress_call&&b-last_progress_call<100){a===1&&setTimeout(function(){cli.progress(1)},150);return}last_progress_call=b;var c=function(){if(a===1)return" 100%\n";var b=Math.floor(a*100)+"%";a<.1&&(b=" "+b);return"  "+b};var d=Math.floor(progress_len*a),e="";while(d--)e+="#";cli.native.util.print(pad(e,progress_len)+c()+"\r")}}
+ var cli=exports,argv,curr_opt,curr_val,full_opt,is_long,short_tags=[],opt_list,parsed={},usage,argv_parsed,command_list,daemon,daemon_arg,hide_status,show_debug;cli.app=null,cli.version=null,cli.argv=[],cli.argc=0,cli.options={},cli.args=[],cli.command,cli.native={};var define_native=function(a){Object.defineProperty(cli.native,a,{enumerable:true,configurable:true,get:function(){delete cli.native[a];return cli.native[a]=require(a)}})};var natives=process.binding("natives");for(var module in natives)define_native(module);cli.output=cli.native.util.print,cli.exit=process.exit;var enable={help:true,version:false,daemon:false,status:false,timeout:false,catchall:false};cli.enable=function(){Array.prototype.slice.call(arguments).forEach(function(a){switch(a){case"daemon":try{daemon=require("daemon");if(typeof daemon.start!=="function")throw"Invalid module"}catch(b){cli.fatal("daemon.node not installed. Please run `npm install daemon`")}break;case"catchall":process.on("uncaughtException",function(a){cli.error("Uncaught exception: "+(a.msg||a))});break;case"help":case"version":case"status":case"autocomplete":case"timeout":break;default:cli.fatal("Unknown plugin \""+a+"\"")}enable[a]=true});return cli},cli.disable=function(){Array.prototype.slice.call(arguments).forEach(function(a){enable[a]&&(enable[a]=false)});return cli},cli.setArgv=function(a,b){a instanceof Array||(a=a.split(" ")),cli.app=a.shift(),!b&&"node"===cli.app&&(cli.app=a.shift()),cli.app=cli.native.path.basename(cli.app),argv_parsed=false,cli.args=cli.argv=argv=a,cli.argc=argv.length},cli.setArgv(process.argv),cli.next=function(){argv_parsed||(cli.args=[],argv_parsed=true),curr_val=null;if(short_tags.length){curr_opt=short_tags.shift(),full_opt="-"+curr_opt;return curr_opt}if(!argv.length)return false;curr_opt=argv.shift();if(curr_opt==="-"||curr_opt==="--"){while(argv.length)cli.args.push(argv.shift());return false}if(curr_opt[0]!=="-"){cli.args.push(curr_opt);return cli.next()}is_long=curr_opt[1]==="-",curr_opt=curr_opt.substr(is_long?2:1);if(!is_long&&curr_opt.length>1){short_tags=curr_opt.split("");return cli.next()}var a,b;if(is_long&&(a=curr_opt.indexOf("="))>=0){curr_val=curr_opt.substr(a+1),curr_opt=curr_opt.substr(0,a),b=curr_val.length;if(curr_val[0]==="\""&&curr_val[b-1]==="\""||curr_val[0]==="'"&&curr_val[b-1]==="'")curr_val=curr_val.substr(1,b-2);curr_val.match(/^[0-9]+$/)&&(curr_val=parseInt(curr_val,10))}full_opt=(is_long?"--":"-")+curr_opt;return curr_opt},cli.parse=function(a,b){var c,d,e=cli.options,f,g=!a;opt_list=a||{},command_list=b||[];while(o=cli.next()){f=false;for(opt in opt_list){if(!(opt_list[opt]instanceof Array))continue;opt_list[opt][0]===false&&(opt_list[opt][0]=opt);if(o===opt||o===opt_list[opt][0]){f=true;if(opt_list[opt].length===2){e[opt]=true;break}c=null,opt_list[opt].length===4&&(c=opt_list[opt][3]);if(opt_list[opt][2]instanceof Array){for(d=0,l=opt_list[opt][2].length;d<l;d++)typeof opt_list[opt][2][d]==="number"&&(opt_list[opt][2][d]+="");e[opt]=cli.getArrayValue(opt_list[opt][2],is_long?null:c);break}opt_list[opt][2].toLowerCase&&(opt_list[opt][2]=opt_list[opt][2].toLowerCase());switch(opt_list[opt][2]){case"string":case 1:case true:e[opt]=cli.getValue(c);break;case"int":case"number":case"num":case"time":case"seconds":case"secs":case"minutes":case"mins":case"x":case"n":e[opt]=cli.getInt(c);break;case"float":case"decimal":e[opt]=cli.getFloat(c);break;case"path":case"file":case"directory":case"dir":e[opt]=cli.getPath(c,opt_list[opt][2]);break;case"email":e[opt]=cli.getEmail(c);break;case"url":case"uri":case"domain":case"host":e[opt]=cli.getUrl(c,opt_list[opt][2]);break;case"ip":e[opt]=cli.getIp(c);break;case"bool":case"boolean":case"on":e[opt]=true;case"false":case"off":case false:case 0:e[opt]=false;default:cli.fatal("Unknown opt type \""+opt_list[opt][2]+"\"")}break}}if(!f){if(enable.version&&(o==="v"||o==="version"))typeof cli.version==="undefined"&&cli.parsePackageJson(),console.log(cli.app+" v"+cli.version),process.exit();else{if(enable.daemon&&(o==="d"||o==="daemon")){daemon_arg=cli.getArrayValue(["start","stop","restart","pid","log"],is_long?null:"start");continue}if(enable.catchall&&(o==="c"||o==="catch"))continue;if(enable.status&&(o==="s"||o==="silent"||o==="debug")){hide_status=o==="s"||o==="silent",show_debug=o==="debug";continue}if(enable.timeout&&(o==="t"||o==="timeout")){var h=cli.getInt();setTimeout(function(){cli.fatal("Process timed out after "+h+"s")},h*1e3);continue}}enable.help&&(o==="h"||o==="help")&&(cli.getUsage(),console.log("HLELLO"),process.exit());if(g){e[o]=curr_val||true;continue}cli.fatal("Unknown option "+full_opt)}}for(opt in opt_list){c=opt_list[opt].length===4?opt_list[opt][3]:null;if(opt_list[opt]instanceof Array)typeof e[opt]==="undefined"&&(e[opt]=c);else{e[opt]=opt_list[opt];continue}}command_list&&(cli.args.length===0?cli.fatal("A command is required"+(enable.help?". Please see --help for more information":"")):cli.command=cli.autocompleteCommand(cli.args.shift())),cli.argc=cli.args.length;return e},cli.autocompleteCommand=function(a){var b;command_list instanceof Array?b=command_list:b=Object.keys(command_list);var c,d=0,e=a.length,f;if(b.length===0||b.indexOf(a)!==-1)return a;for(c=0;c<e;c++){f=[],l=b.length;if(l<=1)break;for(d=0;d<l;d++)b[d].length>=c&&b[d][c]===a[c]&&f.push(b[d]);b=f}l=b.length;if(l===1)return b[0];l===0?cli.fatal("Unknown command \""+a+"\""+(enable.help?". Please see --help for more information":"")):(b.sort(),cli.fatal("The command \""+a+"\" is ambiguous and could mean \""+b.join("\", \"")+"\""))},["info","error","ok","debug","fatal"].forEach(function(a){cli[a]=function(b){switch(a){case"info":b="\u001b[33mINFO\u001b[0m: "+b;break;case"debug":b="\u001b[36mDEBUG\u001b[0m: "+b;break;case"error":case"fatal":b="\u001b[31mERROR\u001b[0m: "+b;break;case"ok":b="\u001b[32mOK\u001b[0m: "+b}a==="fatal"&&(console.error(b),process.exit(1));enable.status&&(hide_status||!show_debug&&a==="debug")||(a==="error"?console.error(b):console.log(b))}}),cli.setApp=function(a,b){a.indexOf("package.json")!==-1?cli.parsePackageJson(a):(cli.app=a,cli.version=b);return cli},cli.parsePackageJson=function(a){var b=function(a){var b=JSON.parse(cli.native.fs.readFileSync(a,"utf8"));cli.version=b.version,cli.app=b.name};var c=function(a,b,c){for(var d=0,e=a.length;d<e;d++)try{b(a[d]);return}catch(f){d===e-1&&cli.fatal(c)}};try{if(a)return b(a);c([__dirname+"/package.json",__dirname+"/../package.json",__dirname+"/../../package.json"],b)}catch(d){cli.fatal("Could not detect "+cli.app+" version")}},cli.setUsage=function(a){usage=a;return cli};var pad=function(a,b){typeof b==="undefined"&&(b=a,a="");if(a.length<b){b-=a.length;while(b--)a+=" "}return a};cli.getUsage=function(){var a,b,c,d,e=[],f=25;var g=function(a,b,c){var d=a.length,e=65-d,f="";if(b.length<=e)return b;var g=b.split(" "),h=0,i;while(g.length)f+=(i=g.shift())+" ",h+=i.length,g.length&&h+g[0].length>e&&(f+="\n"+pad(d),h=0);return f};usage=usage||cli.app+" [OPTIONS]"+(command_list?" command":"")+" [ARGS]",console.log("\u001b[1mUsage\u001b[0m:\n  "+usage),console.log("\n\u001b[1mOptions\u001b[0m: ");for(opt in opt_list){opt.length===1?(long=opt_list[opt][0],a=opt):(long=opt,a=opt_list[opt][0]),b=opt_list[opt][1].trim(),type=opt_list[opt].length>=3?opt_list[opt][2]:null,c=opt_list[opt].length===4?opt_list[opt][3]:null,a===long?a.length===1?d="  -"+a:d="      --"+long:d="  -"+a+", --"+long,d+=" ";if(type){type instanceof Array&&(b+=". VALUE must be either ["+type.join("|")+"]",type="VALUE");if(type===true||type===1)type=long.toUpperCase();type=type.toUpperCase();if(type==="FLOAT"||type==="INT")type="NUMBER";d+=c?"["+type+"]":type}d=pad(d,f),d+=g(d,b),d+=c?" (Default is "+c+")":"",console.log(d),e.push(a),e.push(long)}enable.timeout&&e.indexOf("t")===-1&&e.indexOf("timeout")===-1&&console.log(pad("  -t, --timeout N",f)+"Exit if the process takes longer than N seconds"),enable.status&&(e.indexOf("s")===-1&&e.indexOf("silent")===-1&&console.log(pad("  -s, --silent",f)+"Hide all console status messages"),e.indexOf("debug")===-1&&console.log(pad("      --debug",f)+"Show debug information")),enable.catchall&&e.indexOf("c")===-1&&e.indexOf("catch")===-1&&console.log(pad("  -c, --catch",f)+"Catch unanticipated errors"),enable.daemon&&e.indexOf("d")===-1&&e.indexOf("daemon")===-1&&console.log(pad("  -d, --daemon [ARG]",f)+"Daemonize the process. Control the daemon using [start, stop, restart, log, pid]"),enable.version&&e.indexOf("v")===-1&&e.indexOf("version")===-1&&console.log(pad("  -v, --version",f)+"Display the current version"),enable.help&&e.indexOf("h")===-1&&e.indexOf("help")===-1&&console.log(pad("  -h, --help",f)+"Display help and usage details");if(command_list){console.log("\n\u001b[1mCommands\u001b[0m: ");var h;command_list instanceof Array?h=command_list:h=Object.keys(command_list),command_list.sort(),console.log("  "+g("  ",command_list.join(", ")))}process.exit()},cli.getOptError=function(a,b){var c=full_opt+" expects "+a+". Use `"+cli.app+" "+full_opt+(is_long?"=":" ")+b+"`";return c},cli.getValue=function(a,b,c){c=c||cli.getOptError("a value","VALUE");var d;try{if(curr_val){b&&(curr_val=b(curr_val));return curr_val}if(short_tags.length)throw"Short tags";if(!argv.length||argv[0][0]==="-")throw"No value";d=argv.shift(),d.match(/^[0-9]+$/)&&(d=parseInt(d,10)),b&&(d=b(d))}catch(e){d&&argv.unshift(d);return a||cli.fatal(c)}return d},cli.getInt=function(a){return cli.getValue(a,function(a){if(typeof a==="number")return a;if(!a.match(/^(?:-?(?:0|[1-9][0-9]*))$/))throw"Invalid int";return parseInt(a)},cli.getOptError("a number","NUMBER"))},cli.getFloat=function(a){return cli.getValue(a,function(a){if(!a.match(/^(?:-?(?:0|[1-9][0-9]*))?(?:\.[0-9]*)?$/))throw"Invalid float";return parseFloat(a,10)},cli.getOptError("a number","NUMBER"))},cli.getUrl=function(a,b){b=b||"url";return cli.getValue(a,function(a){if(!a.match(/^(?:(?:ht|f)tp(?:s?)\:\/\/|~\/|\/)?(?:\w+:\w+@)?((?:(?:[-\w\d{1-3}]+\.)+(?:com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|edu|co\.uk|ac\.uk|it|fr|tv|museum|asia|local|travel|[a-z]{2})?)|((\b25[0-5]\b|\b[2][0-4][0-9]\b|\b[0-1]?[0-9]?[0-9]\b)(\.(\b25[0-5]\b|\b[2][0-4][0-9]\b|\b[0-1]?[0-9]?[0-9]\b)){3}))(?::[\d]{1,5})?(?:(?:(?:\/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|\/)+|\?|#)?(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=?(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?:#(?:[-\w~!$ |\/.,*:;=]|%[a-f\d]{2})*)?$/))throw"Invalid URL";return a},cli.getOptError("a "+b,b.toUpperCase()))},cli.getEmail=function(a){return cli.getValue(a,function(a){if(!a.match(/^(?:[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+\.)*[\w\!\#\$\%\&\'\*\+\-\/\=\?\^\`\{\|\}\~]+@(?:(?:(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-](?!\.)){0,61}[a-zA-Z0-9]?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-](?!$)){0,61}[a-zA-Z0-9]?)|(?:\[(?:(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\.){3}(?:[01]?\d{1,2}|2[0-4]\d|25[0-5])\]))$/))throw"Invalid email";return a},cli.getOptError("an email","EMAIL"))},cli.getIp=function(a){return cli.getValue(a,function(a){if(!a.match(/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/))throw"Invalid IP";return a},cli.getOptError("an IP","IP"))},cli.getPath=function(a,b){b=b||"path";return cli.getValue(a,function(a){if(a.match(/[?*:;{}]/))throw"Invalid path";return a},cli.getOptError("a "+b,b.toUpperCase()))},cli.getArrayValue=function(a,b){return cli.getValue(b,function(b){if(a.indexOf(b)===-1)throw"Unexpected value";return b},cli.getOptError("either ["+a.join("|")+"]","VALUE"))},cli.withStdin=function(a,b){typeof a==="function"&&(b=a,a="utf8");var c=process.openStdin(),d="";c.setEncoding(a),c.on("data",function(a){d+=a}),c.on("end",function(){b.apply(cli,[d])})},cli.withStdinLines=function(a){cli.withStdin(function(b){var c=b.indexOf("\r\n")!==-1?"\r\n":"\n";a.apply(cli,[b.split(c),c])})},cli.withInput=function(a,b,c){typeof b==="function"?(c=b,b="utf8"):typeof a==="function"&&(c=a,b="utf8",a="stdin");if(a==="stdin")a=process.openStdin();else try{a=cli.native.fs.createReadStream(a),a.on("error",cli.fatal)}catch(d){return cli.fatal(d)}a.setEncoding(b);var e=[],f,g;a.on("data",function(a){if(!f){if(!g)if(a.indexOf("\r\n")!==-1)g="\r\n";else if(a.indexOf("\n")!==-1)g="\n";else{last_line=a;return}e=a.split(g),a=f?null:e.pop();while(e.length)c.apply(cli,[e.shift(),g,false])}}),a.on("end",function(){f=true,data.length&&c.apply(cli,[data,g||"",false]),c.apply(cli,[null,null,true])})},cli.daemon=function(a,b){typeof daemon==="undefined"&&cli.fatal("Daemon is not initialized"),typeof a==="function"&&(b=a,a="start");var c="/tmp/"+cli.app+".pid",d="/tmp/"+cli.app+".log";var e=function(){daemon.run(d,c,function(a){if(a)return cli.error("Error starting daemon: "+a);b()})};var f=function(){try{cli.native.fs.readFileSync(c)}catch(a){return cli.error("Daemon is not running")}daemon.stop(c,function(a,b){if(a&&a.errno===3)return cli.error("Daemon is not running");if(a)return cli.error("Error stopping daemon: "+a.errno);cli.ok("Successfully stopped daemon with pid: "+b)})};switch(a){case"stop":f();break;case"restart":daemon.stop(c,function(){e()});break;case"log":try{console.log(cli.native.fs.readFileSync(d,"utf8"))}catch(g){return cli.error("No daemon log file")}break;case"pid":try{var h=cli.native.fs.readFileSync(c,"utf8");cli.native.fs.statSync("/proc/"+h),cli.info(h)}catch(g){return cli.error("Daemon is not running")}break;default:e()}},cli.main=function(a){var b=function(){a.apply(cli,[cli.args,cli.options])};enable.daemon&&daemon_arg?cli.daemon(daemon_arg,b):b()},cli.createServer=function(){var a=function(a,b,c){if(c){console.error(c.stack),b.writeHead(500,{"Content-Type":"text/plain"});return b.end(c.stack+"\n")}b.writeHead(404,{"Content-Type":"text/plain"}),b.end("Not Found\n")};var b=error=a,c=Array.prototype.slice.call(arguments);c.length&&c[0]instanceof Array&&(c=c[0]),c.reverse().forEach(function(a){var c=b;b=function(b,d){try{a(b,d,function(a){if(a)return error(b,d,a);c(b,d)})}catch(e){error(b,d,e)}}});return cli.native.http.createServer(b)},cli.exec=function(a,b,c){cli.native.child_process.exec(a,function(a,d,e){a=a||e;if(a){if(c)return c(a);return cli.fatal("exec() failed\n"+a)}b&&b(d.split("\n"))})};var last_progress_call,progress_len=74;cli.progress=function(a){if(!(a<0||a>1)){var b=(new Date).getTime();if(last_progress_call&&b-last_progress_call<100){a===1&&setTimeout(function(){cli.progress(1)},150);return}last_progress_call=b;var c=function(){if(a===1)return" 100%\n";var b=Math.floor(a*100)+"%";a<.1&&(b=" "+b);return"  "+b};var d=Math.floor(progress_len*a),e="";while(d--)e+="#";cli.native.util.print(pad(e,progress_len)+c()+"\r")}}

cli.js

@@ -26,7 +26,7 @@ /**
  //license information for either - contact me if you want your license added
-
+ 
 var cli = exports,
     argv, curr_opt, curr_val, full_opt, is_long,
     short_tags = [], opt_list, parsed = {},
-    usage, argv_parsed,
+    usage, argv_parsed, command_list,
     daemon, daemon_arg, hide_status, show_debug;
@@ -41,2 +41,3 @@
 cli.args = [];
+cli.command;
 
@@ -137,3 +138,2 @@ /**
     cli.app = arr.shift();
-    
     //Strip off argv[0] if it's 'node'
@@ -143,5 +143,3 @@ if (!keep_arg0 && 'node' === cli.app) {
     }
-    
     cli.app = cli.native.path.basename(cli.app);
-    
     argv_parsed = false;
@@ -234,4 +232,6 @@ cli.args = cli.argv = argv = arr;
  *
- * The method returns:
- *      long_tag: value
+ * `commands` is an optional array or object for apps that are of the form
+ *      my_app [OPTIONS] command [ARGS]
+ *  The command list is output with usage information + there is bundled
+ *  support for auto-completion, etc.
  *
@@ -241,9 +241,11 @@ * See README.md for more information.
  * @param {Object} opts
+ * @param {Object} commands (optional)
  * @return {Object} opts (parsed)
  * @api public
  */
-cli.parse = function (opts) {
+cli.parse = function (opts, commands) {
     var default_val, i, parsed = cli.options, seen,
         catch_all = !opts;
     opt_list = opts || {};
+    command_list = commands || [];
     while (o = cli.next()) {
@@ -358,2 +360,7 @@ seen = false;
             }
+            if (enable.help && (o === 'h' || o === 'help')) {
+                cli.getUsage();
+                console.log('HLELLO');
+                process.exit();
+            }
             if (catch_all) {
@@ -363,6 +370,2 @@ parsed[o] = curr_val || true;
             }
-            if (enable.help && (o === 'h' || o === 'help')) {
-                cli.getUsage();
-                continue;
-            }
             cli.fatal('Unknown option ' + full_opt);
@@ -381,2 +384,9 @@ }
     }
+    if (command_list) {
+        if (cli.args.length === 0) {
+            cli.fatal('A command is required' + (enable.help ? '. Please see --help for more information' : ''));
+        } else {
+            cli.command = cli.autocompleteCommand(cli.args.shift());
+        }
+    }
     cli.argc = cli.args.length;
@@ -387,2 +397,40 @@ return parsed;
 /**
+ * Helper method for matching a command from the command list.
+ *
+ * @param {String} command 
+ * @return {String} full_command
+ * @api public
+ */
+cli.autocompleteCommand = function (command) {
+    var list;
+    if (!(command_list instanceof Array)) {
+        list = Object.keys(command_list);
+    } else {
+        list = command_list;
+    }
+    var i, j = 0, c = command.length, tmp_list;
+    if (list.length === 0 || list.indexOf(command) !== -1) {
+        return command;
+    }
+    for (i = 0; i < c; i++) {
+        tmp_list = [];
+        l = list.length;
+        if (l <= 1) break;
+        for (j = 0; j < l; j++)
+            if (list[j].length >= i && list[j][i] === command[i]) 
+                tmp_list.push(list[j]);
+        list = tmp_list;
+    }
+    l = list.length;
+    if (l === 1) {
+        return list[0];
+    } else if (l === 0) {
+        cli.fatal('Unknown command "' + command + '"' + (enable.help ? '. Please see --help for more information' : ''));
+    } else {
+        list.sort();
+        cli.fatal('The command "' + command + '" is ambiguous and could mean "' + list.join('", "') + '"');
+    }
+};
+
+/**
  * Adds methods to output styled status messages to the console. 
@@ -467,2 +515,3 @@ *
         cli.version = packagejson.version;
+        cli.app = packagejson.name;
     };
@@ -529,14 +578,10 @@ var try_all = function (arr, func, err) {
     
-
     var trunc_desc = function (pref, desc, len) {
         var pref_len = pref.length,
-            desc_len = 80 - pref_len, 
+            desc_len = 65 - pref_len, 
             truncated = '';
-        
         if (desc.length <= desc_len) {
             return desc;
         }
-        
         var desc_words = desc.split(' '), chars = 0, word;
-        
         while (desc_words.length) {
@@ -550,7 +595,6 @@ truncated += (word = desc_words.shift()) + ' ';
         }
-        
         return truncated;
     };
-        
-    usage = usage || cli.app + ' [OPTIONS] [ARGS]';
+    
+    usage = usage || cli.app + ' [OPTIONS]' + (command_list ? ' command' : '') + ' [ARGS]';
     console.log('\x1b[1mUsage\x1b[0m:\n  ' + usage);
@@ -630,2 +674,13 @@ console.log('\n\x1b[1mOptions\x1b[0m: ');
     }
+    if (command_list) {
+        console.log('\n\x1b[1mCommands\x1b[0m: ');
+        var list;
+        if (command_list instanceof Array) {
+            list = command_list;
+        } else {
+            list = Object.keys(command_list);
+        }
+        command_list.sort();
+        console.log('  ' + trunc_desc('  ', command_list.join(', ')));
+    }
     process.exit();
@@ -632,0 +687,0 @@ };

examples/sort.js

@@ -11,3 +11,2 @@ #!/usr/bin/env node
 cli.withStdinLines(function (lines, newline) {
-    /*
     lines.sort(!options.numeric ? null : function (a, b) {
@@ -20,7 +19,2 @@ return parseInt(a) > parseInt(b);
     this.output(lines.join(newline));
-    */
-    for (var i = 0; i <= 100; i++) {
-        cli.progress(i);
-        sleep(1);
-    }
 });

package.json

 { "name"          : "cli",
   "description"   : "A tool for rapidly building command line apps",
-  "version"       : "0.2.2-1",
+  "version"       : "0.2.3-1",
   "homepage"      : "http://github.com/chriso/cli",
-  "keywords"      : ["cli","command line","opts","parseopt","opt","args","console","argsparse","optparse","daemon"],
+  "keywords"      : ["cli","command line","opts","parseopt","opt","args","console","argsparse","optparse","daemon","autocomplete","command","autocompletion"],
   "author"        : "Chris O'Hara <[e-mail]>",
@@ -7,0 +7,0 @@ "main"          : "cli.js",

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

62584

increased by5.97%

Number of package files

11

increased by10%

Lines of code

1155

increased by5.77%

No dependency changes