Add CLI -c --config to set the path to the configuration file.

Author: rottmann

bin/apidoc

@@ -30,6 +30,8 @@ var argv = nomnom
     .option('template', { abbr: 't', 'default': path.join(__dirname, '../template/'),
             help: 'Use template for output files.' })
 
+    .option('config', { abbr: 'c', 'default': './', help: 'Path to config file (apidoc.json)' })
+
     .option('verbose', { abbr: 'v', flag: true, 'default': false, help: 'Verbose debug output.' })
 
     .option('help', { abbr: 'h', flag: true, help: 'Show this help information.' })
@@ -87,6 +89,7 @@ var options = {
     src           : argv['input'],
     dest          : argv['output'],
     template      : argv['template'],
+    config        : argv['config'],
     verbose       : argv['verbose'],
     debug         : argv['debug'],
     parse         : argv['parse'],

lib/package_info.js

@@ -45,7 +45,7 @@ PackageInfo.prototype.get = function() {
     _.extend(result, this._getHeaderFooter(result));
 
     if (Object.keys(apidocJson).length === 0 && ! packageJson.apidoc)
-        app.log.warn('Please create an apidoc.json.');
+        app.log.warn('Please create an apidoc.json configuration file.');
 
     return result;
 };
@@ -60,17 +60,16 @@ PackageInfo.prototype.get = function() {
  */
 PackageInfo.prototype._readPackageData = function(filename) {
     var result = {};
-    //var jsonFilename = path.join(app.options.src, filename);
     var dir = this._resolveSrcPath();
     var jsonFilename = path.join(dir, filename);
 
-    // read from source dir
+    // Read from source dir
     if ( ! fs.existsSync(jsonFilename)) {
-        // read vom current dir
-        jsonFilename = './' + filename;
+        // Read from config dir (default './')
+        jsonFilename = path.join(app.options.config, filename);
     }
     if ( ! fs.existsSync(jsonFilename)) {
-        app.log.debug(filename + ' not found!');
+        app.log.debug(jsonFilename + ' not found!');
     } else {
         try {
             result = JSON.parse( fs.readFileSync(jsonFilename, 'utf8') );