devnomads-cli 0.5.3__tar.gz → 0.5.5__tar.gz

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devnomads-cli
-Version: 0.5.3
+Version: 0.5.5
 Summary: Manage your DevNomads services from the command line
 Author-email: DevNomads <support@devnomads.nl>
 License: MIT
@@ -111,11 +111,16 @@ export DN_PROFILE=acme
 ## Scripting
 
 Output is a human-readable table on a terminal and JSON when piped,
-so pipelines get parseable output without any flags; `--output
-json|table` forces either. Data goes to stdout, everything else
+so pipelines get parseable output without any flags; `--json` and
+`--table` force either. Data goes to stdout, everything else
 (warnings, prompts, status messages) to stderr, so `dncli ... | jq .`
 is always safe.
 
+List tables show a focused set of columns: fields that are empty for
+every row, and nested collections (a server's IPs, a container's
+instances, a mailbox list) are left out of the overview. Use `<group>
+show <id>` or `--json` for the complete record.
+
 In CI and pipelines, skip the credentials file and pass the key via
 the environment:
 

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/README.md

@@ -95,11 +95,16 @@ export DN_PROFILE=acme
 ## Scripting
 
 Output is a human-readable table on a terminal and JSON when piped,
-so pipelines get parseable output without any flags; `--output
-json|table` forces either. Data goes to stdout, everything else
+so pipelines get parseable output without any flags; `--json` and
+`--table` force either. Data goes to stdout, everything else
 (warnings, prompts, status messages) to stderr, so `dncli ... | jq .`
 is always safe.
 
+List tables show a focused set of columns: fields that are empty for
+every row, and nested collections (a server's IPs, a container's
+instances, a mailbox list) are left out of the overview. Use `<group>
+show <id>` or `--json` for the complete record.
+
 In CI and pipelines, skip the credentials file and pass the key via
 the environment:
 

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/devnomads_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devnomads-cli
-Version: 0.5.3
+Version: 0.5.5
 Summary: Manage your DevNomads services from the command line
 Author-email: DevNomads <support@devnomads.nl>
 License: MIT
@@ -111,11 +111,16 @@ export DN_PROFILE=acme
 ## Scripting
 
 Output is a human-readable table on a terminal and JSON when piped,
-so pipelines get parseable output without any flags; `--output
-json|table` forces either. Data goes to stdout, everything else
+so pipelines get parseable output without any flags; `--json` and
+`--table` force either. Data goes to stdout, everything else
 (warnings, prompts, status messages) to stderr, so `dncli ... | jq .`
 is always safe.
 
+List tables show a focused set of columns: fields that are empty for
+every row, and nested collections (a server's IPs, a container's
+instances, a mailbox list) are left out of the overview. Use `<group>
+show <id>` or `--json` for the complete record.
+
 In CI and pipelines, skip the credentials file and pass the key via
 the environment:
 

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/dncli.py

@@ -176,13 +176,25 @@ class AppState:
     client: DevNomadsClient | None = None
 
 
-def state_from(ctx: typer.Context, output: OutputFormat | None = None) -> AppState:
+def _format_flag(as_json: bool | None) -> OutputFormat | None:
+    """Map the ``--json``/``--table`` flag to a format: True is JSON, False is
+    table, None means "not given - decide from the terminal"."""
+
+    if as_json is True:
+        return OutputFormat.json
+    if as_json is False:
+        return OutputFormat.table
+    return None
+
+
+def state_from(ctx: typer.Context, output: bool | None = None) -> AppState:
     state = ctx.obj
     if not isinstance(state, AppState):  # direct invocation in tests
         state = AppState()
         ctx.obj = state
-    if output is not None:  # per-command --output overrides the global one
-        state.output = output
+    fmt = _format_flag(output)
+    if fmt is not None:  # per-command --json/--table overrides the global one
+        state.output = fmt
     return state
 
 
@@ -342,14 +354,14 @@ def _render_kv(data: dict[str, Any], title: str | None) -> None:
 def _auto_columns(rows: list[dict[str, Any]]) -> list[str]:
     """Choose the columns worth showing in a list view, from the data itself.
 
-    Three things get dropped, because a list is an overview and the full record
+    Two things get dropped, because a list is an overview and the full record
     is always available via the matching ``show`` command (or ``-o json``):
 
     * columns empty in every row (no information at all);
     * columns holding a list of objects (instances, mailboxes, ips, ...) -
-      these are detail, belonging in the ``show`` view, not the overview;
-    * columns whose value never changes across rows - they cost width without
-      helping tell the rows apart (the first column is kept as an anchor).
+      these are detail, belonging in the ``show`` view, not the overview.
+
+    Every other field is kept, even if its value is the same on every row.
     """
 
     cols: list[str] = []
