Complete loading

Author: SamyPesse

bin/gitbook.js

@@ -47,6 +47,7 @@ program
         if (versions.length > 0) {
             console.log('GitBook Versions Installed:');
             console.log('');
+
             _.each(versions,function(v, i) {
                 var text = v.name;
                 if (v.name != v.version) text += ' [' + v.version + ']';
@@ -120,7 +121,6 @@ program
         runPromise(
             manager.link(version, folder)
             .then(function() {
-                console.log('');
                 console.log(color.green('GitBook '+version+' point to '+folder));
             })
         );
@@ -160,7 +160,7 @@ program
     .description('List commands for GitBook')
     .action(function(){
         runPromise(
-            manager.load(program.gitbook)
+            manager.ensureAndLoad(bookRoot, program.gitbook)
             .get('commands')
             .then(commands.help)
         );
@@ -174,7 +174,7 @@ program
         var kwargs = _.omit(parsedArgv, '$0', '_');
 
         runPromise(
-            manager.load(program.gitbook)
+            manager.ensureAndLoad(bookRoot, program.gitbook)
             .then(function(gitbook) {
                 return commands.exec(gitbook.commands, commandName, args, kwargs);
             })

lib/commands.js

@@ -4,7 +4,7 @@ var _ = require('lodash');
 // It prints the command and its description, then all the options
 function help(commands) {
     _.each(commands, function(command) {
-        console.log('  '+command.name, '\t', command.description);
+        console.log('    '+command.name, '\t', command.description);
         _.each(command.options || [], function(option) {
             var after = [];
 
@@ -14,7 +14,7 @@ function help(commands) {
             if (after.length > 0) after = "("+after.join("; ")+")";
             else after = "";
 
-            console.log('    --'+option.name, '\t', option.description, after);
+            console.log('        --'+option.name, '\t', option.description, after);
         });
         console.log('');
     });

lib/index.js

@@ -41,6 +41,14 @@ function ensureVersion(bookRoot, version, opts) {
     });
 }
 
+// Ensure a version exists (or install it)
+// Then load it and returns the gitbook instance
+function ensureAndLoad(bookRoot, version, opts) {
+    return ensureVersion(bookRoot, version, opts)
+    .then(function(version) {
+        return local.load(version);
+    });
+}
 
 // Update current version
 //   -> Check that a newer version exists
@@ -76,6 +84,7 @@ function updateVersion(tag) {
 module.exports = {
     load: local.load,
     ensure: ensureVersion,
+    ensureAndLoad: ensureAndLoad,
     current: local.current,
     uninstall: local.remove,
     link: local.link,

lib/local.js

@@ -95,7 +95,7 @@ function removeVersion(version) {
 
 // Load a gitbook version
 function loadVersion(version) {
-    return resolveVersion(version)
+    return Q(_.isString(version)? resolveVersion(version) : version)
     .then(function(resolved) {
         var gitbook;