sweatstack-cli 0.7.2__tar.gz → 0.9.0__tar.gz

{sweatstack_cli-0.7.2 → sweatstack_cli-0.9.0}/.claude/settings.local.json

@@ -19,7 +19,8 @@
       "Bash(tree:*)",
       "Bash(env:*)",
       "Bash(uv run python:*)",
-      "Bash(git:*)"
+      "Bash(git:*)",
+      "Bash(grep:*)"
     ]
   }
 }

{sweatstack_cli-0.7.2 → sweatstack_cli-0.9.0}/PKG-INFO

@@ -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 → sweatstack_cli-0.9.0}/README.md

@@ -58,7 +58,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
@@ -100,8 +100,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 → sweatstack_cli-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sweatstack-cli"
-version = "0.7.2"
+version = "0.9.0"
 description = "Command-line interface for SweatStack — the sports data platform for developers"
 readme = "README.md"
 authors = [{ name = "Aart Goossens", email = "aart@sweatstack.no" }]

{sweatstack_cli-0.7.2 → sweatstack_cli-0.9.0}/src/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-0.7.2 → sweatstack_cli-0.9.0}/src/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-0.7.2 → sweatstack_cli-0.9.0}/src/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-0.7.2 → sweatstack_cli-0.9.0}/src/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 → sweatstack_cli-0.9.0}/tests/test_commands/test_app.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
 from typer.testing import CliRunner
@@ -26,14 +26,15 @@ def mock_api():
 class TestAppCreate:
     """Tests for app create command."""
 
-    def test_create_minimal(self, mock_api: MagicMock) -> None:
+    def test_create_minimal(self, mock_api: MagicMock, tmp_path: Path) -> None:
         """Should create an app with just a name."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
         }
 
-        result = runner.invoke(app, ["app", "create", "Test App"])
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            result = runner.invoke(app, ["app", "create", "Test App"])
 
         assert result.exit_code == 0
         assert "Test App" in result.stdout
@@ -43,15 +44,16 @@ class TestAppCreate:
             json={"name": "Test App"},
         )
 
-    def test_create_with_page(self, mock_api: MagicMock) -> None:
+    def test_create_with_page(self, mock_api: MagicMock, tmp_path: Path) -> None:
         """Should create an app with page association."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
             "redirect_uris": ["https://myapp.sweatstack.pages.dev/callback"],
         }
 
-        result = runner.invoke(app, ["app", "create", "Test App", "--page", "myapp"])
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            result = runner.invoke(app, ["app", "create", "Test App", "--page", "myapp"])
 
         assert result.exit_code == 0
         assert "myapp.sweatstack.pages.dev" in result.stdout
@@ -60,15 +62,16 @@ class TestAppCreate:
             json={"name": "Test App", "page": "myapp"},
         )
 
-    def test_create_with_secret(self, mock_api: MagicMock) -> None:
+    def test_create_with_secret(self, mock_api: MagicMock, tmp_path: Path) -> None:
         """Should create an app with client secret and show warning."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
             "client_secret": "secret456",
         }
 
-        result = runner.invoke(app, ["app", "create", "Test App", "--secret"])
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            result = runner.invoke(app, ["app", "create", "Test App", "--secret"])
 
         assert result.exit_code == 0
         assert "secret456" in result.stdout
@@ -78,15 +81,16 @@ class TestAppCreate:
             json={"name": "Test App", "generate_secret": True},
         )
 
-    def test_create_with_short_flags(self, mock_api: MagicMock) -> None:
+    def test_create_with_short_flags(self, mock_api: MagicMock, tmp_path: Path) -> None:
         """Should support short flags -p and -s."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
             "client_secret": "secret456",
         }
 
-        result = runner.invoke(app, ["app", "create", "Test App", "-p", "myapp", "-s"])
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            result = runner.invoke(app, ["app", "create", "Test App", "-p", "myapp", "-s"])
 
         assert result.exit_code == 0
         mock_api.post.assert_called_once_with(
@@ -94,24 +98,25 @@ class TestAppCreate:
             json={"name": "Test App", "page": "myapp", "generate_secret": True},
         )
 
-    def test_create_json_output(self, mock_api: MagicMock) -> None:
+    def test_create_json_output(self, mock_api: MagicMock, tmp_path: Path) -> None:
         """Should output JSON when --json flag is used."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
         }
 
-        result = runner.invoke(app, ["app", "create", "Test App", "--json"])
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            result = runner.invoke(app, ["app", "create", "Test App", "--json"])
 
         assert result.exit_code == 0
-        assert '"client_id": "abc123"' in result.stdout
+        assert '"id": "abc123"' in result.stdout
         assert '"name": "Test App"' in result.stdout
 
     def test_create_with_env(self, mock_api: MagicMock, tmp_path: Path) -> None:
         """Should write credentials to .env file."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
             "client_secret": "secret456",
         }
 
@@ -129,7 +134,7 @@ class TestAppCreate:
         """Should write credentials to custom env file."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
         }
 
         with runner.isolated_filesystem(temp_dir=tmp_path):
@@ -147,7 +152,7 @@ class TestAppCreate:
         """Should append to existing .env file."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
         }
 
         with runner.isolated_filesystem(temp_dir=tmp_path):
