half-orm-dev 1.0.0a19__tar.gz → 1.0.0a21__tar.gz

{half_orm_dev-1.0.0a19/half_orm_dev.egg-info → half_orm_dev-1.0.0a21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a19
+Version: 1.0.0a21
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21}/half_orm_dev/hgit.py

@@ -367,7 +367,12 @@ class HGit:
             # Local git now knows about all remote tags
         """
         origin = self.__git_repo.remote('origin')
-        origin.fetch(tags=True)
+        marker = Path(self.__git_repo.working_dir) / '.hop' / '.fetching'
+        try:
+            marker.touch()
+            origin.fetch(tags=True)
+        finally:
+            marker.unlink(missing_ok=True)
 
     def tag_exists(self, tag_name: str) -> bool:
         """
@@ -443,7 +448,12 @@ class HGit:
             # Stale remote refs (deleted branches on remote) are removed
         """
         origin = self.__git_repo.remote('origin')
-        origin.fetch(prune=True)
+        marker = Path(self.__git_repo.working_dir) / '.hop' / '.fetching'
+        try:
+            marker.touch()
+            origin.fetch(prune=True)
+        finally:
+            marker.unlink(missing_ok=True)
 
     def delete_local_branch(self, branch_name: str) -> None:
         """

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21}/half_orm_dev/release_manager.py

@@ -1232,6 +1232,52 @@ class ReleaseManager:
                 # Best effort - don't fail if checkout back fails
                 pass
 
