build: refactor bump script

Author: lastsunday

scripts/bump.sh

@@ -2,45 +2,85 @@
 set -euo pipefail
 set -f
 
+[ $# -ne 3 ] && {
+  echo "Usage: $0 <tag-prefix> <manifest> <include-paths>" >&2
+  exit 1
+}
+
 TAG_PREFIX=$1
 MANIFEST=$2
-INCLUDE_PATHS=$3
+
+git diff --quiet HEAD || {
+  echo "Working directory is not clean. Commit or stash changes first." >&2
+  exit 1
+}
+
+INCLUDE_PATHS=($3)
 
 COMMIT_SCOPE="$TAG_PREFIX"
 TAG_PATTERN="${TAG_PREFIX}@[0-9]+\.[0-9]+\.[0-9]+"
 CONFIG="$(git rev-parse --show-toplevel)/cliff.toml"
-CURRENT=$(grep -oE '[0-9]+\.[0-9]+\.[0-9]+' "$MANIFEST" | head -1)
 
-LATEST_TAG=$(git tag -l "${TAG_PREFIX}@*" --sort=-version:refname | head -1)
+extract_version() {
+  local file=$1
+  case "$file" in
+    *.toml) grep -m1 -oE '^version = "[0-9]+\.[0-9]+\.[0-9]+"' "$file" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' ;;
+    *.json) grep -m1 -oE '"version": "[0-9]+\.[0-9]+\.[0-9]+"' "$file" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' ;;
+    *) echo "Unsupported manifest: $file" >&2; exit 1 ;;
+  esac
+}
 
-if [ -z "$LATEST_TAG" ]; then
-  touch CHANGELOG.md && git-cliff --unreleased --tag "$CURRENT" $INCLUDE_PATHS --config "$CONFIG" --prepend CHANGELOG.md
-  git add "$MANIFEST" CHANGELOG.md && git commit --no-verify -m "bump($COMMIT_SCOPE): $CURRENT"
-  git tag -m "bump($COMMIT_SCOPE): $CURRENT" "${TAG_PREFIX}@$CURRENT"
-  echo "✔ First release — tagged ${TAG_PREFIX}@$CURRENT"
+update_version() {
+  local file=$1 current=$2 new=$3
+  case "$file" in
+    *.toml) sed -i.bak "s/^version = \"$current\"/version = \"$new\"/" "$file" ;;
+    *.json) sed -i.bak "s/\"version\": \"$current\"/\"version\": \"$new\"/" "$file" ;;
+  esac
+  rm -f "$file.bak"
+}
+
+commit_and_tag() {
+  local version=$1
+  git add "$MANIFEST" CHANGELOG.md
+  git commit --no-verify -m "bump($COMMIT_SCOPE): $version"
+  git tag -m "bump($COMMIT_SCOPE): $version" "${TAG_PREFIX}@$version"
+}
+
+print_recent_changelog() {
+  local version=$1
   echo "---"
   awk '/^## /{if(++c>1) exit} 1' CHANGELOG.md
   echo "---"
-  echo "   Run: git push origin ${TAG_PREFIX}@$CURRENT"
+  echo "   Run: git push origin ${TAG_PREFIX}@$version"
+}
+
+CURRENT=$(extract_version "$MANIFEST")
+[ -z "$CURRENT" ] && { echo "Failed to extract current version from $MANIFEST" >&2; exit 1; }
+
+LATEST_TAG=$(git tag -l "${TAG_PREFIX}@*" --sort=-version:refname | head -1)
+
+if [ -z "$LATEST_TAG" ]; then
+  touch CHANGELOG.md && git-cliff --unreleased --tag "$CURRENT" "${INCLUDE_PATHS[@]}" --config "$CONFIG" --prepend CHANGELOG.md
+  commit_and_tag "$CURRENT"
+  echo "✔ First release — tagged ${TAG_PREFIX}@$CURRENT"
+  print_recent_changelog "$CURRENT"
   exit 0
 fi
 
-OUTPUT=$(git-cliff --bump --tag-pattern "$TAG_PATTERN" $INCLUDE_PATHS --config "$CONFIG" 2>&1)
-echo "$OUTPUT" | grep -q 'There is nothing to bump' && { echo "No unreleased changes."; exit 0; }
+RAW=$(git-cliff --bumped-version --tag-pattern "$TAG_PATTERN" "${INCLUDE_PATHS[@]}" --config "$CONFIG" 2>&1) || {
+  echo "git-cliff error:" >&2
+  echo "$RAW" >&2
+  exit 1
+}
 
-NEW=$(echo "$OUTPUT" | grep '^## ' | head -1 | sed 's/^## *//; s/ (.*//; s/.*@//')
+NEW=$(echo "$RAW" | tail -1)
+NEW=${NEW#"${TAG_PREFIX}@"}
 
-case "$MANIFEST" in
-  *.toml) sed -i "s/version = \"$CURRENT\"/version = \"$NEW\"/" "$MANIFEST" ;;
-  *.json) sed -i "s/\"version\": \"$CURRENT\"/\"version\": \"$NEW\"/" "$MANIFEST" ;;
-esac
+[ "$NEW" = "$CURRENT" ] && { echo "No unreleased changes."; exit 0; }
 
-touch CHANGELOG.md && git-cliff --unreleased --tag "$NEW" $INCLUDE_PATHS --config "$CONFIG" --prepend CHANGELOG.md
-git add "$MANIFEST" CHANGELOG.md && git commit --no-verify -m "bump($COMMIT_SCOPE): $NEW"
-git tag -m "bump($COMMIT_SCOPE): $NEW" "${TAG_PREFIX}@$NEW"
+update_version "$MANIFEST" "$CURRENT" "$NEW"
+touch CHANGELOG.md && git-cliff --unreleased --tag "$NEW" "${INCLUDE_PATHS[@]}" --config "$CONFIG" --prepend CHANGELOG.md
+commit_and_tag "$NEW"
 
 echo "✔ Bumped $CURRENT → $NEW, tagged ${TAG_PREFIX}@$NEW"
-echo "---"
-awk '/^## /{if(++c>1) exit} 1' CHANGELOG.md
-echo "---"
-echo "   Run: git push origin ${TAG_PREFIX}@$NEW"
+print_recent_changelog "$NEW"