option parsing now fully working

Author: pstadler

README.md

@@ -235,10 +235,10 @@ the `-u|--username` option:
 fly production --username=admin
 ```
 
-#### Storing and using properties depending on the target
+#### Defining and using properties depending on the target
 
-`target()` takes an optional third argument to store properties for a
-specific target. These properties can be accessed during runtime:
+`target()` takes an optional third argument to define properties used by
+this target. Values defined in this way can be accessed during runtime.
 
 ```javascript
 plan.target('staging', {...}, {
@@ -254,16 +254,16 @@ plan.target('production', {...}, {
 plan.remote(function(remote) {
   var webRoot = plan.runtime.options.webRoot;   // fly staging -> '/usr/local/www'
   var sudoUser = plan.runtime.options.sudoUser; // fly staging -> 'www'
-  remote.sudo('ls -al ' + webRoot, { user: sudoUser });
+  remote.sudo('ls -al ' + webRoot, {user: sudoUser});
 });
 ```
 
-These properties can be set or overwritten by passing them as named options
-to the `fly` command:
+Properties can be set and overwritten by passing them as named options to the
+ `fly` command.
 
 ```bash
 $ fly staging --sudoUser=foo
-// plan.runtime.options.sudoUser -> 'foo'
+# plan.runtime.options.sudoUser -> 'foo'
 ```
 
 ### <a name="flightplan.local(%5Btasks%2C%20%5Dfn)"></a>flightplan.local([tasks, ]fn) → this 

bin/fly.js

@@ -3,35 +3,50 @@
 var Liftoff = require('liftoff')
   , v8flags = require('v8flags')
   , semver = require('semver')
-  , extend = require('util-extend')
   , cliPackage = require('../package')
-  , logger = require('../lib/logger')()
-  , yargs = require('yargs');
+  , nopt = require('nopt');
 
-var argv = yargs
-  .usage('Usage: $0 [task:]destination [options]')
-  .help('help').alias('help', 'h')
-  .version(cliPackage.version, 'version').alias('version', 'v')
-  .options('flightplan', {
-    alias: 'f',
-    //default: 'flightplan.js',
-    describe: 'path to flightplan'
-  })
-  .options('username', {
-    alias: 'u',
-    describe: 'user for connecting to remote hosts'
-  })
-  .options('debug', {
-    alias: 'd',
-    describe: 'enable debug mode'
-  })
-  .options('no-color', {
-    alias: 'C',
-    describe: 'disable colors in output'
-  }).argv;
+var knownOptions = {
+  'flightplan': String,
+  'username': String,
+  'debug': Boolean,
+  'color': Boolean,
+  'version': Boolean,
+  'help': Boolean
+};
+
+var shortHands = {
+  'f': ['--flightplan'],
+  'u': ['--username'],
+  'd': ['--debug'],
+  'C': ['--no-color'],
+  'v': ['--version'],
+  'h': ['--help']
+};
+
+var options = nopt(knownOptions, shortHands, process.argv, 2);
+
+if(options.help) {
+  console.log('\n' +
+    '  Usage: fly [task:]destination [options]\n\n' +
+    '  Options:\n\n' +
+    '    -h, --help               output usage information\n' +
+    '    -V, --version            output the version number\n' +
+    '    -f, --flightplan <file>  path to flightplan\n' +
+    '    -u, --username <name>    user for connecting to remote hosts\n' +
+    '    -d, --debug              enable debug mode\n' +
+    '    -C, --no-color           disable color output\n'
+  );
+  process.exit(1);
+}
+
+if(options.version) {
+  console.log(cliPackage.version);
+  process.exit(1);
+}
 
 var task = 'default';
-var target = argv._ ? argv._[0] : null;
+var target = options.argv.remain.length ? options.argv.remain[0] : null;
 
 if(target && target.indexOf(':') !== -1) {
   target = target.split(':');
@@ -52,31 +67,31 @@ var cli = new Liftoff({
 
 var invoke = function(env) {
   if(!target) {
-    logger.error('Error: No target specified');
+    console.error('Error: No target specified');
     process.exit(1);
   }
 
   if(!env.configPath) {
-    logger.error('Error: flightplan.js not found');
+    console.error('Error: ' + (options.flightplan || 'flightplan.js') + ' not found');
     process.exit(1);
   }
 
   if(!env.modulePath) {
-    logger.error('Error: Local flightplan package not found in ' + env.cwd);
+    console.error('Error: Local flightplan package not found in ' + env.cwd);
     process.exit(1);
   }
 
   if(!semver.satisfies(env.modulePackage.version, '>=0.5.0')) {
-    logger.error('Error: local flightplan package version should be >=0.5.0');
+    console.error('Error: local flightplan package version should be >=0.5.0');
     process.exit(1);
   }
 
   process.chdir(env.configBase);
   require(env.configPath);
   var instance = require(env.modulePath);
-  instance.run(task, target, argv);
+  instance.run(task, target, options);
 };
 
 cli.launch({
-  configPath: argv.flightplan
+  configPath: options.flightplan
 }, invoke);

lib/index.js

@@ -164,10 +164,10 @@ function Flightplan() {
  * fly production --username=admin
  * ```
  *
- * #### Storing and using properties depending on the target
+ * #### Defining and using properties depending on the target
  *
- * `target()` takes an optional third argument to store properties for a
- * specific target. These properties can be accessed during runtime:
+ * `target()` takes an optional third argument to define properties used by
+ * this target. Values defined in this way can be accessed during runtime.
  *
  * ```javascript
  * plan.target('staging', {...}, {
@@ -183,16 +183,16 @@ function Flightplan() {
  * plan.remote(function(remote) {
  *   var webRoot = plan.runtime.options.webRoot;   // fly staging -> '/usr/local/www'
  *   var sudoUser = plan.runtime.options.sudoUser; // fly staging -> 'www'
- *   remote.sudo('ls -al ' + webRoot, { user: sudoUser });
+ *   remote.sudo('ls -al ' + webRoot, {user: sudoUser});
  * });
  * ```
  *
- * These properties can be set or overwritten by passing them as named options
- * to the `fly` command:
+ * Properties can be set and overwritten by passing them as named options to the
+ *  `fly` command.
  *
  * ```bash
  * $ fly staging --sudoUser=foo
- * // plan.runtime.options.sudoUser -> 'foo'
+ * # plan.runtime.options.sudoUser -> 'foo'
  * ```
  *
  * @method target(name, hosts[, options])
@@ -253,7 +253,7 @@ Flightplan.prototype.remote = function(tasksOrFn, fn) {
 Flightplan.prototype.run = function(task, target, options) {
   options = options || {};
 
-  if(options.color) {
+  if(options.color !== undefined) {
     logger.useColors(options.color);
   }
 
@@ -268,7 +268,7 @@ Flightplan.prototype.run = function(task, target, options) {
   });
 
   if(flights.length === 0) {
-    logger.warn(format('"%s" is not a valid task', task));
+    logger.error(format('No work to be done for task "%s"', task));
     process.exit(1);
   }
 

package.json

@@ -39,14 +39,14 @@
     "fibers": "^1.0.2",
     "liftoff": "^0.13.6",
     "minimist": "^1.1.0",
+    "nopt": "^3.0.1",
     "pretty-hrtime": "^0.2.2",
     "prompt": "^0.2.14",
     "semver": "^4.1.0",
     "ssh2": "^0.3.6",
     "temp-write": "^1.1.0",
     "util-extend": "^1.0.1",
-    "v8flags": "^1.0.1",
-    "yargs": "^1.3.3"
+    "v8flags": "^1.0.1"
   },
   "license": "MIT",
   "devDependencies": {