+    def ensure_ho_current(self) -> bool:
+        """
+        Set up ho-current branch for production servers if not already done.
+
+        Creates ho-current from the current production version's immutable tag
+        and checks it out. Local-only, never pushed to origin.
+
+        Returns:
+            True if ho-current was created and checked out, False otherwise.
+
+        Raises:
+            ReleaseManagerError: If the required version tag is not found locally.
+        """
+        if not (
+            self._repo.production
+            and self._repo.hgit.branch == 'ho-prod'
+            and not self._repo.hgit.branch_exists('ho-current')
+        ):
+            return False
+
+        try:
+            current_version = self._repo.database.last_release_s
+        except Exception as e:
+            raise ReleaseManagerError(
+                f"Cannot read current production version from database: {e}"
+            )
+
+        current_tag = f'v{current_version}'
+        tag_exists = any(
+            t.name == current_tag
+            for t in self._repo.hgit._HGit__git_repo.tags
+        )
+        if not tag_exists:
+            raise ReleaseManagerError(
+                f"Cannot set up ho-current: tag {current_tag} not found locally.\n"
+                f"Run 'hop update' to fetch tags first."
+            )
+
+        self._repo.hgit.create_branch_from_tag('ho-current', current_tag)
+        self._repo.hgit._HGit__git_repo.heads['ho-current'].checkout()
+        click.echo(
+            f"  ℹ ho-current branch created from {current_tag} (local only).\n"
+            f"    Production servers use ho-current instead of ho-prod."
+        )
+        return True
+
     def update_production(self) -> dict:
         """
         Fetch tags and list available releases for production upgrade (read-only).
@@ -1290,30 +1336,8 @@ class ReleaseManager:
                 f"Cannot read current production version from database: {e}"
             )
 
-        # Migration: production servers that still track ho-prod instead of
-        # ho-current. Create ho-current from the current version's immutable tag
-        # and switch to it — local-only, no push to origin.
-        if (
-            self._repo.production
-            and self._repo.hgit.branch == 'ho-prod'
-            and not self._repo.hgit.branch_exists('ho-current')
-        ):
-            current_tag = f'v{current_version}'
-            tag_exists = any(
-                t.name == current_tag
-                for t in self._repo.hgit._HGit__git_repo.tags
-            )
-            if not tag_exists:
-                raise ReleaseManagerError(
-                    f"Cannot migrate to ho-current: tag {current_tag} not found locally.\n"
-                    f"Run 'hop update' again after ensuring tags are fetched."
-                )
-            self._repo.hgit.create_branch_from_tag('ho-current', current_tag)
-            self._repo.hgit._HGit__git_repo.heads['ho-current'].checkout()
-            click.echo(
-                f"  ℹ Migrated to ho-current (created from {current_tag}, local only).\n"
-                f"    Production servers should now use ho-current instead of ho-prod."
-            )
+        # Migration: production servers that still track ho-prod instead of ho-current.
+        self.ensure_ho_current()
 
         # 3. Build list of available releases with details
         available_releases = []

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21}/half_orm_dev/repo.py

@@ -491,7 +491,6 @@ class Repo:
                 "  Run 'hop migrate' on a development machine first, then deploy."
             )
 
-        self._migration_running = True
         try:
             # Create migration manager
             migration_mgr = MigrationManager(self)
@@ -506,25 +505,31 @@ class Repo:
 
             result['migration_needed'] = True
 
-            # Migration must be run on ho-prod branch
-            # If not on ho-prod, switch automatically if working directory is clean
             current_branch = self.hgit.branch if self.hgit else 'unknown'
             switched_branch = False
 
+            # Dirty check done ONCE here, before any operation.
+            # After this point _migration_running disables further dirty checks:
+            # all modifications are the migration's responsibility and will be committed.
+            if self.hgit and self.hgit.git_repo.is_dirty(untracked_files=False):
+                config_version = self.__config.hop_version if hasattr(self, '_Repo__config') else '0.0.0'
+                status = self.hgit.git_repo.git.status('--short')
+                raise RepoError(
+                    f"Repository migration required but working directory has uncommitted changes.\n\n"
+                    f"  Repository version: {config_version}\n"
+                    f"  Installed version:  {current_version}\n"
+                    f"  Current branch:     {current_branch}\n\n"
+                    f"  Please commit or stash your changes:\n"
+                    f"    git stash\n"
+                    f"    OR\n"
+                    f"    git add . && git commit -m \"your message\"\n"
+                    f"Dirty files:\n{status}"
+                )
+
+            # From here, all modifications are made by the migration itself.
+            self._migration_running = True
+
             if not self.hgit or self.hgit.branch != 'ho-prod':
-                # Check if working directory is clean
-                if self.hgit and self.hgit.git_repo.is_dirty(untracked_files=False):
-                    config_version = self.__config.hop_version if hasattr(self, '_Repo__config') else '0.0.0'
-                    raise RepoError(
-                        f"Repository migration required but working directory has uncommitted changes.\n\n"
-                        f"  Repository version: {config_version}\n"
-                        f"  Installed version:  {current_version}\n"
-                        f"  Current branch:     {current_branch}\n\n"
-                        f"  Please commit or stash your changes:\n"
-                        f"    git stash\n"
-                        f"    OR\n"
-                        f"    git add . && git commit -m \"your message\"\n"
-                    )
 
                 # Working directory is clean, switch to ho-prod
                 try:
@@ -896,17 +901,21 @@ class Repo:
             git_repo = self.hgit.git_repo
             current_branch = git_repo.active_branch.name
 
-            # Check if working directory is clean
-            if git_repo.is_dirty(untracked_files=False):
-                status = git_repo.git.status('--short')
-                raise RepoError(
-                    f"Working directory has uncommitted changes.\n"
-                    f"Please commit or stash your changes before running this command:\n"
-                    f"  git stash\n"
-                    f"  OR\n"
-                    f"  git add . && git commit -m \"your message\"\n"
-                    f"Dirty files:\n{status}"
-                )
+            # Check if working directory is clean.
+            # Skipped during migration: _migration_running means the dirty check
+            # was already done once at the start of run_migrations_if_needed(),
+            # and all subsequent modifications are committed by the migration itself.
+            if not getattr(self, '_migration_running', False):
+                if git_repo.is_dirty(untracked_files=False):
+                    status = git_repo.git.status('--short')
+                    raise RepoError(
+                        f"Working directory has uncommitted changes.\n"
+                        f"Please commit or stash your changes before running this command:\n"
+                        f"  git stash\n"
+                        f"  OR\n"
+                        f"  git add . && git commit -m \"your message\"\n"
+                        f"Dirty files:\n{status}"
+                    )
 
             # Switch to ho-prod temporarily
             git_repo.heads['ho-prod'].checkout()
@@ -1391,6 +1400,30 @@ class Repo:
         # step 12: Protect ho-prod from direct commits
         self.install_git_hooks()
 
+    def stage_maintenance_file(self, relative_path: str) -> None:
+        """Stage a file modified by an automated maintenance operation."""
+        if not hasattr(self, '_maintenance_files'):
+            self._maintenance_files = []
+        abs_path = os.path.join(self.__base_dir, relative_path)
+        if os.path.exists(abs_path):
+            self.hgit.git_repo.index.add([relative_path])
+            if relative_path not in self._maintenance_files:
+                self._maintenance_files.append(relative_path)
+
+    def commit_maintenance_files(self, message: str = 'update maintenance files') -> bool:
+        """Commit all staged maintenance files in a single [HOP] commit (skip hooks)."""
+        if not getattr(self, '_maintenance_files', None):
+            return False
+        try:
+            self.hgit.git_repo.index.commit(
+                f'[HOP] {message}',
+                skip_hooks=True,
+            )
+            self._maintenance_files = []
+            return True
+        except Exception:
+            return False
+
     def install_git_hooks(self, force: bool = False) -> dict:
         """
         Install or update Git hooks from templates.
