chore: fix ruff lint + format issues in modified files

Author: iamh2o

tests/test_cli.py

@@ -2,6 +2,8 @@
 Tests for the zebra_day CLI commands.
 """
 
+import http.client
+import socket
 from unittest.mock import MagicMock, patch
 
 from typer.testing import CliRunner
@@ -180,10 +182,21 @@ def _fake_probe(ip_stub="192.168.1", progress_callback=None, scan_http_port=None
                 "serial": p.get("serial", "Unknown"),
             }
             if progress_callback:
-                progress_callback({"kind": "found", "ip": ip, "model": p.get("model", "Unknown"), "serial": p.get("serial", "Unknown")})
-                progress_callback({"kind": "checked", "ip": ip, "checked": idx + 1, "total": 255, "open": True})
+                progress_callback(
+                    {
+                        "kind": "found",
+                        "ip": ip,
+                        "model": p.get("model", "Unknown"),
+                        "serial": p.get("serial", "Unknown"),
+                    }
+                )
+                progress_callback(
+                    {"kind": "checked", "ip": ip, "checked": idx + 1, "total": 255, "open": True}
+                )
         if progress_callback:
-            progress_callback({"kind": "done", "cancelled": False, "checked": len(found_printers), "total": 255})
+            progress_callback(
+                {"kind": "done", "cancelled": False, "checked": len(found_printers), "total": 255}
+            )
 
     mock_zp.probe_zebra_printers_add_to_printers_json = _fake_probe
     return mock_zp
@@ -287,7 +300,6 @@ def test_printer_scan_rejects_trailing_dot_short_flag(self):
         assert "trailing dot" in result.output
 
 
-
 # ---------------------------------------------------------------------------
 # zday man — interactive documentation browser
 # ---------------------------------------------------------------------------
@@ -397,7 +409,7 @@ class TestCLIManGracefulDegradation:
 
     def test_missing_file_shows_warning(self):
         """A topic pointing to a missing file shows a warning, not a crash."""
-        from zebra_day.cli.man import TOPICS, Topic, TopicSource, _get_topic_content
+        from zebra_day.cli.man import Topic, TopicSource, _get_topic_content
 
         fake_topic = Topic(
             name="Missing",
@@ -409,7 +421,7 @@ def test_missing_file_shows_warning(self):
 
     def test_missing_section_shows_warning(self):
         """A topic with a bad heading shows a warning, not a crash."""
-        from zebra_day.cli.man import TOPICS, Topic, TopicSource, _get_topic_content
+        from zebra_day.cli.man import Topic, TopicSource, _get_topic_content
 
         fake_topic = Topic(
             name="BadSection",
@@ -420,15 +432,10 @@ def test_missing_section_shows_warning(self):
         assert "not found" in content.lower()
 
 
-
 # =====================================================================
 # Simulator tests
 # =====================================================================
 
-import socket
-import http.client
-import time
-
 
 class TestSimulatorCore:
     """Tests for the simulator module (non-CLI)."""
@@ -536,11 +543,13 @@ def test_http_discovery_page(self):
 
     def test_cmd_mgr_integration(self):
         """cmd_mgr.ZebraPrinter can query the simulator and parse responses."""
-        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
         from zebra_day.cmd_mgr import ZebraPrinter
+        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
 
         profile = PrinterProfile(
-            model="ZT411-203dpi ZPL", serial="INTEG001", firmware="V99.0.0",
+            model="ZT411-203dpi ZPL",
+            serial="INTEG001",
+            firmware="V99.0.0",
             label_count=500,
         )
         printer = SimulatedPrinter("127.0.0.1", zpl_port=19206, http_port=18206, profile=profile)
@@ -598,7 +607,9 @@ def test_simulator_list_empty(self):
 
     def test_simulator_stop_nonexistent(self):
         """simulator stop on non-running simulator doesn't crash."""
-        result = runner.invoke(app, ["simulator", "stop", "--host", "127.0.0.1", "--zpl-port", "19999"])
+        result = runner.invoke(
+            app, ["simulator", "stop", "--host", "127.0.0.1", "--zpl-port", "19999"]
+        )
         assert result.exit_code == 0
 
 
@@ -612,7 +623,9 @@ def test_start_and_list(self):
         mgr = SimulatorManager()
         try:
             mgr.start_printer(
-                host="127.0.0.1", zpl_port=19210, http_port=18210,
+                host="127.0.0.1",
+                zpl_port=19210,
+                http_port=18210,
                 profile=PrinterProfile(model="ZD420-203dpi ZPL", serial="MGR001"),
             )
             printers = mgr.list_printers()
