git-jira-shortcuts 1.0.16 → 1.0.18

package/README.md

@@ -75,7 +75,8 @@ git config --global core.excludesfile ~/.gitignore_global
 | `gs` | `gstatus` | Clean git status with remote sync info |
 | `glist` | `gl` | List files pending in this branch |
 | `grecent` | — | Show recently checked out branches (last 10) |
-| `grepos` | `repos` | Show all repo clones and their current branch |
+| `grepos` | `repos` | Show all repo clones and their current branch (with Jira URLs) |
+| `gstory [branch]` | — | Print the Jira story URL for the current (or given) branch |
 | `ghelp` | — | Show all available commands |
 
 ### Branching
@@ -152,6 +153,12 @@ When `GJS_BRANCH_ALIASES` is set, the defaults are replaced entirely — so incl
 npm update -g git-jira-shortcuts
 ```
 
+After upgrading, open a new terminal session or reload your current shell:
+
+```bash
+source ~/.zshrc
+```
+
 ## Reconfigure
 
 ```bash

package/bin/postinstall.js

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+console.log(`
+git-jira-shortcuts installed/updated.
+
+Remember to start a new terminal session before using gw, gs, ghelp, etc.
+Existing terminals keep the old shell functions in memory.
+
+Or reload your current shell with:
+  source ~/.zshrc
+`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-jira-shortcuts",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Git + Jira workflow shortcuts for zsh — interactive branch switching, auto-prefixed commits, Jira integration, and more.",
   "author": "chipallen2",
   "license": "MIT",
@@ -11,6 +11,9 @@
   "bin": {
     "git-jira-shortcuts": "./bin/cli.js"
   },
+  "scripts": {
+    "postinstall": "node ./bin/postinstall.js"
+  },
   "files": [
     "bin/",
     "shell/",

package/shell/git-extras.sh

@@ -268,6 +268,34 @@ _gjs_sanitize_branch_name() {
     cut -c1-50
 }
 
+_gjs_extract_ticket_from_branch() {
+  local branch="$1"
+  [[ -z "$branch" ]] && return 1
+  if [[ -n "$GJS_TICKET_PREFIX" ]]; then
+    local pattern="^${GJS_TICKET_PREFIX}-[0-9]+"
+    if [[ "$branch" =~ $pattern ]]; then
+      echo "$MATCH"
+      return 0
+    fi
+  fi
+  if [[ "$branch" =~ ^[A-Z][A-Z0-9_]+-[0-9]+ ]]; then
+    echo "$MATCH"
+    return 0
+  fi
+  return 1
+}
+
+_gjs_jira_story_url() {
+  local branch="$1"
+  [[ -z "$branch" ]] && branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+  [[ -z "$branch" || -z "$GJS_JIRA_DOMAIN" ]] && return 1
+  local ticket
+  if ! ticket=$(_gjs_extract_ticket_from_branch "$branch"); then
+    return 1
+  fi
+  echo "https://$GJS_JIRA_DOMAIN/browse/$ticket"
+}
+
 _gjs_get_jira_story_title() {
   local story_number="$1"
 
@@ -322,11 +350,34 @@ grecent() { # grecent | Show recently checked out branches (last 10)
     sed 's/^/  /'
 }
 
+gstory() { # gstory [branch] | Print Jira story URL for current (or given) branch
+  local branch="$1"
+  [[ -z "$branch" ]] && branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+  if [[ -z "$branch" ]]; then
+    echo "❌ Not a git repo." >&2
+    return 1
+  fi
+  if [[ -z "$GJS_JIRA_DOMAIN" ]]; then
+    echo "❌ GJS_JIRA_DOMAIN not set. Run: git-jira-shortcuts init" >&2
+    return 1
+  fi
+  local url
+  if ! url=$(_gjs_jira_story_url "$branch"); then
+    echo "❌ No Jira ticket found in branch '$branch'." >&2
+    return 1
+  fi
+  echo "$url"
+}
+
 unalias gs 2>/dev/null
 gs() { # gs | Clean git status with remote sync info
   local branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
   [[ -z "$branch" ]] && echo "Not a git repo" && return 1
   echo "\033[1m$branch\033[0m"
+  local story_url
+  if story_url=$(_gjs_jira_story_url "$branch"); then
+    echo "\033[2mWork: $story_url\033[0m"
+  fi
   local staged=$(git diff --cached --numstat 2>/dev/null | wc -l | tr -d ' ')
   local unstaged=$(git diff --numstat 2>/dev/null | wc -l | tr -d ' ')
   local untracked=$(git ls-files --others --exclude-standard 2>/dev/null | wc -l | tr -d ' ')
@@ -347,19 +398,39 @@ alias gp='git pull --no-rebase --no-edit' # gp | Pull without rebase or editor
 
 grepos() { # grepos | Show all repo clones and their current branch
   [[ -z "${GJS_REPOS+x}" ]] && echo "GJS_REPOS not defined. Run: git-jira-shortcuts init" && return 1
-  local max_len=0
+  local max_label=0
+  local max_branch=0
+  local -a labels=() dirs=() branches=()
   for entry in "${GJS_REPOS[@]}"; do
     local label="${entry##*:}"
-    (( ${#label} > max_len )) && max_len=${#label}
-  done
-  for entry in "${GJS_REPOS[@]}"; do
     local dir="${entry%:*}"
-    local label="${entry##*:}"
+    local branch=""
     if [[ -d "$dir/.git" ]]; then
-      local branch=$(git -C "$dir" rev-parse --abbrev-ref HEAD 2>/dev/null)
-      printf "%-${max_len}s  %s\n" "$label" "${branch:-???}"
+      branch=$(git -C "$dir" rev-parse --abbrev-ref HEAD 2>/dev/null)
+      [[ -z "$branch" ]] && branch="???"
+    else
+      branch="(not found)"
+    fi
+    labels+=("$label")
+    dirs+=("$dir")
+    branches+=("$branch")
+    (( ${#label} > max_label )) && max_label=${#label}
+    (( ${#branch} > max_branch )) && max_branch=${#branch}
+  done
+  local i
+  for (( i=1; i<=${#labels[@]}; i++ )); do
+    local label="${labels[$i]}"
+    local branch="${branches[$i]}"
+    local story_url=""
+    if [[ "$branch" != "???" && "$branch" != "(not found)" ]]; then
+      story_url=$(_gjs_jira_story_url "$branch" 2>/dev/null)
+    fi
+    if [[ "$branch" == "(not found)" ]]; then
+      printf "%-${max_label}s  \033[31m%s\033[0m\n" "$label" "$branch"
+    elif [[ -n "$story_url" ]]; then
+      printf "%-${max_label}s  %-${max_branch}s  \033[2m%s\033[0m\n" "$label" "$branch" "$story_url"
     else
-      printf "%-${max_len}s  %s\n" "$label" "\033[31m(not found)\033[0m"
+      printf "%-${max_label}s  %s\n" "$label" "$branch"
     fi
   done
 }
@@ -409,6 +480,7 @@ ghelp() { # ghelp | Show all git-jira-shortcuts commands
 
 ── Utilities ──────────────────────────────────────────────────
   grepos / repos      Show all repo clones and their current branch
+  gstory [branch]     Print Jira story URL for current (or given) branch
   testJira / tj       Test your Jira API connection
   ghelp               This help screen
 
@@ -515,6 +587,10 @@ gpr() { # gpr [*branch=m] | Open GitHub compare URL from current branch to targe
 
   local url="https://github.com/${repo_path}/compare/${target}...${current_branch}?expand=1"
   echo "$url"
+  local story_url
+  if story_url=$(_gjs_jira_story_url "$current_branch"); then
+    echo "Work: $story_url"
+  fi
   open "$url" 2>/dev/null || xdg-open "$url" 2>/dev/null || echo "Open the URL above in your browser."
 }