@neferbyte/cherry-release-cli 1.0.6 → 1.0.8

package/bin/cherry-release

@@ -3,7 +3,6 @@ set -e
 
 # ─── Constants ────────────────────────────────────────────────────────────────
 
-ALL_BRANCHES=(development staging production)
 ORIGINAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 WORKTREE_DIR="/tmp/cherry-release-test"
 WORKTREES_TO_CLEAN=()
@@ -12,8 +11,9 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # ─── Parse --force flag ──────────────────────────────────────────────────────
 
 FORCE_ALL=false
-declare -A FORCE_BRANCH
-for b in "${ALL_BRANCHES[@]}"; do FORCE_BRANCH[$b]=false; done
+FORCE_development=false
+FORCE_staging=false
+FORCE_production=false
 
 if [[ "$1" == "--force" ]]; then
   shift
@@ -21,18 +21,12 @@ if [[ "$1" == "--force" ]]; then
     FORCE_ALL=true
   else
     for arg in "$@"; do
-      found=false
-      for b in "${ALL_BRANCHES[@]}"; do
-        if [[ "$arg" == "$b" ]]; then
-          FORCE_BRANCH[$b]=true
-          found=true
-          break
-        fi
-      done
-      if [[ "$found" == false ]]; then
-        echo -e "\033[1;31mError:\033[0m Unknown branch '$arg'. Valid branches: ${ALL_BRANCHES[*]}" >&2
-        exit 1
-      fi
+      case "$arg" in
+        development) FORCE_development=true ;;
+        staging)     FORCE_staging=true ;;
+        production)  FORCE_production=true ;;
+        *) echo -e "\033[1;31mError:\033[0m Unknown branch '$arg'. Valid branches: development staging production" >&2; exit 1 ;;
+      esac
     done
     shift $#
   fi
@@ -53,11 +47,18 @@ check_ok() {
   echo -e "  \033[1;32m✓\033[0m $1"
 }
 
+is_forced() {
+  local branch=$1
+  [[ "$FORCE_ALL" == true ]] && return 0
+  local var="FORCE_$branch"
+  [[ "${!var}" == true ]] && return 0
+  return 1
+}
+
 should_deploy() {
   local branch=$1
   local commit_count=$2
-  [[ "$FORCE_ALL" == true ]] && return 0
-  [[ "${FORCE_BRANCH[$branch]}" == true ]] && return 0
+  is_forced "$branch" && return 0
   [[ "$commit_count" -gt 0 ]] && return 0
   return 1
 }
@@ -133,31 +134,34 @@ done
 check_ok "No local-only commits on staging/production"
 
 # 7. Auto-discover commits to promote (per target branch)
-declare -A COMMITS_FOR
+COMMITS_staging=""
+COMMITS_production=""
+
 for branch in staging production; do
   hashes=$(git cherry "origin/$branch" origin/development | grep '^+' | awk '{print $2}')
 
   # Filter out version bump commits (commit-and-tag-version)
-  filtered=()
+  filtered=""
   for hash in $hashes; do
     msg=$(git log -1 --format="%s" "$hash")
     if [[ ! "$msg" =~ ^chore\(release\): ]]; then
-      filtered+=("$hash")
+      filtered="$filtered $hash"
     fi
   done
 
-  COMMITS_FOR[$branch]="${filtered[*]}"
+  eval "COMMITS_${branch}=\"${filtered# }\""
 done
 
-staging_count=$(echo "${COMMITS_FOR[staging]}" | wc -w | tr -d ' ')
-production_count=$(echo "${COMMITS_FOR[production]}" | wc -w | tr -d ' ')
+staging_count=$(echo $COMMITS_staging | wc -w | tr -d ' ')
+production_count=$(echo $COMMITS_production | wc -w | tr -d ' ')
 
 # Check if there's anything to do
 has_work=false
-for branch in "${ALL_BRANCHES[@]}"; do
+for branch in development staging production; do
   count=0
   [[ "$branch" == "staging" ]] && count=$staging_count
   [[ "$branch" == "production" ]] && count=$production_count
+  [[ "$branch" == "development" ]] && count=$staging_count  # development deploys when downstream has work
   if should_deploy "$branch" "$count"; then
     has_work=true
     break
@@ -173,7 +177,8 @@ check_ok "Discovered commits to promote (staging: $staging_count, production: $p
 
 # 8. Dry-run cherry-picks in temporary worktrees
 for branch in staging production; do
-  commits=(${COMMITS_FOR[$branch]})
+  commits_var="COMMITS_${branch}"
+  commits=(${!commits_var})
   if [[ ${#commits[@]} -eq 0 ]]; then
     continue
   fi
@@ -217,7 +222,7 @@ else
 fi
 
 # --- staging ---
-staging_commits=(${COMMITS_FOR[staging]})
+staging_commits=($COMMITS_staging)
 if should_deploy "staging" "${#staging_commits[@]}"; then
   step "Deploying to staging (${#staging_commits[@]} commit(s))"
   git checkout staging
@@ -236,7 +241,7 @@ else
 fi
 
 # --- production ---
-production_commits=(${COMMITS_FOR[production]})
+production_commits=($COMMITS_production)
 if should_deploy "production" "${#production_commits[@]}"; then
   step "Deploying to production (${#production_commits[@]} commit(s))"
   git checkout production

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neferbyte/cherry-release-cli",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Cherry-pick commits across environment branches and tag releases",
   "license": "MIT",
   "bin": {
@@ -9,5 +9,8 @@
   },
   "files": [
     "bin/"
-  ]
+  ],
+  "peerDependencies": {
+    "commit-and-tag-version": ">=12.0.0"
+  }
 }