@evanpurkhiser/tooling-personal 1.16.0 → 1.19.0

package/dist/cmd/pr.js

@@ -14,6 +14,7 @@ const pulls_1 = require("../pulls");
 const utils_1 = require("../utils");
 const getCommits = () => simple_git_1.default().log({ from: 'HEAD', to: 'origin/master' });
 async function pr() {
+    const username = await utils_1.getEmailUsername();
     const repo = await utils_1.getRepoKey();
     const rendererOptions = { showTimer: true };
     const collectInfoTask = new listr2_1.Listr([], {
@@ -53,7 +54,7 @@ async function pr() {
     const selectCommits = () => fzf_1.fzfSelect({
         prompt: 'Select commit(s) for PR:',
         genValues: addOption => commits.all.forEach(commit => {
-            const branchName = utils_1.branchFromMessage(commit.message);
+            const branchName = utils_1.branchFromMessage(username, commit.message);
             const pr = prs.find(pr => pr.headRefName === branchName);
             const existingPrLabel = pr !== undefined ? chalk_1.default.yellowBright `(updates #${pr.number})` : '';
             const shortHash = commit.hash.slice(0, 8);
@@ -79,13 +80,21 @@ async function pr() {
         .map(sha => `pick ${sha}`)
         .join('\n');
     const targetCommit = selectedCommits[selectedCommits.length - 1];
-    const branchName = utils_1.branchFromMessage(targetCommit.message);
+    const branchName = utils_1.branchFromMessage(username, targetCommit.message);
     const willOpenPr = prs.some(pr => pr.headRefName === branchName);
     // 03. Rebase and push the selected commits
     const doRebase = async () => {
-        await simple_git_1.default()
+        const rebase = simple_git_1.default()
             .env({ ...process.env, GIT_SEQUENCE_EDITOR: `echo "${rebaseContents}" >` })
             .rebase(['--interactive', '--autostash', 'origin/master']);
+        try {
+            await rebase;
+        }
+        catch (error) {
+            // Abort a failed rebase
+            await simple_git_1.default().rebase(['--abort']);
+            throw new Error(`Failed to rebase\n${error}`);
+        }
     };
     const doPush = async () => {
         const newCommits = await getCommits();
@@ -106,12 +115,19 @@ async function pr() {
     // Cork stdout to avoid listr output polluting vim. We'll uncork after we
     // close vim
     process.stdout.cork();
-    const rebaseAndPush = rebaseAndPushTask.run();
-    const { title, body } = await editor_1.editPullRequest(targetCommit);
     // 05. Open an editor to write the pull request
+    const { editor, editorResult } = await editor_1.editPullRequest(targetCommit);
+    const rebaseAndPush = rebaseAndPushTask.run();
+    rebaseAndPush.catch(() => editor.kill());
+    const { title, body } = await editorResult;
     // XXX: We cork stdout here to avoid listr from corrupting vims output
     process.stdout.uncork();
-    await rebaseAndPush;
+    try {
+        await rebaseAndPush;
+    }
+    catch {
+        process.exit(1);
+    }
     if (title.length === 0) {
         console.log(chalk_1.default.red `Missing PR title, aborting`);
         process.exit(1);

package/dist/editor.js

@@ -18,10 +18,13 @@ async function editPullRequest(commit) {
         shell: true,
         stdio: 'inherit',
     });
-    await new Promise(resolve => editor.on('close', resolve));
-    const prContents = await promises_1.default.readFile(pullEditFile).then(b => b.toString());
-    const [title, ...bodyParts] = prContents.split('\n');
-    const body = bodyParts.join('\n').trim();
-    return { title, body };
+    async function getResult() {
+        await new Promise(resolve => editor.on('close', resolve));
+        const prContents = await promises_1.default.readFile(pullEditFile).then(b => b.toString());
+        const [title, ...bodyParts] = prContents.split('\n');
+        const body = bodyParts.join('\n').trim();
+        return { title, body };
+    }
+    return { editor, editorResult: getResult() };
 }
 exports.editPullRequest = editPullRequest;

package/dist/utils.js

@@ -3,13 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.branchFromMessage = exports.getHubToken = exports.getRepoPath = exports.getRepoKey = void 0;
+exports.branchFromMessage = exports.getHubToken = exports.getRepoPath = exports.getEmailUsername = exports.getRepoKey = void 0;
 const git_url_parse_1 = __importDefault(require("git-url-parse"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
 const simple_git_1 = __importDefault(require("simple-git"));
 const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
-const BRANCH_PREFIX = 'evanpurkhiser/';
 /**
  * Get's the current repo information
  */
@@ -24,6 +23,14 @@ async function getRepoKey() {
     return repoKey;
 }
 exports.getRepoKey = getRepoKey;
+/**
+ * Get the git username from email
+ */
+async function getEmailUsername() {
+    const email = await simple_git_1.default().raw('config', '--get', 'user.email');
+    return email.split('@')[0].toLowerCase();
+}
+exports.getEmailUsername = getEmailUsername;
 /**
  * Get's the absolute path to the current git repo
  */
@@ -44,12 +51,12 @@ exports.getHubToken = getHubToken;
 /**
  * Generates a consistent branch name from a commit message
  */
-function branchFromMessage(commitMessage) {
+function branchFromMessage(prefix, commitMessage) {
     const branch = commitMessage
         .toLowerCase()
         .replaceAll(/[^0-9a-zA-Z]/g, '-')
         .replaceAll(/-+/g, '-')
         .slice(0, 255);
-    return BRANCH_PREFIX + branch;
+    return `${prefix}/${branch}`;
 }
 exports.branchFromMessage = branchFromMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evanpurkhiser/tooling-personal",
-  "version": "1.16.0",
+  "version": "1.19.0",
   "description": "Evan Purkhiser's personal tooling",
   "repository": "https://github.com/EvanPurkhiser/tooling-personal",
   "author": "Evan Purkhiser",