@@ -1457,6 +1490,18 @@ class Repo:
                 if action == 'installed' or overall_action == 'skipped':
                     overall_action = action
 
+        # Ensure production-specific entries are in .gitignore (idempotent).
+        gitignore_path = Path(self.__base_dir) / '.gitignore'
+        if gitignore_path.exists():
+            content = gitignore_path.read_text()
+            lines = content.splitlines()
+            missing = [e for e in ('.hop/production', '.hop/.fetching')
+                       if e not in lines]
+            if missing:
+                with gitignore_path.open('a') as f:
+                    f.write('\n' + '\n'.join(missing) + '\n')
+                self.stage_maintenance_file('.gitignore')
+
         return {
             'installed': any_installed,
             'action': overall_action
@@ -1632,6 +1677,7 @@ class Repo:
         # 1. Check and update Git hooks
         if not dry_run:
             result['hooks'] = self.install_git_hooks()
+            self.commit_maintenance_files('update git hooks and .gitignore')
         else:
             # Dry run: just check if update would be needed
             hooks_source_dir = os.path.join(TEMPLATE_DIRS, 'git-hooks')
@@ -2941,9 +2987,14 @@ Each script is executed only once unless `--force` is used.
             )
 
         # Step 3: Clone repository
+        # Production clones fetch ho-prod only — dev branches are irrelevant on production.
+        clone_cmd = ["git", "clone"]
+        if connection_options.get('production'):
+            clone_cmd += ["--single-branch", "--branch", "ho-prod"]
+        clone_cmd += [git_origin, str(dest_path)]
         try:
             result = subprocess.run(
-                ["git", "clone", git_origin, str(dest_path)],
+                clone_cmd,
                 capture_output=True,
                 text=True,
                 check=True,
@@ -3016,5 +3067,16 @@ Each script is executed only once unless `--force` is used.
                 f"Failed to restore database from schema: {e}"
             ) from e
 
