sweatstack-cli 0.3.0__tar.gz → 0.4.0__tar.gz

{sweatstack_cli-0.3.0 → sweatstack_cli-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sweatstack-cli
-Version: 0.3.0
+Version: 0.4.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

{sweatstack_cli-0.3.0 → sweatstack_cli-0.4.0}/pyproject.toml

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

{sweatstack_cli-0.3.0 → sweatstack_cli-0.4.0}/src/sweatstack_cli/__init__.py

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

sweatstack_cli-0.4.0/src/sweatstack_cli/commands/auth.py

@@ -0,0 +1,100 @@
+"""Authentication commands: login, logout, whoami, status."""
+
+from __future__ import annotations
+
+import typer
+
+from sweatstack_cli.api import APIClient
+from sweatstack_cli.auth import Authenticator
+from sweatstack_cli.console import console
+from sweatstack_cli.exceptions import APIError, AuthenticationError
+from sweatstack_cli.version_check import check_for_update
+
+
+def login(
+    force: bool = typer.Option(
+        False,
+        "--force",
+        "-f",
+        help="Force re-authentication even if already logged in.",
+    ),
+) -> None:
+    """Authenticate with SweatStack via browser."""
+    auth = Authenticator()
+
+    # Check if already logged in
+    if not force:
+        existing = auth.get_valid_tokens()
+        if existing:
+            try:
+                client = APIClient(authenticator=auth)
+                user = client.get("/api/v1/oauth/userinfo")
+                console.print(
+                    f"Already logged in as [bold]{user['name']}[/bold]. "
+                    f"Use [cyan]--force[/cyan] to re-authenticate."
+                )
+                return
+            except AuthenticationError:
+                pass  # Token invalid, proceed with login
+
+    with console.status("[bold]Opening browser for authentication...[/bold]"):
+        try:
+            auth.login(force=True)
+        except AuthenticationError as e:
+            console.print(f"[red]Authentication failed:[/red] {e}")
+            raise typer.Exit(2)
+
+    # Verify by fetching user info
+    try:
+        client = APIClient(authenticator=auth)
+        user = client.get("/api/v1/oauth/userinfo")
+        console.print(f"[green]✓[/green] Logged in as [bold]{user['name']}[/bold]")
+    except AuthenticationError as e:
+        console.print(f"[red]Login succeeded but verification failed:[/red] {e}")
+        raise typer.Exit(2)
+
+
+def logout() -> None:
+    """Remove stored credentials."""
+    auth = Authenticator()
+    auth.logout()
+    console.print("[green]✓[/green] Logged out")
+
+
+def status() -> None:
+    """Show authentication status and version info."""
+    from sweatstack_cli import __version__
+
+    # Check authentication and get user info
+    auth = Authenticator()
+    tokens = auth.get_valid_tokens()
+
+    if tokens is None:
+        console.print("[red]✗[/red] Not authenticated")
+    else:
+        console.print("[green]✓[/green] Authenticated")
+        try:
+            client = APIClient(authenticator=auth)
+            user = client.get("/api/v1/oauth/userinfo")
+            console.print(f"  Name:   {user.get('name', 'unknown')}")
+            console.print(f"  Email:  {user.get('email', 'unknown')}")
+            console.print(f"  ID:     {user.get('sub', 'unknown')}")
+        except (AuthenticationError, APIError):
+            pass  # Silently skip user info on error
+
+    # Check version
+    update_available, latest = check_for_update()
+    if update_available and latest:
+        console.print(
+            f"[yellow]⚠[/yellow] Update available: {latest} (current: {__version__})\n"
+            f"  Run: [cyan]pip install --upgrade sweatstack-cli[/cyan]"
+        )
+    elif latest:
+        console.print(f"[green]✓[/green] Up to date ({__version__})")
+    else:
+        console.print(f"[dim]?[/dim] Version {__version__} (update check failed)")
+
+    # Exit with error if not authenticated
+    if tokens is None:
+        console.print("\nRun [bold]sweatstack login[/bold] to authenticate.")
+        raise typer.Exit(1)

{sweatstack_cli-0.3.0 → sweatstack_cli-0.4.0}/src/sweatstack_cli/main.py

@@ -28,8 +28,7 @@ app.add_typer(app_commands.app, name="app")
 # These are the most common operations, so we promote them to top level
 app.command(name="login", help="Authenticate with SweatStack via browser.")(auth.login)
 app.command(name="logout", help="Remove stored credentials.")(auth.logout)
-app.command(name="whoami", help="Show current authenticated user.")(auth.whoami)
-app.command(name="status", help="Show authentication status and token details.")(auth.status)
+app.command(name="status", help="Show authentication and version status.")(auth.status)
 
 
 def version_callback(value: bool) -> None:

{sweatstack_cli-0.3.0 → sweatstack_cli-0.4.0}/tests/test_commands/test_cli.py

@@ -20,7 +20,7 @@ class TestCLI:
         assert "SweatStack CLI" in result.stdout
         assert "login" in result.stdout
         assert "logout" in result.stdout
-        assert "whoami" in result.stdout
+        assert "status" in result.stdout
         assert "page" in result.stdout
 
     def test_version(self) -> None:

{sweatstack_cli-0.3.0 → sweatstack_cli-0.4.0}/uv.lock

@@ -509,7 +509,7 @@ wheels = [
 
 [[package]]
 name = "sweatstack-cli"
-version = "0.3.0"
+version = "0.4.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

sweatstack_cli-0.3.0/src/sweatstack_cli/commands/auth.py

@@ -1,127 +0,0 @@
-"""Authentication commands: login, logout, whoami, status."""
-
-from __future__ import annotations
-
-import datetime
-
-import typer
-
-from sweatstack_cli.api import APIClient
-from sweatstack_cli.auth import Authenticator
-from sweatstack_cli.auth.jwt import decode_jwt_payload
-from sweatstack_cli.console import console
-from sweatstack_cli.exceptions import APIError, AuthenticationError
-
-
-def login(
-    force: bool = typer.Option(
-        False,
-        "--force",
-        "-f",
-        help="Force re-authentication even if already logged in.",
-    ),
-) -> None:
-    """Authenticate with SweatStack via browser."""
-    auth = Authenticator()
-
-    # Check if already logged in
-    if not force:
-        existing = auth.get_valid_tokens()
-        if existing:
-            try:
-                client = APIClient(authenticator=auth)
-                user = client.get("/api/v1/oauth/userinfo")
-                console.print(
-                    f"Already logged in as [bold]{user['name']}[/bold]. "
-                    f"Use [cyan]--force[/cyan] to re-authenticate."
-                )
-                return
-            except AuthenticationError:
-                pass  # Token invalid, proceed with login
-
-    with console.status("[bold]Opening browser for authentication...[/bold]"):
-        try:
-            auth.login(force=True)
-        except AuthenticationError as e:
-            console.print(f"[red]Authentication failed:[/red] {e}")
-            raise typer.Exit(2)
-
-    # Verify by fetching user info
-    try:
-        client = APIClient(authenticator=auth)
-        user = client.get("/api/v1/oauth/userinfo")
-        console.print(f"[green]✓[/green] Logged in as [bold]{user['name']}[/bold]")
-    except AuthenticationError as e:
-        console.print(f"[red]Login succeeded but verification failed:[/red] {e}")
-        raise typer.Exit(2)
-
-
-def logout() -> None:
-    """Remove stored credentials."""
-    auth = Authenticator()
-    auth.logout()
-    console.print("[green]✓[/green] Logged out")
-
-
-def whoami() -> None:
-    """Show current authenticated user."""
-    try:
-        client = APIClient()
-        user = client.get("/api/v1/oauth/userinfo")
-        console.print(
-            f"Logged in as: [bold]{user['name']}[/bold] (email={user.get('email', 'no email')}, id={user.get('sub', 'no id')})"
-        )
-    except AuthenticationError:
-        console.print("[yellow]Not logged in[/yellow]")
-        console.print("Run [bold]sweatstack login[/bold] to authenticate.")
-        raise typer.Exit(1)
-    except APIError as e:
-        console.print(f"[red]Error:[/red] {e}")
-        raise typer.Exit(3)
-
-
-def status() -> None:
-    """Show authentication status and token details."""
-    auth = Authenticator()
-    tokens = auth.get_valid_tokens()
-
-    if tokens is None:
-        console.print("[yellow]Not authenticated[/yellow]")
-        console.print("Run [bold]sweatstack login[/bold] to authenticate.")
-        raise typer.Exit(1)
-
-    try:
-        payload = decode_jwt_payload(tokens.access_token)
-    except ValueError as e:
-        console.print(f"[red]Invalid token format:[/red] {e}")
-        console.print("Run [bold]sweatstack login --force[/bold] to re-authenticate.")
-        raise typer.Exit(2)
-
-    # Format expiry time
-    exp_timestamp = payload.get("exp", 0)
-    exp_dt = datetime.datetime.fromtimestamp(exp_timestamp, tz=datetime.UTC)
-    now = datetime.datetime.now(tz=datetime.UTC)
-
-    if exp_dt > now:
-        remaining = exp_dt - now
-        hours, remainder = divmod(int(remaining.total_seconds()), 3600)
-        minutes, seconds = divmod(remainder, 60)
-
-        if hours > 0:
-            time_str = f"{hours}h {minutes}m remaining"
-        elif minutes > 0:
-            time_str = f"{minutes}m {seconds}s remaining"
-        else:
-            time_str = f"{seconds}s remaining"
-
-        expiry_display = f"{exp_dt.strftime('%Y-%m-%d %H:%M:%S')} UTC ({time_str})"
-    else:
-        expiry_display = f"{exp_dt.strftime('%Y-%m-%d %H:%M:%S')} UTC [red](expired)[/red]"
-
-    console.print("[green]✓[/green] Authenticated")
-    console.print(f"  User ID:  {payload.get('sub', 'unknown')}")
-    console.print(f"  Expires:  {expiry_display}")
-
-    # Show timezone if available
-    if tz := payload.get("tz"):
-        console.print(f"  Timezone: {tz}")