diff options
Diffstat (limited to 'lib/cli')
| -rw-r--r-- | lib/cli/helper.js | 9 | ||||
| -rw-r--r-- | lib/cli/index.js | 41 |
2 files changed, 26 insertions, 24 deletions
diff --git a/lib/cli/helper.js b/lib/cli/helper.js index e4dc8da..818fd0c 100644 --- a/lib/cli/helper.js +++ b/lib/cli/helper.js @@ -42,12 +42,13 @@ var FORMATS = { function bookCmd(fn) { return function(args, kwargs) { var input = path.resolve(args[0] || process.cwd()); - return Book.setup(nodeFS, input, { + var book = new Book({ + fs: nodeFS, + root: input, logLevel: kwargs.log - }) - .then(function(book) { - return fn(book, args.slice(1), kwargs); }); + + return fn(book, args.slice(1), kwargs); }; } diff --git a/lib/cli/index.js b/lib/cli/index.js index f1aca5e..cf0f73f 100644 --- a/lib/cli/index.js +++ b/lib/cli/index.js @@ -131,26 +131,27 @@ module.exports = { // Generate the book .then(function() { - return Book.setup(helper.nodeFS, input, { - 'logLevel': kwargs.log - }) - .then(function(book) { - return book.parse() - .then(function() { - // Add livereload plugin - book.config.set('plugins', - book.config.get('plugins') - .concat([ - { name: 'livereload' } - ]) - ); - - var Out = helper.FORMATS[kwargs.format]; - var output = new Out(book); - - return output.generate() - .thenResolve(output); - }); + var book = new Book({ + fs: helper.nodeFS, + root: input, + logLevel: kwargs.log + }); + + return book.parse() + .then(function() { + // Add livereload plugin + book.config.set('plugins', + book.config.get('plugins') + .concat([ + { name: 'livereload' } + ]) + ); + + var Out = helper.FORMATS[kwargs.format]; + var output = new Out(book); + + return output.generate() + .thenResolve(output); }); }) |