drun 2.3.4__tar.gz → 2.4.2__tar.gz

{drun-2.3.4 → drun-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drun
-Version: 2.3.4
+Version: 2.4.2
 Summary: Minimal HTTP API test runner (MVP)
 Author: Drun Team
 Requires-Python: >=3.10

{drun-2.3.4 → drun-2.4.2}/drun/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "2.3.3"
+__version__ = "2.4.2"

{drun-2.3.4 → drun-2.4.2}/drun/cli.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
 import json
-import sys
 import os
+import re
+import sys
+import time
+import unicodedata
+from importlib import metadata as _im
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
 import typer
-from importlib import metadata as _im
 import yaml
 
 from drun.loader.collector import discover, match_tags
@@ -23,11 +26,31 @@ from drun.models.report import RunReport
 from drun.reporter.json_reporter import write_json
 from drun.runner.runner import Runner
 from drun.templating.engine import TemplateEngine
+from drun.utils.config import get_system_name
+from drun.utils.errors import LoadError
 from drun.utils.logging import setup_logging, get_logger
-import time
 
 
-from drun.utils.errors import LoadError
+def _sanitize_filename_component(value: str, fallback: str) -> str:
+    value = (value or "").strip()
+    if not value:
+        return fallback
+    normalized = unicodedata.normalize("NFKC", value)
+    invalid_chars = {'<', '>', ':', '"', '/', '\\', '|', '?', '*'}
+    cleaned_chars = []
+    for ch in normalized.lower():
+        if ord(ch) < 32:
+            cleaned_chars.append("-")
+            continue
+        if ch in invalid_chars:
+            cleaned_chars.append("-")
+            continue
+        cleaned_chars.append(ch)
+    candidate = "".join(cleaned_chars)
+    candidate = re.sub(r"\s+", "-", candidate)
+    candidate = re.sub(r"-{2,}", "-", candidate)
+    candidate = candidate.strip(" .-")
+    return candidate or fallback
 
 
 def _resolve_env_file_alias(value: str) -> tuple[str, bool, List[str]]:
@@ -1072,7 +1095,9 @@ def run(
     """运行测试用例或测试套件"""
     # default log file path
     ts = time.strftime("%Y%m%d-%H%M%S")
-    default_log = log_file or f"logs/run-{ts}.log"
+    system_name = get_system_name()
+    log_component = _sanitize_filename_component(system_name, "run")
+    default_log = log_file or f"logs/{log_component}-{ts}.log"
     setup_logging(log_level, log_file=default_log)
     log = get_logger("drun.cli")
     # unify httpx logs: default suppress, unless enabled
@@ -1264,7 +1289,8 @@ def run(
             s.get("steps_skipped", 0),
         )
 
-    html_target = html or f"reports/report-{ts}.html"
+    html_component = _sanitize_filename_component(system_name, "report")
+    html_target = html or f"reports/{html_component}-{ts}.html"
 
     if report:
         write_json(report_obj, report)

drun-2.4.2/drun/utils/config.py

@@ -0,0 +1,15 @@
+"""
+配置工具模块
+提供统一的配置访问接口
+"""
+import os
+
+
+def get_system_name():
+    """
+    获取系统名称，优先级：SYSTEM_NAME > PROJECT_NAME > "Drun"
+
+    Returns:
+        str: 系统名称
+    """
+    return os.environ.get("SYSTEM_NAME") or os.environ.get("PROJECT_NAME", "Drun")

{drun-2.3.4 → drun-2.4.2}/drun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drun
-Version: 2.3.4
+Version: 2.4.2
 Summary: Minimal HTTP API test runner (MVP)
 Author: Drun Team
 Requires-Python: >=3.10

{drun-2.3.4 → drun-2.4.2}/drun.egg-info/SOURCES.txt

@@ -52,6 +52,7 @@ drun/templating/builtins.py
 drun/templating/context.py
 drun/templating/engine.py
 drun/utils/__init__.py
+drun/utils/config.py
 drun/utils/curl.py
 drun/utils/errors.py
 drun/utils/logging.py

{drun-2.3.4 → drun-2.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "drun"
-version = "2.3.4"
+version = "2.4.2"
 description = "Minimal HTTP API test runner (MVP)"
 requires-python = ">=3.10"
 authors = [{ name = "Drun Team" }]