avil13-co 2.1.6 → 2.2.1

package/dist/cli-commands/index.d.ts

@@ -2,8 +2,9 @@ export declare enum Commands {
     Unknown = 0,
     Help = 1,
     DeleteBranch = 2,
-    ShowMerged = 3,
-    ShowUnMerged = 4
+    MergeBranch = 4,
+    ShowMerged = 8,
+    ShowUnMerged = 16
 }
 export declare const getWishOfUser: (firstArg?: string | undefined) => Commands;
 export declare const getHelp: () => string;

package/dist/cli-commands/index.js

@@ -7,8 +7,9 @@ var Commands;
     Commands[Commands["Unknown"] = 0] = "Unknown";
     Commands[Commands["Help"] = 1] = "Help";
     Commands[Commands["DeleteBranch"] = 2] = "DeleteBranch";
-    Commands[Commands["ShowMerged"] = 3] = "ShowMerged";
-    Commands[Commands["ShowUnMerged"] = 4] = "ShowUnMerged";
+    Commands[Commands["MergeBranch"] = 4] = "MergeBranch";
+    Commands[Commands["ShowMerged"] = 8] = "ShowMerged";
+    Commands[Commands["ShowUnMerged"] = 16] = "ShowUnMerged";
 })(Commands = exports.Commands || (exports.Commands = {}));
 ;
 const getWishOfUser = (firstArg) => {
@@ -16,11 +17,13 @@ const getWishOfUser = (firstArg) => {
     switch (true) {
         case ['help', '-h', '--h', '--help'].includes(arg):
             return Commands.Help;
+        case ['-M', 'merge'].includes(arg):
+            return Commands.MergeBranch;
         case ['-D', 'rm'].includes(arg):
             return Commands.DeleteBranch;
-        case ['m', '-m', 'merged'].includes(arg):
+        case ['-sm', '--show-merged'].includes(arg):
             return Commands.ShowMerged;
-        case ['un', '--no-merged'].includes(arg):
+        case ['-un', '--no-merged'].includes(arg):
             return Commands.ShowUnMerged;
         default:
             return Commands.Unknown;
@@ -36,10 +39,13 @@ OPTIONS:
   help, -h, --h, --help
     Showing this message
 
-  m, -m, merged
+  -M, merge
+    Merge branch
+
+  -sm, --show-merged
     Showing merged branches
 
-  un, -un, --no-merged
+  -un, --no-merged
     Showing not merged branches
 
   -D, rm

package/dist/commands/merge-branch.d.ts

@@ -0,0 +1 @@
+export declare function mergeBranch(branchName: string): Promise<void>;

package/dist/commands/merge-branch.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeBranch = void 0;
+const exec_1 = require("./exec");
+const color_1 = require("../color");
+//
+async function mergeBranch(branchName) {
+    if (!branchName) {
+        throw new Error('No branch...');
+    }
+    const checkoutCommand = `git merge ${branchName}`;
+    console.log(' ' + color_1.clc.green('git merge', branchName) + '\n');
+    const checkoutCommandResult = await (0, exec_1.exec)(checkoutCommand);
+    console.log(checkoutCommandResult);
+}
+exports.mergeBranch = mergeBranch;

package/dist/index.js

@@ -4,6 +4,7 @@ const ask_1 = require("./ask");
 const cli_commands_1 = require("./cli-commands");
 const commands_1 = require("./commands");
 const delete_barnch_1 = require("./commands/delete-barnch");
+const merge_branch_1 = require("./commands/merge-branch");
 const run = async () => {
     const userWish = (0, cli_commands_1.getWishOfUser)();
     if (cli_commands_1.Commands.Help === userWish) {
@@ -23,6 +24,10 @@ const run = async () => {
         (0, delete_barnch_1.deleteBranch)(branch);
         return;
     }
+    if (cli_commands_1.Commands.MergeBranch === userWish) {
+        (0, merge_branch_1.mergeBranch)(branch);
+        return;
+    }
     await (0, commands_1.checkoutBranch)(branch);
     await (0, commands_1.getCurrentBranchName)();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "avil13-co",
-  "version": "2.1.6",
+  "version": "2.2.1",
   "description": "",
   "main": "dist/index.js",
   "public": true,

package/src/cli-commands/index.ts

@@ -3,11 +3,12 @@ import { clc } from '../color';
 const args = process.argv.slice(2);
 
 export enum Commands {
-  Unknown,
-  Help,
-  DeleteBranch,
-  ShowMerged,
-  ShowUnMerged,
+  Unknown = 0,
+  Help = 1,
+  DeleteBranch = 2,
+  MergeBranch = 4,
+  ShowMerged = 8,
+  ShowUnMerged = 16,
 };
 
 export const getWishOfUser = (firstArg?: string): Commands => {
@@ -17,13 +18,16 @@ export const getWishOfUser = (firstArg?: string): Commands => {
     case ['help', '-h', '--h', '--help'].includes(arg):
       return Commands.Help;
 
+    case ['-M', 'merge'].includes(arg):
+      return Commands.MergeBranch;
+
     case ['-D', 'rm'].includes(arg):
       return Commands.DeleteBranch;
 
-    case ['m', '-m', 'merged'].includes(arg):
+    case ['-sm', '--show-merged'].includes(arg):
       return Commands.ShowMerged;
 
-    case ['un', '--no-merged'].includes(arg):
+    case ['-un', '--no-merged'].includes(arg):
       return Commands.ShowUnMerged;
 
     default:
@@ -41,10 +45,13 @@ OPTIONS:
   help, -h, --h, --help
     Showing this message
 
-  m, -m, merged
+  -M, merge
+    Merge branch
+
+  -sm, --show-merged
     Showing merged branches
 
-  un, -un, --no-merged
+  -un, --no-merged
     Showing not merged branches
 
   -D, rm

package/src/commands/merge-branch.ts

@@ -0,0 +1,16 @@
+import { exec } from './exec';
+import { clc } from '../color';
+
+//
+export async function mergeBranch(branchName: string) {
+  if (!branchName) {
+    throw new Error('No branch...');
+  }
+
+  const checkoutCommand = `git merge ${branchName}`;
+
+  console.log(' ' + clc.green('git merge', branchName) + '\n');
+
+  const checkoutCommandResult = await exec(checkoutCommand);
+  console.log(checkoutCommandResult);
+}

package/src/index.ts

@@ -2,6 +2,7 @@ import { ask } from './ask';
 import { Commands, getHelp, getWishOfUser } from './cli-commands';
 import { BranchesType, checkoutBranch, getBranches, getCurrentBranchName } from './commands';
 import { deleteBranch } from './commands/delete-barnch';
+import { mergeBranch } from './commands/merge-branch';
 
 const run = async () => {
   const userWish = getWishOfUser();
@@ -28,6 +29,11 @@ const run = async () => {
     return;
   }
 
+  if (Commands.MergeBranch === userWish) {
+    mergeBranch(branch);
+    return;
+  }
+
   await checkoutBranch(branch);
 
   await getCurrentBranchName()