@@ -626,6 +639,7 @@ def test_start_and_list(self):
     def test_start_duplicate_raises(self):
         """Starting a printer on same address raises RuntimeError."""
         import pytest
+
         from zebra_day.simulator import SimulatorManager
 
         mgr = SimulatorManager()
@@ -649,17 +663,21 @@ def test_stop_all(self):
 
     def test_multiple_printers(self):
         """Multiple simulators can run simultaneously with different responses."""
-        from zebra_day.simulator import PrinterProfile, SimulatorManager
         from zebra_day.cmd_mgr import ZebraPrinter
+        from zebra_day.simulator import PrinterProfile, SimulatorManager
 
         mgr = SimulatorManager()
         try:
             mgr.start_printer(
-                host="127.0.0.1", zpl_port=19214, http_port=18214,
+                host="127.0.0.1",
+                zpl_port=19214,
+                http_port=18214,
                 profile=PrinterProfile(model="ZD620-203dpi ZPL", serial="FLEET1"),
             )
             mgr.start_printer(
-                host="127.0.0.1", zpl_port=19215, http_port=18215,
+                host="127.0.0.1",
+                zpl_port=19215,
+                http_port=18215,
                 profile=PrinterProfile(model="ZT411-300dpi ZPL", serial="FLEET2"),
             )
             zp1 = ZebraPrinter("127.0.0.1", port=19214)
@@ -707,8 +725,9 @@ def test_scan_finds_printer_via_zpl(self):
         """Default scan (no scan_http_port) discovers printer via ZPL port 9100."""
         import threading
         from unittest.mock import patch as _patch
-        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
+
         import zebra_day.print_mgr as zdpm
+        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
 
         profile = PrinterProfile(model="ZD620-203dpi ZPL", serial="SCANTEST1")
         printer = SimulatedPrinter("127.0.0.1", zpl_port=19220, http_port=18220, profile=profile)
@@ -748,8 +767,9 @@ def test_scan_http_fallback(self):
         """scan_http_port enables HTTP-based discovery when ZPL fails."""
         import threading
         from unittest.mock import patch as _patch
-        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
+
         import zebra_day.print_mgr as zdpm
+        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
 
         profile = PrinterProfile(model="ZT411-300dpi ZPL", serial="HTTPFB1")
         printer = SimulatedPrinter("127.0.0.1", zpl_port=19221, http_port=18221, profile=profile)
@@ -789,8 +809,9 @@ def test_scan_no_http_port_skips_http(self):
         """Without scan_http_port, HTTP is not attempted (backward compat)."""
         import threading
         from unittest.mock import patch as _patch
-        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
+
         import zebra_day.print_mgr as zdpm
+        from zebra_day.simulator import PrinterProfile, SimulatedPrinter
 
         profile = PrinterProfile(model="ZD420-203dpi ZPL", serial="NOHTTP1")
         printer = SimulatedPrinter("127.0.0.1", zpl_port=19222, http_port=18222, profile=profile)
@@ -817,7 +838,9 @@ def _cb(evt):
                 )
 
             lab_printers = zp.printers.get("labs", {}).get("nohttp-test", {}).get("printers", {})
-            found_any = [ip for ip, p in lab_printers.items() if p.get("model") == "ZD420-203dpi ZPL"]
+            found_any = [
+                ip for ip, p in lab_printers.items() if p.get("model") == "ZD420-203dpi ZPL"
+            ]
             assert len(found_any) >= 1
             p = lab_printers[found_any[0]]
             assert "zpl" in p.get("notes", "").lower()

zebra_day/cli/__init__.py

@@ -6,7 +6,6 @@
 
 import typer
 import yaml
-
 from cli_core_yo.app import create_app
 from cli_core_yo.runtime import _reset, initialize
 from cli_core_yo.spec import CliSpec, ConfigSpec, PluginSpec, XdgSpec

zebra_day/cli/printer.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import json
 import socket
 from typing import TYPE_CHECKING
 

zebra_day/cli/root_commands.py

@@ -65,9 +65,7 @@ def _status_callback() -> None:
             if hasattr(zp, "printers") and "labs" in zp.printers:
                 labs = list(zp.printers["labs"].keys())
                 status_data["printers"]["labs"] = labs
-                total_printers = sum(
-                    len(list(zp.printers["labs"][lab].keys())) for lab in labs
-                )
+                total_printers = sum(len(list(zp.printers["labs"][lab].keys())) for lab in labs)
                 status_data["printers"]["configured"] = total_printers
         except Exception:
             pass
@@ -79,10 +77,7 @@ def _status_callback() -> None:
     # Human-readable output
     output.heading("Service Status")
     if status_data["gui_server"]["running"]:
-        output.success(
-            f"GUI Server: Running"
-            f" (PID {status_data['gui_server']['pid']})"
-        )
+        output.success(f"GUI Server: Running (PID {status_data['gui_server']['pid']})")
         output.detail(f"URL: {status_data['gui_server']['url']}")
     else:
         output.detail("GUI Server: Not running")
@@ -91,9 +86,7 @@ def _status_callback() -> None:
     if status_data["config"]["exists"]:
         output.success("Config: Loaded")
         output.detail(f"Printers: {status_data['printers']['configured']}")
-        output.detail(
-            f"Labs: {', '.join(status_data['printers']['labs']) or 'none'}"
-        )
+        output.detail(f"Labs: {', '.join(status_data['printers']['labs']) or 'none'}")
     else:
         output.warning("Config: Not found")
         output.detail("Run 'zday bootstrap' to initialize")
@@ -103,9 +96,7 @@ def _bootstrap_callback(
     ip_stub: str | None = typer.Option(
         None, "--ip-stub", "-i", help="IP stub for printer scan (e.g., 192.168.1)"
     ),
-    skip_scan: bool = typer.Option(
-        False, "--skip-scan", "-s", help="Skip printer network scan"
-    ),
+    skip_scan: bool = typer.Option(False, "--skip-scan", "-s", help="Skip printer network scan"),
     silent_scan: bool = typer.Option(
         False, "--silent-scan", help="Suppress per-IP scan output (show summary only)"
     ),
@@ -169,17 +160,12 @@ def _scan_progress(event: dict) -> None:
                 checked = event.get("checked", 0)
                 total = event.get("total", 255)
                 ip_addr = event.get("ip", "")
-                output.print_text(
-                    f"  [{checked + 1}/{total}] Probing {ip_addr}..."
-                )
+                output.print_text(f"  [{checked + 1}/{total}] Probing {ip_addr}...")
             elif kind == "found":
                 ip_addr = event.get("ip", "")
                 model = event.get("model", "Unknown")
                 serial = event.get("serial", "Unknown")
-                output.success(
-                    f"Found printer at {ip_addr}"
-                    f"  model={model}  serial={serial}"
-                )
+                output.success(f"Found printer at {ip_addr}  model={model}  serial={serial}")
             elif kind == "done":
                 checked = event.get("checked", 0)
                 total = event.get("total", 255)
@@ -218,24 +204,19 @@ def _scan_progress(event: dict) -> None:
         if not mkcert.is_mkcert_installed():
             output.warning("mkcert not installed")
             output.detail(
-                "Install with: brew install mkcert (macOS) or "
-                "sudo apt install mkcert (Ubuntu)"
+                "Install with: brew install mkcert (macOS) or sudo apt install mkcert (Ubuntu)"
             )
         elif not mkcert.is_ca_installed():
             output.warning("mkcert CA not installed")
-            output.detail(
-                "Run: mkcert -install (one-time, requires password)"
-            )
+            output.detail("Run: mkcert -install (one-time, requires password)")
         elif mkcert.certificates_exist():
             output.success(f"Certificates exist: {mkcert.CERT_FILE}")
             certs_generated = True
             cert_path_str = str(mkcert.CERT_FILE)
         else:
             output.detail("Generating certificates...")
             if mkcert.generate_certificates():
-                output.success(
-                    f"Certificates generated: {mkcert.CERT_FILE}"
-                )
+                output.success(f"Certificates generated: {mkcert.CERT_FILE}")
                 certs_generated = True
                 cert_path_str = str(mkcert.CERT_FILE)
             else:
@@ -260,4 +241,3 @@ def _scan_progress(event: dict) -> None:
     output.detail("zday gui start     Start the web UI")
     output.detail("zday printer list  Show configured printers")
     output.detail("zday info          Show configuration details")
-

zebra_day/cli/simulator.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import signal
-import sys
 import time
 from typing import TYPE_CHECKING
 
@@ -61,9 +60,7 @@ def sim_start(
 
     mgr = _get_manager()
     try:
-        printer = mgr.start_printer(
-            host=host, zpl_port=zpl_port, http_port=http_port, profile=profile
-        )
+        mgr.start_printer(host=host, zpl_port=zpl_port, http_port=http_port, profile=profile)
     except RuntimeError as exc:
         output.error(str(exc))
         raise typer.Exit(1) from None
@@ -128,4 +125,3 @@ def sim_list() -> None:
 def register(registry: CommandRegistry, spec: CliSpec) -> None:
     """cli-core-yo plugin: register the simulator command group."""
     registry.add_typer_app(None, sim_app, "simulator", "Mock Zebra printer simulator")
-