@@ -166,7 +171,7 @@ class TestAppCreate:
         """Should not overwrite existing env vars."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
         }
 
         with runner.isolated_filesystem(temp_dir=tmp_path):
@@ -187,7 +192,7 @@ class TestAppCreate:
             app, ["app", "create", "Test App", "--env", "--env-file", ".env.local"]
         )
 
-        assert result.exit_code == 4  # ValidationError
+        assert result.exit_code == 1
         assert "mutually exclusive" in result.stdout
 
     def test_create_not_authenticated(self) -> None:
@@ -211,16 +216,17 @@ class TestAppCreate:
         assert "App name already exists" in result.stdout
 
     def test_create_env_with_secret_no_warning_without_env(
-        self, mock_api: MagicMock
+        self, mock_api: MagicMock, tmp_path: Path
     ) -> None:
         """Should show secret warning when --env is not used."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
             "client_secret": "secret456",
         }
 
-        result = runner.invoke(app, ["app", "create", "Test App", "--secret"])
+        with runner.isolated_filesystem(temp_dir=tmp_path):
+            result = runner.invoke(app, ["app", "create", "Test App", "--secret"])
 
         assert result.exit_code == 0
         assert "won't be shown again" in result.stdout
@@ -231,7 +237,7 @@ class TestAppCreate:
         """Should not show secret warning when --env is used."""
         mock_api.post.return_value = {
             "name": "Test App",
-            "client_id": "abc123",
+            "id": "abc123",
             "client_secret": "secret456",
         }
 
@@ -241,3 +247,106 @@ class TestAppCreate:
             assert result.exit_code == 0
             assert "won't be shown again" not in result.stdout
             assert "written to" in result.stdout
+
+    def test_create_noninteractive_requires_name(self) -> None:
+        """Should error when name is missing in non-interactive mode."""
+        result = runner.invoke(app, ["app", "create"])
+
+        assert result.exit_code == 1
+        assert "App name is required" in result.stdout
+
+    def test_create_interactive_full(self, mock_api: MagicMock, tmp_path: Path) -> None:
+        """Should prompt for all fields when no args given interactively."""
+        mock_api.post.return_value = {"name": "My App", "id": "abc123"}
+
+        with patch("sweatstack_cli.commands.app._is_interactive", return_value=True):
+            with runner.isolated_filesystem(temp_dir=tmp_path):
+                result = runner.invoke(
+                    app, ["app", "create"], input="My App\n\n\nn\n"
+                )
+
+        assert result.exit_code == 0
+        assert "My App" in result.stdout
+        mock_api.post.assert_called_once_with(
+            "/api/v1/applications",
+            json={"name": "My App"},
+        )
+
+    def test_create_interactive_with_values(
+        self, mock_api: MagicMock, tmp_path: Path
+    ) -> None:
+        """Should send all interactively-provided values to the API."""
+        mock_api.post.return_value = {
+            "name": "My App",
+            "id": "abc123",
+            "client_secret": "secret456",
+        }
+
+        with patch("sweatstack_cli.commands.app._is_interactive", return_value=True):
+            with runner.isolated_filesystem(temp_dir=tmp_path):
+                result = runner.invoke(
+                    app,
+                    ["app", "create"],
+                    input="My App\nA cool app\nmy-page\ny\n",
+                )
+
+        assert result.exit_code == 0
+        mock_api.post.assert_called_once_with(
+            "/api/v1/applications",
+            json={
+                "name": "My App",
+                "description": "A cool app",
+                "page": "my-page",
+                "generate_secret": True,
+            },
+        )
+
+    def test_create_interactive_partial(
+        self, mock_api: MagicMock, tmp_path: Path
+    ) -> None:
+        """Should only prompt for fields not provided via args/flags."""
+        mock_api.post.return_value = {"name": "My App", "id": "abc123"}
+
+        with patch("sweatstack_cli.commands.app._is_interactive", return_value=True):
+            with runner.isolated_filesystem(temp_dir=tmp_path):
+                result = runner.invoke(
+                    app, ["app", "create", "My App"], input="\n\nn\n"
+                )
+
+        assert result.exit_code == 0
+        assert "App name" not in result.stdout
+        mock_api.post.assert_called_once_with(
+            "/api/v1/applications",
+            json={"name": "My App"},
+        )
+
+    def test_create_interactive_skips_provided_flags(
+        self, mock_api: MagicMock, tmp_path: Path
+    ) -> None:
+        """Should skip prompts for fields already provided via flags."""
+        mock_api.post.return_value = {
+            "name": "Test App",
+            "id": "abc123",
+            "client_secret": "secret456",
+        }
+
+        with patch("sweatstack_cli.commands.app._is_interactive", return_value=True):
+            with runner.isolated_filesystem(temp_dir=tmp_path):
+                # --secret and --description provided; only page is prompted
+                result = runner.invoke(
+                    app,
+                    ["app", "create", "Test App", "--secret", "-d", "Desc"],
+                    input="\n",
+                )
+
+        assert result.exit_code == 0
+        assert "Generate client secret?" not in result.stdout
+        assert "Description" not in result.stdout
+        mock_api.post.assert_called_once_with(
+            "/api/v1/applications",
+            json={
+                "name": "Test App",
+                "description": "Desc",
+                "generate_secret": True,
+            },
+        )

{sweatstack_cli-0.7.2 → sweatstack_cli-0.9.0}/tests/test_commands/test_cli.py

@@ -62,7 +62,8 @@ class TestPageCommands:
 
         assert result.exit_code == 0
         assert "SLUG" in result.stdout
-        assert "DIRECTORY" in result.stdout
+        assert "--dir" in result.stdout
+        assert "-d," not in result.stdout
 
 
 class TestAppCommands:

{sweatstack_cli-0.7.2 → sweatstack_cli-0.9.0}/uv.lock

@@ -463,7 +463,7 @@ wheels = [
 
 [[package]]
 name = "sweatstack-cli"
-version = "0.6.0"
+version = "0.8.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },