Move version check logic into its own module

Author: quaertym

lib/package.js

@@ -15,31 +15,8 @@ Package.prototype.init = function(name, versionSpecified, versionInstalled) {
 };
 
 Package.prototype.updateRequired = function() {
-  if (!this.versionInstalled) {
-    return true;
-  }
-
-  var version   = this.versionSpecified;
-  var isGitRepo = require('./git-repo');
-  var semver    = require('semver');
-
-  if (version === '*') {
-    return false;
-  } else if (isGitRepo(version)) {
-    var parts = version.split('#');
-    if (parts.length === 2) {
-      version = semver.valid(parts[1]);
-      if (!version) {
-        return false;
-      }
-    }
-  }
-
-  if (!semver.validRange(version)) {
-    return false;
-  }
-
-  return !semver.satisfies(this.versionInstalled, version);
+  var VersionChecker = require('./version-checker');
+  return !VersionChecker.satisfies(this.versionSpecified, this.versionInstalled);
 };
 
 module.exports = Package;

lib/version-checker.js

@@ -0,0 +1,35 @@
+'use strict';
+
+function VersionChecker() {
+  this.init.apply(this, arguments);
+}
+
+VersionChecker.satisfies = function(versionSpecified, versionInstalled) {
+  if (!versionInstalled) {
+    return false;
+  }
+
+  var version   = versionSpecified;
+  var isGitRepo = require('./git-repo');
+  var semver    = require('semver');
+
+  if (version === '*') {
+    return true;
+  } else if (isGitRepo(version)) {
+    var parts = version.split('#');
+    if (parts.length === 2) {
+      version = semver.valid(parts[1]);
+      if (!version) {
+        return true;
+      }
+    }
+  }
+
+  if (!semver.validRange(version)) {
+    return true;
+  }
+
+  return semver.satisfies(versionInstalled, version);
+};
+
+module.exports = VersionChecker;

tests/unit/version-checker-test.js

@@ -0,0 +1,58 @@
+'use strict';
+
+var assert         = require('chai').assert;
+var VersionChecker = require('../../lib/version-checker');
+
+describe('VersionChecker', function() {
+  describe('does satisfy version', function() {
+    it('when the version specified is \'*\'', function() {
+      assert.ok(VersionChecker.satisfies('*','1.2.0'));
+    });
+
+    it('when the version installed is in the specified range', function() {
+      assert.ok(VersionChecker.satisfies('>1.1.0','2.0.0'));
+      assert.ok(VersionChecker.satisfies('~1.1.0','1.1.4'));
+      assert.ok(VersionChecker.satisfies('^1.1.0','1.2.0'));
+      assert.ok(VersionChecker.satisfies('1.x','1.2.0'));
+    });
+
+    it('when the version installed matches the version specified', function() {
+      assert.ok(VersionChecker.satisfies('1.2.0','1.2.0'));
+    });
+
+    it('when the version specified is not a valid range', function() {
+      assert.ok(VersionChecker.satisfies('a.b.c','1.2.0'));
+    });
+
+    it('when the version specified is git-repo with a matched version', function() {
+      assert.ok(VersionChecker.satisfies('git://github.com/stefanpenner/ember-cli.git#v0.1.0','0.1.0'));
+    });
+
+    it('when the version specified is git-repo with a non-semver tag', function() {
+      assert.ok(VersionChecker.satisfies('git://github.com/stefanpenner/ember-cli.git#master','0.1.0'));
+    });
+  });
+
+  describe('does not satisfy version', function() {
+    it('when the version installed is empty', function() {
+      assert.notOk(VersionChecker.satisfies('1.2.0',null));
+      assert.notOk(VersionChecker.satisfies('1.2.0',undefined));
+      assert.notOk(VersionChecker.satisfies('1.2.0',''));
+    });
+
+    it('when the version installed is in the specified range', function() {
+      assert.notOk(VersionChecker.satisfies('>1.1.0','0.1.0'));
+      assert.notOk(VersionChecker.satisfies('~1.1.0','0.1.0'));
+      assert.notOk(VersionChecker.satisfies('^1.1.0','0.1.0'));
+      assert.notOk(VersionChecker.satisfies('1.x','0.1.0'));
+    });
+
+    it('when the version installed does not match the version specified', function() {
+      assert.notOk(VersionChecker.satisfies('1.3.0','1.2.0'));
+    });
+
+    it('when the version specified is git-repo with a non-matched version', function() {
+      assert.notOk(VersionChecker.satisfies('git://github.com/stefanpenner/ember-cli.git#v0.1.0','1.0.0'));
+    });
+  });
+});