@clickview/ship-it 0.0.3 → 0.0.4-dev.1

package/lib/src/tasks/StartMonorepoBuildTask.js

@@ -0,0 +1,95 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StartMonorepoBuildTask = void 0;
+require("reflect-metadata");
+var inversify_1 = require("inversify");
+var utils_1 = require("../utils");
+var services_1 = require("../services");
+var types_1 = require("../types");
+var TeamCityBuildIDs_1 = require("../constants/TeamCityBuildIDs");
+var StartMonorepoBuildTask = /** @class */ (function () {
+    function StartMonorepoBuildTask(teamCityService, gitLabService) {
+        this.teamCityService = teamCityService;
+        this.gitLabService = gitLabService;
+    }
+    StartMonorepoBuildTask.prototype.run = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var branchName, build;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        utils_1.Logger.logTask('Starting Monorepo build in TeamCity');
+                        return [4 /*yield*/, this.gitLabService.getReleaseBranchNameMilestone(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.milestone)];
+                    case 1:
+                        branchName = _a.sent();
+                        if (!branchName) {
+                            utils_1.Logger.logError("Monorepo release branch with milestone \"".concat(options.milestone, "\" was not found."));
+                            return [2 /*return*/, false];
+                        }
+                        return [4 /*yield*/, this.teamCityService.startBuild(TeamCityBuildIDs_1.TeamCityBuildIds[utils_1.ProjectIds.MONOREPO_PROJECT_ID], branchName)];
+                    case 2:
+                        build = _a.sent();
+                        utils_1.Logger.logSuccess("Successfully started build in monorepo. View progress here: ".concat(build.webUrl));
+                        return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    StartMonorepoBuildTask = __decorate([
+        (0, inversify_1.injectable)(),
+        __param(0, (0, inversify_1.inject)(types_1.SERVICES.TeamCityService)),
+        __param(1, (0, inversify_1.inject)(types_1.SERVICES.GitLabService)),
+        __metadata("design:paramtypes", [services_1.TeamCityService,
+            services_1.GitLabService])
+    ], StartMonorepoBuildTask);
+    return StartMonorepoBuildTask;
+}());
+exports.StartMonorepoBuildTask = StartMonorepoBuildTask;

package/lib/src/tasks/ValidateTask.js

@@ -86,7 +86,7 @@ var ValidateTask = /** @class */ (function () {
                         utils_1.Logger.logMessage("Found ".concat(projects.length, " projects that need to be released"));
                         cont = true;
                         _loop_1 = function (project) {
-                            var groupedMRs = lodash_1.default.groupBy(project.mergeRequests, function (mr) { return mr.status; });
+                            var groupedMRs = lodash_1.default.groupBy(project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; }), function (mr) { return mr.status; });
                             var count = Object.keys(groupedMRs).reduce(function (prev, current) {
                                 var _a;
                                 return __assign(__assign({}, prev), (_a = {}, _a[current] = groupedMRs[current].length, _a));
@@ -132,7 +132,7 @@ var ValidateTask = /** @class */ (function () {
         var allNonDevMrs = [];
         for (var _i = 0, projects_2 = projects; _i < projects_2.length; _i++) {
             var project = projects_2[_i];
-            var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened'; });
+            var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened' && mr.targetBranch !== 'master'; });
             var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev' && mr.targetBranch !== 'master'; });
             if (notReadyMrs.length)
                 allNotReadyMrs.push.apply(allNotReadyMrs, notReadyMrs);

package/lib/src/tasks/index.js

@@ -21,6 +21,8 @@ __exportStar(require("./CreateBranchTask"), exports);
 __exportStar(require("./CreateMergeRequestTask"), exports);
 __exportStar(require("./CreateReleaseNotesTask"), exports);
 __exportStar(require("./InstallPackagesTask"), exports);
+__exportStar(require("./StartConsumingProjectBuildsTask"), exports);
+__exportStar(require("./StartMonorepoBuildTask"), exports);
 __exportStar(require("./ValidateCommitsTask"), exports);
 __exportStar(require("./ValidateDescriptionsTask"), exports);
 __exportStar(require("./ValidateMergeRequestTask"), exports);

package/lib/src/types.js

@@ -3,12 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.COMMANDS = exports.TASKS = exports.SERVICES = exports.API_CLIENTS = exports.MISC = void 0;
 exports.MISC = {
     GitLabConfig: Symbol.for('GitLabConfig'),
+    TeamCityConfig: Symbol.for('TeamCityConfig')
 };
 exports.API_CLIENTS = {
     GitLabApiClient: Symbol.for('GitLabApiClient'),
+    TeamCityApiClient: Symbol.for('TeamCityApiClient')
 };
 exports.SERVICES = {
     GitLabService: Symbol.for('GitLabService'),
+    TeamCityService: Symbol.for('TeamCityService')
 };
 exports.TASKS = {
     ValidateTask: Symbol.for('ValidateTask'),
@@ -22,6 +25,8 @@ exports.TASKS = {
     InstallPackagesTask: Symbol.for('InstallPackagesTask'),
     BumpPackagesTask: Symbol.for('BumpPackagesTask'),
     CommitPackageVersionsTask: Symbol.for('CommitPackageVersionsTask'),
+    StartMonorepoBuildTask: Symbol.for('StartMonorepoBuildTask'),
+    StartConsumingProjectBuildsTask: Symbol.for('StartConsumingProjectBuildsTask'),
     ValidateMergeRequestTask: Symbol.for('ValidateMergeRequestTask')
 };
 exports.COMMANDS = {
@@ -33,5 +38,6 @@ exports.COMMANDS = {
     CreateReleaseNotesCommand: Symbol.for('CreateReleaseNotesCommand'),
     InstallPackagesCommand: Symbol.for('InstallPackagesCommand'),
     BumpPackagesCommand: Symbol.for('BumpPackagesCommand'),
+    StartConsumingProjectBuildsCommand: Symbol.for('StartConsumingProjectBuildsCommand'),
     ValidateMergeRequestCommand: Symbol.for('ValidateMergeRequestCommand')
 };

package/lib/src/utils/BranchNames.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BranchNames = void 0;
 exports.BranchNames = {
     getRelease: function (version) {
+        return 'release/9.9.9';
         return "release/".concat(version);
     },
     getHotfix: function (version) {
+        return 'hotfix/9.9.9';
         return "hotfix/".concat(version);
     }
 };

package/lib/src/utils/ProjectIds.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectIds = void 0;
+exports.ProjectIds = exports.PROJECT_NAMES = void 0;
 var lodash_1 = __importDefault(require("lodash"));
 var errors_1 = require("../errors");
-var PROJECT_NAMES = {
+exports.PROJECT_NAMES = {
     monorepo: '798',
     online: '109',
     curator: '62',
@@ -28,7 +28,7 @@ exports.ProjectIds = {
                 projectIds.push(project);
                 continue;
             }
-            var mappedId = PROJECT_NAMES[project.toLowerCase()];
+            var mappedId = exports.PROJECT_NAMES[project.toLowerCase()];
             if (!mappedId)
                 throw new errors_1.ShipItError("Could not find project id mapping for ".concat(project));
             projectIds.push(mappedId);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@clickview/ship-it",
-  "version": "0.0.3",
+  "version": "0.0.4-dev.1",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {
     "ship-it": "./lib/src/index.js"
   },
   "scripts": {
-    "start": "npm run lint && ts-node src/index.ts",
+    "start": "npm run lint && ts-node --files src/index.ts",
     "build": "npm run lint && tsc -p . && tsc-alias -p tsconfig.json",
     "lint": "eslint . --ext .ts"
   },
@@ -25,7 +25,8 @@
     "inversify": "6.0.1",
     "lodash": "4.17.21",
     "reflect-metadata": "0.1.13",
-    "semver": "7.3.5"
+    "semver": "7.3.5",
+    "teamcity-rest-api": "0.0.8"
   },
   "devDependencies": {
     "@clickview/eslint-config": "1.0.3",