@clickview/ship-it 0.0.43-rc.1 → 0.0.43

package/Dockerfile

@@ -30,8 +30,12 @@ RUN npm link
 
 RUN cliOptions=$(echo "$options" | sed -e 's/^"//' -e 's/"$//') && \
     echo "Build option: $cliOptions" && \
-    if [ "$milestone" = "sprint" ]; then \
-        ship-it $command -s $sprint $cliOptions; \
+    if [ -n "$milestone" ]; then \
+        if [ "$milestone" = "sprint" ]; then \
+            ship-it $command -s $sprint $cliOptions; \
+        else \
+            ship-it $command -m $milestone $cliOptions; \
+        fi \
     else \
-        ship-it $command -m $milestone $cliOptions; \
+        ship-it $command $cliOptions; \
     fi

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

@@ -341,7 +341,7 @@ var GitLabApiClient = /** @class */ (function () {
                         projectId = options.projectId, sourceBranch = options.sourceBranch, targetBranch = options.targetBranch, title = options.title, description = options.description, milestone = options.milestone, removeSourceBranch = options.removeSourceBranch;
                         return [4 /*yield*/, this.client.MergeRequests.create(projectId, sourceBranch, targetBranch, title, {
                                 description: description,
-                                milestoneId: milestone.id,
+                                milestoneId: milestone === null || milestone === void 0 ? void 0 : milestone.id,
                                 assigneeId: GitLabMemberIds_1.GitLabMemberIds.SHIP_IT,
                                 removeSourceBranch: removeSourceBranch
                             })];

package/lib/src/commands/CreateHotfixCommand.js

@@ -0,0 +1,76 @@
+"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.CreateHotfixCommand = void 0;
+require("reflect-metadata");
+var inversify_1 = require("inversify");
+var types_1 = require("../types");
+var CreateHotfixCommand = /** @class */ (function () {
+    function CreateHotfixCommand(createHotfixTask) {
+        this.createHotfixTask = createHotfixTask;
+    }
+    CreateHotfixCommand.prototype.run = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.createHotfixTask.run(options)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    CreateHotfixCommand = __decorate([
+        (0, inversify_1.injectable)(),
+        __param(0, (0, inversify_1.inject)(types_1.TASKS.CreateHotfixTask)),
+        __metadata("design:paramtypes", [Object])
+    ], CreateHotfixCommand);
+    return CreateHotfixCommand;
+}());
+exports.CreateHotfixCommand = CreateHotfixCommand;

package/lib/src/commands/index.js

@@ -30,3 +30,4 @@ __exportStar(require("./TagMasterCommand"), exports);
 __exportStar(require("./ValidateMergeRequestCommand"), exports);
 __exportStar(require("./VersionCommand"), exports);
 __exportStar(require("./CreateTrelloCardsCommand"), exports);
+__exportStar(require("./CreateHotfixCommand"), exports);

package/lib/src/constants/CommandTypeMapping.js

@@ -18,5 +18,6 @@ exports.CommandTypeMapping = {
     'tag-master': types_1.COMMANDS.TagMasterCommand,
     'list-projects': types_1.COMMANDS.ListProjectsCommand,
     'create-trello-cards': types_1.COMMANDS.CreateTrelloCardsCommand,
-    'configure-projects': types_1.COMMANDS.ConfigureProjectsCommand
+    'configure-projects': types_1.COMMANDS.ConfigureProjectsCommand,
+    'create-hotfix': types_1.COMMANDS.CreateHotfixCommand
 };

package/lib/src/interfaces/command-options/CreateHotfixCommandOptions.js

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

package/lib/src/interfaces/command-options/index.js

@@ -21,4 +21,5 @@ __exportStar(require("./ValidateMRCommandOptions"), exports);
 __exportStar(require("./ReleaseCommandOptions"), exports);
 __exportStar(require("./StatusCommandOptions"), exports);
 __exportStar(require("./ConfigureProjectsOptions"), exports);
+__exportStar(require("./CreateHotfixCommandOptions"), exports);
 __exportStar(require("./ToolingReleaseCommandOptions"), exports);

package/lib/src/inversify.config.js

@@ -56,6 +56,7 @@ function createContainer(config) {
     container.bind(types_1.TASKS.AddApprovalRulesTask).to(tasks_1.AddApprovalRulesTask);
     container.bind(types_1.TASKS.EnsureApprovalRulesTask).to(EnsureApprovalRulesTask_1.EnsureApprovalRulesTask);
     container.bind(types_1.TASKS.CreateToolingBranchTask).to(tasks_1.CreateToolingBranchTask);
+    container.bind(types_1.TASKS.CreateHotfixTask).to(tasks_1.CreateHotfixTask);
     container.bind(types_1.TASKS.ChangeMilestoneTask).to(ChangeMilestoneTask_1.ChangeMilestoneTask);
     /**
      * Commands
@@ -77,6 +78,7 @@ function createContainer(config) {
     container.bind(types_1.COMMANDS.StartProjectBuildsCommand)
         .to(commands_1.StartProjectBuildsCommand);
     container.bind(types_1.COMMANDS.ConfigureProjectsCommand).to(commands_1.ConfigureProjectsCommand);
+    container.bind(types_1.COMMANDS.CreateHotfixCommand).to(commands_1.CreateHotfixCommand);
     return container;
 }
 exports.createContainer = createContainer;

package/lib/src/services/GitLabService.js

@@ -454,6 +454,28 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    GitLabService.prototype.getCurrentPatchVersionTag = function (projectId) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tags, tagNames, sortedTagNames, currentTag;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.apiClient.getLatestTags(projectId)];
+                    case 1:
+                        tags = _a.sent();
+                        if (!(tags === null || tags === void 0 ? void 0 : tags.length))
+                            throw new errors_1.ShipItError("Project ".concat(projectId, " does not have any tags"));
+                        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).reverse();
+                        currentTag = tags.find(function (t) { return t.name === sortedTagNames[0]; });
+                        if (!currentTag)
+                            return [2 /*return*/, null];
+                        return [2 /*return*/, currentTag];
+                }
+            });
+        });
+    };
     GitLabService.prototype.hasSomeTags = function (projectId) {
         return __awaiter(this, void 0, void 0, function () {
             var tags;
@@ -469,12 +491,21 @@ var GitLabService = /** @class */ (function () {
     };
     GitLabService.prototype.getNextBranchInfo = function (projectId, version) {
         return __awaiter(this, void 0, void 0, function () {
-            var tag, nextVersion, branchName, branch;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getCurrentMinorVersionTag(projectId)];
+            var tag, _a, nextVersion, branchName, branch;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!(version === 'patch')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.getCurrentPatchVersionTag(projectId)];
                     case 1:
-                        tag = _a.sent();
+                        _a = _b.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, this.getCurrentMinorVersionTag(projectId)];
+                    case 3:
+                        _a = _b.sent();
+                        _b.label = 4;
+                    case 4:
+                        tag = _a;
                         if (!tag)
                             throw new errors_1.ShipItError("Could not find the latest semver tag for projectId: ".concat(projectId));
                         nextVersion = utils_1.Versions.getNextVersion(tag.name, version);
@@ -482,8 +513,8 @@ var GitLabService = /** @class */ (function () {
                             utils_1.BranchNames.getHotfix(nextVersion) :
                             utils_1.BranchNames.getRelease(nextVersion);
                         return [4 /*yield*/, this.getBranch(projectId, branchName)];
-                    case 2:
-                        branch = _a.sent();
+                    case 5:
+                        branch = _b.sent();
                         return [2 /*return*/, {
                                 nextVersion: nextVersion,
                                 branchName: branchName,

package/lib/src/startup/SetupCommands.js

@@ -163,6 +163,15 @@ function setupCommands(program, container) {
         .requiredOption('-b, --branchName <branchName>')
         .option('-p, --preId <preId>')
         .action(getAction('bump-packages'));
+    program.command('create-hotfix')
+        .description('Creates hotfix branches for given projects')
+        .requiredOption('-p, --projectIds <projectIds...>')
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            opts.projectIds = utils_1.ProjectIds.getProjectIds(opts.projectIds);
+            return [2 /*return*/, getAction('create-hotfix')(opts)];
+        });
+    }); });
     program.command('install-packages')
         .description('Install the latest clickview npm packages in all consuming projects that are part of a milestone')
         .option('-m, --milestone <milestone>')

package/lib/src/tasks/CreateHotfixTask.js

@@ -0,0 +1,126 @@
+"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.CreateHotfixTask = void 0;
+require("reflect-metadata");
+var inversify_1 = require("inversify");
+var types_1 = require("../types");
+var services_1 = require("../services");
+var utils_1 = require("../utils");
+var CreateHotfixTask = /** @class */ (function () {
+    function CreateHotfixTask(service) {
+        this.service = service;
+    }
+    CreateHotfixTask.prototype.run = function (options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _i, _a, id, project, _b, branch, branchName, nextVersion, versionBumped, mergeRequest;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        utils_1.Logger.logTask('Creating hotfix branches');
+                        _i = 0, _a = options.projectIds;
+                        _c.label = 1;
+                    case 1:
+                        if (!(_i < _a.length)) return [3 /*break*/, 8];
+                        id = _a[_i];
+                        return [4 /*yield*/, this.service.getProject(id)];
+                    case 2:
+                        project = _c.sent();
+                        utils_1.Logger.logMessage(project.title);
+                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, 'patch')];
+                    case 3:
+                        _b = _c.sent(), branch = _b.branch, branchName = _b.branchName, nextVersion = _b.nextVersion;
+                        if (branch) {
+                            utils_1.Logger.logWarning("[".concat(project.title, "]: [").concat(branchName, "] Already exists"));
+                            return [3 /*break*/, 7];
+                        }
+                        // Create the branch
+                        return [4 /*yield*/, this.service.createBranch(project, 'master', branchName)];
+                    case 4:
+                        // Create the branch
+                        _c.sent();
+                        utils_1.Logger.logMessage("[".concat(project.title, "]: [").concat(branchName, "] Has been created"));
+                        return [4 /*yield*/, this.service.bumpVersionTxt(project.id, branchName, nextVersion)];
+                    case 5:
+                        versionBumped = _c.sent();
+                        if (versionBumped)
+                            utils_1.Logger.logMessage("[".concat(project.title, "]: Bumped to ").concat(nextVersion));
+                        else
+                            utils_1.Logger.logWarning("[".concat(project.title, "]: Has already been bumped, or does not have a version.txt"));
+                        return [4 /*yield*/, this.service.createMergeRequest({
+                                projectId: project.id,
+                                sourceBranch: branchName,
+                                targetBranch: 'master',
+                                title: branchName,
+                                description: '',
+                                milestoneName: 'hotfix',
+                                removeSourceBranch: true
+                            })];
+                    case 6:
+                        mergeRequest = _c.sent();
+                        utils_1.Logger.logMessage("[".concat(project.title, "]: MR created"));
+                        utils_1.Logger.logInfo(mergeRequest.url);
+                        _c.label = 7;
+                    case 7:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 8: return [2 /*return*/, true];
+                }
+            });
+        });
+    };
+    CreateHotfixTask = __decorate([
+        (0, inversify_1.injectable)(),
+        __param(0, (0, inversify_1.inject)(types_1.SERVICES.GitLabService)),
+        __metadata("design:paramtypes", [services_1.GitLabService])
+    ], CreateHotfixTask);
+    return CreateHotfixTask;
+}());
+exports.CreateHotfixTask = CreateHotfixTask;

