Fix tests

Author: SamyPesse

bin/gitbook.js

@@ -8,9 +8,7 @@ var parsedArgv = require('optimist').argv;
 var color = require('bash-color');
 
 var pkg = require('../package.json');
-var config = require('../lib/config');
 var manager = require('../lib');
-var registry = require('../lib/registry');
 var commands = require('../lib/commands');
 
 // Which book is concerned?
@@ -30,7 +28,7 @@ function runPromise(p) {
 
 
 // Init gitbook-cli
-config.init();
+manager.init();
 
 program
     .version(pkg.version)

lib/index.js

@@ -1,6 +1,7 @@
 var Q = require('q');
 var _ = require('lodash');
 
+var config = require('./config');
 var local = require('./local');
 var registry = require('./registry');
 
@@ -82,10 +83,12 @@ function updateVersion(tag) {
 }
 
 module.exports = {
+    init: config.init,
+    setRoot: config.setRoot,
+
     load: local.load,
     ensure: ensureVersion,
     ensureAndLoad: ensureAndLoad,
-    current: local.current,
     uninstall: local.remove,
     link: local.link,
     versions: local.versions,

lib/local.js

@@ -113,9 +113,9 @@ function loadVersion(version) {
 
 // Link a folder to a tag
 function linkVersion(name, folder) {
-    if (!name) return Q.reject(new Error('Need a version to represent this folder'));
-    if (!folder) return Q.reject(new Error('Need a folder'));
-    var outputFolder = path.resolve(config.VERSIONS_ROOT, version);
+    if (!name) return Q.reject(new Error('Require a name to represent this GitBook version'));
+    if (!folder) return Q.reject(new Error('Require a folder'));
+    var outputFolder = versionRoot(name);
 
     return Q.nfcall(fs.symlink.bind(fs), folder, outputFolder);
 }

test/_helper.js

@@ -1,11 +1,11 @@
 var path = require('path');
 var fs = require('fs-extra');
-var config = require('../lib/config');
+var manager = require('../lib');
 
 // Use tmp folder for testing
 before(function() {
     var gitbookFolder = path.resolve(__dirname, '../.tmp');
     fs.removeSync(gitbookFolder);
-    config.setRoot(gitbookFolder);
-    config.init();
+    manager.setRoot(gitbookFolder);
+    manager.init();
 });

test/tags.js

@@ -2,8 +2,7 @@ var should = require('should');
 var tags = require('../lib/tags');
 
 describe('Tags', function() {
-
-    describe('tags.isValid()', function() {
+    describe('.isValid()', function() {
         it('should return true for version >= 2.0.0', function() {
             tags.isValid('2.0.0').should.be.ok()
         });
@@ -13,4 +12,9 @@ describe('Tags', function() {
         });
     });
 
+    describe('.satisfies()', function() {
+        it('should return true for tag and *', function() {
+            tags.satisfies('pre', '*').should.be.ok()
+        });
+    });
 });

test/versions.js

@@ -1,16 +1,16 @@
 var path = require('path');
 var should = require('should');
 
-var versions = require('../lib/versions');
+var manager = require('../lib');
 
 describe('Versions', function() {
     this.timeout(50000);
 
-    describe('versions.available()', function() {
+    describe('.available()', function() {
         var result;
 
         before(function() {
-            return versions.available()
+            return manager.available()
             .then(function(versions) {
                 result = versions;
             });
@@ -27,11 +27,11 @@ describe('Versions', function() {
         });
     });
 
-    describe('versions.install()', function() {
+    describe('.install()', function() {
         var result;
 
         before(function() {
-            return versions.install('2.0.0')
+            return manager.install('2.0.0')
             .then(function(version) {
                 result = version;
             });
@@ -43,57 +43,58 @@ describe('Versions', function() {
         });
     });
 
-    describe('versions.current()', function() {
+    describe('.ensure()', function() {
         it('should correctly return installed version', function() {
-            return versions.current()
+            return manager.ensure(__dirname)
             .then(function(v) {
                 v.should.have.properties('version', 'path');
                 v.version.should.equal('2.0.0');
             });
         });
     });
 
-    describe('versions.list()', function() {
+    describe('.list()', function() {
         var result;
 
         before(function() {
-            result = versions.list();
+            result = manager.versions();
         });
 
         it('should correctly return the installed version', function() {
             result.should.be.an.Array();
             result.should.have.lengthOf(1);
-            result[0].should.have.properties('version', 'path');
+            result[0].should.have.properties('name', 'tag', 'version', 'path');
             result[0].version.should.equal('2.0.0');
         });
     });
 
-    describe('versions.link()', function() {
+    describe('.link()', function() {
         var localGitbook = path.resolve(__dirname, '../node_modules/gitbook');
 
         before(function() {
-            return versions.link('latest', localGitbook);
+            return manager.link('latest', localGitbook);
         });
 
         it('should correctly list latest version', function() {
-            var result = versions.list();
+            var result = manager.versions();
             result.should.have.lengthOf(2);
             result[0].should.have.properties('version', 'path');
-            result[0].tag.should.equal('latest');
+            result[0].tag.should.equal('beta');
+            result[0].name.should.equal('latest');
             result[0].link.should.equal(localGitbook);
         });
 
         it('should correctly return latest version as default one', function() {
-            return versions.current()
+            return manager.get(__dirname)
             .then(function(version) {
-                version.tag.should.equal('latest');
+                version.name.should.equal('latest');
             });
         });
     });
 
-    describe('versions.get()', function() {
+    describe('.load()', function() {
         it('should correctly return gitbook instance', function() {
-            return versions.get()
+            return manager.load(__dirname)
             .then(function(gitbook) {
                 gitbook.should.be.an.Object();
                 gitbook.should.have.properties('commands');
@@ -102,19 +103,19 @@ describe('Versions', function() {
         });
     });
 
-    describe('versions.uninstall()', function() {
+    describe('.uninstall()', function() {
         it('should correctly remove a specific version', function() {
-            return versions.uninstall('2.0.0')
+            return manager.uninstall('2.0.0')
             .then(function() {
-                var result = versions.list();
+                var result = manager.versions();
                 result.should.have.lengthOf(1);
             });
         });
 
         it('should correctly remove a version by tag', function() {
-            return versions.uninstall('latest')
+            return manager.uninstall('latest')
             .then(function() {
-                var result = versions.list();
+                var result = manager.versions();
                 result.should.have.lengthOf(0);
             });
         });