Improved parsing of command line arguments.

Author: neogeek

bin/doxdox

@@ -17,89 +17,87 @@ var input = [],
 
 var args = process.argv.slice(2);
 
-if (args.length) {
+var currentArg;
 
-    while (args.length && !args[0].match(/^\-/)) {
+while (args.length) {
 
-        input.push(args.shift());
+    currentArg = args.shift();
 
-    }
+    if (/^(?!\-).*/.test(currentArg)) {
 
-} else {
+        input.push(currentArg);
 
-    input = process.cwd();
+    } else {
 
-}
+        switch (currentArg) {
 
-while (args.length) {
+        case '-t':
+        case '--title':
 
-    switch (args.shift()) {
+            config.title = args.shift();
 
-    case '-t':
-    case '--title':
+            break;
 
-        config.title = args.shift();
+        case '-d':
+        case '--description':
 
-        break;
+            config.description = args.shift();
 
-    case '-d':
-    case '--description':
+            break;
 
-        config.description = args.shift();
+        case '-l':
+        case '--layout':
 
-        break;
+            config.layout = args.shift();
 
-    case '-l':
-    case '--layout':
+            break;
 
-        config.layout = args.shift();
+        case '-o':
+        case '--output':
 
-        break;
+            output = args.shift();
 
-    case '-o':
-    case '--output':
+            break;
 
-        output = args.shift();
+        case '-p':
+        case '--package':
 
-        break;
+            pkg = args.shift();
 
-    case '-p':
-    case '--package':
+            break;
 
-        pkg = args.shift();
+        case '-v':
+        case '--version':
 
-        break;
+            process.stdout.write(require('../package').version + '\n');
+            process.exit();
 
-    case '-v':
-    case '--version':
+            break;
 
-        process.stdout.write(require('../package').version + '\n');
-        process.exit();
+        default:
 
-        break;
+            process.stdout.write('\n');
+            process.stdout.write(chalk.blue(' Usage:') + ' doxdox <path> [options]' + '\n\n');
+            process.stdout.write(' Options:' + '\n\n');
+            process.stdout.write(chalk.yellow('  -h, --help') + '\t\t\tDisplay this help message.' + '\n');
+            process.stdout.write(chalk.yellow('  -v, --version') + '\t\t\tDisplay the current installed version.' + '\n');
+            process.stdout.write(chalk.yellow('  -t, --title') + '\t\t\tSets title.' + '\n');
+            process.stdout.write(chalk.yellow('  -d, --description') + '\t\tSets description.' + '\n');
+            process.stdout.write(chalk.yellow('  -l, --layout') + '\t\t\tTemplate to render the documentation with.' + '\n');
+            process.stdout.write(chalk.yellow('  -p, --package') + '\t\t\tSets location of package.json file.' + '\n');
+            process.stdout.write(chalk.yellow('  -o, --output') + '\t\t\tFile to save documentation to. Defaults to stdout.' + '\n');
+            process.stdout.write('\n');
+            process.stdout.write(' Available Layouts:' + '\n\n');
+            process.stdout.write('  - Bootstrap (default)\t\t(http://getbootstrap.com/)' + '\n');
+            process.stdout.write('  - Markdown\t\t\t(http://daringfireball.net/projects/markdown/)' + '\n');
+            process.stdout.write('  - Dash\t\t\t(http://kapeli.com/docsets/)' + '\n');
+            process.stdout.write('  - Wiki\t\t\t(https://help.github.com/articles/about-github-wikis/)' + '\n');
+            process.stdout.write('\n');
+            process.exit();
 
-    default:
+            break;
 
-        process.stdout.write('\n');
-        process.stdout.write(chalk.blue(' Usage:') + ' doxdox <path> [options]' + '\n\n');
-        process.stdout.write(' Options:' + '\n\n');
-        process.stdout.write(chalk.yellow('  -h, --help') + '\t\t\tDisplay this help message.' + '\n');
-        process.stdout.write(chalk.yellow('  -v, --version') + '\t\t\tDisplay the current installed version.' + '\n');
-        process.stdout.write(chalk.yellow('  -t, --title') + '\t\t\tSets title.' + '\n');
-        process.stdout.write(chalk.yellow('  -d, --description') + '\t\tSets description.' + '\n');
-        process.stdout.write(chalk.yellow('  -l, --layout') + '\t\t\tTemplate to render the documentation with.' + '\n');
-        process.stdout.write(chalk.yellow('  -p, --package') + '\t\t\tSets location of package.json file.' + '\n');
-        process.stdout.write(chalk.yellow('  -o, --output') + '\t\t\tFile to save documentation to. Defaults to stdout.' + '\n');
-        process.stdout.write('\n');
-        process.stdout.write(' Available Layouts:' + '\n\n');
-        process.stdout.write('  - Bootstrap (default)\t\t(http://getbootstrap.com/)' + '\n');
-        process.stdout.write('  - Markdown\t\t\t(http://daringfireball.net/projects/markdown/)' + '\n');
-        process.stdout.write('  - Dash\t\t\t(http://kapeli.com/docsets/)' + '\n');
-        process.stdout.write('  - Wiki\t\t\t(https://help.github.com/articles/about-github-wikis/)' + '\n');
-        process.stdout.write('\n');
-        process.exit();
-
-        break;
+        }
 
     }
 
@@ -139,6 +137,12 @@ if (!config.title) {
 
 }
 
+if (!input.length) {
+
+    input = process.cwd();
+
+}
+
 doxdox.parseInput(input, config, pkg).then(function (content) {
 
     if (output) {