extracted args-parse.js to ender-args-parser lib

lib/main-add.js

@@ -32,8 +32,8 @@
  * module which does all the hard work.
  */
 
-var util         = require('./util')
-  , argsParse    = require('./args-parse')
+var argsParser   = require('ender-args-parser')
+  , util         = require('./util')
   , parseContext = require('./parse-context')
   , mainBuild    = require('./main-build')
 
@@ -43,7 +43,7 @@ var util         = require('./util')
       parseContext(filename, function (err, context) {
         if (err) return callback(err) // err wrapped in SourceBuild.parseContext()
         // merge commandline args with the build command in ender.js
-        options = argsParse.extend(context.options, options)
+        options = argsParser.extend(context.options, options)
         mainBuild.exec(options, out, callback)
       })
     }

lib/main-remove.js

@@ -35,9 +35,9 @@
 
 var async         = require('async')
   , repository    = require('ender-repository')
+  , argsParser    = require('ender-args-parser')
   , util          = require('./util')
   , mainBuild     = require('./main-build')
-  , argsParse     = require('./args-parse')
   , mainBuildUtil = require('./main-build-util')
   , parseContext  = require('./parse-context')
 
@@ -52,13 +52,13 @@ var async         = require('async')
           }
 
     ; delete options.use // don't want --use showing up in the 'Build:' context string
-      options.packages = [] // reset the packages list so argsParse.extend() doesn't include them
+      options.packages = [] // reset the packages list so argsParser.extend() doesn't include them
 
       parseContext(filename, function (err, context) {
         if (err) return callback(err) // wrapped in source-build.js
 
         // merge the commandline with the ender.js build command
-        options          = argsParse.extend(context.options, options)
+        options          = argsParser.extend(context.options, options)
         options.packages = options.packages.filter(function (p) {
           return packages.indexOf(p) == -1 // do the remove!
         })

lib/main.js

@@ -42,9 +42,8 @@
 process.title = 'Ender'
 
 var sysUtil    = require('util')
+  , argsParser = require('ender-args-parser')
   , Output     = require('./output/output')
-  , argsParse  = require('./args-parse')
-  , EnderError = require('./errors').EnderError
 
     // basic error handler, differentiates between 'known' EnderErrors and everything else
   , complete = function (out, callback, err) {
@@ -66,15 +65,15 @@ var sysUtil    = require('util')
       }
 
       try {
-        options = argsParse[parseType](argv)
+        options = argsParser[parseType](argv)
 
         // get the module to execute and it's partner output module
         exe = options && require('./main-' + options.main)
         out = options && require('./output/main-' + options.main + '-output').create(sysUtil, options.debug, options.quiet)
 
         if (exe && out) {
           exe.exec(options, out, complete.bind(null, out, callback))
-        } // else err? argsParse should take care of this if it's list of mains corresponds to the modules we have
+        } // else err? argsParser should take care of this if it's list of mains corresponds to the modules we have
       } catch (ex) {
         // create a generic/base 'out' module which can do the error printing
         out = Output.create(sysUtil, argv.indexOf('--debug') != -1)

lib/output/main-info-output.js

@@ -23,12 +23,12 @@
  */
 
 
-var archy     = require('archy')
-  , colors    = require('colors')
-  , extend    = require('../util').extend
-  , toKb      = require('../util').toKb
-  , Output    = require('./output')
-  , argsParse = require('../args-parse')
+var archy      = require('archy')
+  , colors     = require('colors')
+  , argsParser = require('ender-args-parser')
+  , extend     = require('../util').extend
+  , toKb       = require('../util').toKb
+  , Output     = require('./output')
 
   , InfoOutput = extend(Output, { // inherit from Output
 
@@ -45,7 +45,7 @@ var archy     = require('archy')
           prepareTree(archyTree)
 
           //this.log('Your current build type is ' + ('"' + options.main + '"').yellow)
-          this.log('Your current build command is: ' + ('ender ' + argsParse.toContextString(options)).yellow)
+          this.log('Your current build command is: ' + ('ender ' + argsParser.toContextString(options)).yellow)
           this.log(
               'Your current build size is: '
             + toKb(sizes.raw).yellow + ' raw'

lib/parse-context.js

@@ -25,11 +25,11 @@
 /******************************************************************************
  * a utility to partially read an ender build file and parse the head comment
  * to pull out the 'Build:' and 'Packages:' lines. Returns the build command as a properly
- * parsed options object (via argsParse).
+ * parsed options object (via argsParser).
  */
 
 const fs              = require('fs')
-    , argsParse       = require('./args-parse')
+    , argsParser      = require('ender-args-parser')
     , FilesystemError = require('./errors').FilesystemError
     , BuildParseError = require('./errors').BuildParseError
 
@@ -56,7 +56,7 @@ var parseContext = function (file, callback) {
             }
 
             try {
-              options = argsParse.parseClean(match[1].split(' '))
+              options = argsParser.parseClean(match[1].split(' '))
             } catch (ex) {
               error = 'Could not parse ender spec from "' + file + '"'
               return callback(new BuildParseError(error, ex))

lib/source-build.js

@@ -29,11 +29,11 @@
  * on the list of SourcePackages.
  */
 
-var async           = require('async')
-  , util            = require('./util')
-  , minify          = require('./minify')
-  , template        = require('./template')
-  , argsParse       = require('./args-parse')
+var async      = require('async')
+  , argsParser = require('ender-args-parser')
+  , util       = require('./util')
+  , minify     = require('./minify')
+  , template   = require('./template')
 
   , templateFile    = '../resources/build.mustache'
 
@@ -59,7 +59,7 @@ var async           = require('async')
             , tmplData = function (sources) {
                 return {
                     source: sources.join('\n\n')
-                  , context: argsParse.toContextString(this.options)
+                  , context: argsParser.toContextString(this.options)
                   , sandbox: !!this.options.sandbox
                   , packages: this.packages.map(function (p) {
                       return p.identifier

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ender"
   , "description": "Open Module JavaScript Framework"
-  , "version": "0.9.9-dev"
+  , "version": "0.9.10-dev"
   , "authors": [
         "Jacob Thornton @fat <jacob@twitter.com> (https://github.com/fat)"
       , "Dustin Diaz @ded <dustin@obvious.com> (https://github.com/ded)"
@@ -15,6 +15,8 @@
       , "ender-minify"     : "0.1.0"
       , "ender-dependency-graph"
                            : "0.0.1"
+      , "ender-args-parser"
+                           : "0.0.1"
       , "colors"           : "~0.6.0"
       , "async"            : "~0.1.22"
       , "hogan.js"         : "~2.0.0"