rhiza 0.8.2__tar.gz → 0.8.3__tar.gz

{rhiza-0.8.2 → rhiza-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rhiza
-Version: 0.8.2
+Version: 0.8.3
 Summary: Reusable configuration templates for modern Python projects
 Project-URL: Homepage, https://github.com/jebel-quant/rhiza-cli
 Project-URL: Repository, https://github.com/jebel-quant/rhiza-cli

{rhiza-0.8.2 → rhiza-0.8.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rhiza"
-version = "0.8.2"
+version = "0.8.3"
 description = "Reusable configuration templates for modern Python projects"
 readme = "README.md"
 requires-python = ">=3.11"

{rhiza-0.8.2 → rhiza-0.8.3}/src/rhiza/cli.py

@@ -87,22 +87,27 @@ def init(
         "--with-dev-dependencies",
         help="Include development dependencies in pyproject.toml",
     ),
+    git_host: str = typer.Option(
+        None,
+        "--git-host",
+        help="Target Git hosting platform (github or gitlab). Determines which CI/CD files to include. "
+        "If not provided, will prompt interactively.",
+    ),
 ):
     r"""Initialize or validate .github/rhiza/template.yml.
 
     Creates a default `.github/rhiza/template.yml` configuration file if one
     doesn't exist, or validates the existing configuration.
 
-    The default template includes common Python project files:
-    - .github (workflows, actions, etc.)
-    - .editorconfig
-    - .gitignore
-    - .pre-commit-config.yaml
-    - Makefile
-    - pytest.ini
+    The default template includes common Python project files.
+    The --git-host option determines which CI/CD configuration to include:
+    - github: includes .github folder (GitHub Actions workflows)
+    - gitlab: includes .gitlab-ci.yml (GitLab CI configuration)
 
     Examples:
       rhiza init
+      rhiza init --git-host github
+      rhiza init --git-host gitlab
       rhiza init /path/to/project
       rhiza init ..
     """
@@ -111,6 +116,7 @@ def init(
         project_name=project_name,
         package_name=package_name,
         with_dev_dependencies=with_dev_dependencies,
+        git_host=git_host,
     )
 
 

{rhiza-0.8.2 → rhiza-0.8.3}/src/rhiza/commands/init.py

@@ -8,8 +8,10 @@ and what paths are governed by Rhiza.
 import importlib.resources
 import keyword
 import re
+import sys
 from pathlib import Path
 
+import typer
 from jinja2 import Template
 from loguru import logger
 
@@ -45,6 +47,7 @@ def init(
     project_name: str | None = None,
     package_name: str | None = None,
     with_dev_dependencies: bool = False,
+    git_host: str | None = None,
 ):
     """Initialize or validate .github/rhiza/template.yml in the target repository.
 
@@ -56,6 +59,8 @@ def init(
         project_name: Custom project name. Defaults to target directory name.
         package_name: Custom package name. Defaults to normalized project name.
         with_dev_dependencies: Include development dependencies in pyproject.toml.
+        git_host: Target Git hosting platform ("github" or "gitlab"). Determines which
+            CI/CD configuration files to include. If None, will prompt user interactively.
 
     Returns:
         bool: True if validation passes, False otherwise.
@@ -63,6 +68,13 @@ def init(
     # Convert to absolute path to avoid surprises
     target = target.resolve()
 
+    # Validate git_host if provided
+    if git_host is not None:
+        git_host = git_host.lower()
+        if git_host not in ["github", "gitlab"]:
+            logger.error(f"Invalid git-host: {git_host}. Must be 'github' or 'gitlab'")
+            raise ValueError(f"Invalid git-host: {git_host}. Must be 'github' or 'gitlab'")
+
     logger.info(f"Initializing Rhiza configuration in: {target}")
 
     # Create .rhiza directory structure if it doesn't exist
@@ -79,12 +91,50 @@ def init(
         logger.info("Creating default .rhiza/template.yml")
         logger.debug("Using default template configuration")
 
-        # Default template points to the jebel-quant/rhiza repository
-        # and includes common Python project configuration files
-        default_template = RhizaTemplate(
-            template_repository="jebel-quant/rhiza",
-            template_branch="main",
-            include=[
+        # Prompt for target git hosting platform if not provided
+        if git_host is None:
+            # Only prompt if running in an interactive terminal
+            if sys.stdin.isatty():
+                logger.info("Where will your project be hosted?")
+                git_host = typer.prompt(
+                    "Target Git hosting platform (github/gitlab)",
+                    type=str,
+                    default="github",
+                ).lower()
+
+                # Validate the input
+                while git_host not in ["github", "gitlab"]:
+                    logger.warning(f"Invalid choice: {git_host}. Please choose 'github' or 'gitlab'")
+                    git_host = typer.prompt(
+                        "Target Git hosting platform (github/gitlab)",
+                        type=str,
+                        default="github",
+                    ).lower()
+            else:
+                # Non-interactive mode (e.g., tests), default to github
+                git_host = "github"
+                logger.debug("Non-interactive mode detected, defaulting to github")
+
+        # Adjust template based on target git hosting platform
+        # The template repository is always on GitHub (jebel-quant/rhiza)
+        # but we include different files based on where the target project will be
+        if git_host == "gitlab":
+            include_paths = [
+                ".rhiza",  # .rhiza folder
+                ".gitlab",  # .gitlab folder
+                ".gitlab-ci.yml",  # GitLab CI configuration
+                ".editorconfig",  # Editor configuration
+                ".gitignore",  # Git ignore patterns
+                ".pre-commit-config.yaml",  # Pre-commit hooks
+                "ruff.toml",  # Ruff linter configuration
+                "Makefile",  # Build and development tasks
+                "pytest.ini",  # Pytest configuration
+                "book",  # Documentation book
+                "presentation",  # Presentation materials
+                "tests",  # Test structure
+            ]
+        else:
+            include_paths = [
                 ".rhiza",  # .rhiza folder
                 ".github",  # GitHub configuration and workflows
                 ".editorconfig",  # Editor configuration
@@ -96,7 +146,16 @@ def init(
                 "book",  # Documentation book
                 "presentation",  # Presentation materials
                 "tests",  # Test structure
-            ],
+            ]
+
+        # Default template points to the jebel-quant/rhiza repository on GitHub
+        # and includes files appropriate for the target platform
+        default_template = RhizaTemplate(
+            template_repository="jebel-quant/rhiza",
+            template_branch="main",
+            # template_host is not set here - it defaults to "github" in the model
+            # because the template repository is on GitHub
+            include=include_paths,
         )
 
         # Write the default template to the file

{rhiza-0.8.2 → rhiza-0.8.3}/tests/test_commands/test_init.py

@@ -6,6 +6,7 @@ that the Typer CLI entry `rhiza init` works as expected.
 
 from pathlib import Path
 
+import pytest
 import yaml
 from typer.testing import CliRunner
 
@@ -232,3 +233,60 @@ class TestInitCommand:
         pyproject_file = tmp_path / "pyproject.toml"
         content = pyproject_file.read_text()
         assert 'packages = ["src/class_"]' in content
+
+    def test_init_with_github_explicit(self, tmp_path):
+        """Test init with explicitly specified GitHub target platform."""
+        init(tmp_path, git_host="github")
+
+        # Verify template.yml was created
+        template_file = tmp_path / ".rhiza" / "template.yml"
+        assert template_file.exists()
+
+        with open(template_file) as f:
+            config = yaml.safe_load(f)
+
+        # template-host should not appear (defaults to github for template repo)
+        assert "template-host" not in config
+        # Should include .github for GitHub target
+        assert ".github" in config["include"]
+        assert ".gitlab-ci.yml" not in config["include"]
+
+    def test_init_with_gitlab_explicit(self, tmp_path):
+        """Test init with explicitly specified GitLab target platform."""
+        init(tmp_path, git_host="gitlab")
+
+        # Verify template.yml was created
+        template_file = tmp_path / ".rhiza" / "template.yml"
+        assert template_file.exists()
+
+        with open(template_file) as f:
+            config = yaml.safe_load(f)
+
+        # template-host should not appear because template repo is still on GitHub
+        # We only change the include list based on target platform
+        assert "template-host" not in config
+        # Should include .gitlab-ci.yml for GitLab target
+        assert ".gitlab-ci.yml" in config["include"]
+        # Should NOT include .github for GitLab target
+        assert ".github" not in config["include"]
+
+    def test_init_with_invalid_git_host(self, tmp_path):
+        """Test init with invalid git-host raises error."""
+        with pytest.raises(ValueError, match="Invalid git-host"):
+            init(tmp_path, git_host="bitbucket")
+
+    def test_init_with_git_host_case_insensitive(self, tmp_path):
+        """Test init with git-host is case insensitive."""
+        init(tmp_path, git_host="GitLab")
+
+        # Verify template.yml was created
+        template_file = tmp_path / ".rhiza" / "template.yml"
+        assert template_file.exists()
+
+        with open(template_file) as f:
+            config = yaml.safe_load(f)
+
+        # Should include .gitlab-ci.yml for GitLab target
+        assert ".gitlab-ci.yml" in config["include"]
+        # Should NOT include .github for GitLab target
+        assert ".github" not in config["include"]

{rhiza-0.8.2 → rhiza-0.8.3}/uv.lock

@@ -771,7 +771,7 @@ wheels = [
 
 [[package]]
 name = "rhiza"
-version = "0.8.2"
+version = "0.8.3"
 source = { editable = "." }
 dependencies = [
     { name = "jinja2" },