@aaronshaf/ger 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Gerrit CLI",
   "main": "src/ger.ts",
   "bin": {
@@ -21,7 +21,7 @@
   "homepage": "https://github.com/aaronshaf/ger#readme",
   "devDependencies": {
     "@commander-js/extra-typings": "^10.0.3",
-    "@types/node": "^18.16.0",
+    "@types/node": "^18.16.1",
     "cli-table3": "^0.6.3",
     "eslint": "^8.39.0",
     "ts-node": "^10.9.1",

package/src/commands/branch.ts

@@ -1,6 +1,7 @@
 import { execSync } from "child_process";
 import { createInterface } from "readline";
 import {
+  abbreviateApproverDescription,
   bold,
   darkBrown,
   getGerritData,
@@ -8,6 +9,7 @@ import {
   getLocalBranchNames,
   green,
   grey,
+  normalizeApproverName,
   normalizeValue,
   yellow,
 } from "../utils";
@@ -16,7 +18,6 @@ import type {
   LocalBranchData,
   GerritDataMap,
 } from "../types.d";
-import { isDataView } from "util/types";
 
 const Table = require("cli-table3");
 
@@ -95,7 +96,9 @@ function output(
         isWip && darkBrown("WIP"),
         isAbandoned && grey("Abandoned"),
         isMerged && green("Merged"),
-      ].filter(Boolean) as string[];
+      ]
+        .filter(Boolean)
+        .map((str) => `[${str}]`) as string[];
 
       const approvals = gerritData.currentPatchSet.approvals.map((a) => {
         let description = a.description;
@@ -103,20 +106,21 @@ function output(
           description = "Submitted";
         }
         return isVerbose
-          ? `${description || a.type}: ${normalizeValue(a.value)} (${a.by.name
-              .replace(" (Bot)", "")
-              .replace("Service Cloud Jenkins", "Jenkins")
-              .replace("Larry Gergich", "Gergich")})`
-          : normalizeValue(a.value);
+          ? `${description || a.type}: ${normalizeValue(
+              a.value
+            )} (${normalizeApproverName(a.by.name)})`
+          : `${abbreviateApproverDescription(
+              description || a.type
+            )}${normalizeValue(a.value)}`;
       });
 
       const approvalText = approvals.join(isVerbose ? "\n" : ", ");
 
       if (isVerbose) {
         table.push([
-          `${localBranch}\n${yellow(gerritData.url.replace("https://", ""))}`,
+          `${bold(localBranch)}\n${localBranchDataMap[localBranch].shortHash}`,
           labels.join(" "),
-          subject,
+          `${subject}\n${yellow(gerritData.url.replace("https://", ""))}`,
           approvalText,
         ]);
       } else {
@@ -129,13 +133,22 @@ function output(
         ]);
       }
     } else {
-      // table.push([
-      //   localBranch,
-      //   "",
-      //   "",
-      //   localBranchDataMap[localBranch].subject,
-      //   "",
-      // ]);
+      if (isVerbose) {
+        table.push([
+          `${bold(localBranch)}\n${localBranchDataMap[localBranch].shortHash}`,
+          "",
+          localBranchDataMap[localBranch].subject,
+          "",
+        ]);
+      } else {
+        table.push([
+          localBranch,
+          "",
+          "",
+          localBranchDataMap[localBranch].subject,
+          "",
+        ]);
+      }
     }
   }
   console.log(table.toString());

package/src/types.d.ts

@@ -1,5 +1,6 @@
 export type LocalBranchData = {
   changeId: string | null;
+  shortHash: string
   subject: string;
 }
 

package/src/utils.ts

@@ -17,8 +17,10 @@ export function grey(text: string) {
   return `\x1b[47m\x1b[30m${text}\x1b[0m`;
 }
 
+// brown with transparent background
 export function darkBrown(text: string) {
-  return `\x1b[43m\x1b[30m${text}\x1b[0m`;
+  // return `\x1b[43m\x1b[30m${text}\x1b[0m`;
+  return `\x1b[33m${text}\x1b[0m`;
 }
 
 export function green(text: string) {
@@ -27,7 +29,8 @@ export function green(text: string) {
 
 // yellow text with transparent background
 export function yellow(text: string) {
-  return `\x1b[33m\x1b[40m${text}\x1b[0m`;
+  // return `\x1b[33m\x1b[40m${text}\x1b[0m`;
+  return `\x1b[33m${text}\x1b[0m`;
 }
 
 export function getChangeIdFromCommitMessage(message: string) {
@@ -78,17 +81,18 @@ export function getGerritData(changeIds: string[]) {
 
 export function getLocalBranchData(branchNames: string[]) {
   return branchNames.reduce<LocalBranchDataMap>((acc, branchName) => {
-    // Get the latest commit message
-    const commit_message = execSync(`git log -1 --pretty=%B ${branchName}`)
+    // Get the latest commit SHA and message
+    const gitLogOutput = execSync(`git log -1 --pretty=format:%h%n%B ${branchName}`)
       .toString()
       .trim();
 
-    // Get first line of commit message
-    const firstLine = commit_message.split("\n")[0];
+    // Split the output into commit SHA and message
+    const [shortHash, ...commitMessageLines] = gitLogOutput.split("\n");
 
     const localBranchData: LocalBranchData = {
-      changeId: getChangeIdFromCommitMessage(commit_message) || null,
-      subject: firstLine,
+      changeId: getChangeIdFromCommitMessage(commitMessageLines.join("\n")) || null,
+      subject: commitMessageLines[0],
+      shortHash,
     };
 
     return {
@@ -103,4 +107,27 @@ export const normalizeValue = (value: string) => {
     return `+${value}`;
   }
   return value;
-};
+};
+
+export function normalizeApproverName(name: string) {
+  return name
+    .replace(" (Bot)", "")
+    .replace("Service Cloud Jenkins", "Jenkins")
+    .replace("Larry Gergich", "Gergich");
+}
+
+export function abbreviateApproverDescription(name: string) {
+  if (name === "Lint-Review") {
+    return `Lint `;
+  }
+  if (name === "Code-Review") {
+    return `CR `;
+  }
+  if (name === "Product-Review") {
+    return `PR `;
+  }
+  if (name === "QA-Review") {
+    return `QA `;
+  }
+  return `${name} `;
+}