@@ -370,17 +382,11 @@ def _auto_columns(rows: list[dict[str, Any]]) -> list[str]:
             for row in rows
         )
 
-    cols = [
+    return [
         c
         for c in cols
         if any(not empty(row.get(c)) for row in rows) and not is_object_list(c)
     ]
-    if len(rows) > 1 and cols:
-        anchor = cols[0]
-        rendered = {c: {_cell(row.get(c)) for row in rows} for c in cols}
-        if any(len(values) > 1 for values in rendered.values()):
-            cols = [c for c in cols if c == anchor or len(rendered[c]) > 1]
-    return cols
 
 
 def _render_rows(
@@ -1001,8 +1007,11 @@ SortOption = Annotated[
     ),
 ]
 OutputOption = Annotated[
-    OutputFormat | None,
-    typer.Option("--output", "-o", help="Output format (table or json)."),
+    bool | None,
+    typer.Option(
+        "--json/--table",
+        help="Force JSON or table output (default: table on a TTY, JSON piped).",
+    ),
 ]
 
 
@@ -1028,11 +1037,11 @@ def main(
         ),
     ] = None,
     output: Annotated[
-        OutputFormat | None,
+        bool | None,
         typer.Option(
-            "--output",
-            "-o",
-            help="Output format; default: table on a TTY, json when piped.",
+            "--json/--table",
+            help="Force JSON or table output; default: table on a TTY, "
+            "JSON when piped.",
         ),
     ] = None,
     debug: Annotated[
@@ -1048,7 +1057,12 @@ def main(
         ),
     ] = False,
 ) -> None:
-    ctx.obj = AppState(profile=profile, api_key=api_key, output=output, debug=debug)
+    ctx.obj = AppState(
+        profile=profile,
+        api_key=api_key,
+        output=_format_flag(output),
+        debug=debug,
+    )
 
 
 # --- configure -------------------------------------------------------------
@@ -2067,7 +2081,9 @@ _SORT_OPT = typer.Option(
 )
 _YES_OPT = typer.Option(False, "--yes", "-y", help="Do not ask for confirmation.")
 _OUTPUT_OPT = typer.Option(
-    None, "--output", "-o", help="Output format (table or json)."
+    None,
+    "--json/--table",
+    help="Force JSON or table output (default: table on a TTY, JSON piped).",
 )
 
 
@@ -2082,7 +2098,7 @@ def _generated_call(
     columns: list[str] | None = None,
     confirm: str | None = None,
     yes: bool = False,
-    output: OutputFormat | None = None,
+    output: bool | None = None,
 ) -> None:
     """Shared runtime for generated commands: build the path, confirm if
     needed, call the API, render the result."""