package/lib/src/tasks/index.js

@@ -32,3 +32,4 @@ __exportStar(require("./ValidateMergeRequestTask"), exports);
 __exportStar(require("./ValidateTask"), exports);
 __exportStar(require("./VersionTask"), exports);
 __exportStar(require("./PopulateTrelloBoardTask"), exports);
+__exportStar(require("./CreateHotfixTask"), exports);

package/lib/src/types.js

@@ -40,6 +40,7 @@ exports.TASKS = {
     AddApprovalRulesTask: Symbol.for('AddApprovalRulesTask'),
     CreateToolingBranchTask: Symbol.for('CreateToolingBranchTask'),
     EnsureApprovalRulesTask: Symbol.for('EnsureApprovalRulesTask'),
+    CreateHotfixTask: Symbol.for('CreateHotfixTask'),
     ChangeMilestoneTask: Symbol.for('ChangeMilestoneTask'),
 };
 exports.COMMANDS = {
@@ -58,5 +59,6 @@ exports.COMMANDS = {
     TagMasterCommand: Symbol.for('TagMasterCommand'),
     ListProjectsCommand: Symbol.for('ListProjectsCommand'),
     CreateTrelloCardsCommand: Symbol.for('CreateTrelloCardsCommand'),
-    ConfigureProjectsCommand: Symbol.for('ConfigureProjectsCommand')
+    ConfigureProjectsCommand: Symbol.for('ConfigureProjectsCommand'),
+    CreateHotfixCommand: Symbol.for('CreateHotfixCommand')
 };

package/package.json

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