ga4-cli 0.1.4__tar.gz → 0.2.0__tar.gz

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ga4-cli
-Version: 0.1.4
+Version: 0.2.0
 Summary: Command-line interface for Google Analytics 4
 Home-page: https://github.com/sulimanbenhalim/ga-cli
 Author: Suliman Ben Halim
@@ -15,17 +15,18 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click<9.0.0,>=8.0.0
 Requires-Dist: google-analytics-admin<1.0.0,>=0.27.0
 Requires-Dist: google-auth<3.0.0,>=2.0.0
-Requires-Dist: rich<14.0.0,>=13.0.0
+Requires-Dist: rich<16.0.0,>=13.0.0
 Requires-Dist: pytz>=2023.3
 Dynamic: author
 Dynamic: author-email
@@ -71,13 +72,15 @@ ga-cli --version
 ga-cli --help
 ```
 
-### Using Docker
+### Using pipx (recommended for a global command)
 
 ```bash
-# Pull from Docker Hub
-docker pull sulimanbenhalim/ga-cli:latest
+pipx install ga4-cli
+```
+
+### Using Docker (build locally)
 
-# Or build locally
+```bash
 docker build -t ga-cli .
 
 # Run with credentials mounted
@@ -90,10 +93,17 @@ docker run -v /path/to/credentials.json:/credentials.json \
 
 Download standalone binaries from [GitHub Releases](https://github.com/sulimanbenhalim/ga-cli/releases):
 
+| File | Platform |
+|---|---|
+| `ga-cli-linux-amd64.tar.gz` | Linux x86_64 |
+| `ga-cli-macos-arm64.tar.gz` | macOS Apple Silicon |
+| `ga-cli-macos-amd64.tar.gz` | macOS Intel |
+| `ga-cli-windows-amd64.exe.zip` | Windows x86_64 |
+
 **Linux/macOS:**
 ```bash
-# Download and extract
-curl -L -o ga-cli.tar.gz https://github.com/sulimanbenhalim/ga-cli/releases/latest/download/ga-cli-linux-amd64.tar.gz
+# Pick the file for your platform from the table above
+curl -L -o ga-cli.tar.gz https://github.com/sulimanbenhalim/ga-cli/releases/latest/download/ga-cli-macos-arm64.tar.gz
 tar -xzf ga-cli.tar.gz
 chmod +x ga-cli
 sudo mv ga-cli /usr/local/bin/
@@ -117,8 +127,9 @@ pip install -e .
 1. Go to [Google Cloud Console](https://console.cloud.google.com/)
 2. Create or select a project
 3. Enable the Google Analytics Admin API
-4. Create a service account with Analytics Admin permissions
+4. Create a service account
 5. Download the JSON credentials file
+6. In Google Analytics, go to **Admin > Account access management**, click **+**, and add the service account's email (the `client_email` value in the JSON file) with the **Editor** role
 
 ### 2. Initialize GA CLI
 
@@ -126,7 +137,7 @@ pip install -e .
 ga-cli config init
 ```
 
-This will prompt you for the path to your service account JSON file and test the credentials.
+This will prompt you for the path to your service account JSON file, test the credentials, and save the path. If you have not done step 6 yet, it prints the exact email to add and you can carry on afterwards without running `init` again.
 
 Alternatively, set the environment variable:
 
@@ -171,7 +182,7 @@ ga-cli properties get <property-id>
 # Create a new property
 ga-cli properties create <account-id> --name "My Website" --timezone "America/New_York" --currency "USD"
 
-# Delete a property
+# Move a property to the trash (restorable from the GA Admin UI until purged)
 ga-cli properties delete <property-id>
 ```
 
@@ -275,11 +286,11 @@ ga-cli/
 
 ## Requirements
 
-- Python 3.8+
+- Python 3.10+
 - Click 8.0+
 - google-analytics-admin 0.27.0+
 - google-auth 2.0+
-- rich 13.0+
+- rich 13.0+ (up to 15.x)
 - pytz 2023.3+
 
 ## License

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/README.md

@@ -28,13 +28,15 @@ ga-cli --version
 ga-cli --help
 ```
 
-### Using Docker
+### Using pipx (recommended for a global command)
 
 ```bash
-# Pull from Docker Hub
-docker pull sulimanbenhalim/ga-cli:latest
+pipx install ga4-cli
+```
+
+### Using Docker (build locally)
 
-# Or build locally
+```bash
 docker build -t ga-cli .
 
 # Run with credentials mounted
@@ -47,10 +49,17 @@ docker run -v /path/to/credentials.json:/credentials.json \
 
 Download standalone binaries from [GitHub Releases](https://github.com/sulimanbenhalim/ga-cli/releases):
 
+| File | Platform |
+|---|---|
+| `ga-cli-linux-amd64.tar.gz` | Linux x86_64 |
+| `ga-cli-macos-arm64.tar.gz` | macOS Apple Silicon |
+| `ga-cli-macos-amd64.tar.gz` | macOS Intel |
+| `ga-cli-windows-amd64.exe.zip` | Windows x86_64 |
+
 **Linux/macOS:**
 ```bash
-# Download and extract
-curl -L -o ga-cli.tar.gz https://github.com/sulimanbenhalim/ga-cli/releases/latest/download/ga-cli-linux-amd64.tar.gz
+# Pick the file for your platform from the table above
+curl -L -o ga-cli.tar.gz https://github.com/sulimanbenhalim/ga-cli/releases/latest/download/ga-cli-macos-arm64.tar.gz
 tar -xzf ga-cli.tar.gz
 chmod +x ga-cli
 sudo mv ga-cli /usr/local/bin/
@@ -74,8 +83,9 @@ pip install -e .
 1. Go to [Google Cloud Console](https://console.cloud.google.com/)
 2. Create or select a project
 3. Enable the Google Analytics Admin API
-4. Create a service account with Analytics Admin permissions
+4. Create a service account
 5. Download the JSON credentials file
+6. In Google Analytics, go to **Admin > Account access management**, click **+**, and add the service account's email (the `client_email` value in the JSON file) with the **Editor** role
 
 ### 2. Initialize GA CLI
 
@@ -83,7 +93,7 @@ pip install -e .
 ga-cli config init
 ```
 
-This will prompt you for the path to your service account JSON file and test the credentials.
+This will prompt you for the path to your service account JSON file, test the credentials, and save the path. If you have not done step 6 yet, it prints the exact email to add and you can carry on afterwards without running `init` again.
 
 Alternatively, set the environment variable:
 
@@ -128,7 +138,7 @@ ga-cli properties get <property-id>
 # Create a new property
 ga-cli properties create <account-id> --name "My Website" --timezone "America/New_York" --currency "USD"
 
-# Delete a property
+# Move a property to the trash (restorable from the GA Admin UI until purged)
 ga-cli properties delete <property-id>
 ```
 
@@ -232,11 +242,11 @@ ga-cli/
 
 ## Requirements
 
-- Python 3.8+
+- Python 3.10+
 - Click 8.0+
 - google-analytics-admin 0.27.0+
 - google-auth 2.0+
-- rich 13.0+
+- rich 13.0+ (up to 15.x)
 - pytz 2023.3+
 
 ## License

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga4_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ga4-cli
-Version: 0.1.4
+Version: 0.2.0
 Summary: Command-line interface for Google Analytics 4
 Home-page: https://github.com/sulimanbenhalim/ga-cli
 Author: Suliman Ben Halim
@@ -15,17 +15,18 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: >=3.8
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click<9.0.0,>=8.0.0
 Requires-Dist: google-analytics-admin<1.0.0,>=0.27.0
 Requires-Dist: google-auth<3.0.0,>=2.0.0
-Requires-Dist: rich<14.0.0,>=13.0.0
+Requires-Dist: rich<16.0.0,>=13.0.0
 Requires-Dist: pytz>=2023.3
 Dynamic: author
 Dynamic: author-email
@@ -71,13 +72,15 @@ ga-cli --version
 ga-cli --help
 ```
 
-### Using Docker
+### Using pipx (recommended for a global command)
 
 ```bash
-# Pull from Docker Hub
-docker pull sulimanbenhalim/ga-cli:latest
+pipx install ga4-cli
+```
+
+### Using Docker (build locally)
 
-# Or build locally
+```bash
 docker build -t ga-cli .
 
 # Run with credentials mounted
@@ -90,10 +93,17 @@ docker run -v /path/to/credentials.json:/credentials.json \
 
 Download standalone binaries from [GitHub Releases](https://github.com/sulimanbenhalim/ga-cli/releases):
 
+| File | Platform |
+|---|---|
+| `ga-cli-linux-amd64.tar.gz` | Linux x86_64 |
+| `ga-cli-macos-arm64.tar.gz` | macOS Apple Silicon |
+| `ga-cli-macos-amd64.tar.gz` | macOS Intel |
+| `ga-cli-windows-amd64.exe.zip` | Windows x86_64 |
+
 **Linux/macOS:**
 ```bash
-# Download and extract
-curl -L -o ga-cli.tar.gz https://github.com/sulimanbenhalim/ga-cli/releases/latest/download/ga-cli-linux-amd64.tar.gz
+# Pick the file for your platform from the table above
+curl -L -o ga-cli.tar.gz https://github.com/sulimanbenhalim/ga-cli/releases/latest/download/ga-cli-macos-arm64.tar.gz
 tar -xzf ga-cli.tar.gz
 chmod +x ga-cli
 sudo mv ga-cli /usr/local/bin/
@@ -117,8 +127,9 @@ pip install -e .
 1. Go to [Google Cloud Console](https://console.cloud.google.com/)
 2. Create or select a project
 3. Enable the Google Analytics Admin API
-4. Create a service account with Analytics Admin permissions
+4. Create a service account
 5. Download the JSON credentials file
+6. In Google Analytics, go to **Admin > Account access management**, click **+**, and add the service account's email (the `client_email` value in the JSON file) with the **Editor** role
 
 ### 2. Initialize GA CLI
 
@@ -126,7 +137,7 @@ pip install -e .
 ga-cli config init
 ```
 
-This will prompt you for the path to your service account JSON file and test the credentials.
+This will prompt you for the path to your service account JSON file, test the credentials, and save the path. If you have not done step 6 yet, it prints the exact email to add and you can carry on afterwards without running `init` again.
 
 Alternatively, set the environment variable:
 
@@ -171,7 +182,7 @@ ga-cli properties get <property-id>
 # Create a new property
 ga-cli properties create <account-id> --name "My Website" --timezone "America/New_York" --currency "USD"
 
-# Delete a property
+# Move a property to the trash (restorable from the GA Admin UI until purged)
 ga-cli properties delete <property-id>
 ```
 
@@ -275,11 +286,11 @@ ga-cli/
 
 ## Requirements
 
-- Python 3.8+
+- Python 3.10+
 - Click 8.0+
 - google-analytics-admin 0.27.0+
 - google-auth 2.0+
-- rich 13.0+
+- rich 13.0+ (up to 15.x)
 - pytz 2023.3+
 
 ## License

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga4_cli.egg-info/SOURCES.txt

@@ -31,5 +31,8 @@ tests/test_accounts.py
 tests/test_auth.py
 tests/test_cli.py
 tests/test_config.py
+tests/test_config_commands.py
+tests/test_datastreams.py
 tests/test_errors.py
+tests/test_properties.py
 tests/test_validators.py

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga4_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 click<9.0.0,>=8.0.0
 google-analytics-admin<1.0.0,>=0.27.0
 google-auth<3.0.0,>=2.0.0
-rich<14.0.0,>=13.0.0
+rich<16.0.0,>=13.0.0
 pytz>=2023.3

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga_cli/__init__.py

@@ -1,3 +1,3 @@
 """Google Analytics CLI - Manage GA4 from the command line"""
 
-__version__ = "0.1.4"
+__version__ = "0.2.0"

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga_cli/commands/config.py

@@ -1,9 +1,12 @@
 """Configuration commands"""
 
+import json
 import click
 import os
+from google.api_core import exceptions
 from ga_cli.config import ConfigManager
 from ga_cli.auth import AuthManager
+from ga_cli.errors import get_friendly_error
 
 
 @click.group()
@@ -12,6 +15,15 @@ def config():
     pass
 
 
+def _read_client_email(credentials_path):
+    """Return the service account email from the JSON key, or None if unreadable"""
+    try:
+        with open(credentials_path, 'r', encoding='utf-8') as f:
+            return json.load(f).get('client_email')
+    except (OSError, ValueError, AttributeError):
+        return None
+
+
 @config.command()
 @click.option('--credentials', prompt='Path to service account JSON',
               help='Path to Google service account credentials file')
@@ -24,23 +36,37 @@ def init(credentials):
             click.echo(f"Error: Credentials file not found at {credentials_path}", err=True)
             raise click.Abort()
 
+        client_email = _read_client_email(credentials_path)
+
         click.echo("Testing credentials...")
         auth = AuthManager(credentials_path)
         client = auth.get_client()
-
         accounts = list(client.list_accounts())
 
+        # The key file is valid at this point, so save it even if the service
+        # account has not been granted access to any GA account yet. Otherwise
+        # the user has to come back and run init a second time.
+        config_manager = ConfigManager()
+        config_manager.set_credentials_path(credentials_path)
+        click.echo(f"Configuration saved to {config_manager.config_file}")
+
         if accounts:
             click.echo(f"Credentials valid! Found {len(accounts)} account(s)")
-
-            config_manager = ConfigManager()
-            config_manager.set_credentials_path(credentials_path)
-
-            click.echo(f"Configuration saved to {config_manager.config_file}")
             click.echo("\nYou can now use ga-cli commands without specifying credentials")
         else:
-            click.echo("Warning: Credentials are valid but no accounts found", err=True)
-
+            click.echo("\nCredentials are valid, but this service account cannot see any "
+                       "Google Analytics accounts yet.")
+            if client_email:
+                click.echo(f"\nAdd this email as a user in Google Analytics:\n  {client_email}")
+            click.echo("\n  Google Analytics > Admin > Account access management > + > Add users")
+            click.echo("  Use the Editor role to create properties and data streams.")
+            click.echo("\nThen run: ga-cli accounts list")
+
+    except click.Abort:
+        raise
+    except exceptions.GoogleAPIError as e:
+        click.echo(get_friendly_error(e), err=True)
+        raise click.Abort()
     except Exception as e:
         click.echo(f"Error: {str(e)}", err=True)
         raise click.Abort()
@@ -56,6 +82,9 @@ def show():
         if credentials_path:
             click.echo("Configuration:")
             click.echo(f"  Credentials: {credentials_path}")
+            client_email = _read_client_email(credentials_path)
+            if client_email:
+                click.echo(f"  Service account: {client_email}")
             click.echo(f"  Config file: {config_manager.config_file}")
         else:
             click.echo("No configuration found. Run 'ga-cli config init' to set up.")

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga_cli/commands/datastreams.py

@@ -134,13 +134,9 @@ def _create_datastream_with_retry(client, property_id, name, url):
     data_stream = DataStream(
         display_name=name,
         type_=DataStream.DataStreamType.WEB_DATA_STREAM,
+        web_stream_data=DataStream.WebStreamData(default_uri=url),
     )
 
-    # Safely initialize web_stream_data if not exists
-    if data_stream.web_stream_data is None:
-        data_stream.web_stream_data = DataStream.WebStreamData()
-    data_stream.web_stream_data.default_uri = url
-
     return client.create_data_stream(
         parent=f"properties/{property_id}",
         data_stream=data_stream

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga_cli/commands/properties.py

@@ -2,7 +2,7 @@
 
 import builtins
 import click
-from google.analytics.admin_v1alpha.types import Property
+from google.analytics.admin_v1alpha.types import IndustryCategory, Property
 from ga_cli.decorators import with_client
 from ga_cli.formatters.table import format_table
 from ga_cli.formatters.json import format_json
@@ -10,6 +10,13 @@ from ga_cli.validators import validate_account_id, validate_property_id, validat
 from ga_cli.logging_config import logger
 from ga_cli.retry import retry_on_transient_error
 
+# Valid --industry values, taken from the API enum so they cannot drift.
+# Shown lowercase for readability; matched case-insensitively.
+INDUSTRY_CHOICES = sorted(
+    name.lower() for name in IndustryCategory.__members__
+    if name != 'INDUSTRY_CATEGORY_UNSPECIFIED'
+)
+
 
 @click.group()
 def properties():
@@ -83,7 +90,9 @@ def get(ctx, property_id, format):
               help='Property timezone')
 @click.option('--currency', default='USD', callback=validate_currency,
               help='Property currency code (e.g., USD, EUR)')
-@click.option('--industry', default='OTHER', help='Industry category')
+@click.option('--industry', default='other',
+              type=click.Choice(INDUSTRY_CHOICES, case_sensitive=False),
+              help='Industry category')
 @click.pass_context
 @with_client
 def create(ctx, account_id, name, timezone, currency, industry):
@@ -106,18 +115,20 @@ def create(ctx, account_id, name, timezone, currency, industry):
 
 @properties.command()
 @click.argument('property_id', callback=validate_property_id)
-@click.confirmation_option(prompt='Are you sure you want to delete this property?')
+@click.confirmation_option(prompt='Move this property to the trash?')
 @click.pass_context
 @with_client
 def delete(ctx, property_id):
-    """Delete a property"""
+    """Move a property to the trash (soft delete)"""
     client = ctx.obj['client']
     logger.info(f"Deleting property: {property_id}")
 
     _delete_property_with_retry(client, property_id)
 
     logger.info(f"Deleted property: {property_id}")
-    click.echo(f"Property {property_id} deleted successfully")
+    click.echo(f"Property {property_id} moved to the trash.")
+    click.echo("It can be restored from the Google Analytics Admin UI "
+               "until it is permanently purged.")
 
 
 @retry_on_transient_error()
@@ -141,7 +152,9 @@ def _create_property_with_retry(client, account_id, name, timezone, currency, in
             display_name=name,
             time_zone=timezone,
             currency_code=currency,
-            industry_category=industry,
+            # __members__ lookup rather than IndustryCategory[...] because
+            # proto-plus ships no type hints and mypy reads [] as a generic.
+            industry_category=IndustryCategory.__members__[industry.upper()],
         )
     )
 

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga_cli/decorators.py

@@ -3,6 +3,7 @@
 import functools
 import click
 from ga_cli.auth import AuthManager
+from ga_cli.config import ConfigManager
 from ga_cli.logging_config import logger
 from ga_cli.errors import get_friendly_error
 from google.api_core import exceptions
@@ -32,9 +33,7 @@ def with_client(func):
             # Get credentials path
             credentials_path = ctx.obj.get('credentials')
             if not credentials_path:
-                from ga_cli.config import ConfigManager
-                config_manager = ConfigManager()
-                credentials_path = config_manager.get('credentials', 'path')
+                credentials_path = ConfigManager().get_credentials_path()
 
             if not credentials_path:
                 logger.error("No credentials configured")

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/ga_cli/output.py

@@ -5,6 +5,7 @@ import json
 from rich.console import Console
 
 console = Console()
+err_console = Console(stderr=True)
 
 
 def success_message(message: str, format_type: str = 'text'):
@@ -28,9 +29,9 @@ def error_message(message: str, format_type: str = 'text'):
         format_type: Output format ('text' or 'json')
     """
     if format_type == 'json':
-        click.echo(json.dumps({"success": False, "error": message}))
+        click.echo(json.dumps({"success": False, "error": message}), err=True)
     else:
-        console.print(f"[red]{message}[/red]", err=True)
+        err_console.print(f"[red]{message}[/red]")
 
 
 def info_message(message: str, format_type: str = 'text'):

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/setup.py

@@ -27,18 +27,19 @@ setup(
         "Topic :: Software Development :: Libraries :: Python Modules",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "Programming Language :: Python :: 3.14",
     ],
     keywords="google-analytics ga4 cli command-line",
-    python_requires=">=3.8",
+    python_requires=">=3.10",
     install_requires=[
         "click>=8.0.0,<9.0.0",
         "google-analytics-admin>=0.27.0,<1.0.0",
         "google-auth>=2.0.0,<3.0.0",
-        "rich>=13.0.0,<14.0.0",
+        "rich>=13.0.0,<16.0.0",
         "pytz>=2023.3",
     ],
     entry_points={

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/tests/conftest.py

@@ -1,14 +1,31 @@
 """Pytest fixtures and configuration"""
 
-import pytest
-from unittest.mock import Mock, MagicMock
-from click.testing import CliRunner
+import os
+import shutil
+import tempfile
+
+# Point HOME at a throwaway directory BEFORE ga_cli is imported anywhere.
+# ga_cli.logging_config creates ~/.ga-cli/ga-cli.log at import time, and
+# ConfigManager reads ~/.ga-cli/config.ini, so without this the suite would
+# write into (and read from) the developer's real configuration.
+_TEST_HOME = tempfile.mkdtemp(prefix="ga-cli-test-home-")
+os.environ["HOME"] = _TEST_HOME
+os.environ["USERPROFILE"] = _TEST_HOME
+os.environ.pop("GOOGLE_APPLICATION_CREDENTIALS", None)
+
+import pytest  # noqa: E402
+from unittest.mock import Mock, MagicMock  # noqa: E402
+from click.testing import CliRunner  # noqa: E402
+
+
+def pytest_sessionfinish(session, exitstatus):
+    shutil.rmtree(_TEST_HOME, ignore_errors=True)
 
 
 @pytest.fixture
 def cli_runner():
-    """Provide a Click CLI test runner"""
-    return CliRunner()
+    """Provide a Click CLI test runner with a wide terminal so Rich never wraps"""
+    return CliRunner(env={"COLUMNS": "200"})
 
 
 @pytest.fixture

ga4_cli-0.2.0/tests/test_accounts.py

@@ -0,0 +1,71 @@
+"""Tests for account commands"""
+
+import json
+from unittest.mock import Mock, patch
+from ga_cli.cli import cli
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_accounts_list(mock_auth, cli_runner, mock_account, mock_credentials_path):
+    """accounts list renders every account returned by the API"""
+    mock_client = Mock()
+    mock_client.list_accounts.return_value = [mock_account]
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(cli, ['--credentials', mock_credentials_path, 'accounts', 'list'])
+
+    assert result.exit_code == 0, result.output
+    assert 'Test Account' in result.output
+    assert '123456' in result.output
+    mock_auth.assert_called_once_with(mock_credentials_path)
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_accounts_list_json(mock_auth, cli_runner, mock_account, mock_credentials_path):
+    """accounts list --format json emits parseable JSON with the account fields"""
+    mock_client = Mock()
+    mock_client.list_accounts.return_value = [mock_account]
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'accounts', 'list', '--format', 'json']
+    )
+
+    assert result.exit_code == 0, result.output
+    data = json.loads(result.output)
+    assert data == [{
+        'id': '123456',
+        'name': 'Test Account',
+        'region': 'US',
+        'create_time': '2023-01-01 00:00:00',
+    }]
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_accounts_get(mock_auth, cli_runner, mock_account, mock_credentials_path):
+    """accounts get fetches accounts/<id> and renders it"""
+    mock_client = Mock()
+    mock_client.get_account.return_value = mock_account
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(cli, ['--credentials', mock_credentials_path, 'accounts', 'get', '123456'])
+
+    assert result.exit_code == 0, result.output
+    assert 'Test Account' in result.output
+    mock_client.get_account.assert_called_once_with(name='accounts/123456')
+
+
+def test_accounts_get_rejects_non_numeric_id(cli_runner, mock_credentials_path):
+    """Validation fails before any API client is built"""
+    result = cli_runner.invoke(cli, ['--credentials', mock_credentials_path, 'accounts', 'get', 'abc'])
+
+    assert result.exit_code == 2
+    assert 'Account ID must be numeric' in result.output
+
+
+def test_commands_fail_cleanly_without_credentials(cli_runner):
+    """No flag, no env var, no config file: a friendly error, not a traceback"""
+    result = cli_runner.invoke(cli, ['accounts', 'list'])
+
+    assert result.exit_code == 1
+    assert "Run 'ga-cli config init' first" in result.output

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/tests/test_auth.py

@@ -1,7 +1,6 @@
 """Tests for authentication module"""
 
-import pytest
-from unittest.mock import Mock, patch, MagicMock
+from unittest.mock import Mock, patch
 from ga_cli.auth import AuthManager
 
 

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/tests/test_cli.py

@@ -1,6 +1,7 @@
 """Tests for CLI entry point"""
 
 from click.testing import CliRunner
+from ga_cli import __version__
 from ga_cli.cli import cli
 
 
@@ -17,7 +18,7 @@ def test_cli_version():
     runner = CliRunner()
     result = runner.invoke(cli, ['--version'])
     assert result.exit_code == 0
-    assert '0.1.0' in result.output
+    assert __version__ in result.output
 
 
 def test_accounts_command_exists():

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/tests/test_config.py

@@ -2,9 +2,7 @@
 
 import pytest
 import os
-import stat
 from pathlib import Path
-from unittest.mock import Mock, patch
 import tempfile
 import click
 from ga_cli.config import ConfigManager

ga4_cli-0.2.0/tests/test_config_commands.py

@@ -0,0 +1,71 @@
+"""Tests for the config command group (init / show) end to end"""
+
+import json
+from unittest.mock import patch
+import pytest
+from ga_cli.cli import cli
+from ga_cli.config import ConfigManager
+
+
+@pytest.fixture
+def sa_key(tmp_path):
+    """A service-account JSON key with the fields config init reads"""
+    key = tmp_path / 'sa.json'
+    key.write_text(json.dumps({
+        'type': 'service_account',
+        'client_email': 'ga-bot@my-project.iam.gserviceaccount.com',
+    }))
+    return str(key)
+
+
+@patch('ga_cli.commands.config.AuthManager')
+def test_config_init_saves_and_reports_accounts(mock_auth, cli_runner, sa_key, mock_account):
+    mock_auth.return_value.get_client.return_value.list_accounts.return_value = [mock_account]
+
+    result = cli_runner.invoke(cli, ['config', 'init', '--credentials', sa_key])
+
+    assert result.exit_code == 0, result.output
+    assert 'Found 1 account(s)' in result.output
+    assert ConfigManager().get_credentials_path() == sa_key
+
+
+@patch('ga_cli.commands.config.AuthManager')
+def test_config_init_saves_even_with_no_accounts_and_prints_email(mock_auth, cli_runner, sa_key):
+    """First-time setup: the key is valid but GA access has not been granted yet"""
+    mock_auth.return_value.get_client.return_value.list_accounts.return_value = []
+
+    result = cli_runner.invoke(cli, ['config', 'init', '--credentials', sa_key])
+
+    assert result.exit_code == 0, result.output
+    assert 'ga-bot@my-project.iam.gserviceaccount.com' in result.output
+    assert 'Account access management' in result.output
+    # Config is saved so the user does not have to run init again after granting access
+    assert ConfigManager().get_credentials_path() == sa_key
+
+
+def test_config_init_missing_file(cli_runner):
+    result = cli_runner.invoke(cli, ['config', 'init', '--credentials', '/nope/sa.json'])
+
+    assert result.exit_code == 1
+    assert 'Credentials file not found' in result.output
+
+
+@patch('ga_cli.commands.config.AuthManager')
+def test_config_show_after_init(mock_auth, cli_runner, sa_key, mock_account):
+    mock_auth.return_value.get_client.return_value.list_accounts.return_value = [mock_account]
+    cli_runner.invoke(cli, ['config', 'init', '--credentials', sa_key])
+
+    result = cli_runner.invoke(cli, ['config', 'show'])
+
+    assert result.exit_code == 0, result.output
+    assert sa_key in result.output
+    assert 'ga-bot@my-project.iam.gserviceaccount.com' in result.output
+
+
+def test_config_show_without_config(cli_runner, tmp_path, monkeypatch):
+    monkeypatch.setenv('HOME', str(tmp_path))
+
+    result = cli_runner.invoke(cli, ['config', 'show'])
+
+    assert result.exit_code == 0, result.output
+    assert "Run 'ga-cli config init'" in result.output

ga4_cli-0.2.0/tests/test_datastreams.py

@@ -0,0 +1,86 @@
+"""Tests for data stream commands"""
+
+import json
+from unittest.mock import Mock, patch
+from google.analytics.admin_v1alpha.types import DataStream
+from ga_cli.cli import cli
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_datastreams_list(mock_auth, cli_runner, mock_datastream, mock_credentials_path):
+    mock_client = Mock()
+    mock_client.list_data_streams.return_value = [mock_datastream]
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'datastreams', 'list', '987654', '--format', 'json']
+    )
+
+    assert result.exit_code == 0, result.output
+    mock_client.list_data_streams.assert_called_once_with(parent='properties/987654')
+    data = json.loads(result.output)
+    assert data == [{
+        'id': '123',
+        'name': 'Test Stream',
+        'type': 'WEB_DATA_STREAM',
+        'measurement_id': 'G-XXXXXXXXXX',
+        'url': 'https://example.com',
+    }]
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_datastreams_get_prints_measurement_id(
+    mock_auth, cli_runner, mock_datastream, mock_credentials_path
+):
+    mock_client = Mock()
+    mock_client.get_data_stream.return_value = mock_datastream
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'datastreams', 'get', '987654', '123']
+    )
+
+    assert result.exit_code == 0, result.output
+    assert 'Measurement ID: G-XXXXXXXXXX' in result.output
+    mock_client.get_data_stream.assert_called_once_with(
+        name='properties/987654/dataStreams/123'
+    )
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_datastreams_create_builds_web_stream(
+    mock_auth, cli_runner, mock_datastream, mock_credentials_path
+):
+    """The DataStream proto sent to the API carries the type and URL"""
+    mock_client = Mock()
+    mock_client.create_data_stream.return_value = mock_datastream
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'datastreams', 'create', '987654',
+              '--name', 'Main Website', '--url', 'https://example.com']
+    )
+
+    assert result.exit_code == 0, result.output
+    assert 'Stream ID: 123' in result.output
+    assert 'Measurement ID: G-XXXXXXXXXX' in result.output
+
+    kwargs = mock_client.create_data_stream.call_args.kwargs
+    assert kwargs['parent'] == 'properties/987654'
+    sent = kwargs['data_stream']
+    assert sent.display_name == 'Main Website'
+    assert sent.type_ == DataStream.DataStreamType.WEB_DATA_STREAM
+    assert sent.web_stream_data.default_uri == 'https://example.com'
+    # Round-trip through the wire format to prove the nested field is really set
+    assert DataStream.deserialize(DataStream.serialize(sent)).web_stream_data.default_uri == \
+        'https://example.com'
+
+
+def test_datastreams_create_rejects_bad_url(cli_runner, mock_credentials_path):
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'datastreams', 'create', '987654',
+              '--name', 'Main Website', '--url', 'example.com']
+    )
+
+    assert result.exit_code == 2
+    assert 'URL must start with http:// or https://' in result.output

{ga4_cli-0.1.4 → ga4_cli-0.2.0}/tests/test_errors.py

@@ -1,7 +1,5 @@
 """Tests for error handling module"""
 
-import pytest
-from unittest.mock import Mock
 from google.api_core import exceptions
 from ga_cli.errors import get_friendly_error, ERROR_MESSAGES
 

ga4_cli-0.2.0/tests/test_properties.py

@@ -0,0 +1,134 @@
+"""Tests for property commands"""
+
+import json
+from unittest.mock import Mock, patch
+from google.analytics.admin_v1alpha.types import IndustryCategory
+from ga_cli.cli import cli
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_properties_list(mock_auth, cli_runner, mock_property, mock_credentials_path):
+    """properties list filters by ancestor account and renders the rows"""
+    mock_client = Mock()
+    mock_client.list_properties.return_value = [mock_property]
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'list', '123456', '--format', 'json']
+    )
+
+    assert result.exit_code == 0, result.output
+    mock_client.list_properties.assert_called_once_with(
+        request={"filter": "ancestor:accounts/123456"}
+    )
+    data = json.loads(result.output)
+    assert data == [{
+        'id': '987654',
+        'name': 'Test Property',
+        'type': 'PROPERTY_TYPE_ORDINARY',
+        'timezone': 'America/Los_Angeles',
+        'currency': 'USD',
+    }]
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_properties_get(mock_auth, cli_runner, mock_property, mock_credentials_path):
+    mock_client = Mock()
+    mock_client.get_property.return_value = mock_property
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'get', '987654']
+    )
+
+    assert result.exit_code == 0, result.output
+    assert 'Test Property' in result.output
+    assert 'TECHNOLOGY' in result.output
+    mock_client.get_property.assert_called_once_with(name='properties/987654')
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_properties_create_defaults(mock_auth, cli_runner, mock_property, mock_credentials_path):
+    """Default timezone, currency and industry are sent as a real Property proto"""
+    mock_client = Mock()
+    mock_client.create_property.return_value = mock_property
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'create', '123456',
+              '--name', 'My Site']
+    )
+
+    assert result.exit_code == 0, result.output
+    assert 'Created property: Test Property' in result.output
+    assert 'Property ID: 987654' in result.output
+
+    sent = mock_client.create_property.call_args.kwargs['property']
+    assert sent.parent == 'accounts/123456'
+    assert sent.display_name == 'My Site'
+    assert sent.time_zone == 'America/Los_Angeles'
+    assert sent.currency_code == 'USD'
+    assert sent.industry_category == IndustryCategory.OTHER
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_properties_create_industry_is_case_insensitive(
+    mock_auth, cli_runner, mock_property, mock_credentials_path
+):
+    mock_client = Mock()
+    mock_client.create_property.return_value = mock_property
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'create', '123456',
+              '--name', 'My Site', '--industry', 'technology',
+              '--timezone', 'Europe/Berlin', '--currency', 'EUR']
+    )
+
+    assert result.exit_code == 0, result.output
+    sent = mock_client.create_property.call_args.kwargs['property']
+    assert sent.industry_category == IndustryCategory.TECHNOLOGY
+    assert sent.time_zone == 'Europe/Berlin'
+    assert sent.currency_code == 'EUR'
+
+
+def test_properties_create_rejects_unknown_industry(cli_runner, mock_credentials_path):
+    """An invalid industry is a usage error, not a KeyError from the API layer"""
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'create', '123456',
+              '--name', 'My Site', '--industry', 'BOGUS']
+    )
+
+    assert result.exit_code == 2
+    assert "Invalid value for '--industry'" in result.output
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_properties_delete(mock_auth, cli_runner, mock_property, mock_credentials_path):
+    """delete is a soft delete and the output says so"""
+    mock_client = Mock()
+    mock_client.delete_property.return_value = mock_property
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'delete', '987654', '--yes']
+    )
+
+    assert result.exit_code == 0, result.output
+    assert 'moved to the trash' in result.output
+    mock_client.delete_property.assert_called_once_with(name='properties/987654')
+
+
+@patch('ga_cli.decorators.AuthManager')
+def test_properties_delete_aborts_without_confirmation(
+    mock_auth, cli_runner, mock_credentials_path
+):
+    mock_client = Mock()
+    mock_auth.return_value.get_client.return_value = mock_client
+
+    result = cli_runner.invoke(
+        cli, ['--credentials', mock_credentials_path, 'properties', 'delete', '987654'], input='n\n'
+    )
+
+    assert result.exit_code == 1
+    mock_client.delete_property.assert_not_called()

ga4_cli-0.1.4/tests/test_accounts.py

@@ -1,49 +0,0 @@
-"""Tests for account commands"""
-
-from click.testing import CliRunner
-from unittest.mock import Mock, patch, MagicMock
-from ga_cli.cli import cli
-
-
-@patch('ga_cli.decorators.AuthManager')
-def test_accounts_list(mock_auth):
-    """Test accounts list command"""
-    runner = CliRunner()
-
-    mock_account = Mock()
-    mock_account.name = "accounts/123456"
-    mock_account.display_name = "Test Account"
-    mock_account.region_code = "US"
-    mock_account.create_time = MagicMock()
-    mock_account.create_time.__str__ = Mock(return_value="2023-01-01 00:00:00.000000")
-
-    mock_client = Mock()
-    mock_client.list_accounts.return_value = [mock_account]
-    mock_auth.return_value.get_client.return_value = mock_client
-
-    result = runner.invoke(cli, ['accounts', 'list'])
-
-    assert 'Test Account' in result.output or result.exit_code == 1
-
-
-@patch('ga_cli.decorators.AuthManager')
-def test_accounts_get(mock_auth):
-    """Test accounts get command"""
-    runner = CliRunner()
-
-    mock_account = Mock()
-    mock_account.name = "accounts/123456"
-    mock_account.display_name = "Test Account"
-    mock_account.region_code = "US"
-    mock_account.create_time = MagicMock()
-    mock_account.create_time.__str__ = Mock(return_value="2023-01-01 00:00:00.000000")
-    mock_account.update_time = MagicMock()
-    mock_account.update_time.__str__ = Mock(return_value="2023-01-02 00:00:00.000000")
-
-    mock_client = Mock()
-    mock_client.get_account.return_value = mock_account
-    mock_auth.return_value.get_client.return_value = mock_client
-
-    result = runner.invoke(cli, ['accounts', 'get', '123456'])
-
-    assert 'Test Account' in result.output or result.exit_code == 1