@evanpurkhiser/tooling-personal 1.13.0 → 1.17.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);
@@ -71,12 +72,15 @@ async function pr() {
     //     the end of the list.
     const rebaseContents = [
         ...selectedShas,
-        ...commits.all.filter(c => !selectedShas.includes(c.hash)).map(c => c.hash),
+        ...commits.all
+            .filter(c => !selectedShas.includes(c.hash))
+            .map(c => c.hash)
+            .reverse(),
     ]
         .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 () => {

package/dist/cmd/select-commit.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
+const simple_git_1 = __importDefault(require("simple-git"));
+const fzf_1 = require("../fzf");
+async function selectCommit() {
+    const commits = await simple_git_1.default().log({ from: 'HEAD', to: 'origin/master' });
+    const selected = await fzf_1.fzfSelect({
+        prompt: 'Select commit(s) for PR:',
+        genValues: addOption => commits.all.forEach(commit => {
+            const shortHash = commit.hash.slice(0, 8);
+            const label = chalk_1.default `{red ${shortHash}} {blue [${commit.author_name}]} {white ${commit.message}}`;
+            addOption({ label, id: commit.hash, ...commit });
+        }),
+    });
+    const commitHashes = selected.map(commit => commit.hash);
+    console.log(commitHashes.join('\n'));
+}
+exports.default = selectCommit;

package/dist/index.js

@@ -4,9 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const chalk_1 = __importDefault(require("chalk"));
 const yargs_1 = __importDefault(require("yargs"));
 const pr_1 = __importDefault(require("./cmd/pr"));
+const select_commit_1 = __importDefault(require("./cmd/select-commit"));
 yargs_1.default(process.argv.slice(2))
+    .option('color', {
+    boolean: true,
+    desc: 'Use colored output (default: auto-detect)',
+})
+    .middleware(args => {
+    if (args.color !== undefined) {
+        chalk_1.default.level = args.color ? 3 : 0;
+    }
+}, true)
     .command('pr', 'Create and update PRs', pr_1.default)
+    .command('select-commit', 'Select a commit hash', select_commit_1.default)
     .demandCommand(1, '')
     .parse();

package/dist/utils.js

@@ -3,7 +3,7 @@ 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"));
@@ -24,6 +24,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,7 +52,7 @@ 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, '-')

package/package.json

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