semver 5.0.1 → 5.1.1

package/.travis.yml

@@ -1,5 +1,7 @@
+sudo: false
 language: node_js
 node_js:
   - '0.10'
   - '0.12'
-  - 'iojs'
+  - '4'
+  - '5'

package/README.md

@@ -16,18 +16,35 @@ As a command-line utility:
 
     $ semver -h
 
-    Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | --preid <identifier> | -l | -rv]
-    Test if version(s) satisfy the supplied range(s), and sort them.
+    SemVer 5.1.0
 
-    Multiple versions or ranges may be supplied, unless increment
-    option is specified.  In that case, only a single version may
-    be used, and it is incremented by the specified level
+    A JavaScript implementation of the http://semver.org/ specification
+    Copyright Isaac Z. Schlueter
+
+    Usage: semver [options] <version> [<version> [...]]
+    Prints valid versions sorted by SemVer precedence
+
+    Options:
+    -r --range <range>
+            Print versions that match the specified range.
+
+    -i --increment [<level>]
+            Increment a version by the specified level.  Level can
+            be one of: major, minor, patch, premajor, preminor,
+            prepatch, or prerelease.  Default level is 'patch'.
+            Only one version may be specified.
+
+    --preid <identifier>
+            Identifier to be used to prefix premajor, preminor,
+            prepatch or prerelease version increments.
+
+    -l --loose
+            Interpret versions and ranges loosely
 
     Program exits successfully if any valid version satisfies
     all supplied ranges, and prints all satisfying versions.
 
-    If no versions are valid, or ranges are not satisfied,
-    then exits failure.
+    If no satisfying versions are found, then exits failure.
 
     Versions are printed in ascending order, so supplying
     multiple versions to the utility will just sort them.
@@ -107,7 +124,7 @@ The method `.inc` takes an additional `identifier` string argument that
 will append the value of the string as a prerelease identifier:
 
 ```javascript
-> semver.inc('1.2.3', 'pre', 'beta')
+> semver.inc('1.2.3', 'prerelease', 'beta')
 '1.2.4-beta.0'
 ```
 
@@ -228,6 +245,30 @@ zero.
 * `^1.x` := `>=1.0.0 <2.0.0`
 * `^0.x` := `>=0.0.0 <1.0.0`
 
+### Range Grammar
+
+Putting all this together, here is a Backus-Naur grammar for ranges,
+for the benefit of parser authors:
+
+```bnf
+range-set  ::= range ( logical-or range ) *
+logical-or ::= ( ' ' ) * '||' ( ' ' ) *
+range      ::= hyphen | simple ( ' ' simple ) * | ''
+hyphen     ::= partial ' - ' partial
+simple     ::= primitive | partial | tilde | caret
+primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
+partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
+xr         ::= 'x' | 'X' | '*' | nr
+nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
+tilde      ::= '~' partial
+caret      ::= '^' partial
+qualifier  ::= ( '-' pre )? ( '+' build )?
+pre        ::= parts
+build      ::= parts
+parts      ::= part ( '.' part ) *
+part       ::= nr | [-0-9A-Za-z]+
+```
+
 ## Functions
 
 All methods and classes take a final `loose` boolean argument that, if

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "semver",
-  "version": "5.0.1",
+  "version": "5.1.1",
   "description": "The semantic version parser used by npm.",
   "main": "semver.js",
   "scripts": {
     "test": "tap test/*.js"
   },
   "devDependencies": {
-    "tap": "^1.2.0",
-    "uglify-js": "~2.3.6"
+    "tap": "^2.0.0"
   },
   "license": "ISC",
   "repository": "https://github.com/npm/node-semver",

package/range.bnf

@@ -0,0 +1,16 @@
+range-set  ::= range ( logical-or range ) *
+logical-or ::= ( ' ' ) * '||' ( ' ' ) *
+range      ::= hyphen | simple ( ' ' simple ) * | ''
+hyphen     ::= partial ' - ' partial
+simple     ::= primitive | partial | tilde | caret
+primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
+partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
+xr         ::= 'x' | 'X' | '*' | nr
+nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
+tilde      ::= '~' partial
+caret      ::= '^' partial
+qualifier  ::= ( '-' pre )? ( '+' build )?
+pre        ::= parts
+build      ::= parts
+parts      ::= part ( '.' part ) *
+part       ::= nr | [-0-9A-Za-z]+

