+14
-2
@@ -43,2 +43,6 @@ #!/usr/bin/env node | ||
| .alias('eval', 'e') | ||
| .describe('e', 'evaluate script') | ||
| .string('e') | ||
| .alias('v', 'version') | ||
@@ -50,3 +54,12 @@ .describe('v', 'Print version number and exit.') | ||
| if (argv._.length < 1) { | ||
| var contents = []; | ||
| if (argv.eval) { | ||
| var oldFromString = argv.fromString; | ||
| argv.fromString = true; | ||
| var content = jdists.build(argv.eval, argv); | ||
| contents.push(content); | ||
| argv.fromString = oldFromString; | ||
| } | ||
| if (argv._.length < 1 && contents.length <= 0) { | ||
| if (argv.version) { | ||
@@ -82,3 +95,2 @@ var json = require('./package.json'); | ||
| var contents = []; | ||
| var filenames = []; | ||
@@ -85,0 +97,0 @@ argv._.forEach(function (filename) { |
+2
-2
@@ -7,4 +7,4 @@ /** | ||
| * zswang (http://weibo.com/zswang) | ||
| * @version 2.1.7 | ||
| * @date 2017-07-31 | ||
| * @version 2.2.0 | ||
| * @date 2017-08-21 | ||
| */ | ||
@@ -11,0 +11,0 @@ var fs = require('fs'); |
+5
-5
@@ -7,4 +7,4 @@ /** | ||
| * zswang (http://weibo.com/zswang) | ||
| * @version 2.1.7 | ||
| * @date 2017-07-31 | ||
| * @version 2.2.0 | ||
| * @date 2017-08-21 | ||
| */ | ||
@@ -85,3 +85,3 @@ var colors = require('colors'); | ||
| var argv = options.argv || {}; | ||
| var env = options.env || {}; | ||
| var env = options.env || process.env; | ||
| var rootScope = options.rootScope || instance; | ||
@@ -164,3 +164,3 @@ var scopes = options.scopes || {}; | ||
| return argv[name]; | ||
| }, true); | ||
| }, false); | ||
| instance.getArgument = getArgument; | ||
@@ -175,3 +175,3 @@ /** | ||
| return env[name]; | ||
| }, true); | ||
| }, false); | ||
| instance.getEnvironment = getEnvironment; | ||
@@ -178,0 +178,0 @@ /** |
+1
-1
| { | ||
| "name": "jdists", | ||
| "version": "2.1.7", | ||
| "version": "2.2.0", | ||
| "description": "Code block processing tools", | ||
@@ -5,0 +5,0 @@ "main": "lib/jdists.js", |
77707
0.39%2117
0.47%8
14.29%