half-orm-dev 0.17.2a6__tar.gz → 0.17.2a7__tar.gz

{half_orm_dev-0.17.2a6/half_orm_dev.egg-info → half_orm_dev-0.17.2a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.2a6
+Version: 0.17.2a7
 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-0.17.2a6 → half_orm_dev-0.17.2a7}/half_orm_dev/cli/main.py

@@ -3,7 +3,8 @@ Main CLI module - Creates and configures the CLI group
 """
 
 import click
-from half_orm_dev.repo import Repo
+import functools
+from half_orm_dev.repo import Repo, OutdatedHalfORMDevError
 from half_orm import utils
 from .commands import ALL_COMMANDS
 
@@ -12,7 +13,16 @@ class Hop:
     """Sets the options available to the hop command"""
 
     def __init__(self):
-        self.__repo: Repo = Repo()  # Utilise le singleton
+        self.__repo: Repo = None
+        self.__hop_upgrade_error: OutdatedHalfORMDevError = None
+
+        # Try to initialize Repo, catch version errors
+        try:
+            self.__repo = Repo()  # Utilise le singleton
+        except OutdatedHalfORMDevError as e:
+            # Capture the error but don't raise it yet
+            self.__hop_upgrade_error = e
+
         self.__available_cmds = self._determine_available_commands()
 
     def _determine_available_commands(self):
@@ -23,7 +33,16 @@ class Hop:
         - Repository status (checked/unchecked)
         - Development mode (devel flag - metadata presence)
         - Environment (production flag)
+
+        Note: When needs_hop_upgrade is true, commands will still be added
+        but will be blocked by the decorator at execution time.
         """
+        if self.needs_hop_upgrade:
+            # Version downgrade detected - return a minimal set of commands
+            # Commands will be blocked by decorator, but we need them in the list
+            # so Click doesn't show "No such command" error
+            return ['check', 'migrate']
+
         if not self.repo_checked:
             # Outside hop repository - commands for project initialization
             return ['init', 'clone']
@@ -47,12 +66,22 @@ class Hop:
     @property
     def repo_checked(self):
         """Returns whether we are in a repo or not."""
-        return self.__repo.checked
+        return self.__repo and self.__repo.checked
+
+    @property
+    def needs_hop_upgrade(self):
+        """Returns whether half_orm_dev needs to be upgraded."""
+        return self.__hop_upgrade_error is not None
+
+    @property
+    def hop_upgrade_error(self):
+        """Returns the upgrade error if any."""
+        return self.__hop_upgrade_error
 
     @property
     def state(self):
         """Returns the state of the repo."""
-        return self.__repo.state
+        return self.__repo.state if self.__repo else "Not in a repository"
 
     @property
     def available_commands(self):
