@clickview/ship-it 0.0.4 → 0.0.5-rc.1

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

@@ -78,14 +78,6 @@ var GitLabApiClient = /** @class */ (function () {
                             })];
                     case 1:
                         mergeRequests = _a.sent();
-                        /**
-                         * Filter out only projectIds we care about
-                         */
-                        if (projectIds === null || projectIds === void 0 ? void 0 : projectIds.length) {
-                            mergeRequests = mergeRequests.filter(function (mr) {
-                                return projectIds.some(function (p) { return mr.project_id.toString() === p.toString(); });
-                            });
-                        }
                         return [2 /*return*/, mergeRequests.map(GitLabMapper_1.GitLabMapper.mergeRequest)];
                 }
             });
@@ -241,20 +233,23 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
-    GitLabApiClient.prototype.getMergeRequest = function (projectId, sourceBranch, targetBranch) {
+    GitLabApiClient.prototype.getMergeRequest = function (projectId, sourceBranch, targetBranch, state) {
         return __awaiter(this, void 0, void 0, function () {
-            var mergeRequests, mergeRequest;
+            var opts, mergeRequests, mergeRequest;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.client.MergeRequests.all({
+                    case 0:
+                        opts = {
                             projectId: projectId,
                             sourceBranch: sourceBranch,
-                            targetBranch: targetBranch,
-                            /**
-                             * We only care about open MRs, this allows us to close any MR and run the CLI again if needed
-                             */
-                            state: 'opened'
-                        })];
+                            targetBranch: targetBranch
+                        };
+                        /**
+                         * We only care about open MRs, this allows us to close any MR and run the CLI again if needed
+                         */
+                        if (state)
+                            opts.state = state;
+                        return [4 /*yield*/, this.client.MergeRequests.all(opts)];
                     case 1:
                         mergeRequests = _a.sent();
                         mergeRequest = mergeRequests[0];

package/lib/src/interfaces/MergeRequestState.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/interfaces/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./command-options"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./view-models"), exports);
 __exportStar(require("./Config"), exports);
+__exportStar(require("./MergeRequestState"), exports);
 __exportStar(require("./ShipItCommand"), exports);
 __exportStar(require("./ShipItTask"), exports);
 __exportStar(require("./VersionType"), exports);

package/lib/src/services/GitLabService.js

@@ -82,40 +82,51 @@ var GitLabService = /** @class */ (function () {
         this.apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var allMergeRequests, mergeRequests, projectIds, projects, mappedProjects, _i, mappedProjects_1, mappedProject, extraProjects;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (this.projects)
                             return [2 /*return*/, this.projects];
                         return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
                     case 1:
-                        allMergeRequests = _a.sent();
+                        allMergeRequests = _b.sent();
                         mergeRequests = allMergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; });
                         if (!(mergeRequests === null || mergeRequests === void 0 ? void 0 : mergeRequests.length))
                             throw new errors_1.ShipItError('Could not find any merge requests for the specified options');
                         projectIds = lodash_1.default.uniqBy(mergeRequests, function (m) { return m.projectId; }).map(function (m) { return m.projectId; });
                         return [4 /*yield*/, this.apiClient.getProjectsByIds(projectIds)];
                     case 2:
-                        projects = _a.sent();
+                        projects = _b.sent();
                         if (!(projects === null || projects === void 0 ? void 0 : projects.length) || projects.length !== projectIds.length)
                             throw new errors_1.ShipItError('Could not find all projects for the found merge requests');
                         mappedProjects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); });
                         _i = 0, mappedProjects_1 = mappedProjects;
-                        _a.label = 3;
+                        _b.label = 3;
                     case 3:
                         if (!(_i < mappedProjects_1.length)) return [3 /*break*/, 6];
                         mappedProject = mappedProjects_1[_i];
                         return [4 /*yield*/, this.getExtraProjects(mappedProject, projectIds)];
                     case 4:
-                        extraProjects = _a.sent();
+                        extraProjects = _b.sent();
                         Array.prototype.push.apply(mappedProjects, extraProjects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: [] })); }));
-                        _a.label = 5;
+                        _b.label = 5;
                     case 5:
                         _i++;
                         return [3 /*break*/, 3];
-                    case 6: return [2 /*return*/, (this.projects = mappedProjects)];
+                    case 6:
+                        /**
+                         * We need to filter our relevant projects after we've added extra projects via tags
+                         */
+                        if ((_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.length) {
+                            mappedProjects = mappedProjects.filter(function (p) {
+                                var _a;
+                                return (_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.some(function (pid) { return p.id.toString() === pid; });
+                            });
+                        }
+                        return [2 /*return*/, (this.projects = mappedProjects)];
                 }
             });
         });
