@neferbyte/cherry-release-cli 1.0.1 → 1.0.3

package/bin/cherry-release.sh

@@ -7,6 +7,7 @@ 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)"
 
 # ─── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -42,56 +43,33 @@ trap cleanup EXIT
 
 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
+# 1. 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
+# 2. Required tools available
+for tool in jq sed commit-and-tag-version; 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)"
+check_ok "Required tools available (jq, sed, commit-and-tag-version)"
 
-# 4. Remote write access
+# 3. 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
+# 4. 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)
+# 5. 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)
@@ -100,13 +78,13 @@ if [[ "$local_dev" != "$remote_dev" && "$merge_base_dev" != "$local_dev" ]]; the
 fi
 check_ok "development can fast-forward to origin"
 
-# 9. staging and production have no local-only commits ahead of origin
+# 6. 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
+    continue
   fi
 
   ahead=$(git rev-list --count "origin/$branch..$branch" 2>/dev/null || echo "0")
@@ -116,12 +94,43 @@ for branch in "${BRANCHES[@]}"; do
 done
 check_ok "No local-only commits on staging/production"
 
-# 10. Dry-run cherry-picks in temporary worktrees
+# 7. Auto-discover commits to promote (per target branch)
+declare -A COMMITS_FOR
+for branch in "${BRANCHES[@]}"; do
+  hashes=$(git cherry "origin/$branch" origin/development | grep '^+' | awk '{print $2}')
+
+  # Filter out version bump commits (commit-and-tag-version)
+  filtered=()
+  for hash in $hashes; do
+    msg=$(git log -1 --format="%s" "$hash")
+    if [[ ! "$msg" =~ ^chore\(release\): ]]; then
+      filtered+=("$hash")
+    fi
+  done
+
+  COMMITS_FOR[$branch]="${filtered[*]}"
+done
+
+staging_count=$(echo "${COMMITS_FOR[staging]}" | wc -w | tr -d ' ')
+production_count=$(echo "${COMMITS_FOR[production]}" | wc -w | tr -d ' ')
+
+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."
+  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]})
+  if [[ ${#commits[@]} -eq 0 ]]; then
+    continue
+  fi
+
   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
@@ -129,7 +138,7 @@ for branch in "${BRANCHES[@]}"; do
   git worktree add "$wt_path" "origin/$branch" --detach --quiet 2>/dev/null \
     || fail "Failed to create test worktree for $branch."
 
-  for hash in "$@"; do
+  for hash in "${commits[@]}"; do
     short=$(git rev-parse --short "$hash")
     if ! git -C "$wt_path" cherry-pick "$hash" &>/dev/null; then
       git -C "$wt_path" cherry-pick --abort 2>/dev/null || true
@@ -139,7 +148,7 @@ for branch in "${BRANCHES[@]}"; do
 
   git worktree remove --force "$wt_path" 2>/dev/null || true
 done
-check_ok "Dry-run cherry-picks succeeded on staging and production"
+check_ok "Dry-run cherry-picks succeeded"
 
 echo -e "\n\033[1;32mAll pre-flight checks passed.\033[0m"
 
@@ -150,33 +159,39 @@ step "Deploying to development"
 
 git checkout development
 git pull --ff-only
-pnpm release patch
+"$SCRIPT_DIR/release.sh" patch
 git push --follow-tags origin development
 echo -e "  \033[1;32m✓\033[0m development released"
 
 # --- staging ---
-step "Deploying to staging"
+staging_commits=(${COMMITS_FOR[staging]})
+step "Deploying to staging (${#staging_commits[@]} commit(s))"
 
 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
+if [[ ${#staging_commits[@]} -gt 0 ]]; then
+  for hash in "${staging_commits[@]}"; do
+    git cherry-pick "$hash"
+  done
+  git push origin staging
+fi
+"$SCRIPT_DIR/release.sh" patch
 git push --follow-tags origin staging
 echo -e "  \033[1;32m✓\033[0m staging released"
 
 # --- production ---
-step "Deploying to production"
+production_commits=(${COMMITS_FOR[production]})
+step "Deploying to production (${#production_commits[@]} commit(s))"
 
 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
+if [[ ${#production_commits[@]} -gt 0 ]]; then
+  for hash in "${production_commits[@]}"; do
+    git cherry-pick "$hash"
+  done
+  git push origin production
+fi
+"$SCRIPT_DIR/release.sh" patch
 git push --follow-tags origin production
 echo -e "  \033[1;32m✓\033[0m production released"
 

package/bin/release.sh

@@ -0,0 +1,113 @@
+#!/usr/bin/env bash
+
+set -e
+
+if [[ -n $1 && ! $1 =~ ^(major|minor|patch)$ ]]; then
+  echo "Usage: $0 [major|minor|patch]"
+  exit 1
+fi
+
+for cmd in jq git sed commit-and-tag-version; do
+  command -v $cmd >/dev/null 2>&1 || {
+    echo "$cmd is required but not installed. Aborting."
+    exit 1
+  }
+done
+
+removePrerelease() {
+  newVersion=$(echo "$currentVersion" | sed 's/-.*//')
+  jq ".version = \"$newVersion\"" package.json >package.json.tmp
+  mv package.json.tmp package.json
+}
+
+currentVersion=$(jq -r '.version' package.json)
+branch=$(git branch --show-current)
+
+if [[ $currentVersion =~ ^[0-9]+\.[0-9]+\.[0-9]+-(dev|rc)\.[0-9]+$ ]]; then
+  currentRelease="${BASH_REMATCH[1]}"
+  mainVersion="${currentVersion%%-*}"
+else
+  currentRelease=""
+  mainVersion="${currentVersion}"
+fi
+
+case $1 in
+major)
+  releaseType="--release-as major"
+  ;;
+
+minor)
+  releaseType="--release-as minor"
+  ;;
+
+patch)
+  releaseType="--release-as patch"
+  ;;
+
+*)
+  releaseType=""
+  ;;
+esac
+
+case $branch in
+development)
+  # No change - it comes from development release
+  if [[ $currentRelease = 'dev' ]]; then
+    # Release type is explicitly defined; remove prerelease to enforce it
+    if [[ -n $releaseType ]]; then
+      removePrerelease
+    fi
+    # Carry out operation; variations depend on $releaseType's value
+    commit-and-tag-version --tag-prefix "" --prerelease dev $releaseType
+  # It comes from a later stage release; pump up is mandatory; remove prerelease
+  else
+    removePrerelease
+    # No explicitly defined release type; go forward with minor
+    if [[ -z $releaseType ]]; then
+      commit-and-tag-version --tag-prefix "" --prerelease dev --release-as minor
+    # Explicitly defined release type; just go forward with it
+    else
+      commit-and-tag-version --tag-prefix "" --prerelease dev $releaseType
+    fi
+  fi
+  ;;
+
+staging)
+  # No change - it comes from staging release
+  if [[ $currentRelease = 'rc' ]]; then
+    if [[ -n $releaseType ]]; then
+      removePrerelease
+    fi
+
+    commit-and-tag-version --tag-prefix "" --prerelease rc $releaseType
+  # It comes from dev; several things could happen
+  elif [[ $currentRelease = 'dev' ]]; then
+    # No explicitly defined release type; adopts main version by just replacing dev with rc
+    if [[ -z $releaseType ]]; then
+      commit-and-tag-version --tag-prefix "" --prerelease rc --release-as $mainVersion
+    # Explicitly defined release type; just go forward with it
+    else
+      commit-and-tag-version --tag-prefix "" --prerelease rc $releaseType
+    fi
+  # It comes from production; pump up is mandatory; remove prerelease
+  else
+    removePrerelease
+    # No explicitly defined release type; continue with minor
+    if [[ -z $releaseType ]]; then
+      commit-and-tag-version --tag-prefix "" --prerelease rc --release-as minor
+    # Explicitly defined release type; just go forward with it
+    else
+      commit-and-tag-version --tag-prefix "" --prerelease rc $releaseType
+    fi
+  fi
+  ;;
+
+production)
+  commit-and-tag-version --tag-prefix "" $releaseType
+  ;;
+
+*)
+  echo "Release is not allowed in the current branch"
+  exit 1
+  ;;
+esac

package/package.json

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