@clickview/ship-it 0.0.4-dev.5 → 0.0.4

package/lib/src/tasks/{CommitLocalPackagesTask.js → TagMasterTask.js}

@@ -47,91 +47,76 @@ 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.CommitLocalPackagesTask = void 0;
+exports.TagMasterTask = void 0;
 require("reflect-metadata");
-var fs_1 = __importDefault(require("fs"));
 var inversify_1 = require("inversify");
+var Logger_1 = require("../utils/Logger");
 var types_1 = require("../types");
 var services_1 = require("../services");
-var MonorepoPackageJsonFiles_1 = require("../constants/MonorepoPackageJsonFiles");
-var utils_1 = require("../utils");
-var CommitLocalPackagesTask = /** @class */ (function () {
-    function CommitLocalPackagesTask(service) {
+var TagMasterTask = /** @class */ (function () {
+    function TagMasterTask(service) {
         this.service = service;
     }
-    CommitLocalPackagesTask.prototype.run = function (options) {
+    TagMasterTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var mergeRequest, commitFiles;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var projects, cont, _i, projects_1, project, _a, branchName, nextVersion, mergeRequest, existingTag;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        utils_1.Logger.logTask('Committing clickview npm package versions');
-                        return [4 /*yield*/, this.service.getMergeRequest(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
+                        Logger_1.Logger.logTask('Tagging master');
+                        return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        mergeRequest = _a.sent();
-                        return [4 /*yield*/, this.getCommitFiles()];
+                        projects = _b.sent();
+                        cont = true;
+                        _i = 0, projects_1 = projects;
+                        _b.label = 2;
                     case 2:
-                        commitFiles = _a.sent();
-                        console.log('commit files', commitFiles);
-                        // await this.service.commit(
-                        //   ProjectIds.MONOREPO_PROJECT_ID,
-                        //   options.branchName,
-                        //   'Bump package versions',
-                        //   commitFiles
-                        // );
-                        return [2 /*return*/, true];
-                }
-            });
-        });
-    };
-    CommitLocalPackagesTask.prototype.getCommitFiles = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var commitFiles, _i, MONOREPO_PACKAGE_JSON_FILES_1, filePath;
-            return __generator(this, function (_a) {
-                commitFiles = [];
-                for (_i = 0, MONOREPO_PACKAGE_JSON_FILES_1 = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES; _i < MONOREPO_PACKAGE_JSON_FILES_1.length; _i++) {
-                    filePath = MONOREPO_PACKAGE_JSON_FILES_1[_i];
-                    console.log('reading file', filePath);
-                    commitFiles.push({
-                        filePath: filePath,
-                        content: fs_1.default.readFileSync(filePath, { encoding: 'utf8' })
-                    });
+                        if (!(_i < projects_1.length)) return [3 /*break*/, 8];
+                        project = projects_1[_i];
+                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
+                    case 3:
+                        _a = _b.sent(), branchName = _a.branchName, nextVersion = _a.nextVersion;
+                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
+                    case 4:
+                        mergeRequest = _b.sent();
+                        if (!(mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.mergeCommit)) {
+                            Logger_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] has not been merged"));
+                            cont = false;
+                            return [3 /*break*/, 7];
+                        }
+                        return [4 /*yield*/, this.service.getTag(project.id, nextVersion)];
+                    case 5:
+                        existingTag = _b.sent();
+                        if (existingTag) {
+                            Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(existingTag.name, "] tag already exists"));
+                            cont = false;
+                            return [3 /*break*/, 7];
+                        }
+                        return [4 /*yield*/, this.service.createRelease(project.id, {
+                                name: "".concat(options.milestone, " Release"),
+                                tag: nextVersion,
+                                description: mergeRequest.description,
+                                ref: mergeRequest.mergeCommit,
+                                milestones: [options.milestone]
+                            })];
+                    case 6:
+                        _b.sent();
+                        Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(nextVersion, "] was created"));
+                        _b.label = 7;
+                    case 7:
+                        _i++;
+                        return [3 /*break*/, 2];
+                    case 8: return [2 /*return*/, cont];
                 }
-                return [2 /*return*/, commitFiles];
             });
         });
     };
-    CommitLocalPackagesTask = __decorate([
-        inversify_1.injectable(),
-        __param(0, inversify_1.inject(types_1.SERVICES.GitLabService)),
+    TagMasterTask = __decorate([
+        (0, inversify_1.injectable)(),
+        __param(0, (0, inversify_1.inject)(types_1.SERVICES.GitLabService)),
         __metadata("design:paramtypes", [services_1.GitLabService])
-    ], CommitLocalPackagesTask);
-    return CommitLocalPackagesTask;
+    ], TagMasterTask);
+    return TagMasterTask;
 }());
