@clickview/ship-it 0.0.2-dev.2 → 0.0.2

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

@@ -52,7 +52,7 @@ exports.GitLabApiClient = void 0;
 require("reflect-metadata");
 var inversify_1 = require("inversify");
 var node_1 = require("@gitbeaker/node");
-var types_1 = require("types");
+var types_1 = require("../types");
 var GitLabApiClient = /** @class */ (function () {
     function GitLabApiClient(config) {
         this._config = config;

package/lib/src/api-clients/index.js

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./git-lab/GitLabApiClient"), exports);
+__exportStar(require("./GitLabApiClient"), exports);

package/lib/src/commands/BumpPackagesCommand.js

@@ -53,22 +53,15 @@ require("reflect-metadata");
 var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var BumpPackagesCommand = /** @class */ (function () {
-    function BumpPackagesCommand(bumpPackagesTask, commitPackageVersionsTask) {
-        this.bumpPackagesTask = bumpPackagesTask;
-        this.commitPackageVersionsTask = commitPackageVersionsTask;
+    function BumpPackagesCommand(bumpPackagesTask) {
+        this._bumpPackagesTask = bumpPackagesTask;
     }
     BumpPackagesCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var cont;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.bumpPackagesTask.run(options)];
+                    case 0: return [4 /*yield*/, this._bumpPackagesTask.run(options)];
                     case 1:
-                        cont = _a.sent();
-                        if (!cont)
-                            return [2 /*return*/];
-                        return [4 /*yield*/, this.commitPackageVersionsTask.run(options)];
-                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -78,8 +71,7 @@ var BumpPackagesCommand = /** @class */ (function () {
     BumpPackagesCommand = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.TASKS.BumpPackagesTask)),
-        __param(1, (0, inversify_1.inject)(types_1.TASKS.CommitPackageVersionsTask)),
-        __metadata("design:paramtypes", [Object, Object])
+        __metadata("design:paramtypes", [Object])
     ], BumpPackagesCommand);
     return BumpPackagesCommand;
 }());

package/lib/src/commands/CreateBranchCommand.js

@@ -54,34 +54,34 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var CreateBranchCommand = /** @class */ (function () {
     function CreateBranchCommand(validateTask, versionTask, validateCommitsTask, createBranchTask) {
-        this.validateTask = validateTask;
-        this.versionTask = versionTask;
-        this.validateCommitsTask = validateCommitsTask;
-        this.createBranchTask = createBranchTask;
+        this._validateTask = validateTask;
+        this._versionTask = versionTask;
+        this._validateCommitsTask = validateCommitsTask;
+        this._createBranchTask = createBranchTask;
     }
     CreateBranchCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var cont;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.validateTask.run(options)];
+                    case 0: return [4 /*yield*/, this._validateTask.run(options)];
                     case 1:
                         cont = _a.sent();
                         // Check if we want to continue with inquirer?
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.versionTask.run(options)];
+                        return [4 /*yield*/, this._versionTask.run(options)];
                     case 2:
                         cont = _a.sent();
                         // Check if we want to continue with inquirer?
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.validateCommitsTask.run(options)];
+                        return [4 /*yield*/, this._validateCommitsTask.run(options)];
                     case 3:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.createBranchTask.run(options)];
+                        return [4 /*yield*/, this._createBranchTask.run(options)];
                     case 4:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/CreateMergeRequestCommand.js

@@ -54,40 +54,40 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var CreateMergeRequestCommand = /** @class */ (function () {
     function CreateMergeRequestCommand(validateTask, versionTask, validateDescriptionsTask, validateCommitsTask, createMergeRequestCommand) {
-        this.validateTask = validateTask;
-        this.versionTask = versionTask;
-        this.validateDescriptionsTask = validateDescriptionsTask;
-        this.validateCommitsTask = validateCommitsTask;
-        this.createMergeRequestCommand = createMergeRequestCommand;
+        this._validateTask = validateTask;
+        this._versionTask = versionTask;
+        this._validateDescriptionsTask = validateDescriptionsTask;
+        this._validateCommitsTask = validateCommitsTask;
+        this._createMergeRequestCommand = createMergeRequestCommand;
     }
     CreateMergeRequestCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var cont;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.validateTask.run(options)];
+                    case 0: return [4 /*yield*/, this._validateTask.run(options)];
                     case 1:
                         cont = _a.sent();
                         // Check if we want to continue with inquirer?
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.versionTask.run(options)];
+                        return [4 /*yield*/, this._versionTask.run(options)];
                     case 2:
                         cont = _a.sent();
                         // Check if we want to continue with inquirer?
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.validateDescriptionsTask.run(options)];
+                        return [4 /*yield*/, this._validateDescriptionsTask.run(options)];
                     case 3:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.validateCommitsTask.run(options)];
