Guard dev pushes against missing version bumps

Author: alexphillips-dev

.githooks/pre-push

@@ -7,6 +7,9 @@ cd "${ROOT_DIR}"
 echo "[pre-push] Running main branch history guard..."
 bash scripts/main_branch_history_guard.sh
 
+echo "[pre-push] Running dev version bump guard..."
+bash scripts/dev_version_bump_guard.sh
+
 echo "[pre-push] Running release guard checks..."
 bash scripts/release_guard.sh
 

scripts/dev_version_bump_guard.sh

@@ -0,0 +1,114 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+# shellcheck source=scripts/lib.sh
+source "${ROOT_DIR}/scripts/lib.sh"
+cd "${ROOT_DIR}"
+
+fvplus::require_commands git sed
+
+detect_branch() {
+  local branch=""
+  branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || true)"
+  if [[ -z "${branch}" || "${branch}" == "HEAD" ]]; then
+    branch="${GITHUB_REF_NAME:-}"
+    branch="${branch#refs/heads/}"
+  fi
+  printf '%s' "${branch}"
+}
+
+resolve_base_ref() {
+  local explicit_base="${FVPLUS_DEV_VERSION_BASE_REF:-}"
+  if [[ -n "${explicit_base}" ]]; then
+    if git rev-parse --verify "${explicit_base}^{commit}" >/dev/null 2>&1; then
+      printf '%s' "${explicit_base}"
+      return
+    fi
+    fvplus::fail "FVPLUS_DEV_VERSION_BASE_REF does not resolve to a commit: ${explicit_base}"
+  fi
+
+  if git rev-parse --verify '@{upstream}' >/dev/null 2>&1; then
+    printf '%s' '@{upstream}'
+    return
+  fi
+
+  if git rev-parse --verify 'refs/remotes/origin/dev^{commit}' >/dev/null 2>&1; then
+    printf '%s' 'refs/remotes/origin/dev'
+    return
+  fi
+
+  if git rev-parse --verify 'HEAD~1' >/dev/null 2>&1; then
+    printf '%s' 'HEAD~1'
+    return
+  fi
+
+  printf '%s' ''
+}
+
+read_version_from_ref() {
+  local ref_name="${1:-}"
+  local payload=""
+  payload="$(git show "${ref_name}:folderview.plus.plg" 2>/dev/null || true)"
+  if [[ -z "${payload}" ]]; then
+    printf '%s' ''
+    return
+  fi
+  printf '%s\n' "${payload}" | sed -n 's/^<!ENTITY version "\([^"]*\)".*/\1/p' | head -n 1
+}
+
+is_release_relevant_path() {
+  local file_path="${1:-}"
+  case "${file_path}" in
+    src/folderview.plus/*|folderview.plus.plg|folderview.plus.xml)
+      return 0
+      ;;
+    *)
+      return 1
+      ;;
+  esac
+}
+
+TARGET_BRANCH="$(detect_branch)"
+if [[ "${TARGET_BRANCH}" != "dev" ]]; then
+  echo "Dev version bump guard skipped: branch=${TARGET_BRANCH:-unknown}"
+  exit 0
+fi
+
+BASE_REF="$(resolve_base_ref)"
+if [[ -z "${BASE_REF}" ]]; then
+  echo "Dev version bump guard passed: no comparison base available."
+  exit 0
+fi
+
+CURRENT_VERSION="$(fvplus::read_plg_version "${ROOT_DIR}/folderview.plus.plg")"
+BASE_VERSION="$(read_version_from_ref "${BASE_REF}")"
+if [[ -z "${BASE_VERSION}" ]]; then
+  echo "Dev version bump guard passed: base manifest unavailable at ${BASE_REF}."
+  exit 0
+fi
+
+mapfile -t CHANGED_FILES < <(git diff --name-only "${BASE_REF}..HEAD" || true)
+RELEASE_RELEVANT_FILES=()
+for file_path in "${CHANGED_FILES[@]}"; do
+  [[ -z "${file_path}" ]] && continue
+  if is_release_relevant_path "${file_path}"; then
+    RELEASE_RELEVANT_FILES+=("${file_path}")
+  fi
+done
+
+if [[ "${#RELEASE_RELEVANT_FILES[@]}" -eq 0 ]]; then
+  echo "Dev version bump guard passed: no shipped plugin files changed."
+  exit 0
+fi
+
+if [[ "${CURRENT_VERSION}" == "${BASE_VERSION}" ]]; then
+  echo "ERROR: dev pushes that change shipped plugin files must bump folderview.plus.plg version." >&2
+  echo "base=${BASE_REF} version=${BASE_VERSION} current=${CURRENT_VERSION}" >&2
+  echo "Changed shipped files:" >&2
+  printf '  %s\n' "${RELEASE_RELEVANT_FILES[@]}" >&2
+  echo "HINT: Run 'bash scripts/release_prepare.sh' or 'bash pkg_build.sh', commit the updated manifest/archive artifacts, then push dev again." >&2
+  exit 1
+fi
+
+echo "Dev version bump guard passed: ${BASE_VERSION} -> ${CURRENT_VERSION}"

tests/versioning-guard.test.mjs

@@ -33,11 +33,13 @@ const themeRuntimeGuardPath = path.join(repoRoot, 'scripts/theme_runtime_guard.s
 const perfBudgetGuardPath = path.join(repoRoot, 'scripts/perf_budget_guard.sh');
 const reproBuildGuardPath = path.join(repoRoot, 'scripts/repro_build_guard.sh');
 const mainBranchHistoryGuardPath = path.join(repoRoot, 'scripts/main_branch_history_guard.sh');
+const devVersionBumpGuardPath = path.join(repoRoot, 'scripts/dev_version_bump_guard.sh');
 const pruneArchivesPath = path.join(repoRoot, 'scripts/prune_archives.sh');
 const unraidMatrixSmokePath = path.join(repoRoot, 'scripts/unraid_matrix_smoke.sh');
 const ensureChangesPath = path.join(repoRoot, 'scripts/ensure_plg_changes_entry.sh');
 const doctorPath = path.join(repoRoot, 'scripts/doctor.sh');
 const sharedLibPath = path.join(repoRoot, 'scripts/lib.sh');
+const prePushHookPath = path.join(repoRoot, '.githooks/pre-push');
 const perfBaselinePath = path.join(repoRoot, 'scripts/perf_baseline.json');
 const pkgBuild = fs.readFileSync(pkgBuildPath, 'utf8');
 const stableTemplate = fs.readFileSync(stableTemplatePath, 'utf8');
@@ -69,11 +71,13 @@ const themeRuntimeGuard = fs.readFileSync(themeRuntimeGuardPath, 'utf8');
 const perfBudgetGuard = fs.readFileSync(perfBudgetGuardPath, 'utf8');
 const reproBuildGuard = fs.readFileSync(reproBuildGuardPath, 'utf8');
 const mainBranchHistoryGuard = fs.readFileSync(mainBranchHistoryGuardPath, 'utf8');
+const devVersionBumpGuard = fs.readFileSync(devVersionBumpGuardPath, 'utf8');
 const pruneArchives = fs.readFileSync(pruneArchivesPath, 'utf8');
 const unraidMatrixSmoke = fs.readFileSync(unraidMatrixSmokePath, 'utf8');
 const ensureChanges = fs.readFileSync(ensureChangesPath, 'utf8');
 const doctorScript = fs.readFileSync(doctorPath, 'utf8');
 const sharedLib = fs.readFileSync(sharedLibPath, 'utf8');
+const prePushHook = fs.readFileSync(prePushHookPath, 'utf8');
 const perfBaseline = JSON.parse(fs.readFileSync(perfBaselinePath, 'utf8'));
 
 test('pkg_build computes stable versions per current date only', () => {
@@ -208,6 +212,19 @@ test('remote publish guard validates raw manifest, archive, and checksum after p
     assert.match(remotePublishGuard, /remote raw manifest, archive, and checksum match/);
 });
 
+test('dev pushes that change shipped plugin files must bump the manifest version', () => {
+    assert.match(devVersionBumpGuard, /TARGET_BRANCH="\$\(detect_branch\)"/);
+    assert.match(devVersionBumpGuard, /if \[\[ "\$\{TARGET_BRANCH\}" != "dev" \]\]/);
+    assert.match(devVersionBumpGuard, /FVPLUS_DEV_VERSION_BASE_REF/);
+    assert.match(devVersionBumpGuard, /fvplus::read_plg_version "\$\{ROOT_DIR\}\/folderview\.plus\.plg"/);
+    assert.match(devVersionBumpGuard, /git show "\$\{ref_name\}:folderview\.plus\.plg"/);
+    assert.match(devVersionBumpGuard, /src\/folderview\.plus\/\*|folderview\.plus\.plg|folderview\.plus\.xml/);
+    assert.match(devVersionBumpGuard, /change shipped plugin files must bump folderview\.plus\.plg version/);
+    assert.match(devVersionBumpGuard, /bash scripts\/release_prepare\.sh' or 'bash pkg_build\.sh/);
+    assert.match(prePushHook, /echo "\[pre-push\] Running dev version bump guard\.\.\."/);
+    assert.match(prePushHook, /bash scripts\/dev_version_bump_guard\.sh/);
+});
+
 test('browser smoke scripts require folder editor coverage and include real editor interaction smoke', () => {
     assert.match(browserSmokeShell, /FVPLUS_BROWSER_SMOKE_URL/);
     assert.match(browserSmokeShell, /FVPLUS_BROWSER_SMOKE_REQUIRED/);