Merge branch 'master' of github.com:mozilla/jpm into 147 r=@erikvold

Conflicts: package.json
erikvold · Aug 26, 2014 · ed278ae · ed278ae
2 parents 0bc72ea + d0f0003
commit ed278ae
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/lib/init-input.js b/lib/init-input.js
@@ -1,5 +1,6 @@
 var path = require("path");
 var MIN_VERSION = require("./settings").MIN_VERSION;
+var semver = require("semver");
 
 module.exports = {
   "title": prompt("title", "My Jetpack Addon", identity),
@@ -45,10 +46,8 @@ function sanitizeName (name) {
  * @return {String}
  */
 
-function sanitizeVersion (ver) {
-  if (/^\d+\.\d+\.\d+$/.test(ver))
-    return ver;
-  return "0.0.0";
+function sanitizeVersion (version) {
+  return semver.valid(version) || "0.0.0";
 }
 
 /**

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "semver": "2.2.1",
     "mozilla-version-comparator": "1.0.2",
     "mozilla-toolkit-versioning": "0.0.1",
-    "jetpack-validation": "0.0.3",
+    "jetpack-validation": "0.0.4",
     "winreg": "0.0.12",
     "xml-escape": "1.0.0"
   },

diff --git a/test/functional/test.init.js b/test/functional/test.init.js
@@ -130,6 +130,18 @@ describe("jpm init", function () {
     });
   });
 
+  it("allows non-numeric version strings", function (done) {
+    process.chdir(utils.tmpOutputDir);
+    var responses = ["", "", "v0.4.0-rc4", "", "", "", "", "", "yes"];
+
+    var proc = respond(exec("init"), responses.map(function (val) {
+      return val + '\n';
+    }));
+    proc.on("close", function () {
+      var manifest = JSON.parse(fs.readFileSync(path.join(utils.tmpOutputDir, "package.json"), "utf-8"));
+      expect(manifest.version).to.be.equal("0.4.0-rc4")
+    });
+  });
 });
 
 /**