+                        return [4 /*yield*/, this._validateCommitsTask.run(options)];
                     case 4:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.createMergeRequestCommand.run(options)];
+                        return [4 /*yield*/, this._createMergeRequestCommand.run(options)];
                     case 5:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/CreateReleaseNotesCommand.js

@@ -54,20 +54,20 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var CreateReleaseNotesCommand = /** @class */ (function () {
     function CreateReleaseNotesCommand(validateDescriptionsTask, createReleaseNotesTask) {
-        this.validateDescriptionsTask = validateDescriptionsTask;
-        this.createReleaseNotesTask = createReleaseNotesTask;
+        this._validateDescriptionsTask = validateDescriptionsTask;
+        this._createReleaseNotesTask = createReleaseNotesTask;
     }
     CreateReleaseNotesCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var cont;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.validateDescriptionsTask.run(options)];
+                    case 0: return [4 /*yield*/, this._validateDescriptionsTask.run(options)];
                     case 1:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.createReleaseNotesTask.run(options)];
+                        return [4 /*yield*/, this._createReleaseNotesTask.run(options)];
                     case 2:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/ReleaseCommand.js

@@ -54,51 +54,51 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var ReleaseCommand = /** @class */ (function () {
     function ReleaseCommand(validateTask, versionTask, validateDescriptionsTask, validateCommitsTask, createBranchTask, bumpVersionTxtTask, createMergeRequestTask) {
-        this.validateTask = validateTask;
-        this.versionTask = versionTask;
-        this.validateDescriptionsTask = validateDescriptionsTask;
-        this.validateCommitsTask = validateCommitsTask;
-        this.createBranchTask = createBranchTask;
-        this.bumpVersionTxtTask = bumpVersionTxtTask;
-        this.createMergeRequestTask = createMergeRequestTask;
+        this._validateTask = validateTask;
+        this._versionTask = versionTask;
+        this._validateDescriptionsTask = validateDescriptionsTask;
+        this._validateCommitsTask = validateCommitsTask;
+        this._createBranchTask = createBranchTask;
+        this._bumpVersionTxtTask = bumpVersionTxtTask;
+        this._createMergeRequestTask = createMergeRequestTask;
     }
     ReleaseCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var cont;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.validateTask.run(options)];
+                    case 0: return [4 /*yield*/, this._validateTask.run(options)];
                     case 1:
                         cont = _a.sent();
                         // Check if we want to continue with inquirer?
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.versionTask.run(options)];
+                        return [4 /*yield*/, this._versionTask.run(options)];
                     case 2:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.validateDescriptionsTask.run(options)];
+                        return [4 /*yield*/, this._validateDescriptionsTask.run(options)];
                     case 3:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.validateCommitsTask.run(options)];
+                        return [4 /*yield*/, this._validateCommitsTask.run(options)];
                     case 4:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.createBranchTask.run(options)];
+                        return [4 /*yield*/, this._createBranchTask.run(options)];
                     case 5:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.bumpVersionTxtTask.run(options)];
+                        return [4 /*yield*/, this._bumpVersionTxtTask.run(options)];
                     case 6:
                         cont = _a.sent();
                         if (!cont)
                             return [2 /*return*/];
-                        return [4 /*yield*/, this.createMergeRequestTask.run(options)];
+                        return [4 /*yield*/, this._createMergeRequestTask.run(options)];
                     case 7:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/StatusCommand.js

