Merge pull request #291 from bebraw/book.js

Allow book.js to be used in addition to book.json

3 files changed, 10 insertions, 12 deletions

diff --git a/README.md b/README.md
index 03fa1c5..9cede83 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Options for commands `build` and `serve` are:
 ```
 -o, --output <directory>  Path to output directory, defaults to ./_book
 -f, --format <name>       Change generation format, defaults to site, availables are: site, page, ebook, json
---config <config file>    Configuration file to use, defaults to book.json
+--config <config file>    Configuration file to use, defaults to book.js or book.json
 ```
 
 GitBook loads the default configuration from a `book.json` file in the repository if it exists.
diff --git a/bin/build.js b/bin/build.js
index 35018cb..4bb6bb4 100644
--- a/bin/build.js
+++ b/bin/build.js
@@ -12,7 +12,7 @@ var buildCommand = function(command) {
     return command
     .option('-o, --output <directory>', 'Path to output directory, defaults to ./_book')
     .option('-f, --format <name>', 'Change generation format, defaults to site, availables are: '+_.keys(generators).join(", "))
-    .option('--config <config file>', 'Configuration file to use, defualt to book.json')
+    .option('--config <config file>', 'Configuration file to use, defaults to book.js or book.json')
 };
 
 
diff --git a/lib/generate/index.js b/lib/generate/index.js
index 520981c..adbcf26 100644
--- a/lib/generate/index.js
+++ b/lib/generate/index.js
@@ -54,7 +54,7 @@ var generate = function(options) {
         "output": null,
 
         // Config file (relative to input)
-        "configFile": "book.json",
+        "configFile": "book",
 
         // Output generator
         "generator": "site",
@@ -93,17 +93,15 @@ var generate = function(options) {
 
     // Read config file
     .then(function() {
-        return fs.readFile(path.resolve(options.input, options.configFile))
-        .then(function(_config) {
-            // Extend current config
-            _config = JSON.parse(_config);
-            _config = _.omit(_config, 'input', 'configFile', 'defaultsPlugins');
-
-            _.extend(options, _config);
-        }, function() {
+        try {
+            var _config = require(path.resolve(options.input, options.configFile));
+
+            _.extend(options, _.omit(_config, 'input', 'configFile', 'defaultsPlugins'));
+        }
+        catch(err) {
             // No config file: not a big deal
             return Q();
-        });
+        }
     })
 
     // Read readme