Merge pull request #45 from psadmin-io/staging

Release 0.2.2

Author: kbens

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "psa-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "PeopleSoft Administration CLI"
 readme = "README.md"
 requires-python = ">=3.8"

src/psa/__init__.py

@@ -1,3 +1,3 @@
 """PeopleSoft Administration Tools."""
 
-__version__ = "0.2.0"
+__version__ = "0.2.2"

src/psa/cli.py

@@ -5,7 +5,7 @@
 import typer
 
 from psa import __version__
-from psa.commands import config, domain, dpk, ops
+from psa.commands import config, domain, dpk, kit, ops
 from psa.core.output import Verbosity, console, set_verbosity
 
 # Main application
@@ -21,6 +21,7 @@
 app.add_typer(config.app, name="config")
 app.add_typer(domain.app, name="domain")
 app.add_typer(dpk.app, name="dpk")
+app.add_typer(kit.app, name="kit")
 app.add_typer(ops.app, name="ops")
 
 

src/psa/commands/config.py

@@ -1,15 +1,15 @@
 """Configuration management commands."""
 
-from typing import List, Optional
+from typing import Optional
 
 import typer
 from rich.console import Console
-from rich.table import Table
 
 from psa.commands import init
-from psa.core.config import CONFIG_PATH, PsaConfig, get_config
-from psa.core.domain_cache import get_cached_domain_id
+from pathlib import Path
+
 from psa.core.api import ApiClient, ApiError
+from psa.core.config import CONFIG_PATH, PsaConfig, get_config
 from psa.core.output import print_error
 
 console = Console()
@@ -21,7 +21,7 @@
 )
 
 
-app.command(name="setup")(init.init)
+app.command(name="setup")(init.standalone_setup)
 
 
 @app.command(name="init", hidden=True)
@@ -93,6 +93,9 @@ def config_init(
     "parallel_boot": ("bool", "Use parallelboot instead of boot"),
     "sudo_enabled": ("bool", "Use sudo to run commands as runtime_user"),
     "runtime_user": ("str", "OS user for domain commands"),
+    "dpk_repo_path": ("path", "Path to DPK file repository (PCM mount or local dir)"),
+    "psa_kit_path": ("path", "Path to PSA Kit installation"),
+    "psa_cust_path": ("path", "Path to PSA customer customizations"),
 }
 
 
