sum-cli 3.0.0__py3-none-any.whl → 3.1.0__py3-none-any.whl

sum/cli.py

@@ -9,7 +9,7 @@ from sum.commands.backup import backup
 from sum.commands.check import check
 from sum.commands.init import init
 from sum.commands.promote import promote
-from sum.commands.run import run
+from sum.commands.setup import setup
 from sum.commands.themes import themes
 from sum.commands.update import update
 
@@ -26,14 +26,14 @@ def _get_version() -> str:
     version=_get_version(), prog_name="sum-platform", message="%(prog)s %(version)s"
 )
 def cli() -> None:
-    """SUM Platform CLI (v2)."""
+    """SUM Platform CLI - Deploy and manage client sites."""
 
 
 cli.add_command(backup)
 cli.add_command(check)
 cli.add_command(init)
 cli.add_command(promote)
-cli.add_command(run)
+cli.add_command(setup)
 cli.add_command(themes)
 cli.add_command(update)
 

sum/commands/__init__.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from sum.commands.check import check
 from sum.commands.init import init
-from sum.commands.run import run
+from sum.commands.setup import setup
 from sum.commands.themes import themes
 
-__all__ = ["check", "init", "run", "themes"]
+__all__ = ["check", "init", "setup", "themes"]

sum/commands/init.py

@@ -7,7 +7,7 @@ Creates a working site on staging at /srv/sum/<name>/ with:
 - External venv
 - Systemd service
 - Caddy configuration
