half-orm-dev 0.16.0a3__tar.gz → 0.16.0a5__tar.gz

{half_orm_dev-0.16.0a3/half_orm_dev.egg-info → half_orm_dev-0.16.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.16.0a3
+Version: 0.16.0a5
 Summary: half_orm development Framework.
 Home-page: https://github.com/collorg/halfORM_dev
 Author: Joël Maïzi
@@ -20,7 +20,7 @@ License-File: AUTHORS
 Requires-Dist: GitPython
 Requires-Dist: click
 Requires-Dist: pydash
-Requires-Dist: half_orm>=0.16.0
+Requires-Dist: half_orm<0.17.0,>=0.16.0
 Requires-Dist: pytest
 Dynamic: author
 Dynamic: author-email

half_orm_dev-0.16.0a5/half_orm_dev/__init__.py

@@ -0,0 +1 @@
+__all__ = ['cli']

half_orm_dev-0.16.0a5/half_orm_dev/cli/__init__.py

@@ -0,0 +1,9 @@
+"""
+CLI module for half-orm-dev
+
+Provides modular command structure for development tools.
+"""
+
+from .main import create_cli_group
+
+__all__ = ['create_cli_group']

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/__init__.py

@@ -0,0 +1,38 @@
+"""
+Commands module for half-orm-dev CLI
+
+Provides all individual command implementations.
+"""
+
+from .new import new
+from .prepare import prepare
+from .apply import apply
+from .undo import undo
+from .release import release
+from .sync import sync_package
+from .upgrade import upgrade
+from .restore import restore
+
+# Registry of all available commands
+ALL_COMMANDS = {
+    'new': new,
+    'prepare': prepare,
+    'apply': apply,
+    'undo': undo,
+    'release': release,
+    'sync-package': sync_package,
+    'upgrade': upgrade,
+    'restore': restore,
+}
+
+__all__ = [
+    'new',
+    'prepare', 
+    'apply',
+    'undo',
+    'release',
+    'sync_package',
+    'upgrade',
+    'restore',
+    'ALL_COMMANDS'
+]

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/apply.py

@@ -0,0 +1,13 @@
+"""
+Apply command - Apply the current release
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+def apply():
+    """Apply the current release."""
+    repo = Repo()
+    repo.apply_release()

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/new.py

@@ -0,0 +1,15 @@
+"""
+New command - Creates a new hop project
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+@click.argument('package_name')
+@click.option('-d', '--devel', is_flag=True, help="Development mode")
+def new(package_name, devel=False):
+    """Creates a new hop project named <package_name>."""
+    repo = Repo()
+    repo.init(package_name, devel)

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/prepare.py

@@ -0,0 +1,21 @@
+"""
+Prepare command - Prepares the next release
+"""
+
+import sys
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+@click.option(
+    '-l', '--level',
+    type=click.Choice(['patch', 'minor', 'major']), 
+    help="Release level."
+)
+@click.option('-m', '--message', type=str, help="The git commit message")
+def prepare(level, message=None):
+    """Prepares the next release."""
+    repo = Repo()
+    repo.prepare_release(level, message)
+    sys.exit()

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/release.py

@@ -0,0 +1,14 @@
+"""
+Release command - Commit and optionally push the current release
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+@click.option('-p', '--push', is_flag=True, help='Push git repo to origin')
+def release(push=False):
+    """Commit and optionally push the current release."""
+    repo = Repo()
+    repo.commit_release(push)

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/restore.py

@@ -0,0 +1,14 @@
+"""
+Restore command - Restore to release
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+@click.argument('release')
+def restore(release):
+    """Restore to release."""
+    repo = Repo()
+    repo.restore(release)

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/sync.py

@@ -0,0 +1,13 @@
+"""
+Sync command - Synchronize the Python package with the database model
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+def sync_package():
+    """Synchronize the Python package with the database model."""
+    repo = Repo()
+    repo.sync_package()

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/undo.py

@@ -0,0 +1,17 @@
+"""
+Undo command - Undo the last release
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+@click.option(
+    '-d', '--database-only', is_flag=True,
+    help='Restore the database to the previous release.'
+)
+def undo(database_only):
+    """Undo the last release."""
+    repo = Repo()
+    repo.undo_release(database_only)

half_orm_dev-0.16.0a5/half_orm_dev/cli/commands/upgrade.py

@@ -0,0 +1,16 @@
+"""
+Upgrade command - Apply one or many patches in production
+"""
+
+import click
+from half_orm_dev.repo import Repo
+
+
+@click.command()
+def upgrade():
+    """Apply one or many patches.
+    
+    Switches to hop_main, pulls should check the tags.
+    """
+    repo = Repo()
+    repo.upgrade_prod()

half_orm_dev-0.16.0a5/half_orm_dev/cli/main.py

@@ -0,0 +1,76 @@
+"""
+Main CLI module - Creates and configures the CLI group
+"""
+
+import click
+from half_orm_dev.repo import Repo
+from half_orm import utils
+from .commands import ALL_COMMANDS
+
+
+class Hop:
+    """Sets the options available to the hop command"""
+    
+    def __init__(self):
+        self.__repo: Repo = Repo()  # Utilise le singleton
+        self.__available_cmds = self._determine_available_commands()
+    
+    def _determine_available_commands(self):
+        """Determine which commands are available based on context"""
+        if not self.repo_checked:
+            return ['new']
+        else:
+            if not self.__repo.devel:
+                # Sync-only mode
+                return ['sync-package']
+            else:
+                # Full mode - check environment
+                if self.__repo.production:
+                    return ['upgrade', 'restore']
+                else:
+                    return ['prepare', 'apply', 'release', 'undo']
+    
+    @property
+    def repo_checked(self):
+        """Returns whether we are in a repo or not."""
+        return self.__repo.checked
+
+    @property
+    def state(self):
+        """Returns the state of the repo."""
+        return self.__repo.state
+    
+    @property
+    def available_commands(self):
+        """Returns the list of available commands."""
+        return self.__available_cmds
+
+
+def create_cli_group():
+    """
+    Creates and returns the CLI group with appropriate commands.
+    
+    Returns:
+        click.Group: Configured CLI group
+    """
+    hop = Hop()
+    
+    @click.group(invoke_without_command=True)
+    @click.pass_context
+    def dev(ctx):
+        """halfORM development tools - project management, patches, and database synchronization"""
+        if ctx.invoked_subcommand is None:
+            # Show repo state when no subcommand is provided
+            if hop.repo_checked:
+                click.echo(hop.state)
+            else:
+                click.echo(hop.state)
+                click.echo("\nNot in a hop repository.")
+                click.echo(f"Try {utils.Color.bold('half_orm dev new [--devel] <package_name>')} or change directory.\n")
+    
+    # Add only available commands to the group
+    for cmd_name in hop.available_commands:
+        if cmd_name in ALL_COMMANDS:
+            dev.add_command(ALL_COMMANDS[cmd_name])
+    
+    return dev

half_orm_dev-0.16.0a5/half_orm_dev/cli_extension.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+CLI extension integration for half-orm-dev
+
+Provides the halfORM development tools through the unified half_orm CLI interface.
+Generates/Patches/Synchronizes a hop Python package with a PostgreSQL database.
+"""
+
+import sys
+from half_orm.cli_utils import create_and_register_extension
+from .cli import create_cli_group
+
+
+def add_commands(main_group):
+    """
+    Required entry point for halfORM extensions.
+    
+    Args:
+        main_group: The main Click group for the half_orm command
+    """
+    
+    # Create the dev CLI group with all commands
+    dev_group = create_cli_group()
+    
+    # Register it as an extension
+    @create_and_register_extension(main_group, sys.modules[__name__])
+    def dev():
+        """halfORM development tools - project management, patches, and database synchronization"""
+        pass
+    
+    # Copy all commands from the created group to the registered extension
+    for name, command in dev_group.commands.items():
+        dev.add_command(command)
+    
+    # Copy the callback from the created group
+    dev.callback = dev_group.callback

{half_orm_dev-0.16.0a3 → half_orm_dev-0.16.0a5}/half_orm_dev/repo.py

@@ -87,16 +87,68 @@ class Config:
 
 class Repo:
     """Reads and writes the hop repo conf file.
+    
+    Implements Singleton pattern to ensure only one instance per base directory.
     """
+    
+    # Singleton storage: base_dir -> instance
+    _instances = {}
+    
+    # Instance variables
     __new = False
     __checked: bool = False
     __base_dir: Optional[str] = None
     __config: Optional[Config] = None
     database: Optional[Database] = None
     hgit: Optional[HGit] = None
+    
+    def __new__(cls):
+        """Singleton implementation based on current working directory"""
+        # Find the base directory for this context
+        base_dir = cls._find_base_dir()
+        
+        # Return existing instance if it exists for this base_dir
+        if base_dir in cls._instances:
+            return cls._instances[base_dir]
+        
+        # Create new instance
+        instance = super().__new__(cls)
+        cls._instances[base_dir] = instance
+        return instance
+
     def __init__(self):
+        # Only initialize once per instance
+        if hasattr(self, '_initialized'):
+            return
+        
+        self._initialized = True
         self.__check()
 
+    @classmethod
+    def _find_base_dir(cls):
+        """Find the base directory for the current context (same logic as __check)"""
+        base_dir = os.path.abspath(os.path.curdir)
+        while base_dir:
+            conf_file = os.path.join(base_dir, '.hop', 'config')
+            if os.path.exists(conf_file):
+                return base_dir
+            par_dir = os.path.split(base_dir)[0]
+            if par_dir == base_dir:
+                break
+            base_dir = par_dir
+        return os.path.abspath(os.path.curdir)  # fallback to current dir
+
+    @classmethod
+    def clear_instances(cls):
+        """Clear all singleton instances - useful for testing or cleanup"""
+        for instance in cls._instances.values():
+            if instance.database and instance.database.model:
+                try:
+                    instance.database.model.disconnect()
+                except:
+                    pass
+        cls._instances.clear()
+
     @property
     def new(self):
         "Returns if the repo is being created or not."

half_orm_dev-0.16.0a5/half_orm_dev/version.txt

@@ -0,0 +1 @@
+0.16.0-a5

{half_orm_dev-0.16.0a3 → half_orm_dev-0.16.0a5/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 0.16.0a3
+Version: 0.16.0a5
 Summary: half_orm development Framework.
 Home-page: https://github.com/collorg/halfORM_dev
 Author: Joël Maïzi
@@ -20,7 +20,7 @@ License-File: AUTHORS
 Requires-Dist: GitPython
 Requires-Dist: click
 Requires-Dist: pydash
-Requires-Dist: half_orm>=0.16.0
+Requires-Dist: half_orm<0.17.0,>=0.16.0
 Requires-Dist: pytest
 Dynamic: author
 Dynamic: author-email

{half_orm_dev-0.16.0a3 → half_orm_dev-0.16.0a5}/half_orm_dev.egg-info/SOURCES.txt

@@ -20,6 +20,17 @@ half_orm_dev.egg-info/SOURCES.txt
 half_orm_dev.egg-info/dependency_links.txt
 half_orm_dev.egg-info/requires.txt
 half_orm_dev.egg-info/top_level.txt
+half_orm_dev/cli/__init__.py
+half_orm_dev/cli/main.py
+half_orm_dev/cli/commands/__init__.py
+half_orm_dev/cli/commands/apply.py
+half_orm_dev/cli/commands/new.py
+half_orm_dev/cli/commands/prepare.py
+half_orm_dev/cli/commands/release.py
+half_orm_dev/cli/commands/restore.py
+half_orm_dev/cli/commands/sync.py
+half_orm_dev/cli/commands/undo.py
+half_orm_dev/cli/commands/upgrade.py
 half_orm_dev/patches/log
 half_orm_dev/patches/0/1/0/00_half_orm_meta.database.sql
 half_orm_dev/patches/0/1/0/01_alter_half_orm_meta.hop_release.sql

{half_orm_dev-0.16.0a3 → half_orm_dev-0.16.0a5}/half_orm_dev.egg-info/requires.txt

@@ -1,5 +1,5 @@
 GitPython
 click
 pydash
-half_orm>=0.16.0
+half_orm<0.17.0,>=0.16.0
 pytest

{half_orm_dev-0.16.0a3 → half_orm_dev-0.16.0a5}/setup.py

@@ -2,12 +2,36 @@
 
 import os
 import codecs
-from setuptools import setup
+import re
+from setuptools import setup, find_packages
 
 def read(name):
     return codecs.open(
         os.path.join(os.path.dirname(__file__), name), "r", "utf-8").read()
 
+def get_half_orm_version_constraint():
+    """
+    Calculate half_orm version constraint from half_orm_dev version.
+    
+    For version X.Y.Z[-xxx], returns: half_orm>=X.Y.0,<X.(Y+1).0
+    """
+    version_text = read('half_orm_dev/version.txt').strip()
+    
+    # Parse version with regex to handle X.Y.Z[-suffix]
+    match = re.match(r'^(\d+)\.(\d+)\.(\d+)(?:-.*)?$', version_text)
+    
+    if not match:
+        raise ValueError(f"Invalid version format in version.txt: {version_text}")
+    
+    major, minor, patch = match.groups()
+    major, minor = int(major), int(minor)
+    
+    # Generate constraint: half_orm>=X.Y.0,<X.(Y+1).0
+    min_version = f"{major}.{minor}.0"
+    max_version = f"{major}.{minor + 1}.0"
+    
+    return f"half_orm>={min_version},<{max_version}"
+
 setup(
     name='half_orm_dev',
     version=read('half_orm_dev/version.txt').strip(),
@@ -18,14 +42,14 @@ setup(
     author_email='joel.maizi@collorg.org',
     url='https://github.com/collorg/halfORM_dev',
     license='GNU General Public License v3 (GPLv3)',
-    packages=['half_orm_dev'],
+    packages=find_packages(),
     package_data={'half_orm_dev': [
         'templates/*', 'templates/.gitignore', 'db_patch_system/*', 'patches/**/*', 'version.txt']},
     install_requires=[
         'GitPython',
         'click',
         'pydash',
-        'half_orm>=0.16.0',
+        get_half_orm_version_constraint(),
         'pytest'
     ],
     classifiers=[

half_orm_dev-0.16.0a3/half_orm_dev/cli_extension.py

@@ -1,171 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-"""
-CLI extension integration for half-orm-dev
-
-Provides the halfORM development tools through the unified half_orm CLI interface.
-Generates/Patches/Synchronizes a hop Python package with a PostgreSQL database.
-"""
-
-import sys
-import click
-from half_orm.cli_utils import create_and_register_extension
-
-# Import existing halfORM_dev functionality
-from half_orm_dev.repo import Repo
-from half_orm import utils
-
-class Hop:
-    """Sets the options available to the hop command"""
-    __available_cmds = []
-    __command = None
-    
-    def __init__(self):
-        self.__repo: Repo = Repo()
-        if not self.repo_checked:
-            Hop.__available_cmds = ['new']
-        else:
-            if not self.__repo.devel:
-                # Sync-only mode
-                Hop.__available_cmds = ['sync-package']
-            else:
-                # Full mode - check environment
-                if self.__repo.production:
-                    Hop.__available_cmds = ['upgrade', 'restore']
-                else:
-                    Hop.__available_cmds = ['prepare', 'apply', 'release', 'undo']
-    
-    @property
-    def repo_checked(self):
-        """Returns whether we are in a repo or not."""
-        return self.__repo.checked
-
-    @property
-    def model(self):
-        """Returns the model (half_orm.model.Model) associated to the repo."""
-        return self.__repo.model
-
-    @property
-    def state(self):
-        """Returns the state of the repo."""
-        return self.__repo.state
-
-    @property
-    def command(self):
-        """The command invoked (click)"""
-        return self.__command
-
-def add_commands(main_group):
-    """
-    Required entry point for halfORM extensions.
-    
-    Args:
-        main_group: The main Click group for the half_orm command
-    """
-    
-    # Create hop instance to determine available commands
-    hop = Hop()
-    
-    @create_and_register_extension(main_group, sys.modules[__name__])
-    def dev():
-        """halfORM development tools - project management, patches, and database synchronization"""
-        pass
-    
-    # Define all possible commands
-    @click.command()
-    @click.argument('package_name')
-    @click.option('-d', '--devel', is_flag=True, help="Development mode")
-    def new(package_name, devel=False):
-        """Creates a new hop project named <package_name>."""
-        hop._Hop__repo.init(package_name, devel)
-
-    @click.command()
-    @click.option(
-        '-l', '--level',
-        type=click.Choice(['patch', 'minor', 'major']), help="Release level.")
-    @click.option('-m', '--message', type=str, help="The git commit message")
-    def prepare(level, message=None):
-        """Prepares the next release."""
-        hop._Hop__command = 'prepare'
-        hop._Hop__repo.prepare_release(level, message)
-        sys.exit()
-
-    @click.command()
-    def apply():
-        """Apply the current release."""
-        hop._Hop__command = 'apply'
-        hop._Hop__repo.apply_release()
-
-    @click.command()
-    @click.option(
-        '-d', '--database-only', is_flag=True,
-        help='Restore the database to the previous release.')
-    def undo(database_only):
-        """Undo the last release."""
-        hop._Hop__command = 'undo'
-        hop._Hop__repo.undo_release(database_only)
-
-    @click.command()
-    def upgrade():
-        """Apply one or many patches.
-        
-        Switches to hop_main, pulls should check the tags.
-        """
-        hop._Hop__command = 'upgrade_prod'
-        hop._Hop__repo.upgrade_prod()
-
-    @click.command()
-    @click.argument('release')
-    def restore(release):
-        """Restore to release."""
-        hop._Hop__repo.restore(release)
-
-    @click.command()
-    @click.option('-p', '--push', is_flag=True, help='Push git repo to origin')
-    def release(push=False):
-        """Commit and optionally push the current release."""
-        hop._Hop__repo.commit_release(push)
-
-    @click.command()
-    def sync_package():
-        """Synchronize the Python package with the database model."""
-        hop._Hop__repo.sync_package()
-
-    # Map command names to command functions
-    all_commands = {
-        'new': new,
-        'prepare': prepare,
-        'apply': apply,
-        'undo': undo,
-        'release': release,
-        'sync-package': sync_package,
-        'upgrade': upgrade,
-        'restore': restore
-    }
-    
-    # 🎯 COMPORTEMENT ADAPTATIF RESTAURÉ
-    # Only add commands that are available in the current context
-    for cmd_name in hop._Hop__available_cmds:
-        if cmd_name in all_commands:
-            dev.add_command(all_commands[cmd_name])
-    
-    # Add callback to show state when no subcommand (like original hop)
-    original_callback = dev.callback
-    
-    @click.pass_context
-    def enhanced_callback(ctx, *args, **kwargs):
-        if ctx.invoked_subcommand is None:
-            # Show repo state when no subcommand is provided
-            if hop.repo_checked:
-                click.echo(hop.state)
-            else:
-                click.echo(hop.state)
-                click.echo("\nNot in a hop repository.")
-                click.echo(f"Try {utils.Color.bold('half_orm dev new [--devel] <package_name>')} or change directory.\n")
-        else:
-            # Call original callback if there is one
-            if original_callback:
-                return original_callback(*args, **kwargs)
-    
-    dev.callback = enhanced_callback

half_orm_dev-0.16.0a3/half_orm_dev/version.txt

@@ -1 +0,0 @@
-0.16.0-a3