-exports.CommitLocalPackagesTask = CommitLocalPackagesTask;
-// function getPackageJsonPaths(): string[] {
-//   const packageJsonPaths: string[] = [];
-//   // Walk through the file system and push the path of each package.json file to the array
-//   function findPackageJsonPathsInDirectory(startPath: string) {
-//     const files = fs.readdirSync(startPath);
-//     files.forEach(file => {
-//       const filename = path.join(startPath, file);
-//       const stat = fs.lstatSync(filename);
-//       if (stat.isDirectory())
-//         return findPackageJsonPathsInDirectory(filename);
-//       if (!filename.includes('package.json'))
-//         return;
-//       // Ignore any `package.json` files found under `node_modules`
-//       if (filename.includes('node_modules'))
-//         return;
-//       packageJsonPaths.push(filename);
-//     });
-//   };
-//   const packagesRoot = path.resolve(__dirname, '../../../packages');
-//   findPackageJsonPathsInDirectory(packagesRoot); // Start from the `/packages` folder
-//   return packageJsonPaths;
-// }
+exports.TagMasterTask = TagMasterTask;

package/lib/src/tasks/ValidateDescriptionsTask.js

@@ -63,15 +63,16 @@ var ValidateDescriptionsTask = /** @class */ (function () {
         this.service = service;
     }
     ValidateDescriptionsTask.prototype.run = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var projects, cont, _i, projects_1, project, invalidMrs, mergeRequestsTargetingDev, _a, mergeRequestsTargetingDev_1, mr, isDescriptionValid, groupedByUser, key, _b, _c, mr;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var projects, cont, _i, projects_1, project, invalidMrs, mergeRequestsTargetingDev, _b, mergeRequestsTargetingDev_1, mr, isMonorepo, isMrValid, groupedByUser, key, _c, _d, mr;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         utils_1.Logger.logTask('Validating descriptions');
                         return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        projects = _d.sent();
+                        projects = _e.sent();
                         cont = true;
                         for (_i = 0, projects_1 = projects; _i < projects_1.length; _i++) {
                             project = projects_1[_i];
@@ -79,21 +80,24 @@ var ValidateDescriptionsTask = /** @class */ (function () {
                             mergeRequestsTargetingDev = project.mergeRequests.filter(function (mergeRequest) {
                                 return mergeRequest.targetBranch === 'dev';
                             });
-                            for (_a = 0, mergeRequestsTargetingDev_1 = mergeRequestsTargetingDev; _a < mergeRequestsTargetingDev_1.length; _a++) {
-                                mr = mergeRequestsTargetingDev_1[_a];
-                                isDescriptionValid = project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID ?
+                            for (_b = 0, mergeRequestsTargetingDev_1 = mergeRequestsTargetingDev; _b < mergeRequestsTargetingDev_1.length; _b++) {
+                                mr = mergeRequestsTargetingDev_1[_b];
+                                isMonorepo = project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID;
+                                isMrValid = isMonorepo ?
                                     utils_1.Descriptions.isMonorepoDescriptionValid(mr.description) :
                                     utils_1.Descriptions.isDescriptionValid(mr.description);
-                                if (!isDescriptionValid)
+                                if (isMonorepo && !((_a = mr.labels) === null || _a === void 0 ? void 0 : _a.length))
+                                    isMrValid = false;
+                                if (!isMrValid)
                                     invalidMrs.push(mr);
                             }
                             if (invalidMrs.length) {
-                                utils_1.Logger.logError("\n[".concat(project.title, "] has invalid MR descriptions"));
+                                utils_1.Logger.logError("\n[".concat(project.title, "] has invalid MRs"));
                                 groupedByUser = lodash_1.default.groupBy(invalidMrs, function (mr) { return mr.author; });
                                 for (key in groupedByUser) {
                                     utils_1.Logger.logMessage(key);
-                                    for (_b = 0, _c = groupedByUser[key]; _b < _c.length; _b++) {
-                                        mr = _c[_b];
+                                    for (_c = 0, _d = groupedByUser[key]; _c < _d.length; _c++) {
+                                        mr = _d[_c];
                                         utils_1.Logger.logMessage("- ".concat(mr.url));
                                     }
                                 }

package/lib/src/tasks/ValidateMergeRequestTask.js

@@ -60,19 +60,20 @@ var ValidateMergeRequestTask = /** @class */ (function () {
         this.service = service;
     }
     ValidateMergeRequestTask.prototype.run = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var project, mergeRequestId, mergeRequest, isDescriptionValid;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var project, mergeRequestId, mergeRequest, isMonorepo, isDescriptionValid;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         Logger_1.Logger.logTask('Validating Merge Request');
                         return [4 /*yield*/, this.service.getProject(options.projectId)];
                     case 1:
-                        project = _a.sent();
+                        project = _b.sent();
                         mergeRequestId = options.branchName.replace('merge-requests/', '');
                         return [4 /*yield*/, this.service.getMergeRequestById(project.id, mergeRequestId)];
                     case 2:
-                        mergeRequest = _a.sent();
+                        mergeRequest = _b.sent();
                         if (!mergeRequest) {
                             Logger_1.Logger.logError("Could not find merge request [".concat(project.title, "]: [").concat(options.branchName, "]"));
                             return [2 /*return*/, false];
@@ -85,7 +86,12 @@ var ValidateMergeRequestTask = /** @class */ (function () {
                             Logger_1.Logger.logError("Merge request does not have a milestone");
                             return [2 /*return*/, false];
                         }
-                        isDescriptionValid = project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID ?
+                        isMonorepo = project.id.toString() === utils_1.ProjectIds.MONOREPO_PROJECT_ID;
+                        if (isMonorepo && !((_a = mergeRequest.labels) === null || _a === void 0 ? void 0 : _a.length)) {
+                            Logger_1.Logger.logError('Monorepo MRs must have labels');
+                            return [2 /*return*/, false];
+                        }
+                        isDescriptionValid = isMonorepo ?
                             utils_1.Descriptions.isMonorepoDescriptionValid(mergeRequest.description) :
                             utils_1.Descriptions.isDescriptionValid(mergeRequest.description);
                         if (!isDescriptionValid) {

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.filter(function (mr) { return mr.targetBranch !== 'master'; }), function (mr) { return mr.status; });
+                            var groupedMRs = lodash_1.default.groupBy(project.mergeRequests, 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));
@@ -95,7 +95,7 @@ var ValidateTask = /** @class */ (function () {
                             /**
                              * Any MRs that are not targeting dev should not have a milestone
                              */
-                            var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev' && mr.targetBranch !== 'master'; });
+                            var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev'; });
                             if (nonDevMrs.length)
                                 ready = false;
                             if (!ready)
@@ -132,8 +132,8 @@ 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' && mr.targetBranch !== 'master'; });
-            var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev' && mr.targetBranch !== 'master'; });
+            var notReadyMrs = project.mergeRequests.filter(function (mr) { return mr.status === 'opened'; });
+            var nonDevMrs = project.mergeRequests.filter(function (mr) { return mr.targetBranch !== 'dev'; });
             if (notReadyMrs.length)
                 allNotReadyMrs.push.apply(allNotReadyMrs, notReadyMrs);
             if (nonDevMrs.length)

package/lib/src/tasks/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./CreateReleaseNotesTask"), exports);
 __exportStar(require("./InstallPackagesTask"), exports);
 __exportStar(require("./StartConsumingProjectBuildsTask"), exports);
 __exportStar(require("./StartMonorepoBuildTask"), exports);
+__exportStar(require("./TagMasterTask"), exports);
 __exportStar(require("./ValidateCommitsTask"), exports);
 __exportStar(require("./ValidateDescriptionsTask"), exports);
 __exportStar(require("./ValidateMergeRequestTask"), exports);

package/lib/src/types.js

@@ -25,9 +25,10 @@ exports.TASKS = {
     InstallPackagesTask: Symbol.for('InstallPackagesTask'),
     BumpPackagesTask: Symbol.for('BumpPackagesTask'),
     CommitPackageVersionsTask: Symbol.for('CommitPackageVersionsTask'),
+    ValidateMergeRequestTask: Symbol.for('ValidateMergeRequestTask'),
     StartMonorepoBuildTask: Symbol.for('StartMonorepoBuildTask'),
     StartConsumingProjectBuildsTask: Symbol.for('StartConsumingProjectBuildsTask'),
-    ValidateMergeRequestTask: Symbol.for('ValidateMergeRequestTask')
+    TagMasterTask: Symbol.for('TagMasterTask')
 };
 exports.COMMANDS = {
     StatusCommand: Symbol.for('StatusCommand'),
@@ -38,6 +39,7 @@ exports.COMMANDS = {
     CreateReleaseNotesCommand: Symbol.for('CreateReleaseNotesCommand'),
     InstallPackagesCommand: Symbol.for('InstallPackagesCommand'),
     BumpPackagesCommand: Symbol.for('BumpPackagesCommand'),
+    ValidateMergeRequestCommand: Symbol.for('ValidateMergeRequestCommand'),
     StartConsumingProjectBuildsCommand: Symbol.for('StartConsumingProjectBuildsCommand'),
-    ValidateMergeRequestCommand: Symbol.for('ValidateMergeRequestCommand')
+    TagMasterCommand: Symbol.for('TagMasterCommand')
 };

package/lib/src/utils/BranchNames.js

@@ -3,11 +3,9 @@ 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

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectIds = exports.PROJECT_NAMES = void 0;
-var lodash_1 = __importDefault(require("lodash"));
 var errors_1 = require("../errors");
 exports.PROJECT_NAMES = {
     monorepo: '798',
@@ -24,7 +20,7 @@ exports.ProjectIds = {
         var projectIds = [];
         for (var _i = 0, projects_1 = projects; _i < projects_1.length; _i++) {
             var project = projects_1[_i];
-            if (lodash_1.default.isNumber(project)) {
+            if (!isNaN(+project)) {
                 projectIds.push(project);
                 continue;
             }

package/lib/src/utils/Versions.js

@@ -7,7 +7,6 @@ exports.Versions = void 0;
 var semver_1 = __importDefault(require("semver"));
 exports.Versions = {
     getNextVersion: function (currentVersion, type) {
-        return '9.9.9';
         var curr = new semver_1.default.SemVer(currentVersion);
         switch (type) {
             case 'major':

package/package.json

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