-- Git repository (optional)
+- Git repository (optional, specify provider with --git-provider)
 """
 
 from __future__ import annotations
@@ -17,6 +17,7 @@ from types import ModuleType
 from sum.exceptions import SetupError
 from sum.setup.infrastructure import check_infrastructure
 from sum.setup.site_orchestrator import SiteOrchestrator, SiteSetupConfig
+from sum.site_config import GitConfig
 from sum.system_config import ConfigurationError, get_system_config
 from sum.utils.output import OutputFormatter
 from sum.utils.project import validate_project_name
@@ -37,6 +38,11 @@ def run_init(
     profile: str = "starter",
     content_path: str | None = None,
     no_git: bool = False,
+    git_provider: str | None = None,
+    git_org: str | None = None,
+    gitea_url: str | None = None,
+    gitea_ssh_port: int = 22,
+    gitea_token_env: str = "GITEA_TOKEN",
     skip_systemd: bool = False,
     skip_caddy: bool = False,
     superuser_username: str = "admin",
@@ -51,7 +57,12 @@ def run_init(
         theme: Theme slug to use.
         profile: Content profile name to seed.
         content_path: Optional path to custom content directory.
-        no_git: Skip GitHub repository creation.
+        no_git: Skip git repository creation.
+        git_provider: Git provider ("github" or "gitea").
+        git_org: Git organization/namespace.
+        gitea_url: Gitea instance URL (required if git_provider=gitea).
+        gitea_ssh_port: SSH port for Gitea.
+        gitea_token_env: Env var name for Gitea API token.
         skip_systemd: Skip systemd service installation.
         skip_caddy: Skip Caddy configuration.
         superuser_username: Username for Django superuser.
@@ -96,11 +107,32 @@ def run_init(
         OutputFormatter.error(f"Site already exists at {site_dir}")
         return 1
 
-    # Warn about GitHub if gh CLI not available and --no-git not set
-    if not no_git and not infra.has_gh_cli:
-        OutputFormatter.warning(
-            "GitHub CLI (gh) not available. Repository creation will be skipped.\n"
-            "To enable: install gh CLI and run 'gh auth login'"
+    # Build git config from flags
+    git_config: GitConfig | None = None
+    if not no_git:
+        # Validate required git flags
+        if not git_provider:
+            OutputFormatter.error(
+                "Git provider required. Use --git-provider github or --git-provider gitea.\n"
+                "Or use --no-git to skip git setup."
+            )
+            return 1
+        if not git_org:
+            OutputFormatter.error(
+                "Git organization required. Use --git-org <org>.\n"
+                "Or use --no-git to skip git setup."
+            )
+            return 1
+        if git_provider == "gitea" and not gitea_url:
+            OutputFormatter.error("Gitea URL required. Use --gitea-url <url>.")
+            return 1
+
+        git_config = GitConfig(
+            provider=git_provider,
+            org=git_org,
+            url=gitea_url,
+            ssh_port=gitea_ssh_port,
+            token_env=gitea_token_env,
         )
 
     # Build setup config
@@ -110,9 +142,9 @@ def run_init(
         seed_profile=profile,
         content_path=content_path,
         superuser_username=superuser_username,
-        skip_git=no_git,
         skip_systemd=skip_systemd,
         skip_caddy=skip_caddy,
+        git_config=git_config,
     )
 
     # Run setup
@@ -153,6 +185,11 @@ def _init_command(
     profile: str,
     content_path: str | None,
     no_git: bool,
+    git_provider: str | None,
+    git_org: str | None,
+    gitea_url: str | None,
+    gitea_ssh_port: int,
+    gitea_token_env: str,
     skip_systemd: bool,
     skip_caddy: bool,
     superuser_username: str,
@@ -164,6 +201,11 @@ def _init_command(
         profile=profile,
         content_path=content_path,
         no_git=no_git,
+        git_provider=git_provider,
+        git_org=git_org,
+        gitea_url=gitea_url,
+        gitea_ssh_port=gitea_ssh_port,
+        gitea_token_env=gitea_token_env,
         skip_systemd=skip_systemd,
         skip_caddy=skip_caddy,
         superuser_username=superuser_username,
@@ -202,7 +244,36 @@ else:
     @click.option(
         "--no-git",
         is_flag=True,
-        help="Skip GitHub repository creation (git init only).",
+        help="Skip git repository creation (local git init only).",
+    )
+    @click.option(
+        "--git-provider",
+        type=click.Choice(["github", "gitea"]),
+        default=None,
+        help="Git provider: github or gitea. Required unless --no-git.",
+    )
+    @click.option(
+        "--git-org",
+        default=None,
+        help="Git organization/namespace. Required unless --no-git.",
+    )
+    @click.option(
+        "--gitea-url",
+        default=None,
+        help="Gitea instance URL. Required if --git-provider=gitea.",
+    )
+    @click.option(
+        "--gitea-ssh-port",
+        type=int,
+        default=22,
+        show_default=True,
+        help="SSH port for Gitea.",
+    )
+    @click.option(
+        "--gitea-token-env",
+        default="GITEA_TOKEN",
+        show_default=True,
+        help="Environment variable for Gitea API token.",
     )
     @click.option(
         "--skip-systemd",
@@ -227,6 +298,11 @@ else:
         profile: str,
         content_path: str | None,
         no_git: bool,
+        git_provider: str | None,
+        git_org: str | None,
+        gitea_url: str | None,
+        gitea_ssh_port: int,
+        gitea_token_env: str,
         skip_systemd: bool,
         skip_caddy: bool,
         superuser_username: str,
@@ -241,15 +317,16 @@ else:
         - External virtualenv
         - Systemd service
         - Caddy reverse proxy
-        - GitHub repository (optional)
-
-        The site will be accessible at https://<SITE_NAME>.lintel.site
+        - Git repository (optional, specify provider with --git-provider)
 
         \b
         Examples:
-          sudo sum-platform init acme
-          sudo sum-platform init acme --theme theme_b
-          sudo sum-platform init acme --content-path /path/to/profiles/acme
+          sudo sum-platform init acme --no-git
+          sudo sum-platform init acme --git-provider github --git-org acme-corp
+          sudo sum-platform init acme --git-provider gitea --git-org clients \\
+              --gitea-url https://git.agency.com
+          sudo sum-platform init acme --git-provider gitea --git-org clients \\
+              --gitea-url https://git.agency.com --gitea-ssh-port 2222
         """
         _init_command(
             site_name,
@@ -257,6 +334,11 @@ else:
             profile=profile,
             content_path=content_path,
             no_git=no_git,
+            git_provider=git_provider,
+            git_org=git_org,
+            gitea_url=gitea_url,
+            gitea_ssh_port=gitea_ssh_port,
+            gitea_token_env=gitea_token_env,
             skip_systemd=skip_systemd,
             skip_caddy=skip_caddy,
             superuser_username=superuser_username,

sum/commands/promote.py

@@ -19,8 +19,9 @@ from pathlib import Path
 from types import ModuleType
 
 from sum.exceptions import SetupError
-from sum.setup.git_ops import get_git_provider
+from sum.setup.git_ops import get_git_provider_from_config
 from sum.setup.infrastructure import generate_password, generate_secret_key
+from sum.site_config import GitConfig, SiteConfig, SiteConfigError
 from sum.system_config import ConfigurationError, SystemConfig, get_system_config
 from sum.utils.output import OutputFormatter
 
@@ -206,7 +207,9 @@ WAGTAILADMIN_BASE_URL=https://{domain}
     return credentials
 
 
-def _clone_repo_on_prod(site_slug: str, config: SystemConfig) -> None:
+def _clone_repo_on_prod(
+    site_slug: str, config: SystemConfig, git_config: GitConfig
+) -> None:
     """Clone the site repository on production.
 
     Uses HTTPS with token to avoid SSH key requirements on production.
@@ -214,8 +217,8 @@ def _clone_repo_on_prod(site_slug: str, config: SystemConfig) -> None:
     """
     ssh_host = config.production.ssh_host
     site_dir = config.get_site_dir(site_slug, target="prod")
-    provider = get_git_provider(config.agency)
-    org = config.agency.org
+    provider = get_git_provider_from_config(git_config)
+    org = git_config.org
 
     q_app_dir = shlex.quote(f"{site_dir}/app")
     q_site_env = shlex.quote(f"{site_dir}/.env")
@@ -226,7 +229,7 @@ def _clone_repo_on_prod(site_slug: str, config: SystemConfig) -> None:
 
     # Try to get token for HTTPS clone (avoids SSH key setup on prod)
     repo_url = ssh_clone_url  # Default to SSH
-    if config.agency.git_provider == "github":
+    if git_config.provider == "github":
         # Try GitHub CLI token
         try:
             result = subprocess.run(
@@ -240,14 +243,14 @@ def _clone_repo_on_prod(site_slug: str, config: SystemConfig) -> None:
                 repo_url = f"https://{gh_token}@github.com/{org}/{site_slug}.git"
         except (subprocess.SubprocessError, FileNotFoundError):
             pass
-    elif config.agency.git_provider == "gitea":
+    elif git_config.provider == "gitea":
         # Try Gitea token from environment
         import os
         from urllib.parse import urlparse
 
-        gitea_token = os.environ.get(config.agency.gitea_token_env)
-        if gitea_token and config.agency.gitea_url:
-            parsed = urlparse(config.agency.gitea_url)
+        gitea_token = os.environ.get(git_config.token_env)
+        if gitea_token and git_config.url:
+            parsed = urlparse(git_config.url)
             repo_url = f"https://{gitea_token}@{parsed.netloc}/{org}/{site_slug}.git"
 
     cmd = f"git clone {shlex.quote(repo_url)} {q_app_dir}"
@@ -558,6 +561,22 @@ def run_promote(
         OutputFormatter.error(f"Staging site not found: {staging_dir}")
         return 1
 
+    # Load site config to get git settings
+    try:
+        site_config = SiteConfig.load(staging_dir)
+    except SiteConfigError as exc:
+        OutputFormatter.error(str(exc))
+        return 1
+
+    if site_config.git is None:
+        OutputFormatter.error(
+            f"Site '{site_name}' was created with --no-git. "
+            "Cannot promote without git repository."
+        )
+        return 1
+
+    git_config = site_config.git
+
     OutputFormatter.header(f"Promoting {site_name} to production")
     print(f"  Domain: {domain}")
     print()
@@ -601,7 +620,7 @@ def run_promote(
         OutputFormatter.progress(
             current_step, total_steps, "Cloning repository on production", "⏳"
         )
-        _clone_repo_on_prod(site_name, config)
+        _clone_repo_on_prod(site_name, config, git_config)
         OutputFormatter.progress(current_step, total_steps, "Repository cloned", "✅")
 
         # Step 5: Setup venv on production

sum/commands/setup.py

@@ -0,0 +1,143 @@
+"""Setup command for initializing /etc/sum/config.yml."""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from types import ModuleType
+
+import yaml
+from sum.system_config import DEFAULT_CONFIG_PATH
+from sum.utils.output import OutputFormatter
+
+click_module: ModuleType | None
+try:
+    import click as click_module
+except ImportError:  # pragma: no cover
+    click_module = None
+
+click: ModuleType | None = click_module
+
+
+def _missing_click(*_args: object, **_kwargs: object) -> None:
+    raise RuntimeError("click is required to use the setup command")
+
+
+if click is None:
+    setup = _missing_click
+else:
+
+    @click.command()
+    def setup() -> None:
+        """Initialize system configuration interactively.
+
+        Creates /etc/sum/config.yml with infrastructure settings.
+        Requires sudo.
+
+        \b
+        The configuration file stores:
+        - Agency information
+        - Staging server settings
+        - Production server settings
+        - Infrastructure template paths
+        - Default values
+
+        \b
+        Git settings are NOT stored here - they are per-site,
+        specified when running 'sum-platform init'.
+        """
+        if os.geteuid() != 0:
+            raise click.ClickException(
+                "Setup requires root privileges. Run with: sudo sum-platform setup"
+            )
+
+        if DEFAULT_CONFIG_PATH.exists():
+            if not click.confirm(f"{DEFAULT_CONFIG_PATH} exists. Overwrite?"):
+                raise SystemExit(0)
+
+        click.echo("SUM Platform Setup")
+        click.echo("=" * 40)
+        click.echo()
+
+        # Agency
+        click.echo("Agency Information:")
+        agency_name = click.prompt("  Agency name", type=str)
+
+        click.echo()
+
+        # Staging
+        click.echo("Staging Server Configuration:")
+        staging_server = click.prompt("  Hostname", type=str)
+        staging_domain_pattern = click.prompt(
+            "  Domain pattern (use {slug} placeholder)",
+            default="{slug}." + staging_server,
+        )
+        staging_base_dir = click.prompt("  Base directory", default="/srv/sum")
+
+        click.echo()
+
+        # Production
+        click.echo("Production Server Configuration:")
+        prod_server = click.prompt("  Hostname", type=str)
+        prod_ssh_host = click.prompt("  SSH host (IP or hostname)", default=prod_server)
+        prod_base_dir = click.prompt("  Base directory", default="/srv/sum")
+
+        click.echo()
+
+        # Templates
+        click.echo("Infrastructure Templates:")
+        templates_dir = click.prompt("  Templates directory", type=str)
+        systemd_template = click.prompt(
+            "  Systemd template (relative path)",
+            default="systemd/sum-site-gunicorn.service.template",
+        )
+        caddy_template = click.prompt(
+            "  Caddy template (relative path)",
+            default="caddy/Caddyfile.template",
+        )
+
+        click.echo()
+
+        # Defaults
+        click.echo("Defaults:")
+        default_theme = click.prompt("  Default theme", default="theme_a")
+        seed_profile = click.prompt("  Seed profile", default="starter")
+        deploy_user = click.prompt("  Deploy user", default="deploy")
+        postgres_port = click.prompt("  Postgres port", default=5432, type=int)
+
+        # Build config
+        config = {
+            "agency": {
+                "name": agency_name,
+            },
+            "staging": {
+                "server": staging_server,
+                "domain_pattern": staging_domain_pattern,
+                "base_dir": staging_base_dir,
+            },
+            "production": {
+                "server": prod_server,
+                "ssh_host": prod_ssh_host,
+                "base_dir": prod_base_dir,
+            },
+            "templates": {
+                "dir": templates_dir,
+                "systemd": systemd_template,
+                "caddy": caddy_template,
+            },
+            "defaults": {
+                "theme": default_theme,
+                "seed_profile": seed_profile,
+                "deploy_user": deploy_user,
+                "postgres_port": postgres_port,
+            },
+        }
+
+        # Write config
+        config_path = Path(DEFAULT_CONFIG_PATH)
+        config_path.parent.mkdir(parents=True, exist_ok=True)
+        with open(config_path, "w") as f:
+            yaml.dump(config, f, default_flow_style=False, sort_keys=False)
+
+        click.echo()
+        OutputFormatter.success(f"Configuration saved to {DEFAULT_CONFIG_PATH}")

sum/setup/git_ops.py

@@ -13,7 +13,7 @@ from abc import ABC, abstractmethod
 from pathlib import Path
 
 from sum.exceptions import SetupError
-from sum.system_config import AgencyConfig, get_system_config
+from sum.site_config import GitConfig
 from sum.utils.output import OutputFormatter
 
 # =============================================================================
@@ -65,8 +65,8 @@ class GitProvider(ABC):
 class GitHubProvider(GitProvider):
     """GitHub provider using gh CLI."""
 
-    def __init__(self, config: AgencyConfig) -> None:
-        self.org = config.github_org or ""
+    def __init__(self, org: str) -> None:
+        self.org = org
 
     @property
     def name(self) -> str:
@@ -175,10 +175,17 @@ class GitHubProvider(GitProvider):
 class GiteaProvider(GitProvider):
     """Gitea provider using REST API."""
 
-    def __init__(self, config: AgencyConfig) -> None:
-        self.org = config.gitea_org or ""
-        self.base_url = (config.gitea_url or "").rstrip("/")
-        self.token_env = config.gitea_token_env
+    def __init__(
+        self,
+        org: str,
+        base_url: str,
+        ssh_port: int = 22,
+        token_env: str = "GITEA_TOKEN",
+    ) -> None:
+        self.org = org
+        self.base_url = base_url.rstrip("/")
+        self.ssh_port = ssh_port
+        self.token_env = token_env
 
     @property
     def name(self) -> str:
@@ -198,13 +205,22 @@ class GiteaProvider(GitProvider):
         return f"{self.base_url}/{org}/{repo_name}"
 
     def get_clone_url(self, org: str, repo_name: str) -> str:
-        # Extract host from base_url for SSH
-        # e.g., https://gitea.example.com -> gitea.example.com
+        """Get SSH clone URL for a repository.
+
+        Uses ssh:// URL format when custom port is specified,
+        otherwise uses standard git@host:path format.
+        """
         from urllib.parse import urlparse
 
         parsed = urlparse(self.base_url)
         host = parsed.netloc
-        return f"git@{host}:{org}/{repo_name}.git"
+
+        if self.ssh_port != 22:
+            # Non-standard port requires ssh:// URL format
+            return f"ssh://git@{host}:{self.ssh_port}/{org}/{repo_name}.git"
+        else:
+            # Standard port 22 can use short format
+            return f"git@{host}:{org}/{repo_name}.git"
 
     def create_repo(self, app_dir: Path, repo_name: str) -> str:
         """Create a private Gitea repository and push the code."""
@@ -338,21 +354,49 @@ class GiteaProvider(GitProvider):
 # =============================================================================
 
 
-def get_git_provider(config: AgencyConfig | None = None) -> GitProvider:
-    """Get the configured git provider instance.
+def get_git_provider(
+    provider: str,
+    org: str,
+    gitea_url: str | None = None,
+    gitea_ssh_port: int = 22,
+    gitea_token_env: str = "GITEA_TOKEN",
+) -> GitProvider:
+    """Create a git provider instance.
 
     Args:
-        config: Optional AgencyConfig. If not provided, loads from system config.
+        provider: "github" or "gitea"
+        org: Organization/namespace
+        gitea_url: Gitea instance URL (required if provider=gitea)
+        gitea_ssh_port: SSH port for Gitea
+        gitea_token_env: Env var name for Gitea API token
 
     Returns:
-        GitProvider instance for the configured provider.
+        GitProvider instance for the specified provider.
+
+    Raises:
+        ValueError: If provider is gitea but gitea_url not provided.
     """
-    if config is None:
-        config = get_system_config().agency
+    if provider == "gitea":
+        if not gitea_url:
+            raise ValueError("gitea_url required when provider is 'gitea'")
+        return GiteaProvider(
+            org=org,
+            base_url=gitea_url,
+            ssh_port=gitea_ssh_port,
+            token_env=gitea_token_env,
+        )
+    return GitHubProvider(org=org)
 
-    if config.git_provider == "gitea":
-        return GiteaProvider(config)
-    return GitHubProvider(config)
+
+def get_git_provider_from_config(git_config: GitConfig) -> GitProvider:
+    """Create a git provider from a GitConfig object."""
+    return get_git_provider(
+        provider=git_config.provider,
+        org=git_config.org,
+        gitea_url=git_config.url,
+        gitea_ssh_port=git_config.ssh_port,
+        gitea_token_env=git_config.token_env,
+    )
 
 
 # =============================================================================
@@ -401,14 +445,14 @@ def create_initial_commit(
 def setup_git_for_site(
     app_dir: Path,
     site_slug: str,
-    skip_remote: bool = False,
+    git_config: GitConfig | None,
 ) -> str | None:
     """Set up git repository for a new site.
 
     Args:
         app_dir: Path to the app directory.
         site_slug: The site slug (used as repo name).
-        skip_remote: If True, only do local git init, skip remote repo creation.
+        git_config: Git configuration, or None to skip remote.
 
     Returns:
         Remote repo URL if created, None if skipped.
@@ -419,45 +463,20 @@ def setup_git_for_site(
     # Create initial commit
     create_initial_commit(app_dir)
 
-    if skip_remote:
+    if git_config is None:
         OutputFormatter.info("Skipping remote repository creation (--no-git)")
         return None
 
-    # Get the configured provider
-    provider = get_git_provider()
+    # Get the provider from config
+    provider = get_git_provider_from_config(git_config)
 
     # Check if provider is available
     if not provider.is_available():
         OutputFormatter.warning(
-            f"{provider.name} is not available or not configured. "
-            "Skipping repository creation."
+            f"{provider.name} is not available. " "Skipping repository creation."
         )
         return None
 
     # Create remote repo
     repo_url = provider.create_repo(app_dir, site_slug)
     return repo_url
-
-
-# =============================================================================
-# Backward Compatibility
-# =============================================================================
-
-
-# Keep old function names for backward compatibility
-def check_gh_cli() -> bool:
-    """Check if gh CLI is available and authenticated.
-
-    Deprecated: Use get_git_provider().is_available() instead.
-    """
-    provider = GitHubProvider(get_system_config().agency)
-    return provider.is_available()
-
-
-def create_github_repo(app_dir: Path, repo_name: str) -> str:
-    """Create a private GitHub repository and push the code.
-
-    Deprecated: Use get_git_provider().create_repo() instead.
-    """
-    provider = GitHubProvider(get_system_config().agency)
-    return provider.create_repo(app_dir, repo_name)

sum/setup/orchestrator.py

@@ -6,7 +6,7 @@ import shutil
 import subprocess
 from collections.abc import Callable
 from dataclasses import dataclass
-from enum import Enum
+from enum import StrEnum
 from pathlib import Path
 
 from sum.config import SetupConfig
@@ -33,7 +33,7 @@ class SetupResult:
     url: str = "http://127.0.0.1:8000/"
 
 
-class SetupStep(str, Enum):
+class SetupStep(StrEnum):
     """Ordered, typed identifiers for setup steps."""
 
     SCAFFOLD = "Scaffolding structure"