@neferbyte/cherry-release-cli 1.0.0 → 1.0.2

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 ──────────────────────────────────────────────────────────────────
 
@@ -55,12 +56,12 @@ fi
 check_ok "Working tree is clean"
 
 # 3. Required tools available
-for tool in jq sed commit-and-tag-version pnpm; do
+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
 if ! git push --dry-run origin HEAD &>/dev/null; then
@@ -131,11 +132,10 @@ for branch in "${BRANCHES[@]}"; do
 
   for hash in "$@"; do
     short=$(git rev-parse --short "$hash")
-    if ! git -C "$wt_path" cherry-pick --no-commit "$hash" &>/dev/null; then
+    if ! git -C "$wt_path" cherry-pick "$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
@@ -151,7 +151,7 @@ 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"
 
@@ -164,7 +164,7 @@ for hash in "$@"; do
   git cherry-pick "$hash"
 done
 git push origin staging
-pnpm release patch
+"$SCRIPT_DIR/release.sh" patch
 git push --follow-tags origin staging
 echo -e "  \033[1;32m✓\033[0m staging released"
 
@@ -177,7 +177,7 @@ for hash in "$@"; do
   git cherry-pick "$hash"
 done
 git push origin production
-pnpm release patch
+"$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.0",
+  "version": "1.0.2",
   "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/"