@neferbyte/cherry-release-cli 1.0.0

package/bin/cherry-release.sh

@@ -0,0 +1,191 @@
+#!/usr/bin/env bash
+set -e
+
+# ─── Constants ────────────────────────────────────────────────────────────────
+
+BRANCHES=(staging production)
+ORIGINAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+WORKTREE_DIR="/tmp/cherry-release-test"
+WORKTREES_TO_CLEAN=()
+
+# ─── Helpers ──────────────────────────────────────────────────────────────────
+
+fail() {
+  echo -e "\n\033[1;31mError:\033[0m $1" >&2
+  exit 1
+}
+
+step() {
+  echo -e "\n\033[1;34m→\033[0m $1"
+}
+
+check_ok() {
+  echo -e "  \033[1;32m✓\033[0m $1"
+}
+
+cleanup() {
+  for wt in "${WORKTREES_TO_CLEAN[@]}"; do
+    if [[ -d "$wt" ]]; then
+      git worktree remove --force "$wt" 2>/dev/null || true
+    fi
+  done
+
+  current=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)
+  if [[ "$current" != "$ORIGINAL_BRANCH" ]]; then
+    git checkout "$ORIGINAL_BRANCH" 2>/dev/null || true
+  fi
+}
+
+trap cleanup EXIT
+
+# ─── Phase 1: Pre-flight checks ──────────────────────────────────────────────
+
+step "Running pre-flight checks"
+
+# 1. At least one commit hash argument
+if [[ $# -eq 0 ]]; then
+  fail "No commit hashes provided.\nUsage: cherry-release <hash1> [hash2] ..."
+fi
+check_ok "Received $# commit hash(es)"
+
+# 2. Working tree is clean
+if [[ -n "$(git status --porcelain)" ]]; then
+  fail "Working tree is dirty. Commit or stash your changes first."
+fi
+check_ok "Working tree is clean"
+
+# 3. Required tools available
+for tool in jq sed commit-and-tag-version pnpm; do
+  if ! command -v "$tool" &>/dev/null; then
+    fail "Required tool '$tool' is not installed or not in PATH."
+  fi
+done
+check_ok "Required tools available (jq, sed, commit-and-tag-version, pnpm)"
+
+# 4. Remote write access
+if ! git push --dry-run origin HEAD &>/dev/null; then
+  fail "No write access to the remote repository."
+fi
+check_ok "Remote write access confirmed"
+
+# 5. Fetch latest remote refs
+if ! git fetch origin development staging production 2>/dev/null; then
+  fail "Failed to fetch remote branches (development, staging, production)."
+fi
+check_ok "Fetched latest remote refs"
+
+# 6. All commit hashes are valid commit objects
+for hash in "$@"; do
+  obj_type=$(git cat-file -t "$hash" 2>/dev/null || true)
+  if [[ "$obj_type" != "commit" ]]; then
+    fail "Invalid commit hash: $hash (type: ${obj_type:-not found})"
+  fi
+done
+check_ok "All commit hashes are valid commit objects"
+
+# 7. All commits are reachable from origin/development
+for hash in "$@"; do
+  if ! git merge-base --is-ancestor "$hash" origin/development 2>/dev/null; then
+    fail "Commit $hash is not reachable from origin/development.\nOnly deploy commits that are already merged to development."
+  fi
+done
+check_ok "All commits are reachable from origin/development"
+
+# 8. development is not diverged from origin (can fast-forward)
+local_dev=$(git rev-parse development 2>/dev/null)
+remote_dev=$(git rev-parse origin/development 2>/dev/null)
+merge_base_dev=$(git merge-base development origin/development 2>/dev/null)
+if [[ "$local_dev" != "$remote_dev" && "$merge_base_dev" != "$local_dev" ]]; then
+  fail "Local 'development' has diverged from origin/development.\nResolve this manually before deploying."
+fi
+check_ok "development can fast-forward to origin"
+
+# 9. staging and production have no local-only commits ahead of origin
+for branch in "${BRANCHES[@]}"; do
+  local_ref=$(git rev-parse "$branch" 2>/dev/null || true)
+  remote_ref=$(git rev-parse "origin/$branch" 2>/dev/null || true)
+
+  if [[ -z "$local_ref" || -z "$remote_ref" ]]; then
+    continue  # branch may not exist locally yet — that's fine, reset --hard will create it
+  fi
+
+  ahead=$(git rev-list --count "origin/$branch..$branch" 2>/dev/null || echo "0")
+  if [[ "$ahead" -gt 0 ]]; then
+    fail "Local '$branch' is $ahead commit(s) ahead of origin/$branch.\nThis would be lost on reset. Push or discard those commits first."
+  fi
+done
+check_ok "No local-only commits on staging/production"
+
+# 10. Dry-run cherry-picks in temporary worktrees
+for branch in "${BRANCHES[@]}"; do
+  wt_path="${WORKTREE_DIR}-${branch}"
+  WORKTREES_TO_CLEAN+=("$wt_path")
+
+  # Clean up any leftover worktree from a previous failed run
+  if [[ -d "$wt_path" ]]; then
+    git worktree remove --force "$wt_path" 2>/dev/null || true
+  fi
+
+  git worktree add "$wt_path" "origin/$branch" --detach --quiet 2>/dev/null \
+    || fail "Failed to create test worktree for $branch."
+
+  for hash in "$@"; do
+    short=$(git rev-parse --short "$hash")
+    if ! git -C "$wt_path" cherry-pick --no-commit "$hash" &>/dev/null; then
+      git -C "$wt_path" cherry-pick --abort 2>/dev/null || true
+      fail "Cherry-pick of $short will fail on $branch.\nResolve conflicts before deploying."
+    fi
+    git -C "$wt_path" reset --hard HEAD --quiet 2>/dev/null
+  done
+
+  git worktree remove --force "$wt_path" 2>/dev/null || true
+done
+check_ok "Dry-run cherry-picks succeeded on staging and production"
+
+echo -e "\n\033[1;32mAll pre-flight checks passed.\033[0m"
+
+# ─── Phase 2: Execution ──────────────────────────────────────────────────────
+
+# --- development ---
+step "Deploying to development"
+
+git checkout development
+git pull --ff-only
+pnpm release patch
+git push --follow-tags origin development
+echo -e "  \033[1;32m✓\033[0m development released"
+
+# --- staging ---
+step "Deploying to staging"
+
+git checkout staging
+git reset --hard origin/staging --quiet
+for hash in "$@"; do
+  git cherry-pick "$hash"
+done
+git push origin staging
+pnpm release patch
+git push --follow-tags origin staging
+echo -e "  \033[1;32m✓\033[0m staging released"
+
+# --- production ---
+step "Deploying to production"
+
+git checkout production
+git reset --hard origin/production --quiet
+for hash in "$@"; do
+  git cherry-pick "$hash"
+done
+git push origin production
+pnpm release patch
+git push --follow-tags origin production
+echo -e "  \033[1;32m✓\033[0m production released"
+
+# ─── Phase 3: Cleanup ────────────────────────────────────────────────────────
+
+step "Returning to development"
+
+git checkout development
+git pull --ff-only
+
+echo -e "\n\033[1;32mDeploy complete.\033[0m"

package/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "@neferbyte/cherry-release-cli",
+  "version": "1.0.0",
+  "description": "Cherry-pick commits across environment branches and tag releases",
+  "license": "MIT",
+  "bin": {
+    "cherry-release": "./bin/cherry-release.sh"
+  },
+  "files": [
+    "bin/"
+  ]
+}