Fixed regression with output generated via non-promise logic.

Improved promise handling logic.

Author: neogeek

bin/doxdox

@@ -139,4 +139,8 @@ doxdox.parseInput(input, config, pkg).then(function (content) {
 
     }
 
+}).catch(function (err) {
+
+    console.error(err);
+
 });

lib/doxdox.js

@@ -78,13 +78,21 @@ module.exports.parseScripts = function (scripts, config, pkg) {
 
     });
 
-    if (exports.templates[config.layout.toLowerCase()]) {
+    try {
 
-        template = exports.templates[config.layout.toLowerCase()];
+        if (exports.templates[config.layout.toLowerCase()]) {
 
-    } else if (fs.existsSync(path.resolve(config.layout))) {
+            template = exports.templates[config.layout.toLowerCase()];
 
-        template = require(path.resolve(config.layout));
+        } else if (fs.existsSync(path.resolve(config.layout))) {
+
+            template = require(path.resolve(config.layout));
+
+        }
+
+    } catch (e) {
+
+        deferred.reject(new Error('Invalid layout specified.'));
 
     }
 
@@ -105,11 +113,15 @@ module.exports.parseScripts = function (scripts, config, pkg) {
 
             });
 
+        } else {
+
+            deferred.resolve(content);
+
         }
 
     } else {
 
-        console.error('Invalid layout specified.\n');
+        deferred.reject(new Error('Invalid layout specified.'));
 
     }
 

lib/utils.js

@@ -82,7 +82,9 @@ module.exports.buildDashDocSet = function (input) {
 
     });
 
-    db.close(function () {
+    db.close(function (err) {
+
+        if (err) { return deferred.reject(err); }
 
         zip.addFile(
             input.title + '.docset/Contents/Resources/docSet.dsidx',