@@ -2239,7 +2255,7 @@ def gen_handles_create(
     city: str | None = typer.Option(None),
     region: str | None = typer.Option(None),
     country: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create a contact handle."""
 
@@ -2274,7 +2290,7 @@ def gen_handles_create(
 def gen_handles_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List your contact handles."""
 
@@ -2292,7 +2308,7 @@ def gen_handles_index(
 def gen_handles_show(
     ctx: typer.Context,
     handle_id: int = typer.Argument(..., metavar="HANDLE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show one contact handle."""
 
@@ -2309,7 +2325,7 @@ def gen_handles_show(
 def gen_services_apps_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List apps."""
 
@@ -2327,7 +2343,7 @@ def gen_services_apps_index(
 def gen_services_apps_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show apps details."""
 
@@ -2346,7 +2362,7 @@ def gen_services_apps_state(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     state: str = typer.Argument(..., metavar="STATE"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Change the state of an app service."""
 
@@ -2365,7 +2381,7 @@ def gen_services_apps_state(
 def gen_services_buckets_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List buckets."""
 
@@ -2383,7 +2399,7 @@ def gen_services_buckets_index(
 def gen_services_buckets_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show buckets details."""
 
@@ -2401,7 +2417,7 @@ def gen_services_containers_deploy(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Deploy a container service."""
 
@@ -2420,7 +2436,7 @@ def gen_services_containers_deploy(
 def gen_services_containers_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List containers."""
 
@@ -2440,7 +2456,7 @@ def gen_services_containers_instances_deploy(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Deploy a container instance."""
 
@@ -2460,7 +2476,7 @@ def gen_services_containers_instances_index(
     ctx: typer.Context,
     service_id: str = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List containers instances."""
 
@@ -2479,7 +2495,7 @@ def gen_services_containers_instances_logs(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show the logs of a container instance."""
 
@@ -2497,7 +2513,7 @@ def gen_services_containers_instances_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show containers instances details."""
 
@@ -2517,7 +2533,7 @@ def gen_services_containers_instances_state(
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
     state: str = typer.Argument(..., metavar="STATE"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Change the state of a container instance."""
 
@@ -2538,7 +2554,7 @@ def gen_services_containers_instances_update(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
     image: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update containers instances."""
 
@@ -2558,7 +2574,7 @@ def gen_services_containers_instances_volumes_index(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List containers instances volumes."""
 
@@ -2578,7 +2594,7 @@ def gen_services_containers_instances_volumes_show(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     instance_id: int = typer.Argument(..., metavar="INSTANCE_ID"),
     volume_id: int = typer.Argument(..., metavar="VOLUME_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show containers instances volumes details."""
 
@@ -2599,7 +2615,7 @@ def gen_services_containers_instances_volumes_update(
     volume_id: int = typer.Argument(..., metavar="VOLUME_ID"),
     path: str | None = typer.Option(None),
     uid: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update containers instances volumes."""
 
@@ -2617,7 +2633,7 @@ def gen_services_containers_instances_volumes_update(
 def gen_services_containers_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show containers details."""
 
@@ -2637,7 +2653,7 @@ def gen_services_containers_update(
     registry_url: str | None = typer.Option(None),
     description: str | None = typer.Option(None),
     port: int | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update containers."""
 
@@ -2655,7 +2671,7 @@ def gen_services_containers_update(
 def gen_services_databases_clusters_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List databases clusters."""
 
@@ -2673,7 +2689,7 @@ def gen_services_databases_clusters_index(
 def gen_services_databases_clusters_show(
     ctx: typer.Context,
     cluster_id: int = typer.Argument(..., metavar="CLUSTER_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show databases clusters details."""
 
@@ -2691,7 +2707,7 @@ def gen_services_databases_clusters_users_index(
     ctx: typer.Context,
     cluster_id: int = typer.Argument(..., metavar="CLUSTER_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List databases clusters users."""
 
@@ -2710,7 +2726,7 @@ def gen_services_databases_clusters_users_show(
     ctx: typer.Context,
     cluster_id: int = typer.Argument(..., metavar="CLUSTER_ID"),
     user_id: int = typer.Argument(..., metavar="USER_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show databases clusters users details."""
 
@@ -2727,7 +2743,7 @@ def gen_services_databases_clusters_users_show(
 def gen_services_databases_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List databases."""
 
@@ -2747,7 +2763,7 @@ def gen_services_databases_permissions_create(
     service_id: str = typer.Argument(..., metavar="SERVICE_ID"),
     user_id: str | None = typer.Option(None),
     permissions: list[str] | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create databases permissions."""
 
@@ -2765,7 +2781,7 @@ def gen_services_databases_permissions_create(
 def gen_services_databases_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show databases details."""
 
@@ -2784,7 +2800,7 @@ def gen_services_databases_store(
     name: str | None = typer.Option(None),
     client_id: int | None = typer.Option(None),
     cluster_id: int | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create databases."""
 
@@ -2805,7 +2821,7 @@ def gen_services_databases_users_store(
     username: str | None = typer.Option(None),
     password: str | None = typer.Option(None),
     client_id: int | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create databases users."""
 
@@ -2825,7 +2841,7 @@ def gen_services_databases_users_update(
     cluster_id: str = typer.Argument(..., metavar="CLUSTER_ID"),
     user_id: str = typer.Argument(..., metavar="USER_ID"),
     password: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update databases users."""
 
@@ -2850,7 +2866,7 @@ def gen_services_domains_create(
     handle_id_owner: int | None = typer.Option(None),
     handle_id_administrative: int | None = typer.Option(None),
     handle_id_technical: int | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create domains."""
 
@@ -2877,7 +2893,7 @@ def gen_services_domains_create(
 def gen_services_domains_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List domains."""
 
@@ -2895,7 +2911,7 @@ def gen_services_domains_index(
 def gen_services_domains_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show domains details."""
 
@@ -2914,7 +2930,7 @@ def gen_services_emails_aliases_create(
     service_id: str = typer.Argument(..., metavar="SERVICE_ID"),
     emailaddress: str | None = typer.Option(None),
     alias: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails aliases."""
 
@@ -2934,7 +2950,7 @@ def gen_services_emails_aliases_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     alias_id: int = typer.Argument(..., metavar="ALIAS_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails aliases."""
 
@@ -2954,7 +2970,7 @@ def gen_services_emails_aliases_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails aliases."""
 
@@ -2973,7 +2989,7 @@ def gen_services_emails_aliases_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     alias_id: int = typer.Argument(..., metavar="ALIAS_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show emails aliases details."""
 
@@ -2995,7 +3011,7 @@ def gen_services_emails_create(
     return_path_domain: str | None = typer.Option(None),
     relay_hosts: list[str] | None = typer.Option(None),
     delivery_rate: int | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails."""
 
@@ -3021,7 +3037,7 @@ def gen_services_emails_delete(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails."""
 
@@ -3040,7 +3056,7 @@ def gen_services_emails_delete(
 def gen_services_emails_dkim_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show the DKIM configuration of an email service."""
 
@@ -3059,7 +3075,7 @@ def gen_services_emails_forwardings_create(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     emailaddress: str | None = typer.Option(None),
     target: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails forwardings."""
 
@@ -3079,7 +3095,7 @@ def gen_services_emails_forwardings_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     forwarding_id: int = typer.Argument(..., metavar="FORWARDING_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails forwardings."""
 
@@ -3099,7 +3115,7 @@ def gen_services_emails_forwardings_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails forwardings."""
 
@@ -3118,7 +3134,7 @@ def gen_services_emails_forwardings_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     forwarding_id: int = typer.Argument(..., metavar="FORWARDING_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show emails forwardings details."""
 
@@ -3135,7 +3151,7 @@ def gen_services_emails_forwardings_show(
 def gen_services_emails_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails."""
 
@@ -3155,7 +3171,7 @@ def gen_services_emails_mailboxes_create(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     emailaddress: str | None = typer.Option(None),
     password: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails mailboxes."""
 
@@ -3175,7 +3191,7 @@ def gen_services_emails_mailboxes_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     emailaddress: str = typer.Argument(..., metavar="EMAILADDRESS"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails mailboxes."""
 
@@ -3195,7 +3211,7 @@ def gen_services_emails_mailboxes_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails mailboxes."""
 
@@ -3214,7 +3230,7 @@ def gen_services_emails_mailboxes_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     emailaddress: str = typer.Argument(..., metavar="EMAILADDRESS"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show emails mailboxes details."""
 
@@ -3233,7 +3249,7 @@ def gen_services_emails_mailboxes_update(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     emailaddress: str = typer.Argument(..., metavar="EMAILADDRESS"),
     password: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update emails mailboxes."""
 
@@ -3252,7 +3268,7 @@ def gen_services_emails_records_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List the DNS records an email service needs."""
 
@@ -3270,7 +3286,7 @@ def gen_services_emails_records_index(
 def gen_services_emails_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show emails details."""
 
@@ -3288,7 +3304,7 @@ def gen_services_emails_transactional_aliases_create(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails transactional aliases."""
 
@@ -3308,7 +3324,7 @@ def gen_services_emails_transactional_aliases_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     alias_id: int = typer.Argument(..., metavar="ALIAS_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails transactional aliases."""
 
@@ -3328,7 +3344,7 @@ def gen_services_emails_transactional_aliases_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails transactional aliases."""
 
@@ -3349,7 +3365,7 @@ def gen_services_emails_transactional_keys_create(
     name: str | None = typer.Option(None),
     key: str | None = typer.Option(None),
     active: bool | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails transactional keys."""
 
@@ -3369,7 +3385,7 @@ def gen_services_emails_transactional_keys_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     key_id: int = typer.Argument(..., metavar="KEY_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails transactional keys."""
 
@@ -3389,7 +3405,7 @@ def gen_services_emails_transactional_keys_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails transactional keys."""
 
@@ -3408,7 +3424,7 @@ def gen_services_emails_transactional_keys_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     key_id: int = typer.Argument(..., metavar="KEY_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show emails transactional keys details."""
 
@@ -3429,7 +3445,7 @@ def gen_services_emails_transactional_keys_update(
     name: str | None = typer.Option(None),
     key: str | None = typer.Option(None),
     active: bool | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update emails transactional keys."""
 
@@ -3450,7 +3466,7 @@ def gen_services_emails_transactional_users_create(
     emailaddress: str | None = typer.Option(None),
     password: str | None = typer.Option(None),
     delivery_mode: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create emails transactional users."""
 
@@ -3474,7 +3490,7 @@ def gen_services_emails_transactional_users_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     user_id: int = typer.Argument(..., metavar="USER_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete emails transactional users."""
 
@@ -3494,7 +3510,7 @@ def gen_services_emails_transactional_users_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List emails transactional users."""
 
@@ -3513,7 +3529,7 @@ def gen_services_emails_transactional_users_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     user_id: int = typer.Argument(..., metavar="USER_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show emails transactional users details."""
 
@@ -3533,7 +3549,7 @@ def gen_services_emails_transactional_users_update(
     user_id: int = typer.Argument(..., metavar="USER_ID"),
     password: str | None = typer.Option(None),
     delivery_mode: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Update emails transactional users."""
 
@@ -3551,7 +3567,7 @@ def gen_services_emails_transactional_users_update(
 def gen_services_forwards_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List forwards."""
 
@@ -3569,7 +3585,7 @@ def gen_services_forwards_index(
 def gen_services_forwards_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show forwards details."""
 
@@ -3587,7 +3603,7 @@ def gen_services_proxies_down(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Bring a proxy down."""
 
@@ -3606,7 +3622,7 @@ def gen_services_proxies_down(
 def gen_services_proxies_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List proxies."""
 
@@ -3624,7 +3640,7 @@ def gen_services_proxies_index(
 def gen_services_proxies_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show proxies details."""
 
@@ -3642,7 +3658,7 @@ def gen_services_proxies_up(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Bring a proxy up."""
 
@@ -3661,7 +3677,7 @@ def gen_services_proxies_up(
 def gen_services_searches_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List searches."""
 
@@ -3679,7 +3695,7 @@ def gen_services_searches_index(
 def gen_services_searches_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show searches details."""
 
@@ -3696,7 +3712,7 @@ def gen_services_searches_show(
 def gen_services_servers_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List servers."""
 
@@ -3714,7 +3730,7 @@ def gen_services_servers_index(
 def gen_services_servers_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show servers details."""
 
@@ -3733,7 +3749,7 @@ def gen_services_servers_state(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     state: str = typer.Argument(..., metavar="STATE"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Change the state of a server."""
 
@@ -3752,7 +3768,7 @@ def gen_services_servers_state(
 def gen_services_sites_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List sites."""
 
@@ -3770,7 +3786,7 @@ def gen_services_sites_index(
 def gen_services_sites_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show sites details."""
 
@@ -3787,7 +3803,7 @@ def gen_services_sites_show(
 def gen_services_spams_clusters_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List spams clusters."""
 
@@ -3805,7 +3821,7 @@ def gen_services_spams_clusters_index(
 def gen_services_spams_clusters_show(
     ctx: typer.Context,
     cluster_id: int = typer.Argument(..., metavar="CLUSTER_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show spams clusters details."""
 
@@ -3823,7 +3839,7 @@ def gen_services_spams_domain_create(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create spams domain."""
 
@@ -3843,7 +3859,7 @@ def gen_services_spams_domain_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str = typer.Argument(..., metavar="DOMAIN"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete spams domain."""
 
@@ -3864,7 +3880,7 @@ def gen_services_spams_domain_dkim_disable(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str = typer.Argument(..., metavar="DOMAIN"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Disable DKIM for a spam filter domain."""
 
@@ -3885,7 +3901,7 @@ def gen_services_spams_domain_dkim_enable(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str = typer.Argument(..., metavar="DOMAIN"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Enable DKIM for a spam filter domain."""
 
@@ -3905,7 +3921,7 @@ def gen_services_spams_domain_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List spams domain."""
 
@@ -3924,7 +3940,7 @@ def gen_services_spams_domain_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str = typer.Argument(..., metavar="DOMAIN"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show spams domain details."""
 
@@ -3941,7 +3957,7 @@ def gen_services_spams_domain_show(
 def gen_services_spams_index(
     ctx: typer.Context,
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List spams."""
 
@@ -3959,7 +3975,7 @@ def gen_services_spams_index(
 def gen_services_spams_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show spams details."""
 
@@ -3979,7 +3995,7 @@ def gen_services_spams_transports_create(
     domain: str | None = typer.Option(None),
     host: str | None = typer.Option(None),
     port: int | None = typer.Option(None),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Create spams transports."""
 
@@ -3999,7 +4015,7 @@ def gen_services_spams_transports_delete(
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str = typer.Argument(..., metavar="DOMAIN"),
     yes: bool = _YES_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Delete spams transports."""
 
@@ -4019,7 +4035,7 @@ def gen_services_spams_transports_index(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     sort: str | None = _SORT_OPT,
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """List spams transports."""
 
@@ -4038,7 +4054,7 @@ def gen_services_spams_transports_show(
     ctx: typer.Context,
     service_id: int = typer.Argument(..., metavar="SERVICE_ID"),
     domain: str = typer.Argument(..., metavar="DOMAIN"),
-    output: OutputFormat | None = _OUTPUT_OPT,
+    output: bool | None = _OUTPUT_OPT,
 ) -> None:
     """Show spams transports details."""
 

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devnomads-cli"
-version = "0.5.3"
+version = "0.5.5"
 description = "Manage your DevNomads services from the command line"
 readme = "README.md"
 requires-python = ">=3.10"

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/tests/test_cert.py

@@ -386,7 +386,7 @@ def test_cert_list_shows_issued(configured, isolated_config):
     import json
 
     _write_cert(dncli.config_dir() / "certs" / "example.com", days=45)
-    result = runner.invoke(app, ["cert", "list", "-o", "json"])
+    result = runner.invoke(app, ["cert", "list", "--json"])
     assert result.exit_code == 0, result.output
     rows = json.loads(result.output)
     assert rows[0]["domain"] == "example.com"

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/tests/test_cli.py

@@ -45,7 +45,7 @@ def test_services_list_emits_json_and_bearer_header(configured):
         }
     ]
     route = respx.get(f"{API}/services").mock(return_value=Response(200, json=services))
-    result = runner.invoke(app, ["--output", "json", "services", "list"])
+    result = runner.invoke(app, ["--json", "services", "list"])
     assert result.exit_code == 0
     assert json.loads(result.output) == services
     request = route.calls.last.request
@@ -57,11 +57,9 @@ def test_services_list_emits_json_and_bearer_header(configured):
 def test_trailing_output_option_beats_global(configured):
     services = [{"service_id": 1}]
     respx.get(f"{API}/services").mock(return_value=Response(200, json=services))
-    # per-command --output works after the subcommand and wins over the
-    # global one
-    result = runner.invoke(
-        app, ["--output", "table", "services", "list", "--output", "json"]
-    )
+    # per-command --json works after the subcommand and wins over the
+    # global --table
+    result = runner.invoke(app, ["--table", "services", "list", "--json"])
     assert result.exit_code == 0
     assert json.loads(result.stdout) == services
 
@@ -72,7 +70,7 @@ def test_services_list_unwraps_laravel_envelope(configured):
     respx.get(f"{API}/services").mock(
         return_value=Response(200, json={"data": services})
     )
-    result = runner.invoke(app, ["--output", "json", "services", "list"])
+    result = runner.invoke(app, ["--json", "services", "list"])
     assert result.exit_code == 0
     assert json.loads(result.output) == services
 
@@ -84,9 +82,7 @@ def test_services_list_sort_option(configured):
         {"service_id": 1, "entity": "geleijn.net"},
     ]
     respx.get(f"{API}/services").mock(return_value=Response(200, json=services))
-    result = runner.invoke(
-        app, ["--output", "json", "services", "list", "--sort", "entity"]
-    )
+    result = runner.invoke(app, ["--json", "services", "list", "--sort", "entity"])
     assert result.exit_code == 0
     assert [s["entity"] for s in json.loads(result.output)] == [
         "geleijn.net",
@@ -116,7 +112,7 @@ def test_records_list_sort_descending(configured):
     )
     result = runner.invoke(
         app,
-        ["--output", "json", "dns", "records", "list", "example.com", "--sort", "-ttl"],
+        ["--json", "dns", "records", "list", "example.com", "--sort", "-ttl"],
     )
     assert result.exit_code == 0
     assert [r["ttl"] for r in json.loads(result.output)] == [3600, 60]
@@ -137,7 +133,7 @@ def test_services_show(configured):
     respx.get(f"{API}/services/42").mock(
         return_value=Response(200, json={"service_id": 42, "type": "email"})
     )
-    result = runner.invoke(app, ["--output", "json", "services", "show", "42"])
+    result = runner.invoke(app, ["--json", "services", "show", "42"])
     assert result.exit_code == 0
     assert json.loads(result.output)["service_id"] == 42
 
@@ -146,7 +142,7 @@ def test_services_show(configured):
 def test_zones_list(configured):
     zones = [{"id": "example.com.", "name": "example.com.", "kind": "Master"}]
     respx.get(f"{API}/services/dns/zones").mock(return_value=Response(200, json=zones))
-    result = runner.invoke(app, ["--output", "json", "dns", "zones", "list"])
+    result = runner.invoke(app, ["--json", "dns", "zones", "list"])
     assert result.exit_code == 0
     assert json.loads(result.output) == zones
 
@@ -172,9 +168,7 @@ def test_zones_show_table_mode(configured):
     respx.get(f"{API}/services/dns/zones/example.com.").mock(
         return_value=Response(200, json=ZONE)
     )
-    result = runner.invoke(
-        app, ["--output", "table", "dns", "zones", "show", "example.com"]
-    )
+    result = runner.invoke(app, ["--table", "dns", "zones", "show", "example.com"])
     assert result.exit_code == 0
     assert "www.example.com." in result.output
     assert "192.0.2.1" in result.output
@@ -187,9 +181,7 @@ def test_zones_show_accepts_trailing_dot_form_too(configured):
     )
     # both spellings resolve to the canonical PowerDNS zone id
     for zone_arg in ("example.com", "example.com."):
-        result = runner.invoke(
-            app, ["--output", "json", "dns", "zones", "show", zone_arg]
-        )
+        result = runner.invoke(app, ["--json", "dns", "zones", "show", zone_arg])
         assert result.exit_code == 0, result.output
     assert route.call_count == 2
 
@@ -199,9 +191,7 @@ def test_records_list_flattens_rrsets(configured):
     respx.get(f"{API}/services/dns/zones/example.com.").mock(
         return_value=Response(200, json=ZONE)
     )
-    result = runner.invoke(
-        app, ["--output", "json", "dns", "records", "list", "example.com"]
-    )
+    result = runner.invoke(app, ["--json", "dns", "records", "list", "example.com"])
     assert result.exit_code == 0
     rows = json.loads(result.output)
     assert rows == [
@@ -318,7 +308,7 @@ def test_retry_on_429_honors_retry_after(configured, monkeypatch):
         Response(429, headers={"Retry-After": "3"}),
         Response(200, json=[]),
     ]
-    result = runner.invoke(app, ["--output", "json", "services", "list"])
+    result = runner.invoke(app, ["--json", "services", "list"])
     assert result.exit_code == 0
     assert route.call_count == 2
     assert sleeps == [3.0]
@@ -397,7 +387,7 @@ def test_configure_unknown_provider(isolated_config):
 def test_configure_list_masks_secrets(write_profile):
     write_profile(api_key="dn_abcdefghijklmnop")
     write_profile("transip:personal", login="loek", private_key_file="/x.pem")
-    result = runner.invoke(app, ["--output", "json", "configure", "list"])
+    result = runner.invoke(app, ["--json", "configure", "list"])
     assert result.exit_code == 0
     rows = {row["profile"]: row for row in json.loads(result.output)}
     assert rows["default"]["type"] == "devnomads"

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/tests/test_generated_cli.py

@@ -22,7 +22,7 @@ def configured(write_profile):
 def test_handles_list(configured):
     handles = [{"handle_id": 7, "firstname": "Loek"}]
     respx.get(f"{API}/handles").mock(return_value=Response(200, json={"data": handles}))
-    result = runner.invoke(app, ["--output", "json", "handles", "list"])
+    result = runner.invoke(app, ["--json", "handles", "list"])
     assert result.exit_code == 0
     assert json.loads(result.output) == handles
 
@@ -35,8 +35,7 @@ def test_nested_path_params(configured):
     result = runner.invoke(
         app,
         [
-            "--output",
-            "json",
+            "--json",
             "containers",
             "instances",
             "volumes",
@@ -138,7 +137,7 @@ def test_table_mode_flattens_nested_detail_objects(configured):
     )
     result = runner.invoke(
         app,
-        ["--output", "table", "proxies", "list"],
+        ["--table", "proxies", "list"],
         env={"COLUMNS": "200"},  # wide terminal so rich does not truncate
     )
     assert result.exit_code == 0
@@ -153,7 +152,7 @@ def test_json_mode_keeps_raw_nested_shape(configured):
     respx.get(f"{API}/services/proxies").mock(
         return_value=Response(200, json={"data": PROXIES})
     )
-    result = runner.invoke(app, ["--output", "json", "proxies", "list"])
+    result = runner.invoke(app, ["--json", "proxies", "list"])
     assert result.exit_code == 0
     assert json.loads(result.output) == PROXIES
 
@@ -163,7 +162,7 @@ def test_trailing_output_option_on_generated_command(configured):
     respx.get(f"{API}/services/forwards/2493").mock(
         return_value=Response(200, json={"data": {"service_id": 2493}})
     )
-    result = runner.invoke(app, ["forwards", "show", "2493", "--output", "json"])
+    result = runner.invoke(app, ["forwards", "show", "2493", "--json"])
     assert result.exit_code == 0, result.output
     assert json.loads(result.stdout)["service_id"] == 2493
 
@@ -172,7 +171,7 @@ def test_trailing_output_option_on_generated_command(configured):
 def test_unique_command_prefixes_resolve(configured):
     respx.get(f"{API}/services/emails").mock(return_value=Response(200, json=[]))
     # `dncli e l` -> `dncli emails list`
-    result = runner.invoke(app, ["e", "l", "--output", "json"])
+    result = runner.invoke(app, ["e", "l", "--json"])
     assert result.exit_code == 0, result.output
     assert json.loads(result.stdout) == []
 
@@ -196,7 +195,7 @@ def test_exact_command_name_always_wins(configured):
 @respx.mock
 def test_plain_get_does_not_confirm(configured):
     respx.get(f"{API}/services/servers").mock(return_value=Response(200, json=[]))
-    result = runner.invoke(app, ["--output", "json", "servers", "list"])
+    result = runner.invoke(app, ["--json", "servers", "list"])
     assert result.exit_code == 0
 
 
@@ -206,7 +205,7 @@ def test_generated_list_supports_sort(configured):
     respx.get(f"{API}/services/servers").mock(return_value=Response(200, json=servers))
     result = runner.invoke(
         app,
-        ["--output", "json", "servers", "list", "--sort", "service_id"],
+        ["--json", "servers", "list", "--sort", "service_id"],
     )
     assert result.exit_code == 0
     assert [s["service_id"] for s in json.loads(result.output)] == [1, 2]

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/tests/test_helpers.py

@@ -231,25 +231,25 @@ def test_cell_detail_keeps_per_item_lines():
     assert _cell(insts) == "id=7 state_last_known=running"
 
 
-def test_auto_columns_drops_empty_constant_and_object_lists():
+def test_auto_columns_drops_empty_and_object_lists_only():
     rows = [
         {"id": 1, "port": 80, "registry": "same", "blank": "", "instances": [{"i": 7}]},
         {"id": 2, "port": 81, "registry": "same", "blank": "", "instances": [{"i": 8}]},
     ]
-    # registry is constant, blank is empty, instances is an object list -> all
-    # dropped; id (anchor) and port (varies) remain.
-    assert _auto_columns(rows) == ["id", "port"]
+    # blank is empty and instances is an object list -> dropped; every other
+    # scalar is kept, including the constant `registry`.
+    assert _auto_columns(rows) == ["id", "port", "registry"]
 
 
-def test_auto_columns_keeps_anchor_even_if_constant():
+def test_auto_columns_keeps_constant_scalar_columns():
     rows = [{"id": 1, "x": 9, "y": "a"}, {"id": 1, "x": 9, "y": "b"}]
-    # x is constant -> dropped; id is constant but the anchor -> kept
-    assert _auto_columns(rows) == ["id", "y"]
+    # constant columns are no longer dropped - normal fields always show
+    assert _auto_columns(rows) == ["id", "x", "y"]
 
 
 def test_auto_columns_single_row_keeps_nonempty_scalars():
     rows = [{"id": 1, "name": "x", "blank": None, "items": [{"a": 1}]}]
-    # one row: no constant-drop, but empty and object-list columns still go
+    # empty and object-list columns go, scalars stay
     assert _auto_columns(rows) == ["id", "name"]
 
 
@@ -266,8 +266,8 @@ def test_object_table_uses_auto_columns():
         {"emailaddress": "b@x", "quota": 2, "domain": "x"},
     ]
     table = _object_table(items)
-    # constant `domain` dropped; the differing fields are kept as headers
-    assert [c.header for c in table.columns] == ["emailaddress", "quota"]
+    # all scalar sub-fields are kept (empties/object-lists would be dropped)
+    assert [c.header for c in table.columns] == ["emailaddress", "quota", "domain"]
 
 
 def test_render_kv_drops_empty_and_nests_objects(capsys):

{devnomads_cli-0.5.3 → devnomads_cli-0.5.5}/tests/test_transfer.py

@@ -370,8 +370,7 @@ def test_transfer_dry_run_does_not_patch(transfer_setup):
     result = runner.invoke(
         app,
         [
-            "--output",
-            "json",
+            "--json",
             "dns",
             "transfer",
             "--from",