sweatstack-cli 0.7.2__py3-none-any.whl → 0.9.0__py3-none-any.whl

sweatstack_cli/__init__.py

@@ -1,3 +1,3 @@
 """SweatStack CLI — Command-line interface for the SweatStack platform."""
 
-__version__ = "0.7.2"
+__version__ = "0.9.0"

sweatstack_cli/commands/app.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json as json_lib
+import sys
 from pathlib import Path
 from typing import Any, cast
 
@@ -16,9 +17,14 @@ from sweatstack_cli.project import CONFIG_FILENAME, write_config
 app = typer.Typer(name="app", help="Manage OAuth2 applications.")
 
 
+def _is_interactive() -> bool:
+    """Check if stdin is a TTY (interactive terminal)."""
+    return sys.stdin.isatty()
+
+
 @app.command()
 def create(
-    name: str = typer.Argument(..., help="Application name."),
+    name: str | None = typer.Argument(None, help="Application name."),
     description: str | None = typer.Option(
         None,
         "--description",
@@ -56,7 +62,33 @@ def create(
     """Create a new private OAuth2 application."""
     if env and env_file:
         console.print("[red]Error:[/red] --env and --env-file are mutually exclusive.")
-        raise typer.Exit(4)
+        raise typer.Exit(1)
+
+    interactive = _is_interactive()
+
+    # Resolve name
+    if name is None:
+        if not interactive:
+            console.print("[red]Error:[/red] App name is required.")
+            raise typer.Exit(1)
+        name = typer.prompt("App name")
+
+    # Prompt for optional fields in interactive mode
+    if interactive:
+        if description is None:
+            description = typer.prompt(
+                "Description (optional)", default="", show_default=False
+            )
+            if not description:
+                description = None
+        if page is None:
+            page = typer.prompt(
+                "Page slug (optional)", default="", show_default=False
+            )
+            if not page:
+                page = None
+        if not secret:
+            secret = typer.confirm("Generate client secret?", default=False)
 
     body: dict[str, str | bool] = {"name": name}
 
@@ -86,7 +118,18 @@ def create(
     if env_path:
         _write_env_file(env_path, result)
 
-    # Write sweatstack.toml
+    # Write sweatstack.toml (protect existing file)
+    config_path = Path(CONFIG_FILENAME)
+    if config_path.exists():
+        if not interactive:
+            console.print(
+                f"[red]Error:[/red] {CONFIG_FILENAME} already exists. "
+                "Remove it first or run interactively."
+            )
+            raise typer.Exit(1)
+        console.print(f"[yellow]Warning:[/yellow] {CONFIG_FILENAME} already exists.")
+        typer.confirm("Overwrite?", abort=True)
+
     config_path = write_config(
         app_name=result["name"],
         client_id=result["id"],
@@ -206,6 +249,9 @@ def link(
         console.print(f"  [cyan][{i}][/cyan] {app_info['name']}{page_info}")
 
     console.print()
+    if not sys.stdin.isatty():
+        console.print("[red]Error:[/red] Cannot select application in non-interactive mode.")
+        raise typer.Exit(1)
     selection = typer.prompt("Select application", type=int)
 
     if selection < 1 or selection > len(apps):

sweatstack_cli/commands/page.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import mimetypes
+import sys
 from pathlib import Path
 
 import typer
@@ -12,7 +13,7 @@ from sweatstack_cli.api import APIClient
 from sweatstack_cli.config import get_settings
 from sweatstack_cli.console import console
 from sweatstack_cli.exceptions import APIError, AuthenticationError
-from sweatstack_cli.project import CONFIG_FILENAME, ProjectConfig
+from sweatstack_cli.project import CONFIG_FILENAME, ProjectConfig, update_config, write_config
 
 # URL where users can create pages for their applications
 SETTINGS_URL = "https://app.sweatstack.no/settings/api"
@@ -59,12 +60,14 @@ def deploy(
         None,
         help="Page slug. Reads from sweatstack.toml if not provided.",
     ),
-    directory: Path | None = typer.Argument(
+    directory: Path | None = typer.Option(
         None,
-        help="Directory to deploy. Reads from sweatstack.toml or defaults to current dir.",
+        "--dir",
+        help="Directory to deploy. Reads from sweatstack.toml if not provided.",
     ),
 ) -> None:
     """Deploy a static site to SweatStack Pages."""
+
     # Load config for defaults
     config = ProjectConfig.load()
 
@@ -76,9 +79,19 @@ def deploy(
         raise typer.Exit(1)
 
     # Resolve directory
+    directory_explicit = directory is not None
     if directory is None:
         dir_from_config = config.page.directory if config else None
-        directory = Path(dir_from_config) if dir_from_config else Path(".")
+        if dir_from_config:
+            directory = Path(dir_from_config)
+        else:
+            if not sys.stdin.isatty():
+                console.print("[red]Error:[/red] No deploy directory specified.")
+                console.print("Use --dir or set it in sweatstack.toml.")
+                raise typer.Exit(1)
+            dir_input = typer.prompt("Deploy directory", default="public/")
+            directory = Path(dir_input)
+            directory_explicit = True
 
     if not directory.exists():
         console.print(f"[red]Error:[/red] Directory '{directory}' does not exist.")
@@ -90,6 +103,32 @@ def deploy(
 
     directory = directory.resolve()
 
+    # Compute relative directory for config and warnings
+    try:
+        rel_dir = str(directory.relative_to(Path.cwd()))
+    except ValueError:
+        rel_dir = str(directory)
+
+    # Warn and confirm if deploying with different values than toml
+    if config:
+        mismatches: list[str] = []
+        if config.page.slug and slug and slug != config.page.slug:
+            mismatches.append(
+                f"Deploying to '{slug}' but "
+                f"{CONFIG_FILENAME} has slug '{config.page.slug}'"
+            )
+        if config.page.directory and rel_dir != config.page.directory:
+            mismatches.append(
+                f"Deploying '{rel_dir}' but "
+                f"{CONFIG_FILENAME} has directory '{config.page.directory}'"
+            )
+        if mismatches:
+            for msg in mismatches:
+                console.print(f"[yellow]Warning:[/yellow] {msg}")
+            if not sys.stdin.isatty():
+                raise typer.Exit(1)
+            typer.confirm("Continue?", abort=True)
+
     # Collect files
     files = _collect_files(directory)
     file_count = len(files)
@@ -143,6 +182,20 @@ def deploy(
             console.print(f"[red]Error:[/red] {e}")
             raise typer.Exit(3)
 
+    # Save to config after successful deploy
+    if config:
+        update_kwargs: dict[str, str] = {}
+        if not config.page.slug:
+            update_kwargs["page_slug"] = page_slug
+        if not config.page.directory and directory_explicit:
+            update_kwargs["page_directory"] = rel_dir
+        if update_kwargs:
+            update_config(**update_kwargs)
+            console.print(f"[green]✓[/green] Saved to [bold]{CONFIG_FILENAME}[/bold]")
+    elif directory_explicit:
+        write_config(page_slug=page_slug, page_directory=rel_dir)
+        console.print(f"[green]✓[/green] Created [bold]{CONFIG_FILENAME}[/bold]")
+
     console.print()
     console.print(f"[green]✓[/green] Deployed [bold]{page_slug}[/bold] successfully!")
     console.print(f"  Files: {file_count}")

sweatstack_cli/project.py

@@ -109,3 +109,37 @@ def write_config(
     config_path.write_text("\n".join(lines), encoding="utf-8")
 
     return config_path
+
+
+def update_config(
+    path: Path | None = None,
+    *,
+    page_slug: str | None = None,
+    page_directory: str | None = None,
+) -> Path | None:
+    """Update specific fields in an existing sweatstack.toml without overwriting other values."""
+    config_path = path or Path(CONFIG_FILENAME)
+
+    if not config_path.exists():
+        return None
+
+    try:
+        data = tomllib.loads(config_path.read_text(encoding="utf-8"))
+    except tomllib.TOMLDecodeError:
+        return None
+
+    app_data = data.get("app", {})
+    page_data = data.get("page", {})
+
+    if page_slug is not None:
+        page_data["slug"] = page_slug
+    if page_directory is not None:
+        page_data["directory"] = page_directory
+
+    return write_config(
+        path=config_path,
+        app_name=app_data.get("name"),
+        client_id=app_data.get("client_id"),
+        page_slug=page_data.get("slug"),
+        page_directory=page_data.get("directory"),
+    )

{sweatstack_cli-0.7.2.dist-info → sweatstack_cli-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sweatstack-cli
-Version: 0.7.2
+Version: 0.9.0
 Summary: Command-line interface for SweatStack — the sports data platform for developers
 Project-URL: Homepage, https://sweatstack.no
 Project-URL: Documentation, https://docs.sweatstack.no
@@ -88,7 +88,7 @@ sweatstack page deploy
 
 | Command | Description |
 |---------|-------------|
-| `sweatstack app create NAME` | Create a new private OAuth2 application |
+| `sweatstack app create [NAME]` | Create a new private OAuth2 application |
 | `sweatstack app link` | Link current directory to an existing application |
 
 #### `app create` options
@@ -130,8 +130,8 @@ Deploy static sites to SweatStack Pages.
 # Deploy using sweatstack.toml defaults (recommended)
 sweatstack page deploy
 
-# Or specify slug and directory directly
-sweatstack page deploy my-page ./dist
+# Or specify slug and directory explicitly
+sweatstack page deploy my-page --dir ./dist
 ```
 
 ## License

{sweatstack_cli-0.7.2.dist-info → sweatstack_cli-0.9.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-sweatstack_cli/__init__.py,sha256=ZNIAY7QNAqi01JDEnHZN9bJyiM_TICftFpoY4fNRsZ8,100
+sweatstack_cli/__init__.py,sha256=gqp4cHVRfTQZSb9iCu508gC8SFLnocm0gOfZLzXV934,100
 sweatstack_cli/config.py,sha256=cD4OXnVAKVagYazyk9Cw-WWx62tJPqcjQt1cknYyymM,706
 sweatstack_cli/console.py,sha256=69KWAM7ksnYRTONMYTXGXN4LWRAQhRxcLXO0LcWGLqo,300
 sweatstack_cli/exceptions.py,sha256=qEUu8GydXGRKR4ndAdZ2wnkHekmFpBXDJiT5bXdl7Yk,613
 sweatstack_cli/main.py,sha256=obcF1VGhwcE_pI1BwTJkY4J4BgIGac-y3yYGvY6ZOp8,2330
-sweatstack_cli/project.py,sha256=mOwqzuc6D6J6IHf-5L9Vv_sfjpReS4vwzSjUSFi7qys,2716
+sweatstack_cli/project.py,sha256=yUpkrEbPD2c0lu8IKw88aQrkFtksLHMjmgHlaqKVQUo,3660
 sweatstack_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sweatstack_cli/version_check.py,sha256=yZ_qVe7tUBowUDAmMki-wyf5pSxlNDsoWKgTcSfesBA,2015
 sweatstack_cli/api/__init__.py,sha256=l9s6BzF6Wx17K_ElRUX-8aAwwIIzqmGF1PQ3Mbc07mw,107
@@ -14,10 +14,10 @@ sweatstack_cli/auth/jwt.py,sha256=Ja6ccFyRKtX5MPjFdHNavVYf8KTz0MYT86StbnF-cwg,15
 sweatstack_cli/auth/pkce.py,sha256=sO_xUeN1UIvXKX0yEIGgMTIIzvfCOCUwlyNAveEd16k,1542
 sweatstack_cli/auth/tokens.py,sha256=kc8ytoO9PAyjLD6wUTIagVuP7_ia5ZjW5m_WjXIRIkA,4942
 sweatstack_cli/commands/__init__.py,sha256=YCO8wYVvdGeoEI0p_oUm8ANLneuET4SHsKDjitMjAgY,35
-sweatstack_cli/commands/app.py,sha256=pk6QBUF0yQcrLJYR47TniMVhl-5FNeQopQeV3BTop0k,6924
+sweatstack_cli/commands/app.py,sha256=3kTnXBCNqu77VwFa-TL4AMtTtDFqvZ68q2CYalzJL_Q,8517
 sweatstack_cli/commands/auth.py,sha256=lmlN2RcZIHdbZG-EEUVFwOSn6vPN-Ijgh_5E-cFQVtU,3478
-sweatstack_cli/commands/page.py,sha256=tEWjzOmht_IKm47lbprJz-XDKibrx5nFlStuvBRST6A,5329
-sweatstack_cli-0.7.2.dist-info/METADATA,sha256=WI1UvMTUMV02t4lSThgQR6uh5WpY2tm21oRBhndx6nQ,3664
-sweatstack_cli-0.7.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-sweatstack_cli-0.7.2.dist-info/entry_points.txt,sha256=rnH0EV1U9CQlmKQcJ7RmxGpNRTa9J-YdiIJZDYrAXb4,56
-sweatstack_cli-0.7.2.dist-info/RECORD,,
+sweatstack_cli/commands/page.py,sha256=aiuKVYUBdV2AcAcDAISx8qzs0PKieXQKAoYq00fTDew,7470
+sweatstack_cli-0.9.0.dist-info/METADATA,sha256=Y8EHoUGmIc4zTd87x-ZH7rziBQBmB7xMUjZyiTe98Fk,3674
+sweatstack_cli-0.9.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+sweatstack_cli-0.9.0.dist-info/entry_points.txt,sha256=rnH0EV1U9CQlmKQcJ7RmxGpNRTa9J-YdiIJZDYrAXb4,56
+sweatstack_cli-0.9.0.dist-info/RECORD,,