@@ -69,8 +98,43 @@ def create_cli_group():
     """
     hop = Hop()
 
-    @click.group(invoke_without_command=True)
+    def check_version_before_invoke(f, allow_on_downgrade=False):
+        """Decorator to check version before invoking any command.
+
+        Args:
+            f: Function to wrap
+            allow_on_downgrade: If True, allow this command even when version is outdated
+        """
+        @functools.wraps(f)
+        def wrapper(*args, **kwargs):
+            if hop.needs_hop_upgrade and not allow_on_downgrade:
+                # Display formatted error message for version downgrade
+                error = hop.hop_upgrade_error
+                click.echo("=" * 70, err=True)
+                click.echo(f"{utils.Color.red('❌ OUTDATED half_orm_dev VERSION')}", err=True)
+                click.echo("=" * 70, err=True)
+                click.echo(f"\n  Repository requires: {utils.Color.bold(error.required_version)}", err=True)
+                click.echo(f"  Installed version:   {utils.Color.bold(error.installed_version)}", err=True)
+                click.echo(f"\n  Your installed version is OLDER than the repository requirement.", err=True)
+                click.echo(f"  All commands are blocked for safety.", err=True)
+                click.echo(f"\n  Please upgrade half_orm_dev:", err=True)
+                click.echo(f"    {utils.Color.bold('pip install --upgrade half_orm_dev')}", err=True)
+                click.echo("\n" + "=" * 70 + "\n", err=True)
+                raise click.Abort()
+            return f(*args, **kwargs)
+        return wrapper
+
+    # Create custom Group that auto-decorates commands
+    class VersionCheckGroup(click.Group):
+        def add_command(self, cmd, name=None):
+            """Override to decorate all commands with version check."""
+            if isinstance(cmd, click.Command) and cmd.callback:
+                cmd.callback = check_version_before_invoke(cmd.callback)
+            super().add_command(cmd, name)
+
+    @click.group(cls=VersionCheckGroup, invoke_without_command=True)
     @click.pass_context
+    @check_version_before_invoke
     def dev(ctx):
         """halfORM development tools - Git-centric patch management and database synchronization"""
         if ctx.invoked_subcommand is None:

{half_orm_dev-0.17.2a6 → half_orm_dev-0.17.2a7}/half_orm_dev/repo.py

@@ -37,6 +37,17 @@ from .utils import TEMPLATE_DIRS, hop_version, resolve_database_config_name
 class RepoError(Exception):
     pass
 
+class OutdatedHalfORMDevError(RepoError):
+    """Raised when installed half_orm_dev version is older than repository requirement."""
+    def __init__(self, required_version: str, installed_version: str):
+        self.required_version = required_version
+        self.installed_version = installed_version
+        super().__init__(
+            f"Repository requires half_orm_dev >= {required_version} "
+            f"but {installed_version} is installed.\n"
+            f"Please upgrade: pip install --upgrade half_orm_dev"
+        )
+
 class Config:
     """
     """
@@ -259,6 +270,10 @@ class Repo:
                 self.__checked = True
                 # NOTE: Migration is no longer automatic - user must run `half_orm dev migrate`
                 # This prevents implicit changes and gives user control over when migration happens
+
+                # Automatically check and update hooks/config (silent, uses cache)
+                # This ensures Git hooks are always up-to-date for all commands
+                self.check_and_update(silent=True)
                 return
             par_dir = os.path.split(base_dir)[0]
             if par_dir == base_dir:
@@ -292,15 +307,11 @@ class Repo:
         try:
             # Use centralized comparison method
             if self.compare_versions(installed_version, required_version) < 0:
-                raise RepoError(
-                    f"Repository requires half_orm_dev >= {required_version} "
-                    f"but {installed_version} is installed.\n"
-                    f"Please upgrade: pip install --upgrade half_orm_dev"
-                )
+                raise OutdatedHalfORMDevError(required_version, installed_version)
+        except OutdatedHalfORMDevError:
+            # Re-raise downgrade errors immediately
+            raise
         except RepoError as e:
-            # If it's a version validation error (not comparison error), re-raise it
-            if "requires half_orm_dev" in str(e):
-                raise
             # If version parsing fails, log warning but don't block
             warnings.warn(
                 f"Could not parse version: installed={installed_version}, "
@@ -1120,6 +1131,9 @@ class Repo:
         hooks_source_dir = os.path.join(TEMPLATE_DIRS, 'git-hooks')
         hooks_dest_dir = os.path.join(self.__base_dir, '.git', 'hooks')
 
+        # Create .git/hooks directory if it doesn't exist
+        os.makedirs(hooks_dest_dir, exist_ok=True)
+
         any_installed = False
         overall_action = 'skipped'
 
@@ -2215,6 +2229,7 @@ See docs/half_orm_dev.md for complete documentation.
             5. Create .hop/alt_config if custom database_name provided
             6. Setup database (create + metadata if create_db=True)
             7. Restore database from model/schema.sql to production version
+            8. Install Git hooks (pre-commit, prepare-commit-msg)
 
         Examples:
             # Interactive with prompts for connection params
@@ -2338,3 +2353,6 @@ See docs/half_orm_dev.md for complete documentation.
             raise RepoError(
                 f"Failed to restore database from schema: {e}"
             ) from e
+
+        # Step 9: Install Git hooks
+        repo.install_git_hooks()

{half_orm_dev-0.17.2a6 → half_orm_dev-0.17.2a7}/half_orm_dev/templates/git-hooks/pre-commit

@@ -3,11 +3,48 @@
 # Half-ORM pre-commit hook
 # 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
 
 # Get current branch
 CURRENT_BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null)
 
+# =============================================================================
+# CUSTOM PRE-COMMIT HOOK SUPPORT
+# =============================================================================
+# If a pre-commit-custom script exists in .git/hooks/, execute it first.
+# This allows users to add their own custom checks (linting, formatting, etc.)
+#
+# ⚠️  WARNING: pre-commit-custom is NOT tracked by Git and NOT cloned.
+# It must be added manually to each local repository clone.
+#
+# To create a custom hook:
+#   1. Create .git/hooks/pre-commit-custom (executable)
+#   2. Add your custom checks
+#   3. Exit with 0 (success) or non-zero (failure) to block the commit
+#
+# Example .git/hooks/pre-commit-custom:
+#   #!/usr/bin/env bash
+#   # Run Python linter
+#   python -m pylint $(git diff --cached --name-only --diff-filter=ACM | grep '\.py$')
+#   exit $?
+# =============================================================================
+
+CUSTOM_HOOK=".git/hooks/pre-commit-custom"
+if [ -x "$CUSTOM_HOOK" ]; then
+    "$CUSTOM_HOOK"
+    CUSTOM_EXIT_CODE=$?
+    if [ $CUSTOM_EXIT_CODE -ne 0 ]; then
+        echo ""
+        echo "❌ Custom pre-commit hook failed (exit code: $CUSTOM_EXIT_CODE)"
+        exit $CUSTOM_EXIT_CODE
+    fi
+fi
+
+# =============================================================================
+# HALF-ORM STANDARD CHECKS
+# =============================================================================
+
 # 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

half_orm_dev-0.17.2a7/half_orm_dev/version.txt

@@ -0,0 +1 @@
+0.17.2-a7

{half_orm_dev-0.17.2a6 → half_orm_dev-0.17.2a7/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.2a6
+Version: 0.17.2a7
 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-0.17.2a6/half_orm_dev/version.txt

@@ -1 +0,0 @@
-0.17.2-a6