Build: Fix commands in Makefile.js

Author: nzakas

Makefile.js

@@ -14,7 +14,8 @@ require("shelljs/make");
 
 var checker = require("npm-license"),
     dateformat = require("dateformat"),
-    nodeCLI = require("shelljs-nodecli");
+    nodeCLI = require("shelljs-nodecli"),
+    semver = require("semver");
 
 //------------------------------------------------------------------------------
 // Settings
@@ -69,8 +70,26 @@ function release(type) {
     target.changelog();
     exec("git push origin master --tags");
     exec("npm publish");
-    target.gensite();
-    target.publishsite();
+}
+
+/**
+ * Splits a command result to separate lines.
+ * @param {string} result The command result string.
+ * @returns {array} The separated lines.
+ */
+function splitCommandResultToLines(result) {
+    return result.trim().split("\n");
+}
+
+function getVersionTags() {
+    var tags = splitCommandResultToLines(exec("git tag", { silent: true }).output);
+
+    return tags.reduce(function(list, tag) {
+        if (semver.valid(tag)) {
+            list.push(tag);
+        }
+        return list;
+    }, []).sort(semver.compare);
 }
 
 //------------------------------------------------------------------------------
@@ -97,11 +116,11 @@ target.lint = function() {
         errors++;
     }
 
-    // echo("Validating JavaScript test files");
-    // lastReturn = nodeCLI.exec("eslint", TEST_FILES);
-    // if (lastReturn.code !== 0) {
-    //     errors++;
-    // }
+    echo("Validating JavaScript test files");
+    lastReturn = nodeCLI.exec("eslint", TEST_FILES);
+    if (lastReturn.code !== 0) {
+        errors++;
+    }
 
     if (errors) {
         exit(1);
@@ -164,7 +183,7 @@ target.browserify = function() {
 target.changelog = function() {
 
     // get most recent two tags
-    var tags = exec("git tag", { silent: true }).output.trim().split(/\s/g),
+    var tags = getVersionTags(),
         rangeTags = tags.slice(tags.length - 2),
         now = new Date(),
         timestamp = dateformat(now, "mmmm d, yyyy");
@@ -188,14 +207,8 @@ target.changelog = function() {
     rm("CHANGELOG.tmp");
     rm("CHANGELOG.md");
     mv("CHANGELOG.md.tmp", "CHANGELOG.md");
-
-    // add into commit
-    exec("git add CHANGELOG.md");
-    exec("git commit --amend --no-edit");
-
 };
 
-
 target.checkLicenses = function() {
 
     function isPermissible(dependency) {

package.json

@@ -47,7 +47,7 @@
     "npm-license": "^0.2.3",
     "optimist": "~0.6.0",
     "regenerate": "~0.5.4",
-    "semver": "^4.1.0",
+    "semver": "^4.1.1",
     "shelljs": "^0.3.0",
     "shelljs-nodecli": "^0.1.1",
     "unicode-6.3.0": "~0.1.0"

tests/lib/.eslintrc

@@ -0,0 +1,2 @@
+env:
+    mocha: true

tests/lib/attach-comments.js

@@ -55,8 +55,8 @@ describe("attachComment: true", function() {
     leche.withData(testFiles, function(filename) {
 
         it("should produce correct AST when parsed with attachComments", function() {
-            var input = shelljs.cat(filename + ".src.js"),
-                output = require(path.resolve(__dirname, "../../", filename + ".ast.js"));
+            var output = require(path.resolve(__dirname, "../../", filename + ".ast.js"));
+            var input = shelljs.cat(filename + ".src.js");
 
             var result = espree.parse(input, {
                 loc: true,

tests/lib/tokenize.js

@@ -31,7 +31,6 @@
 //------------------------------------------------------------------------------
 
 var assert = require("chai").assert,
-    leche = require("leche"),
     espree = require("../../espree");
 
 //------------------------------------------------------------------------------
@@ -98,6 +97,3 @@ describe("tokenize()", function() {
 
 
 });
-
-
-