-        # Step 9: Install Git hooks
+        # Step 9: Set up ho-current for production servers
+        if connection_options.get('production'):
+            # Mark this clone as production (read-only): blocks git commit/push via hooks.
+            production_marker = Path(dest_path) / '.hop' / 'production'
+            production_marker.parent.mkdir(parents=True, exist_ok=True)
+            production_marker.touch()
+            try:
+                repo.release_manager.ensure_ho_current()
+            except Exception as e:
+                print(f"  ⚠️  Warning: Could not set up ho-current: {e}", file=sys.stderr)
+
+        # Step 10: Install Git hooks
         repo.install_git_hooks()

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21}/half_orm_dev/templates/.gitignore

@@ -14,4 +14,6 @@ Backups
 __pycache__
 .hop/alt_config
 .hop/local_config
-.hop/backups/
+.hop/backups/
+.hop/production
+.hop/.fetching

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21}/half_orm_dev/templates/git-hooks/pre-commit

@@ -1,11 +1,23 @@
 #!/usr/bin/env bash
 
 # Half-ORM pre-commit hook
+# 0. Blocks commits on production servers (read-only)
 # 1. Checks if current ho-* branch exists on remote origin
 # 2. Protects ho-prod branch from direct commits
 # 3. Optionally calls pre-commit-custom if it exists
 # Generated by half_orm_dev
 
+# =============================================================================
+# PRODUCTION SERVER GUARD
+# =============================================================================
+REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null)"
+if [ -f "${REPO_ROOT}/.hop/production" ]; then
+    echo "ERROR: git commit is not allowed on a production server." >&2
+    echo "       This repository is read-only (production mode)." >&2
+    echo "       Changes are deployed via 'hop upgrade', never committed directly." >&2
+    exit 1
+fi
+
 # Get current branch
 CURRENT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
 

half_orm_dev-1.0.0a21/half_orm_dev/templates/git-hooks/pre-push

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Half-ORM pre-push hook
+# Blocks git push on production servers (read-only mode).
+# Generated by half_orm_dev
+
+# =============================================================================
+# PRODUCTION SERVER GUARD
+# =============================================================================
+REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null)"
+if [ -f "${REPO_ROOT}/.hop/production" ]; then
+    echo "ERROR: git push is not allowed on a production server." >&2
+    echo "       This repository is read-only (production mode)." >&2
+    echo "       Changes are deployed via 'hop upgrade', never pushed directly." >&2
+    exit 1
+fi
+
+exit 0

half_orm_dev-1.0.0a21/half_orm_dev/templates/git-hooks/reference-transaction

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Half-ORM reference-transaction hook
+# Blocks tag creation on production servers (read-only mode).
+# Generated by half_orm_dev
+
+# Only act on the "prepared" phase (before the transaction is committed).
+if [ "$1" != "prepared" ]; then
+    exit 0
+fi
+
+REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null)"
+if [ ! -f "${REPO_ROOT}/.hop/production" ]; then
+    exit 0
+fi
+
+# Allow tag updates that originate from an internal hop fetch operation.
+# hop sets .hop/.fetching before calling git fetch and removes it after.
+if [ -f "${REPO_ROOT}/.hop/.fetching" ]; then
+    exit 0
+fi
+
+# Block any local tag creation.
+while read -r _ _ ref_name; do
+    case "$ref_name" in
+        refs/tags/*)
+            echo "ERROR: git tag is not allowed on a production server." >&2
+            echo "       This repository is read-only (production mode)." >&2
+            exit 1
+            ;;
+    esac
+done
+
+exit 0

half_orm_dev-1.0.0a21/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a21

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a19
+Version: 1.0.0a21
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

{half_orm_dev-1.0.0a19 → half_orm_dev-1.0.0a21}/half_orm_dev.egg-info/SOURCES.txt

@@ -72,4 +72,6 @@ half_orm_dev/templates/relation_test
 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
+half_orm_dev/templates/git-hooks/pre-push
+half_orm_dev/templates/git-hooks/prepare-commit-msg
+half_orm_dev/templates/git-hooks/reference-transaction

half_orm_dev-1.0.0a19/half_orm_dev/version.txt

@@ -1 +0,0 @@
-1.0.0-a19