@@ -254,8 +265,8 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
-    GitLabService.prototype.getMergeRequest = function (projectId, branchName) {
-        return this.apiClient.getMergeRequest(projectId, branchName, 'master');
+    GitLabService.prototype.getMergeRequest = function (projectId, branchName, state) {
+        return this.apiClient.getMergeRequest(projectId, branchName, 'master', state);
     };
     GitLabService.prototype.getMergeRequestById = function (projectId, mergeRequestId) {
         if (isNaN(+mergeRequestId))
@@ -299,7 +310,7 @@ var GitLabService = /** @class */ (function () {
             var mergeRequest;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.getMergeRequest(projectId, branchName)];
+                    case 0: return [4 /*yield*/, this.getMergeRequest(projectId, branchName, 'opened')];
                     case 1:
                         mergeRequest = _c.sent();
                         if (!mergeRequest)

package/lib/src/startup/AddMilestoneCommand.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,10 +50,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMilestoneCommandOptions = exports.getAddMilestoneCommand = void 0;
 var utils_1 = require("../utils");
 function processOptions(options) {
-    var opts = {
-        milestone: options.milestone,
-        version: 'minor'
-    };
+    var opts = __assign(__assign({}, options), { version: 'minor' });
     if (options.projectIds)
         opts.projectIds = utils_1.ProjectIds.getProjectIds(options.projectIds);
     if (options.hotfix && options.major)

package/lib/src/startup/SetupCommands.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,12 +35,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommands = void 0;
-var lodash_1 = __importDefault(require("lodash"));
 var AddMilestoneCommand_1 = require("./AddMilestoneCommand");
 var GetAction_1 = require("./GetAction");
 function setupCommands(program, container) {
@@ -77,7 +62,7 @@ function setupCommands(program, container) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    options = __assign(__assign({}, (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(lodash_1.default.omit(opts, 'triggerMonorepoBuild'))), { triggerMonorepoBuild: !!opts.triggerMonorepoBuild });
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
                     return [4 /*yield*/, getAction('release')(options)];
                 case 1:
                     _a.sent();
@@ -95,7 +80,19 @@ function setupCommands(program, container) {
         .option('-m, --milestone <milestone>')
         .option('-b, --monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
-        .action(getAction('install-packages'));
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('install-packages')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     program.command('validate-mr')
         .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
         .option('-p, --projectId <projectId>')
@@ -106,12 +103,18 @@ function setupCommands(program, container) {
         .option('-m, --milestone <milestone>')
         .option('--monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
-        .action(getAction('start-consuming-project-builds'));
-    program.command('start-consuming-project-builds')
-        .description('Trigger TeamCity builds in all consuming projects that are a part of a milestone')
-        .option('-m, --milestone <milestone>')
-        .option('--monorepoBranchName <monorepoBranchName>')
-        .option('-p, --projectIds <projectIds...>')
-        .action(getAction('start-consuming-project-builds'));
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('start-consuming-project-builds')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 }
 exports.setupCommands = setupCommands;

package/lib/src/tasks/CreateMergeRequestTask.js

@@ -80,7 +80,7 @@ var CreateMergeRequestTask = /** @class */ (function () {
                             utils_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] does not exist"));
                             return [3 /*break*/, 6];
                         }
-                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
+                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName, 'opened')];
                     case 4:
                         mergeRequest = _b.sent();
                         if (mergeRequest) {

package/lib/src/tasks/InstallPackagesTask.js

@@ -225,6 +225,8 @@ var InstallPackagesTask = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         rootDir = ROOT_DIRECTORIES[project.id];
+                        if (!rootDir)
+                            return [2 /*return*/, false];
                         return [4 /*yield*/, this.getFileText(project.id, branchName, "".concat(rootDir, "/package.json"))];
                     case 1:
                         packageJson = _a.sent();

package/lib/src/tasks/StartConsumingProjectBuildsTask.js

@@ -62,7 +62,7 @@ var StartConsumingProjectBuildsTask = /** @class */ (function () {
     }
     StartConsumingProjectBuildsTask.prototype.run = function (_options) {
         return __awaiter(this, void 0, void 0, function () {
-            var milestone, options, projects, consumingProjects, projectBuildMap, _i, consumingProjects_1, project, branchName, build, totalBuilds, project;
+            var milestone, options, projects, consumingProjects, projectBuildMap, _i, consumingProjects_1, project, branchName, buildId, build, totalBuilds, project;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -81,7 +81,7 @@ var StartConsumingProjectBuildsTask = /** @class */ (function () {
                     case 2:
                         if (!milestone)
                             return [2 /*return*/, false];
-                        utils_1.Logger.logInfo("Found milestone \"".concat(milestone, "\". Proceeding to install packages in consuming projects..."));
+                        utils_1.Logger.logInfo("Found milestone \"".concat(milestone, "\". Proceeding to run builds for consuming projects..."));
                         options = {
                             version: _options.version,
                             projectIds: _options.projectIds,
@@ -108,7 +108,12 @@ var StartConsumingProjectBuildsTask = /** @class */ (function () {
                             utils_1.Logger.logWarning("Release branch in project \"".concat(project.title, "\" with milestone \"").concat(options.milestone, "\" was not found. Skipping project..."));
                             return [3 /*break*/, 7];
                         }
-                        return [4 /*yield*/, this.teamCityService.startBuild(TeamCityBuildIDs_1.TeamCityBuildIds[project.id.toString()], branchName)];
+                        buildId = TeamCityBuildIDs_1.TeamCityBuildIds[project.id.toString()];
+                        if (!buildId) {
+                            utils_1.Logger.logWarning("Skipping build for ".concat(project.title, " as no Team City build ID has been specified"));
+                            return [3 /*break*/, 7];
+                        }
+                        return [4 /*yield*/, this.teamCityService.startBuild(buildId, branchName)];
                     case 6:
                         build = _a.sent();
                         projectBuildMap[project.title] = build;

package/lib/src/tasks/TagMasterTask.js

@@ -94,7 +94,7 @@ var TagMasterTask = /** @class */ (function () {
                             return [3 /*break*/, 7];
                         }
                         return [4 /*yield*/, this.service.createRelease(project.id, {
-                                name: "".concat(options.milestone, " Release"),
+                                name: nextVersion,
                                 tag: nextVersion,
                                 description: mergeRequest.description,
                                 ref: mergeRequest.mergeCommit,

package/lib/src/utils/Descriptions.js

@@ -7,7 +7,8 @@ var VALID_HEADINGS = {
     'customer changes': true,
     'code changes': true,
     'testing': true,
-    'notes': true
+    'notes': true,
+    'other': true
 };
 var VALID_MONOREPO_HEADINGS = {
     'common': true,
@@ -24,11 +25,12 @@ var VALID_MONOREPO_HEADINGS = {
     'testing': true,
     'dependencies': true,
     'notes': true,
-    'monorepo': true
+    'monorepo': true,
+    'before release': true
 };
 function toObject(lines, headingPrefix) {
     var obj = {};
-    var currentHeading = 'Other';
+    var currentHeading = 'other';
     for (var _i = 0, lines_1 = lines; _i < lines_1.length; _i++) {
         var line = lines_1[_i];
         // Skip empty lines
@@ -55,8 +57,9 @@ function toObject(lines, headingPrefix) {
     return obj;
 }
 exports.Descriptions = {
-    isDescriptionValid: function (description, headingPrefix) {
+    isDescriptionValid: function (description, headingPrefix, checkForTesting) {
         if (headingPrefix === void 0) { headingPrefix = '#'; }
+        if (checkForTesting === void 0) { checkForTesting = true; }
         if (!description.trim())
             return false;
         var obj = toObject(description.split('\n'), headingPrefix);
@@ -65,7 +68,7 @@ exports.Descriptions = {
             return false;
         if (keys.some(function (k) { return !VALID_HEADINGS[k]; }))
             return false;
-        if (obj['testing'] === undefined)
+        if (checkForTesting && obj['testing'] === undefined)
             return false;
         return true;
     },
@@ -78,12 +81,13 @@ exports.Descriptions = {
             return false;
         if (keys.some(function (k) { return !VALID_MONOREPO_HEADINGS[k]; }))
             return false;
-        if (!obj['testing'])
+        if (obj['testing'] === undefined)
             return false;
         var isValid = Object.keys(obj).every(function (key) {
-            if (key !== 'dependencies' && key !== 'testing')
+            if (key === 'dependencies' || key === 'testing')
                 return true;
-            return exports.Descriptions.isDescriptionValid(obj[key], '##');
+            var subValid = exports.Descriptions.isDescriptionValid(obj[key], '##', false);
+            return subValid;
         });
         return isValid;
     },

package/package.json

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