Fix defaults for configuration

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/generate/index.js b/lib/generate/index.js
index 362d613..c9d6e5c 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -49,7 +49,14 @@ var loadGenerator = function(options) {
 
 var generate = function(options) {
     // Set defaults to options
-    options = _.merge(options || {}, defaultConfig, _.defaults);
+    options = _.defaults(options || {}, {
+        // Config file (relative to input)
+        "configFile": "book",
+
+        // Output generator
+        "generator": "site"
+    });
+    //options = _.merge(options || {}, defaultConfig, _.defaults);
 
     // Validate options
     if (!options.input) {
@@ -70,6 +77,8 @@ var generate = function(options) {
             // No config file: not a big deal
             return Q();
         }
+
+        options = defaultConfig.defaults(options);
     })
 
     // Read readme