@@ -54,13 +54,13 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var StatusCommand = /** @class */ (function () {
     function StatusCommand(validateTask) {
-        this.validateTask = validateTask;
+        this._validateTask = validateTask;
     }
     StatusCommand.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.validateTask.run(options)];
+                    case 0: return [4 /*yield*/, this._validateTask.run(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/VersionCommand.js

@@ -54,13 +54,13 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var VersionCommand = /** @class */ (function () {
     function VersionCommand(versionTask) {
-        this.versionTask = versionTask;
+        this._versionTask = versionTask;
     }
     VersionCommand.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.versionTask.run(options)];
+                    case 0: return [4 /*yield*/, this._versionTask.run(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/index.js

@@ -18,7 +18,6 @@ __exportStar(require("./BumpPackagesCommand"), exports);
 __exportStar(require("./CreateBranchCommand"), exports);
 __exportStar(require("./CreateMergeRequestCommand"), exports);
 __exportStar(require("./CreateReleaseNotesCommand"), exports);
-__exportStar(require("./InstallPackagesCommand"), exports);
 __exportStar(require("./ReleaseCommand"), exports);
 __exportStar(require("./StatusCommand"), exports);
 __exportStar(require("./VersionCommand"), exports);

package/lib/src/index.js

@@ -1,18 +1,101 @@
 #!/usr/bin/env node
 "use strict";
+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 };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var commander_1 = require("commander");
 var inversify_config_1 = require("./inversify.config");
-var SetupCommands_1 = require("./startup/SetupCommands");
+var types_1 = require("./types");
+var utils_1 = require("./utils");
 var config_json_1 = __importDefault(require("../config.json"));
+function processOptions(options) {
+    var opts = {
+        milestone: options.milestone,
+        version: 'minor'
+    };
+    if (options.projectIds)
+        opts.projectIds = utils_1.ProjectIds.getProjectIds(options.projectIds);
+    if (options.hotfix && options.major)
+        throw new Error('Cannot pass both --hotfix and --major options');
+    if (options.major)
+        opts.version = 'major';
+    if (options.hotfix)
+        opts.version = 'patch';
+    return opts;
+}
+var commandTypeMapping = {
+    'status': types_1.COMMANDS.StatusCommand,
+    'version': types_1.COMMANDS.VersionCommand,
+    'release': types_1.COMMANDS.ReleaseCommand,
+    'create-branches': types_1.COMMANDS.CreateBranchCommand,
+    'create-mrs': types_1.COMMANDS.CreateMergeRequestCommand,
+    'create-notes': types_1.COMMANDS.CreateReleaseNotesCommand,
+    'bump-packages': types_1.COMMANDS.BumpPackagesCommand
+};
+function addCommand(name, description) {
+    var _this = this;
+    program.command(name)
+        .description(description)
+        .requiredOption('-m, --milestone <milestone>')
+        .option('-p, --projectIds <projectIds...>')
+        .option('--hotfix')
+        .option('--major')
+        .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            container.get(commandTypeMapping[name])
+                .run(processOptions(options));
+            return [2 /*return*/];
+        });
+    }); });
+}
 var program = new commander_1.Command();
 program
     .name('ship-it')
     .description('ClickView Release Manager')
     .version('0.0.0');
 var container = (0, inversify_config_1.createContainer)(config_json_1.default);
-(0, SetupCommands_1.setupCommands)(program, container);
+addCommand('status', 'Get the status of all MRs in a milestone');
+addCommand('version', 'Display the versions that will be used for the release');
+addCommand('create-branches', 'Create release branches for all projects that are part of a milestone');
+addCommand('create-mrs', 'Create merge requests for all projects that are part of a milestone');
+addCommand('create-notes', 'Builds descriptions for all projects that are part of a milestone');
+addCommand('release', 'Create releases for all projects that are part of a milestone');
+addCommand('bump-packages', 'Bump consuming project npm packages for all projects that are part of a milestone');
 program.parseAsync();

package/lib/src/interfaces/index.js

@@ -14,10 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./command-options"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./view-models"), exports);
 __exportStar(require("./Config"), exports);
 __exportStar(require("./ShipItCommand"), exports);
+__exportStar(require("./ShipItOptions"), exports);
 __exportStar(require("./ShipItTask"), exports);
-__exportStar(require("./VersionType"), exports);

package/lib/src/inversify.config.js

