half-orm-dev 0.17.0a2__tar.gz → 0.17.0a4__tar.gz

{half_orm_dev-0.17.0a2/half_orm_dev.egg-info → half_orm_dev-0.17.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.0a2
+Version: 0.17.0a4
 Summary: half_orm development Framework.
 Home-page: https://github.com/collorg/halfORM_dev
 Author: Joël Maïzi

{half_orm_dev-0.17.0a2 → half_orm_dev-0.17.0a4}/half_orm_dev/release_manager.py

@@ -2520,10 +2520,26 @@ class ReleaseManager:
         rc_tag = f"v{version}-rc{rc_number}"  # Use v prefix and rc1 for first RC
 
         try:
-            # Checkout release branch
+            # 1. Apply patches to database (for validation)
+            # 1.1. Restore database from baseline
+            self._repo.restore_database_from_schema()
+
+            # 1.2. Apply all previous RC patches in order
+            rc_files = self.get_rc_files(version)
+            for rc_file_name in rc_files:
+                rc_patches = self.read_release_patches(rc_file_name)
+                for patch_id in rc_patches:
+                    self._repo.patch_manager.apply_patch_files(patch_id, self._repo.model)
+
+            # 1.3. Apply stage patches
+            stage_patches = self.read_release_patches(f"{version}-stage.txt")
+            for patch_id in stage_patches:
+                self._repo.patch_manager.apply_patch_files(patch_id, self._repo.model)
+
+            # 2. Checkout release branch
             self._repo.hgit.checkout(release_branch)
 
-            # Create RC tag on release branch
+            # 3. Create RC tag on release branch
             self._repo.hgit.create_tag(rc_tag, f"Release Candidate {version}")
 
             # Push tag
@@ -2630,7 +2646,33 @@ class ReleaseManager:
                         "ho-prod has been restored to its previous state."
                     )
 
-            # 3. Rename rc file to prod
+            # 3. Apply patches and generate schema
+            # 3.1. Restore database from baseline
+            self._repo.restore_database_from_schema()
+
+            # 3.2. Apply all RC patches in order
+            rc_files = self.get_rc_files(version)
+            for rc_file in rc_files:
+                rc_patches = self.read_release_patches(rc_file)
+                for patch_id in rc_patches:
+                    self._repo.patch_manager.apply_patch_files(patch_id, self._repo.model)
+
+            # 3.3. Apply stage patches (before renaming to prod)
+            stage_patches = self.read_release_patches(f"{version}-stage.txt")
+            for patch_id in stage_patches:
+                self._repo.patch_manager.apply_patch_files(patch_id, self._repo.model)
+
+            # 3.4. Generate schema dump for this version
+            from pathlib import Path
+            model_dir = Path(self._repo.base_dir) / "model"
+            self._repo.database._generate_schema_sql(version, model_dir)
+
+            # 3.5. Commit schema files
+            self._repo.hgit.add(str(model_dir / f"schema-{version}.sql"))
+            self._repo.hgit.add(str(model_dir / f"metadata-{version}.sql"))
+            self._repo.hgit.add(str(model_dir / "schema.sql"))  # symlink
+
+            # 4. Rename stage file to prod
             prod_file = self._releases_dir / f"{version}.txt"
             stage_file.rename(prod_file)
             self._repo.hgit.add(str(stage_file))   # Old path

half_orm_dev-0.17.0a4/half_orm_dev/templates/git-hooks/pre-commit

