@neferbyte/cherry-release-cli 1.0.5 → 1.0.7

package/bin/cherry-release

@@ -3,12 +3,35 @@ set -e
 
 # ─── Constants ────────────────────────────────────────────────────────────────
 
-BRANCHES=(staging production)
 ORIGINAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 WORKTREE_DIR="/tmp/cherry-release-test"
 WORKTREES_TO_CLEAN=()
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
+# ─── Parse --force flag ──────────────────────────────────────────────────────
+
+FORCE_ALL=false
+FORCE_development=false
+FORCE_staging=false
+FORCE_production=false
+
+if [[ "$1" == "--force" ]]; then
+  shift
+  if [[ $# -eq 0 ]]; then
+    FORCE_ALL=true
+  else
+    for arg in "$@"; do
+      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
+fi
+
 # ─── Helpers ──────────────────────────────────────────────────────────────────
 
 fail() {
@@ -24,6 +47,22 @@ 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
+  is_forced "$branch" && return 0
+  [[ "$commit_count" -gt 0 ]] && return 0
+  return 1
+}
+
 cleanup() {
   for wt in "${WORKTREES_TO_CLEAN[@]}"; do
     if [[ -d "$wt" ]]; then
@@ -79,7 +118,7 @@ fi
 check_ok "development can fast-forward to origin"
 
 # 6. staging and production have no local-only commits ahead of origin
-for branch in "${BRANCHES[@]}"; do
+for branch in staging production; do
   local_ref=$(git rev-parse "$branch" 2>/dev/null || true)
   remote_ref=$(git rev-parse "origin/$branch" 2>/dev/null || true)
 
@@ -95,35 +134,51 @@ done
 check_ok "No local-only commits on staging/production"
 
 # 7. Auto-discover commits to promote (per target branch)
-declare -A COMMITS_FOR
-for branch in "${BRANCHES[@]}"; do
+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 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
+  fi
+done
 
-if [[ "$staging_count" -eq 0 && "$production_count" -eq 0 ]]; then
-  echo -e "\n\033[1;32mNothing to promote.\033[0m staging and production are up to date."
+if [[ "$has_work" == false ]]; then
+  echo -e "\n\033[1;32mNothing to do.\033[0m All branches are up to date."
   exit 0
 fi
 
 check_ok "Discovered commits to promote (staging: $staging_count, production: $production_count)"
 
 # 8. Dry-run cherry-picks in temporary worktrees
-for branch in "${BRANCHES[@]}"; do
-  commits=(${COMMITS_FOR[$branch]})
+for branch in staging production; do
+  commits_var="COMMITS_${branch}"
+  commits=(${!commits_var})
   if [[ ${#commits[@]} -eq 0 ]]; then
     continue
   fi
@@ -155,24 +210,29 @@ 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
-"$SCRIPT_DIR/cherry-release-version" patch
-git push --follow-tags origin development
-echo -e "  \033[1;32m✓\033[0m development released"
+if should_deploy "development" "$staging_count"; then
+  step "Deploying to development"
+  git checkout development
+  git pull --ff-only
+  "$SCRIPT_DIR/cherry-release-version" patch
+  git push --follow-tags origin development
+  echo -e "  \033[1;32m✓\033[0m development released"
+else
+  echo -e "\n\033[1;34m→\033[0m Skipping development (up to date)"
+fi
 
 # --- staging ---
-staging_commits=(${COMMITS_FOR[staging]})
-if [[ ${#staging_commits[@]} -gt 0 ]]; then
+staging_commits=($COMMITS_staging)
+if should_deploy "staging" "${#staging_commits[@]}"; then
   step "Deploying to staging (${#staging_commits[@]} commit(s))"
   git checkout staging
   git reset --hard origin/staging --quiet
-  for hash in "${staging_commits[@]}"; do
-    git cherry-pick "$hash"
-  done
-  git push origin staging
+  if [[ ${#staging_commits[@]} -gt 0 ]]; then
+    for hash in "${staging_commits[@]}"; do
+      git cherry-pick "$hash"
+    done
+    git push origin staging
+  fi
   "$SCRIPT_DIR/cherry-release-version" patch
   git push --follow-tags origin staging
   echo -e "  \033[1;32m✓\033[0m staging released"
@@ -181,15 +241,17 @@ else
 fi
 
 # --- production ---
-production_commits=(${COMMITS_FOR[production]})
-if [[ ${#production_commits[@]} -gt 0 ]]; then
+production_commits=($COMMITS_production)
+if should_deploy "production" "${#production_commits[@]}"; then
   step "Deploying to production (${#production_commits[@]} commit(s))"
   git checkout production
   git reset --hard origin/production --quiet
-  for hash in "${production_commits[@]}"; do
-    git cherry-pick "$hash"
-  done
-  git push origin production
+  if [[ ${#production_commits[@]} -gt 0 ]]; then
+    for hash in "${production_commits[@]}"; do
+      git cherry-pick "$hash"
+    done
+    git push origin production
+  fi
   "$SCRIPT_DIR/cherry-release-version" patch
   git push --follow-tags origin production
   echo -e "  \033[1;32m✓\033[0m production released"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neferbyte/cherry-release-cli",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Cherry-pick commits across environment branches and tag releases",
   "license": "MIT",
   "bin": {