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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.17.0a1
+Version: 0.17.0a2
 Summary: half_orm development Framework.
 Home-page: https://github.com/collorg/halfORM_dev
 Author: Joël Maïzi
@@ -928,7 +928,7 @@ This project is licensed under the GNU General Public License v3.0 - see the [LI
 ---
 
 **Version**: 0.17.0
-**halfORM**: Compatible with halfORM 0.16.x
+**halfORM**: Compatible with halfORM 0.17.x
 **Python**: 3.8+
 **PostgreSQL**: Tested with 13+ (might work with earlier versions)
 

{half_orm_dev-0.17.0a1 → half_orm_dev-0.17.0a2}/README.md

@@ -888,7 +888,7 @@ This project is licensed under the GNU General Public License v3.0 - see the [LI
 ---
 
 **Version**: 0.17.0
-**halfORM**: Compatible with halfORM 0.16.x
+**halfORM**: Compatible with halfORM 0.17.x
 **Python**: 3.8+
 **PostgreSQL**: Tested with 13+ (might work with earlier versions)
 

{half_orm_dev-0.17.0a1 → half_orm_dev-0.17.0a2}/half_orm_dev/cli/commands/__init__.py

@@ -12,6 +12,7 @@ from .patch import patch
 from .release import release
 from .update import update
 from .upgrade import upgrade
+from .check import check
 from .todo import apply_release
 from .todo import create_hotfix
 from .todo import rollback
@@ -29,6 +30,7 @@ ALL_COMMANDS = {
     'release': release,
     'update': update,          # Adapted for production
     'upgrade': upgrade,          # Adapted for production
+    'check': check,            # Project health check and updates
     # 🚧 (stubs)
     'apply_release': apply_release,
 
@@ -48,6 +50,7 @@ __all__ = [
     'patch',
     'release',
     'upgrade',
+    'check',
     'create_hotfix',
     'rollback',
     # Adapted commands

half_orm_dev-0.17.0a2/half_orm_dev/cli/commands/check.py

@@ -0,0 +1,221 @@
+"""
+Check command - Verify and update project configuration.
+
+Checks project health and updates components as needed:
+  - Git hooks (pre-commit)
+  - Configuration files
+  - Template files
+  - Clean up stale branches
+"""
+
+import click
+from half_orm_dev.repo import Repo
+from half_orm import utils
+
+
+@click.command()
+@click.option(
+    '--prune-branches', '-p',
+    is_flag=True,
+    help='Also clean up local branches that no longer exist on remote'
+)
+@click.option(
+    '--dry-run',
+    is_flag=True,
+    help='Show what would be done without making changes'
+)
+@click.option(
+    '--verbose', '-v',
+    is_flag=True,
+    help='Show detailed information'
+)
+def check(prune_branches: bool, dry_run: bool, verbose: bool) -> None:
+    """
+    Verify and update project configuration.
+
+    Checks project health and updates components as needed. This command
+    is also run automatically at the start of other commands.
+
+    Checks performed:
+      • Git hooks are up to date (pre-commit)
+      • Repository is properly configured
+      • Optionally: Clean up stale local branches
+
+    Examples:
+        # Basic check and update
+        half_orm dev check
+
+        # Check and clean up stale branches
+        half_orm dev check --prune-branches
+
+        # Preview what would be done
+        half_orm dev check --dry-run
+    """
+    try:
+        repo = Repo()
+
+        # Perform check (delegates to Repo)
+        result = repo.check_and_update(
+            prune_branches=prune_branches,
+            dry_run=dry_run,
+            silent=False  # Show messages
+        )
+
+        # Display results
+        _display_check_results(result, dry_run, prune_branches, verbose)
+
+    except Exception as e:
+        click.echo(utils.Color.red(f"❌ Error: {e}"), err=True)
+        if verbose:
+            import traceback
+            traceback.print_exc()
+        raise click.Abort()
+
+
+def _display_check_results(result: dict, dry_run: bool, prune_branches: bool, verbose: bool):
+    """Display check results to user."""
+    # Hooks
+    hooks = result.get('hooks', {})
+    if hooks.get('installed'):
+        if hooks['action'] == 'updated':
+            click.echo(f"✓ {utils.Color.green('Pre-commit hook updated')}")
+        elif hooks['action'] == 'installed':
+            click.echo(f"✓ {utils.Color.green('Pre-commit hook installed')}")
+    elif verbose:
+        click.echo(f"✓ {utils.Color.green('Pre-commit hook up to date')}")
+
+    # Active branches
+    active = result.get('active_branches', {})
+    patch_branches = active.get('patch_branches', [])
+    release_branches = active.get('release_branches', [])
+
+    # Show current branch
+    current = active.get('current_branch')
+    if current:
+        click.echo(f"\n📍 {utils.Color.bold('Current branch:')} {current}")
+
+    # Show patch branches
+    if patch_branches:
+        click.echo(f"\n🔧 {utils.Color.bold('Patch branches')} ({len(patch_branches)}):")
+        for branch_info in patch_branches:
+            _display_branch_info(branch_info, verbose)
+    elif verbose:
+        click.echo(f"\n🔧 {utils.Color.bold('Patch branches:')} None")
+
+    # Show patch branches in stage release (grouped by version)
+    active_release = [b for b in release_branches if b.get('in_stage_file', False)]
+    if active_release:
+        click.echo(f"\n📦 {utils.Color.bold('Patch branches in stage release:')}")
+        _display_release_branches_grouped(active_release, verbose)
+    elif verbose:
+        click.echo(f"\n📦 {utils.Color.bold('Patch branches in stage release:')} None")
+
+    # Show stale release branches (exist locally but not in stage)
+    stale_release = [b for b in release_branches if not b.get('in_stage_file', False)]
+    if stale_release and verbose:
+        click.echo(f"\n⚠️  {utils.Color.blue('Stale release branches')} ({len(stale_release)}):")
+        for branch_info in stale_release[:5]:
+            click.echo(f"  • {branch_info['name']}")
+            if not branch_info['exists_on_remote']:
+                click.echo(f"    {utils.Color.red('⚠ Not on remote - can be deleted')}")
+        if len(stale_release) > 5:
+            click.echo(f"  ... and {len(stale_release) - 5} more")
+
+    # Prune results
+    if prune_branches:
+        branches = result.get('branches', {})
+        deleted = branches.get('deleted', [])
+
+        if deleted:
+            click.echo()
+            if dry_run:
+                click.echo(f"○ {utils.Color.blue(f'Would delete {len(deleted)} stale branch(es)')}")
+            else:
+                click.echo(f"✓ {utils.Color.green(f'Deleted {len(deleted)} stale branch(es)')}")
+
+            if verbose:
+                for branch in deleted[:10]:
+                    symbol = "○" if dry_run else "✓"
+                    click.echo(f"  {symbol} {branch}")
+                if len(deleted) > 10:
+                    click.echo(f"  ... and {len(deleted) - 10} more")
+
+        if branches.get('errors'):
+            click.echo(f"⚠ {utils.Color.red('Some errors occurred during cleanup')}")
+            if verbose:
+                for branch, error in branches['errors'][:3]:
+                    click.echo(f"  {branch}: {error}")
+
+
+def _display_release_branches_grouped(branches: list, verbose: bool):
+    """Display release branches grouped by version and sorted by order."""
+    from collections import defaultdict
+
+    # Group branches by version
+    by_version = defaultdict(list)
+    for branch_info in branches:
+        name = branch_info['name']
+        # Extract version from ho-release/{version}/{patch_id}
+        parts = name.split('/')
+        if len(parts) >= 3 and parts[0] == 'ho-release':
+            version = parts[1]
+            patch_id = '/'.join(parts[2:])  # Handle patch IDs with slashes
+            by_version[version].append((patch_id, branch_info))
+
+    # Display each version group
+    for version in sorted(by_version.keys()):
+        patches = by_version[version]
+
+        # Sort patches by their order in the stage file
+        patches_sorted = sorted(patches, key=lambda x: x[1].get('order', 999))
+
+        click.echo(f"\n  {utils.Color.bold(f'Release {version}')} ({len(patches)} patch{'es' if len(patches) > 1 else ''}):")
+        for patch_id, branch_info in patches_sorted:
+            _display_branch_info(branch_info, verbose, indent="    ", show_patch_id_only=True)
+
+
+def _display_branch_info(branch_info: dict, verbose: bool, indent: str = "  ", show_patch_id_only: bool = False):
+    """Display information about a single branch.
+
+    Args:
+        branch_info: Branch information dict
+        verbose: Show verbose output
+        indent: Indentation prefix
+        show_patch_id_only: If True, show only patch_id instead of full branch name
+    """
+    name = branch_info['name']
+    is_current = branch_info.get('is_current', False)
+    exists_on_remote = branch_info.get('exists_on_remote', False)
+    sync_status = branch_info.get('sync_status', 'unknown')
+    ahead = branch_info.get('ahead', 0)
+    behind = branch_info.get('behind', 0)
+
+    # Extract display name
+    if show_patch_id_only:
+        # Extract patch_id from ho-release/{version}/{patch_id}
+        parts = name.split('/')
+        if len(parts) >= 3:
+            display_name = '/'.join(parts[2:])
+        else:
+            display_name = name
+    else:
+        display_name = name
+
+    # Symbol for current branch
+    marker = "→ " if is_current else ""
+
+    # Status symbol and text
+    if not exists_on_remote:
+        status = utils.Color.red("⚠ no remote")
+    elif sync_status == 'synced':
+        status = utils.Color.green("✓ synced")
+    elif sync_status == 'ahead':
+        status = utils.Color.blue(f"↑ {ahead} ahead")
+    elif sync_status == 'behind':
+        status = utils.Color.blue(f"↓ {behind} behind")
+    elif sync_status == 'diverged':
+        status = utils.Color.red(f"⚠ diverged (↑{ahead} ↓{behind})")
+    else:
+        status = "?"
+
+    click.echo(f"{indent}{marker}• {display_name} - {status}")

{half_orm_dev-0.17.0a1 → half_orm_dev-0.17.0a2}/half_orm_dev/cli/commands/patch.py

@@ -301,7 +301,6 @@ def patch_add(patch_id: str, to_version: Optional[str] = None) -> None:
         click.echo(f"  Stage file:      {utils.Color.bold(result['stage_file'])}")
         click.echo(f"  Patch added:     {utils.Color.bold(result['patch_id'])}")
         click.echo(f"  Tests passed:    {utils.Color.green('✓')}")
-        click.echo(f"  Archived branch: {utils.Color.bold(result['archived_branch'])}")
 
         if result.get('notified_branches'):
             click.echo(f"  Notified:        {len(result['notified_branches'])} active branch(es)")

{half_orm_dev-0.17.0a1 → half_orm_dev-0.17.0a2}/half_orm_dev/cli/commands/release.py

@@ -101,29 +101,31 @@ def release_new(level: str) -> None:
         # Get ReleaseManager
         release_mgr = repo.release_manager
 
-        click.echo(f"Preparing {level} release...")
+        click.echo(f"Creating {level} release with integration branch...")
         click.echo()
 
-        # Prepare release
-        result = release_mgr.prepare_release(level)
+        # Create new release with integration branch
+        result = release_mgr.new_release(level)
 
         # Extract result info
         version = result['version']
-        stage_file = result['file']
-        previous_version = result['previous_version']
+        branch = result['branch']
+        stage_file = result['stage_file']
 
         # Success message
-        click.echo(f"✅ {utils.Color.bold('Release prepared successfully!')}")
+        click.echo(f"✅ {utils.Color.bold('Release created successfully!')}")
         click.echo()
-        click.echo(f"  Previous version: {utils.Color.bold(previous_version)}")
-        click.echo(f"  New version:      {utils.Color.bold(version)}")
+        click.echo(f"  Version:          {utils.Color.bold(version)}")
+        click.echo(f"  Release branch:   {utils.Color.bold(branch)}")
         click.echo(f"  Stage file:       {utils.Color.bold(stage_file)}")
         click.echo()
         click.echo(f"📝 Next steps:")
         click.echo(f"  1. Create patches: {utils.Color.bold(f'half_orm dev patch new <patch_id>')}")
-        click.echo(f"  2. Add to release: {utils.Color.bold(f'half_orm dev patch add <patch_id>')}")
+        click.echo(f"  2. Add to release: {utils.Color.bold(f'half_orm dev patch add <patch_id> --to-version={version}')}")
         click.echo(f"  3. Promote to RC:  {utils.Color.bold('half_orm dev release promote rc')}")
         click.echo()
+        click.echo(f"ℹ️  Patches will be merged into {utils.Color.bold(branch)} for integration testing")
+        click.echo()
 
     except ReleaseManagerError as e:
         # Handle validation errors (branch, clean, sync, etc.)
@@ -222,12 +224,17 @@ def release_promote(target: str) -> None:
     try:
         # Get repository instance
         repo = Repo()
+        release_mgr = repo.release_manager
 
         # Delegate to ReleaseManager
         click.echo(f"Promoting release to {target.upper()}...")
         click.echo()
 
-        result = repo.release_manager.promote_to(target.lower())
+        # ReleaseManager auto-detects which version to promote
+        if target.lower() == 'rc':
+            result = release_mgr.promote_to_rc()
+        else:  # prod
+            result = release_mgr.promote_to_prod()
 
         # Display success message
         click.echo(f"✓ {utils.Color.green('Success!')}")
@@ -236,38 +243,25 @@ def release_promote(target: str) -> None:
         # Target-specific output
         if target.lower() == 'rc':
             # RC promotion output
-            click.echo(f"  Promoted:        {utils.Color.bold(result['from_file'])} → {utils.Color.bold(result['to_file'])}")
-            patches = result.get('patches_merged')
-            if patches:
-                click.echo(f"  Patches merged:  {utils.Color.bold(str(len(patches)))} patch(es)")
-            click.echo(f"  Branches cleaned: {utils.Color.bold(str(len(result['branches_deleted'])))} branch(es)")
-
-            if result.get('notified_branches'):
-                click.echo(f"  Notified:        {len(result['notified_branches'])} active branch(es)")
-
+            click.echo(f"  Version:  {utils.Color.bold(result['version'])}")
+            click.echo(f"  Tag:      {utils.Color.bold(result['tag'])}")
+            click.echo(f"  Branch:   {utils.Color.bold(result['branch'])}")
             click.echo()
             click.echo("📝 Next steps:")
             click.echo(f"  • Test RC thoroughly")
-            click.echo(f"  • Fix issues: Create patch, add to new stage, promote again")
             click.echo(f"  • Deploy to production: {utils.Color.bold('half_orm dev release promote prod')}")
 
         else:
             # Production promotion output
-            click.echo(f"  Promoted:        {utils.Color.bold(result['from_file'])} → {utils.Color.bold(result['to_file'])}")
-            click.echo(f"  Version:         {utils.Color.bold(result['version'])}")
-
-            if result.get('schema_file'):
-                click.echo(f"  Schema:          {utils.Color.bold(result['schema_file'])}")
-            if result.get('metadata_file'):
-                click.echo(f"  Metadata:        {utils.Color.bold(result['metadata_file'])}")
-            if result.get('symlink_updated'):
-                click.echo(f"  Symlink:         schema.sql → {utils.Color.bold(result['schema_file'])}")
-
+            click.echo(f"  Version:          {utils.Color.bold(result['version'])}")
+            click.echo(f"  Tag:              {utils.Color.bold(result['tag'])}")
+            deleted = result.get('deleted_branches', [])
+            if deleted:
+                click.echo(f"  Branches deleted: {utils.Color.bold(str(len(deleted)))}")
             click.echo()
             click.echo("📝 Next steps:")
-            click.echo(f"""  • Tag release: {utils.Color.bold(f'git tag v{result["version"]}')}""")
-            click.echo(f"  • Deploy to production servers: {utils.Color.bold('half_orm dev db upgrade')}")
-            click.echo(f"  • Start next cycle: {utils.Color.bold('half_orm dev release new patch')}")
+            click.echo(f"  • Deploy to production servers")
+            click.echo(f"  • Start next cycle: {utils.Color.bold('half_orm dev release new minor')}")
 
         click.echo()
 

{half_orm_dev-0.17.0a1 → half_orm_dev-0.17.0a2}/half_orm_dev/cli/main.py

@@ -31,15 +31,15 @@ class Hop:
         # Inside hop repository
         if not self.__repo.devel:
             # Sync-only mode (no metadata)
-            return ['sync-package']
+            return ['sync-package', 'check']
 
         # Development mode (metadata present)
         if self.__repo.database.production:
             # PRODUCTION ENVIRONMENT - Release deployment only
-            return ['update', 'upgrade']
+            return ['update', 'upgrade', 'check']
         else:
             # DEVELOPMENT ENVIRONMENT - Patch development
-            return ['patch', 'release']
+            return ['patch', 'release', 'check']
 
     @property
     def repo_checked(self):

half_orm_dev-0.17.0a2/half_orm_dev/decorators.py

@@ -0,0 +1,49 @@
+"""
+Decorators for half-orm-dev.
+
+Provides common decorators for ReleaseManager and PatchManager.
+"""
+
+from functools import wraps
+
+
+def with_ho_prod_lock(branch: str = "ho-prod", timeout_minutes: int = 30):
+    """
+    Decorator to protect methods that modify ho-prod with a lock tag.
+
+    The lock tag allows the pre-commit hook to permit commits on ho-prod
+    during the execution of the decorated method.
+
+    Args:
+        branch: Branch to lock (default: "ho-prod")
+        timeout_minutes: Lock timeout in minutes (default: 30)
+
+    Usage:
+        @with_ho_prod_lock()
+        def my_method(self, ...):
+            # Can commit to ho-prod here
+            ...
+
+    Notes:
+        - The decorator assumes `self._repo.hgit` has `acquire_branch_lock()`
+          and `release_branch_lock()` methods
+        - The lock is ALWAYS released in the finally block, even on error
+        - If lock acquisition fails, the method is not executed
+    """
+    def decorator(func):
+        @wraps(func)
+        def wrapper(self, *args, **kwargs):
+            lock_tag = None
+            try:
+                # Acquire lock
+                lock_tag = self._repo.hgit.acquire_branch_lock(branch, timeout_minutes=timeout_minutes)
+
+                # Execute the method
+                return func(self, *args, **kwargs)
+            finally:
+                # Always release lock (even on error)
+                if lock_tag:
+                    self._repo.hgit.release_branch_lock(lock_tag)
+
+        return wrapper
+    return decorator