@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+
+# Half-ORM pre-commit hook
+# 1. Checks if current ho-* branch exists on remote origin
+# 2. Protects ho-prod branch from direct commits
+# Generated by half_orm_dev
+
+# Get current branch
+CURRENT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
+
+# Check if current ho-* branch (except ho-prod) still exists on remote origin
+# This prevents committing to ho-* branches that were deleted remotely
+if [[ "$CURRENT_BRANCH" == ho-* ]] && [ "$CURRENT_BRANCH" != "ho-prod" ]; then
+    # Fetch remote refs quietly (only updates remote tracking, doesn't modify local branches)
+    git fetch origin --prune --quiet 2>/dev/null || true
+
+    # Check if branch exists on remote
+    if ! git show-ref --verify --quiet "refs/remotes/origin/$CURRENT_BRANCH"; then
+        cat << EOF
+❌ Branch '$CURRENT_BRANCH' no longer exists on remote origin
+
+This Half-ORM branch was deleted on the remote repository (likely cleaned up
+after a release promotion). You cannot commit to a branch that doesn't exist
+remotely.
+
+Common causes:
+  • ho-release/<version>/<patch_id> branches are deleted after promotion to prod
+  • ho-patch/<patch_id> branches are renamed to ho-release/<version>/<patch_id> after integration
+  • Branch was manually deleted by another team member
+
+What to do:
+  1. Save your changes if needed:
+     $ git stash
+
+  2. Switch to ho-prod:
+     $ git checkout ho-prod
+
+  3. Delete this stale local branch:
+     $ git branch -D $CURRENT_BRANCH
+
+  4. Create a new patch and restore your changes if you stashed them:
+     $ git stash pop
+
+For more information about branch lifecycle, see Half-ORM documentation.
+
+EOF
+        exit 1
+    fi
+fi
+
+# Check if we're on ho-prod branch
+if [ "$CURRENT_BRANCH" != "ho-prod" ]; then
+    # Not on ho-prod, allow commit
+    exit 0
+fi
+
+# Check if this is a temporary validation tag commit (allows automated promotion)
+CURRENT_TAG=$(git describe --exact-match --tags HEAD 2>/dev/null | grep -E '^temp-valid-')
+
+if [ -n "$CURRENT_TAG" ]; then
+    # This is an automated promotion commit with temp tag, allow it
+    exit 0
+fi
+
+# Check if there's an active lock on ho-prod
+# Lock tags follow pattern: lock-ho-prod-{timestamp}
+LOCK_TAG=$(git tag -l 'lock-ho-prod-*' 2>/dev/null | head -n 1)
+
+if [ -n "$LOCK_TAG" ]; then
+    # Lock is active, allow commit from Half-ORM workflow
+    exit 0
+fi
+
+# Direct commit on ho-prod is not allowed
+cat << 'EOF'
+❌ Direct commits on 'ho-prod' are not allowed
+
+The ho-prod branch is a protected production branch. Changes must be
+promoted through the official Half-ORM release workflow.
+
+To create a patch:
+  $ half_orm dev patch new <patch_id>
+
+To add a patch to a release:
+  $ half_orm dev patch <patch_id> add-to-release [release]
+
+To promote a stage release to rc/production:
+  $ half_orm dev release promote <rc|prod>
+
+This workflow ensures:
+  • All patches are validated and tested
+  • Code is properly merged from patch branches
+  • Active patch branches are notified to rebase
+  • Production deploys are tracked and auditable
+
+For more information, see the Half-ORM documentation on release management.
+
+EOF
+
+exit 1

half_orm_dev-0.17.0a4/half_orm_dev/templates/git-hooks/prepare-commit-msg

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# Half-ORM prepare-commit-msg hook
+# Automatically appends ticket reference (#N) to commit messages
+# when on ho-patch/{N}-... branches
+# Generated by half_orm_dev
+
+COMMIT_MSG_FILE=$1
+
+# Get current branch
+CURRENT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
+
+# Check if on ho-patch branch
+if [[ "$CURRENT_BRANCH" == ho-patch/* ]]; then
+    # Extract patch_id from ho-patch/{patch_id}
+    PATCH_ID="${CURRENT_BRANCH#ho-patch/}"
+
+    # Extract ticket number (first part before '-')
+    TICKET_NUMBER="${PATCH_ID%%-*}"
+
+    # Remove leading zeros for consistency
+    TICKET_NUMBER=$(echo "$TICKET_NUMBER" | sed 's/^0*//')
+
+    # Handle edge case where ticket is "0" or empty after stripping
+    if [ -z "$TICKET_NUMBER" ]; then
+        TICKET_NUMBER="0"
+    fi
+
+    # Check if message already contains the reference
+    if ! grep -q "#$TICKET_NUMBER\b" "$COMMIT_MSG_FILE"; then
+        # Append ticket reference to commit message
+        echo "" >> "$COMMIT_MSG_FILE"
+        echo "Refs #$TICKET_NUMBER" >> "$COMMIT_MSG_FILE"
+    fi
+fi
+
+exit 0

half_orm_dev-0.17.0a4/half_orm_dev/version.txt

@@ -0,0 +1 @@
+0.17.0-a4

{half_orm_dev-0.17.0a2 → half_orm_dev-0.17.0a4/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.0a2
+Version: 0.17.0a4
 Summary: half_orm development Framework.
 Home-page: https://github.com/collorg/halfORM_dev
 Author: Joël Maïzi

{half_orm_dev-0.17.0a2 → half_orm_dev-0.17.0a4}/half_orm_dev.egg-info/SOURCES.txt

@@ -56,5 +56,7 @@ half_orm_dev/templates/relation_test
 half_orm_dev/templates/setup.py
 half_orm_dev/templates/sql_adapter
 half_orm_dev/templates/warning
+half_orm_dev/templates/git-hooks/pre-commit
+half_orm_dev/templates/git-hooks/prepare-commit-msg
 tests/__init__.py
 tests/conftest.py

{half_orm_dev-0.17.0a2 → half_orm_dev-0.17.0a4}/setup.py

@@ -44,7 +44,7 @@ setup(
     license='GNU General Public License v3 (GPLv3)',
     packages=find_packages(),
     package_data={'half_orm_dev': [
-        'templates/*', 'templates/.gitignore', 'db_patch_system/*', 'patches/**/*', 'version.txt']},
+        'templates/*', 'templates/git-hooks/*', 'templates/.gitignore', 'db_patch_system/*', 'patches/**/*', 'version.txt']},
     install_requires=[
         'GitPython',
         'click',

half_orm_dev-0.17.0a2/half_orm_dev/version.txt

@@ -1 +0,0 @@
-0.17.0-a2