@@ -128,6 +131,8 @@ def config_set(
     try:
         if val_type == "bool":
             setattr(config, key, _parse_bool(value))
+        elif val_type == "path":
+            setattr(config, key, Path(value))
         else:
             setattr(config, key, value)
     except ValueError as e:
@@ -157,8 +162,23 @@ def config_show() -> None:
         console.print(f"  PS_CFG_HOME: {config.ps_cfg_home}")
     if config.ps_home:
         console.print(f"  PS_HOME: {config.ps_home}")
+    if config.ps_app_home:
+        console.print(f"  PS_APP_HOME: {config.ps_app_home}")
+    if config.ps_cust_home:
+        console.print(f"  PS_CUST_HOME: {config.ps_cust_home}")
+    if config.psa_kit_path:
+        console.print(f"  PSA Kit: {config.psa_kit_path}")
+    if config.psa_cust_path:
+        console.print(f"  PSA Cust: {config.psa_cust_path}")
+    if config.multi_homes:
+        console.print(f"  Multi-homes: {', '.join(str(p) for p in config.multi_homes)}")
     console.print(f"  Runtime user: {config.runtime_user}")
 
+    console.print("\n[bold]Options:[/bold]")
+    console.print(f"  sudo_enabled: {config.sudo_enabled}")
+    console.print(f"  parallel_boot: {config.parallel_boot}")
+    console.print(f"  skip_domain_confirm: {config.skip_domain_confirm}")
+
     if config.ops.is_configured():
         console.print("\n[bold]PSA-OPS:[/bold]")
         console.print(f"  URL: {config.ops.url}")
@@ -170,125 +190,11 @@ def config_show() -> None:
             console.print(f"  Tier: {config.ops.tier}")
         if config.ops.pillar:
             console.print(f"  Pillar: {config.ops.pillar}")
+        if config.ops.zone:
+            console.print(f"  Zone: {config.ops.zone}")
+        if config.ops.suppress_fact_warnings:
+            console.print(f"  Suppress fact warnings: {config.ops.suppress_fact_warnings}")
         if config.ops.ps_role:
             console.print(f"  Role: {config.ops.ps_role}")
     else:
         console.print("\n[yellow]PSA-OPS not configured[/yellow]")
-
-
-def _resolve_domain_id(client: ApiClient, name: str) -> str:
-    """Resolve domain name to UUID. Checks local cache first, then PSA-OPS."""
-    cached = get_cached_domain_id(name)
-    if cached:
-        return cached
-    domain = client.resolve_domain(name)
-    if not domain:
-        print_error(f"Domain '{name}' not found in PSA-OPS")
-        raise typer.Exit(1)
-    return domain["id"]
-
-
-@app.command(name="compare")
-def config_compare(
-    domains: List[str] = typer.Argument(
-        ...,
-        help="Domain names to compare (at least 2)",
-    ),
-    config_type: Optional[str] = typer.Option(
-        None,
-        "--type",
-        "-t",
-        help="Config file type (e.g. psappsrv.cfg, psprcs.cfg)",
-    ),
-    show_all: bool = typer.Option(
-        False,
-        "--all",
-        "-a",
-        help="Show all rows including identical values",
-    ),
-    json_output: bool = typer.Option(
-        False,
-        "--json",
-        "-j",
-        help="Output as JSON",
-    ),
-) -> None:
-    """
-    Compare config across domains
-
-    Fetches config comparison from PSA-OPS for 2+ domains and displays
-    differences. By default only shows 'different' and 'missing' rows.
-
-    Examples:
-        psa config compare APPDOM1 APPDOM2
-        psa config compare APPDOM1 APPDOM2 --type psappsrv.cfg
-        psa config compare APPDOM1 APPDOM2 APPDOM3 --all
-    """
-    if len(domains) < 2:
-        print_error("At least 2 domain names required for comparison")
-        raise typer.Exit(1)
-
-    config = get_config()
-    if not config.ops.is_configured():
-        print_error("PSA-OPS not configured. Run 'psa config setup' first")
-        raise typer.Exit(1)
-
-    client = ApiClient(config.ops.url)
-
-    # Resolve names to UUIDs
-    domain_ids = []
-    for name in domains:
-        domain_id = _resolve_domain_id(client, name)
-        domain_ids.append(domain_id)
-
-    try:
-        result = client.compare_configs(domain_ids, config_type)
-    except ApiError as e:
-        print_error(f"Compare failed: {e}")
-        raise typer.Exit(1)
-
-    if json_output:
-        import json
-        console.print_json(json.dumps(result, default=str, indent=2))
-        return
-
-    rows = result.get("rows", [])
-    if not rows:
-        console.print("[dim]No config data to compare[/dim]")
-        return
-
-    # Filter rows unless --all
-    if not show_all:
-        rows = [r for r in rows if r.get("status") != "same"]
-
-    # Count summary
-    all_rows = result.get("rows", [])
-    same_count = sum(1 for r in all_rows if r.get("status") == "same")
-    diff_count = sum(1 for r in all_rows if r.get("status") == "different")
-    missing_count = sum(1 for r in all_rows if r.get("status") == "missing")
-
-    # Build table
-    table = Table(title="Config Comparison")
-    table.add_column("Key", style="cyan")
-    for name in domains:
-        table.add_column(name, style="white")
-    table.add_column("Status", style="dim")
-
-    for row in rows:
-        status = row.get("status", "")
-        values = row.get("values", {})
-        style = ""
-        if status == "different":
-            style = "yellow"
-        elif status == "missing":
-            style = "red"
-
-        cells = [row.get("key", "")]
-        for name in domains:
-            val = values.get(name, "")
-            cells.append(str(val) if val is not None else "[dim]-[/dim]")
-        cells.append(f"[{style}]{status}[/{style}]" if style else status)
-        table.add_row(*cells)
-
-    console.print(table)
-    console.print(f"\n{same_count} same, {diff_count} different, {missing_count} missing")