package/semver.js

@@ -332,10 +332,6 @@ SemVer.prototype.format = function() {
   return this.version;
 };
 
-SemVer.prototype.inspect = function() {
-  return '<SemVer "' + this + '">';
-};
-
 SemVer.prototype.toString = function() {
   return this.version;
 };
@@ -481,6 +477,7 @@ SemVer.prototype.inc = function(release, identifier) {
       throw new Error('invalid increment argument: ' + release);
   }
   this.format();
+  this.raw = this.version;
   return this;
 };
 
@@ -691,10 +688,6 @@ Comparator.prototype.parse = function(comp) {
     this.semver = new SemVer(m[2], this.loose);
 };
 
-Comparator.prototype.inspect = function() {
-  return '<SemVer Comparator "' + this + '">';
-};
-
 Comparator.prototype.toString = function() {
   return this.value;
 };
@@ -738,10 +731,6 @@ function Range(range, loose) {
   this.format();
 }
 
-Range.prototype.inspect = function() {
-  return '<SemVer Range "' + this.range + '">';
-};
-
 Range.prototype.format = function() {
   this.range = this.set.map(function(comps) {
     return comps.join(' ').trim();
@@ -847,7 +836,7 @@ function replaceTilde(comp, loose) {
     else if (isX(m))
       ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
     else if (isX(p))
-      // ~1.2 == >=1.2.0- <1.3.0-
+      // ~1.2 == >=1.2.0 <1.3.0
       ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
     else if (pr) {
       debug('replaceTilde pr', pr);

package/test/index.js

@@ -391,14 +391,14 @@ test('\nincrement versions test', function(t) {
     ['1.2.3-alpha.9.beta', 'prerelease', '1.2.3-alpha.10.beta', false, 'alpha'],
     ['1.2.3-alpha.10.beta', 'prerelease', '1.2.3-alpha.11.beta', false, 'alpha'],
     ['1.2.3-alpha.11.beta', 'prerelease', '1.2.3-alpha.12.beta', false, 'alpha'],
-    ['1.2.0', 'prepatch', '1.2.1-dev.0', 'dev'],
-    ['1.2.0-1', 'prepatch', '1.2.1-dev.0', 'dev'],
-    ['1.2.0', 'preminor', '1.3.0-dev.0', 'dev'],
-    ['1.2.3-1', 'preminor', '1.3.0-dev.0', 'dev'],
-    ['1.2.0', 'premajor', '2.0.0-dev.0', 'dev'],
-    ['1.2.3-1', 'premajor', '2.0.0-dev.0', 'dev'],
-    ['1.2.0-1', 'minor', '1.2.0', 'dev'],
-    ['1.0.0-1', 'major', '1.0.0', 'dev'],
+    ['1.2.0', 'prepatch', '1.2.1-dev.0', false, 'dev'],
+    ['1.2.0-1', 'prepatch', '1.2.1-dev.0', false, 'dev'],
+    ['1.2.0', 'preminor', '1.3.0-dev.0', false, 'dev'],
+    ['1.2.3-1', 'preminor', '1.3.0-dev.0', false, 'dev'],
+    ['1.2.0', 'premajor', '2.0.0-dev.0', false, 'dev'],
+    ['1.2.3-1', 'premajor', '2.0.0-dev.0', false, 'dev'],
+    ['1.2.0-1', 'minor', '1.2.0', false, 'dev'],
+    ['1.0.0-1', 'major', '1.0.0', false, 'dev'],
     ['1.2.3-dev.bar', 'prerelease', '1.2.3-dev.0', false, 'dev']
 
   ].forEach(function(v) {
@@ -410,6 +410,19 @@ test('\nincrement versions test', function(t) {
     var found = inc(pre, what, loose, id);
     var cmd = 'inc(' + pre + ', ' + what + ', ' + id + ')';
     t.equal(found, wanted, cmd + ' === ' + wanted);
+
+    var parsed = semver.parse(pre, loose);
+    if (wanted) {
+      parsed.inc(what, id);
+      t.equal(parsed.version, wanted, cmd + ' object version updated');
+      t.equal(parsed.raw, wanted, cmd + ' object raw field updated');
+    } else if (parsed) {
+      t.throws(function () {
+        parsed.inc(what, id)
+      })
+    } else {
+      t.equal(parsed, null)
+    }
   });
 
   t.end();