@@ -32,9 +32,7 @@ function createContainer(config) {
     container.bind(types_1.TASKS.CreateMergeRequestTask).to(tasks_1.CreateMergeRequestTask);
     container.bind(types_1.TASKS.ValidateDescriptionsTask).to(tasks_1.ValidateDescriptionsTask);
     container.bind(types_1.TASKS.CreateReleaseNotesTask).to(tasks_1.CreateReleaseNotesTask);
-    container.bind(types_1.TASKS.InstallPackagesTask).to(tasks_1.InstallPackagesTask);
     container.bind(types_1.TASKS.BumpPackagesTask).to(tasks_1.BumpPackagesTask);
-    container.bind(types_1.TASKS.CommitPackageVersionsTask).to(tasks_1.CommitPackageVersionsTask);
     /**
      * Commands
      */
@@ -44,7 +42,6 @@ function createContainer(config) {
     container.bind(types_1.COMMANDS.CreateMergeRequestCommand).to(commands_1.CreateMergeRequestCommand);
     container.bind(types_1.COMMANDS.ReleaseCommand).to(commands_1.ReleaseCommand);
     container.bind(types_1.COMMANDS.CreateReleaseNotesCommand).to(commands_1.CreateReleaseNotesCommand);
-    container.bind(types_1.COMMANDS.InstallPackagesCommand).to(commands_1.InstallPackagesCommand);
     container.bind(types_1.COMMANDS.BumpPackagesCommand).to(commands_1.BumpPackagesCommand);
     return container;
 }

package/lib/src/services/GitLabService.js

@@ -69,11 +69,9 @@ var lodash_1 = __importDefault(require("lodash"));
 var semver_1 = __importDefault(require("semver"));
 var types_1 = require("../types");
 var api_clients_1 = require("../api-clients");
-var errors_1 = require("../errors");
-var utils_1 = require("../utils");
 var GitLabService = /** @class */ (function () {
     function GitLabService(apiClient) {
-        this.apiClient = apiClient;
+        this._apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -81,20 +79,20 @@ var GitLabService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this.projects)
-                            return [2 /*return*/, this.projects];
-                        return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
+                        if (this._projects)
+                            return [2 /*return*/, this._projects];
+                        return [4 /*yield*/, this._apiClient.getMergeRequests(options)];
                     case 1:
                         mergeRequests = _a.sent();
                         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');
+                            throw new Error('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)];
+                        return [4 /*yield*/, this._apiClient.getProjectsByIds(projectIds)];
                     case 2:
                         projects = _a.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');
-                        return [2 /*return*/, (this.projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
+                            throw new Error('Could not find all projects for the found merge requests');
+                        return [2 /*return*/, (this._projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
                 }
             });
         });
@@ -104,7 +102,7 @@ var GitLabService = /** @class */ (function () {
             var commits, lastDevCommit, title;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
+                    case 0: return [4 /*yield*/, this._apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
                     case 1:
                         commits = _a.sent();
                         lastDevCommit = lodash_1.default.last(commits);
@@ -115,7 +113,7 @@ var GitLabService = /** @class */ (function () {
                             commits.pop();
                         }
                         if (!(commits === null || commits === void 0 ? void 0 : commits.length))
-                            throw new errors_1.ShipItError("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
+                            throw new Error("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
                         return [2 /*return*/, commits];
                 }
             });
@@ -125,7 +123,7 @@ var GitLabService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getBranch(projectId, branchName)];
+                    case 0: return [4 /*yield*/, this._apiClient.getBranch(projectId, branchName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -133,47 +131,53 @@ var GitLabService = /** @class */ (function () {
     };
     GitLabService.prototype.createBranch = function (project, branchFrom, branchName, cherryPick) {
         return __awaiter(this, void 0, void 0, function () {
-            var newBranch, i, mr;
+            var newBranch_1, i, mr, newBranch;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!cherryPick) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this.apiClient.createBranch(project.id, branchName, 'master')];
+                        return [4 /*yield*/, this._apiClient.createBranch(project.id, branchName, 'master')];
                     case 1:
-                        newBranch = _a.sent();
+                        newBranch_1 = _a.sent();
+                        if (!newBranch_1)
+                            throw new Error("Failed to create branch from master for projectId: ".concat(project.id));
                         i = 0;
                         _a.label = 2;
                     case 2:
                         if (!(i < project.mergeRequests.length)) return [3 /*break*/, 5];
                         mr = project.mergeRequests[i];
                         if (!mr.mergeCommit)
-                            throw new errors_1.ShipItError("Could not find the merge commit sha for MR: ".concat(mr.title, " in projectId: ").concat(project.id));
-                        return [4 /*yield*/, this.apiClient.cherryPick(project.id, mr.mergeCommit, branchName)];
+                            throw new Error("Could not find the merge commit sha for MR: ".concat(mr.title, " in projectId: ").concat(project.id));
+                        return [4 /*yield*/, this._apiClient.cherryPick(project.id, mr.mergeCommit, branchName)];
                     case 3:
                         _a.sent();
                         _a.label = 4;
                     case 4:
                         i++;
                         return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/, newBranch];
-                    case 6: return [4 /*yield*/, this.apiClient.createBranch(project.id, branchName, branchFrom)];
-                    case 7: return [2 /*return*/, _a.sent()];
+                    case 5: return [2 /*return*/, newBranch_1];
+                    case 6: return [4 /*yield*/, this._apiClient.createBranch(project.id, branchName, branchFrom)];
+                    case 7:
+                        newBranch = _a.sent();
+                        if (!newBranch)
+                            throw new Error("Failed to create branch from master for projectId: ".concat(project.id));
+                        return [2 /*return*/, newBranch];
                 }
             });
         });
     };
     GitLabService.prototype.getMergeRequest = function (projectId, branchName) {
-        return this.apiClient.getMergeRequest(projectId, branchName, 'master');
+        return this._apiClient.getMergeRequest(projectId, branchName, 'master');
     };
     GitLabService.prototype.createMergeRequest = function (projectId, branchName, description) {
-        return this.apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description);
+        return this._apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description);
     };
     GitLabService.prototype.bumpVersionTxt = function (projectId, branchName, newVersion) {
         return __awaiter(this, void 0, void 0, function () {
             var versionTxt, buff, text;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getFile(projectId, 'version.txt', branchName)];
+                    case 0: return [4 /*yield*/, this._apiClient.getFile(projectId, 'version.txt', branchName)];
                     case 1:
                         versionTxt = _a.sent();
                         if (!versionTxt)
@@ -182,7 +186,7 @@ var GitLabService = /** @class */ (function () {
                         text = buff.toString('utf-8');
                         if (text === newVersion)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this.apiClient.updateFile(projectId, 'version.txt', branchName, newVersion, 'Bumping version.txt')];
+                        return [4 /*yield*/, this._apiClient.updateFile(projectId, 'version.txt', branchName, newVersion, 'Bumping version.txt')];
                     case 2:
                         _a.sent();
                         return [2 /*return*/, true];
@@ -194,20 +198,20 @@ var GitLabService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getFile(projectId, file, branchName)];
+                    case 0: return [4 /*yield*/, this._apiClient.getFile(projectId, file, branchName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     GitLabService.prototype.updateFile = function (projectId, filePath, branchName, content, commit) {
-        return this.apiClient.updateFile(projectId, filePath, branchName, content, commit);
+        return this._apiClient.updateFile(projectId, filePath, branchName, content, commit);
     };
     GitLabService.prototype.commit = function (projectId, branchName, commitMessage, files) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.commit(projectId, branchName, files, commitMessage)];
+                    case 0: return [4 /*yield*/, this._apiClient.commit(projectId, branchName, files, commitMessage)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -215,16 +219,12 @@ 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) {
         return __awaiter(this, void 0, void 0, function () {
             var tags, tagNames, sortedTagNames, currentVersion, currentTag;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.apiClient.getLatestTags(projectId)];
+                    case 0: return [4 /*yield*/, this._apiClient.getLatestTags(projectId)];
                     case 1:
                         tags = _a.sent();
                         if (!(tags === null || tags === void 0 ? void 0 : tags.length))
@@ -242,33 +242,6 @@ 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.getCurrentVersionTag(projectId)];
-                    case 1:
-                        tag = _a.sent();
-                        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);
-                        branchName = version === 'patch' ?
-                            utils_1.BranchNames.getHotfix(nextVersion) :
-                            utils_1.BranchNames.getRelease(nextVersion);
-                        return [4 /*yield*/, this.getBranch(projectId, branchName)];
-                    case 2:
-                        branch = _a.sent();
-                        return [2 /*return*/, {
-                                nextVersion: nextVersion,
-                                branchName: branchName,
-                                branch: branch,
-                                tag: tag
-                            }];
-                }
-            });
-        });
-    };
     GitLabService = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.API_CLIENTS.GitLabApiClient)),