@clickview/ship-it 0.0.12 → 0.0.13

package/lib/src/api-clients/git-lab/GitLabApiClient.js

@@ -165,23 +165,20 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
-    GitLabApiClient.prototype.getCommitsSince = function (projectId, branchName, sinceSha) {
+    GitLabApiClient.prototype.getCommitsForRelease = function (projectId, dateSince) {
         return __awaiter(this, void 0, void 0, function () {
-            var commit, commits;
+            var commits;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.client.Commits.show(projectId, sinceSha)];
+                    case 0: return [4 /*yield*/, this.client.Commits.all(projectId, {
+                            ref_name: 'dev',
+                            since: dateSince,
+                            /**
+                             * This allows us to get merge commits of MRs being accepted
+                             */
+                            first_parent: true
+                        })];
                     case 1:
-                        commit = _a.sent();
-                        return [4 /*yield*/, this.client.Commits.all(projectId, {
-                                ref_name: branchName,
-                                since: commit.committed_date,
-                                /**
-                                 * This allows us to get merge commits of MRs being accepted
-                                 */
-                                first_parent: true
-                            })];
-                    case 2:
                         commits = _a.sent();
                         return [2 /*return*/, commits.map(GitLabMapper_1.GitLabMapper.commit)];
                 }

package/lib/src/api-clients/git-lab/GitLabMapper.js

@@ -17,7 +17,8 @@ exports.GitLabMapper = {
             targetBranch: m.target_branch,
             sourceBranch: m.source_branch,
             milestone: exports.GitLabMapper.milestone(m.milestone),
-            labels: m.labels
+            labels: m.labels,
+            dateCreated: m.created_at
         };
     },
     project: function (p) {

package/lib/src/services/GitLabService.js

@@ -205,30 +205,12 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
-    GitLabService.prototype.getDevCommitsSince = function (projectId, sinceSha) {
+    GitLabService.prototype.getCommitsForRelease = function (projectId, dateSince) {
         return __awaiter(this, void 0, void 0, function () {
-            var commits, mergeCommitIndex;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
-                    case 1:
-                        commits = _a.sent();
-                        mergeCommitIndex = commits.findIndex(function (commit) {
-                            var title = commit.title.toLowerCase();
-                            return title.includes('merge') &&
-                                title.includes('master') &&
-                                title.includes('dev');
-                        });
-                        if (mergeCommitIndex > -1)
-                            commits.splice(mergeCommitIndex, 1);
-                        /**
-                         * This is commented out right now because of a problem with the logic of this approach of validating MRs.
-                         * We need to find a way to fetch all commits that will be included in this release. Leaving this commented
-                         * until we figure that out - Sha
-                         */
-                        // if (!commits?.length)
-                        //   throw new ShipItError(`Could not find any commits in dev for projectId: ${projectId} since ${sinceSha}`);
-                        return [2 /*return*/, commits];
+                    case 0: return [4 /*yield*/, this.apiClient.getCommitsForRelease(projectId, dateSince)];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -412,9 +394,9 @@ var GitLabService = /** @class */ (function () {
      * We use the latest valid semver tag in master to determine what the current version
      * of a project is
      */
-    GitLabService.prototype.getCurrentVersionTag = function (projectId) {
+    GitLabService.prototype.getCurrentMinorVersionTag = function (projectId) {
         return __awaiter(this, void 0, void 0, function () {
-            var tags, tagNames, sortedTagNames, currentVersion, currentTag;
+            var tags, tagNames, sortedTagNames, latestMinorVersion, currentTag;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.apiClient.getLatestTags(projectId)];
@@ -425,9 +407,9 @@ var GitLabService = /** @class */ (function () {
                         tagNames = tags.map(function (t) { return t.name; }).filter(function (t) { return semver_1.default.valid(t); });
                         if (!tagNames.length)
                             return [2 /*return*/, null];
-                        sortedTagNames = semver_1.default.sort(tagNames);
-                        currentVersion = lodash_1.default.last(sortedTagNames);
-                        currentTag = tags.find(function (t) { return t.name === currentVersion; });
+                        sortedTagNames = semver_1.default.sort(tagNames).reverse();
+                        latestMinorVersion = sortedTagNames.find(function (tag) { return tag.endsWith('.0'); });
+                        currentTag = tags.find(function (t) { return t.name === latestMinorVersion; });
                         if (!currentTag)
                             return [2 /*return*/, null];
                         return [2 /*return*/, currentTag];
@@ -453,7 +435,7 @@ var GitLabService = /** @class */ (function () {
             var tag, nextVersion, branchName, branch;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCurrentVersionTag(projectId)];
+                    case 0: return [4 /*yield*/, this.getCurrentMinorVersionTag(projectId)];
                     case 1:
                         tag = _a.sent();
                         if (!tag)

package/lib/src/tasks/BumpVersionTxtTask.js

@@ -75,7 +75,7 @@ var BumpVersionTxtTask = /** @class */ (function () {
                         if (!(_i < projects_1.length)) return [3 /*break*/, 6];
                         project = projects_1[_i];
                         if (this.skip(project.id))
-                            return [2 /*return*/, false];
+                            return [3 /*break*/, 5];
                         return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
                         _a = _b.sent(), nextVersion = _a.nextVersion, branchName = _a.branchName;

package/lib/src/tasks/ValidateCommitsTask.js

@@ -59,43 +59,49 @@ var ValidateCommitsTask = /** @class */ (function () {
         this.service = service;
     }
     ValidateCommitsTask.prototype.run = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var projects, cont, _i, projects_1, project, _a, branch, tag, devCommits, shouldCherryPick;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var projects, cont, _i, projects_1, project, _b, branch, tag, previousReleaseBranchName, previousReleaseMergeRequest, devCommits, _c, shouldCherryPick, invalidCommits;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         utils_1.Logger.logTask('Validating dev commits');
                         return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        projects = _b.sent();
+                        projects = _d.sent();
                         cont = true;
                         _i = 0, projects_1 = projects;
-                        _b.label = 2;
+                        _d.label = 2;
                     case 2:
-                        if (!(_i < projects_1.length)) return [3 /*break*/, 6];
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 7];
                         project = projects_1[_i];
                         return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
-                        _a = _b.sent(), branch = _a.branch, tag = _a.tag;
+                        _b = _d.sent(), branch = _b.branch, tag = _b.tag;
                         /**
                          * If the release branch already exists, this can be skipped as this
                          * validation is only required when creating a new release
                          */
                         if (branch)
-                            return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.service.getDevCommitsSince(project.id, tag.target)];
+                            return [3 /*break*/, 6];
+                        previousReleaseBranchName = utils_1.BranchNames.getRelease(tag.name);
+                        return [4 /*yield*/, this.service.getMergeRequest(project.id, previousReleaseBranchName)];
                     case 4:
-                        devCommits = _b.sent();
-                        shouldCherryPick = utils_1.Commits.shouldCherryPick(project, devCommits);
+                        previousReleaseMergeRequest = _d.sent();
+                        return [4 /*yield*/, this.service.getCommitsForRelease(project.id, (_a = previousReleaseMergeRequest === null || previousReleaseMergeRequest === void 0 ? void 0 : previousReleaseMergeRequest.dateCreated) !== null && _a !== void 0 ? _a : '')];
+                    case 5:
+                        devCommits = _d.sent();
+                        _c = utils_1.Commits.shouldCherryPick(project, devCommits), shouldCherryPick = _c.shouldCherryPick, invalidCommits = _c.invalidCommits;
                         if (shouldCherryPick) {
-                            utils_1.Logger.logError("[".concat(project.title, "]: Requires cherrypicking"));
+                            utils_1.Logger.logError("[".concat(project.title, "]: Requires cherrypicking. These are the merge commits that either have the wrong milestone, or no milestone:"));
+                            invalidCommits.forEach(function (commit) { return utils_1.Logger.logError("- ".concat(commit.id)); });
                             cont = false;
                         }
-                        _b.label = 5;
-                    case 5:
+                        _d.label = 6;
+                    case 6:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 6:
+                    case 7:
                         if (cont)
                             utils_1.Logger.logSuccess('No projects require cherrypicking');
                         return [2 /*return*/, cont];

package/lib/src/utils/Commits.js

@@ -13,31 +13,39 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Commits = void 0;
 exports.Commits = {
-    /**
-     * Returns true if dev contains commits that are merge commits from a milestone
-     * that is beyond the current release milestone
-     */
     shouldCherryPick: function (project, commits) {
-        var _a;
-        var commitKeys = project.mergeRequests.reduce(function (prev, current) {
+        /**
+         * Build a lookup table of every merge request with the milestone we passed.
+         */
+        var mergeRequestLookup = project.mergeRequests.reduce(function (acc, current) {
             var _a;
             if (!current.mergeCommit)
-                return prev;
-            return __assign(__assign({}, prev), (_a = {}, _a[current.mergeCommit] = true, _a));
+                return acc;
+            if (current.sourceBranch === 'master')
+                return acc;
+            return __assign(__assign({}, acc), (_a = {}, _a[current.mergeCommit] = current, _a));
         }, {});
-        for (var _i = 0, commits_1 = commits; _i < commits_1.length; _i++) {
-            var commit = commits_1[_i];
-            if (!commitKeys[commit.id]) {
-                /**
-                 * Commits straight to dev will have 1 parentId, however
-                 * merge commits that are potentially targeting another milestone
-                 * will have at least 2 parent Ids.
-                 */
-                if (((_a = commit.parentIds) === null || _a === void 0 ? void 0 : _a.length) === 1)
-                    continue;
-                return true;
-            }
+        /**
+         * Loop through every single commit since the last release was created.
+         * Any commit that has more than 1 parent Id is a merge commit.
+         *
+         * Every single merge commit should have a corresponding merge request in the lookup table.
+         * If a merge commit does not have a corresponding merge request, it means that the merge request has the wrong milestone.
+         */
+        var invalidCommits = commits.filter(function (commit) {
+            var _a;
+            if (!commit.parentIds || ((_a = commit.parentIds) === null || _a === void 0 ? void 0 : _a.length) < 2)
+                return false;
+            if (commit.title.toLowerCase().includes('merge') && commit.title.includes('master') && commit.title.includes('dev'))
+                return false;
+            return !mergeRequestLookup[commit.id];
+        });
+        if (invalidCommits.length) {
+            return {
+                shouldCherryPick: true,
+                invalidCommits: invalidCommits
+            };
         }
-        return false;
+        return { shouldCherryPick: false, invalidCommits: [] };
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickview/ship-it",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {