@neferbyte/cherry-release-cli 1.0.8 → 1.1.0

package/bin/cherry-release

@@ -8,29 +8,47 @@ WORKTREE_DIR="/tmp/cherry-release-test"
 WORKTREES_TO_CLEAN=()
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
-# ─── Parse --force flag ──────────────────────────────────────────────────────
+# ─── Parse flags ──────────────────────────────────────────────────────────────
 
 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 ;;
+BUMP_TYPE="patch"
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --force)
+      shift
+      if [[ $# -eq 0 || "$1" == --* ]]; then
+        FORCE_ALL=true
+      else
+        while [[ $# -gt 0 && "$1" != --* ]]; do
+          case "$1" in
+            development) FORCE_development=true ;;
+            staging)     FORCE_staging=true ;;
+            production)  FORCE_production=true ;;
+            *) echo -e "\033[1;31mError:\033[0m Unknown branch '$1'. Valid branches: development staging production" >&2; exit 1 ;;
+          esac
+          shift
+        done
+      fi
+      ;;
+    --bump)
+      shift
+      if [[ $# -eq 0 ]]; then
+        echo -e "\033[1;31mError:\033[0m --bump requires an argument (major, minor, patch)" >&2; exit 1
+      fi
+      case "$1" in
+        major|minor|patch) BUMP_TYPE="$1"; shift ;;
+        *) echo -e "\033[1;31mError:\033[0m Invalid bump type '$1'. Must be major, minor, or patch" >&2; exit 1 ;;
       esac
-    done
-    shift $#
-  fi
-fi
+      ;;
+    *)
+      echo -e "\033[1;31mError:\033[0m Unknown option '$1'. Usage: cherry-release [--bump major|minor|patch] [--force [branch ...]]" >&2; exit 1
+      ;;
+  esac
+done
 
 # ─── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -140,13 +158,23 @@ 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)
+  # Filter out version bump commits and already-promoted commits
   filtered=""
   for hash in $hashes; do
-    msg=$(git log -1 --format="%s" "$hash")
-    if [[ ! "$msg" =~ ^chore\(release\): ]]; then
-      filtered="$filtered $hash"
+    subject=$(git log -1 --format="%s" "$hash")
+
+    # Skip version bump commits (commit-and-tag-version)
+    if [[ "$subject" =~ ^chore\(release\): ]]; then
+      continue
+    fi
+
+    # Skip commits whose subject already exists on the target branch
+    # (handles cases where git cherry misidentifies due to package.json/lockfile diffs)
+    if git log "origin/$branch" --format="%s" | grep -qFx "$subject"; then
+      continue
     fi
+
+    filtered="$filtered $hash"
   done
 
   eval "COMMITS_${branch}=\"${filtered# }\""
@@ -214,7 +242,7 @@ if should_deploy "development" "$staging_count"; then
   step "Deploying to development"
   git checkout development
   git pull --ff-only
-  "$SCRIPT_DIR/cherry-release-version" patch
+  "$SCRIPT_DIR/cherry-release-version" "$BUMP_TYPE"
   git push --follow-tags origin development
   echo -e "  \033[1;32m✓\033[0m development released"
 else
@@ -233,7 +261,7 @@ if should_deploy "staging" "${#staging_commits[@]}"; then
     done
     git push origin staging
   fi
-  "$SCRIPT_DIR/cherry-release-version" patch
+  "$SCRIPT_DIR/cherry-release-version" "$BUMP_TYPE"
   git push --follow-tags origin staging
   echo -e "  \033[1;32m✓\033[0m staging released"
 else
@@ -252,7 +280,7 @@ if should_deploy "production" "${#production_commits[@]}"; then
     done
     git push origin production
   fi
-  "$SCRIPT_DIR/cherry-release-version" patch
+  "$SCRIPT_DIR/cherry-release-version" "$BUMP_TYPE"
   git push --follow-tags origin production
   echo -e "  \033[1;32m✓\033[0m production released"
 else

package/package.json

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