Merge branch 'master' into greenkeeper-doxdox-plugin-markdown-1.0.3

Author: neogeek

DOCUMENTATION.md

@@ -126,6 +126,7 @@ Find which node_modules directory to load package from.
 Load parser based on user defined choice.
 
     loadParser({'parser': 'dox'}).then(parser => {});
+    loadParser({'parser': 'parser.js'}).then(parser => {});
 
 
 

lib/loaders.js

@@ -45,6 +45,7 @@ const findPackagePath = pkg =>
  * Load parser based on user defined choice.
  *
  *     loadParser({'parser': 'dox'}).then(parser => {});
+ *     loadParser({'parser': 'parser.js'}).then(parser => {});
  *
  * @param {Object} config Configuration object.
  * @param {String} config.parser String representing the parser to be loaded.
@@ -54,11 +55,27 @@ const findPackagePath = pkg =>
 
 const loadParser = config => new Promise((resolve, reject) => {
 
-    findPackagePath(`doxdox-parser-${config.parser}`).then(parser => {
+    fs.stat(config.parser, (err, stats) => {
 
-        if (parser.length) {
+        if (err) {
+
+            findPackagePath(`doxdox-parser-${config.parser}`).then(parser => {
 
-            resolve(require(parser[0]));
+                if (parser.length) {
+
+                    resolve(require(parser[0]));
+
+                } else {
+
+                    reject('Invalid parser specified.');
+
+                }
+
+            });
+
+        } else if (stats && stats.isFile() && config.parser.match(JAVASCRIPT_PATTERN)) {
+
+            resolve(require(path.join(process.cwd(), config.parser)));
 
         } else {
 
@@ -117,8 +134,6 @@ const loadPlugin = config => new Promise((resolve, reject) => {
 
         }
 
-        return false;
-
     });
 
 });

package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "chalk": "1.1.3",
     "doxdox-parser-dox": "~1.0.4",
-    "doxdox-plugin-bootstrap": "~1.0.3",
+    "doxdox-plugin-bootstrap": "~1.0.4",
     "doxdox-plugin-handlebars": "~1.0.3",
     "doxdox-plugin-markdown": "~1.0.3",
     "globby": "6.1.0",