deploynator 1.3.0__tar.gz → 1.3.3__tar.gz

{deploynator-1.3.0 → deploynator-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: deploynator
-Version: 1.3.0
+Version: 1.3.3
 Summary: Multi-platform deployer for GitHub, GitLab, and Bitbucket
 Project-URL: Homepage, https://github.com/grisuno/deploynator
 Project-URL: Repository, https://github.com/grisuno/deploynator
@@ -260,55 +260,22 @@ Deployed with [deploynator](https://github.com/grisuno/deploynator)
 ## Knowledge Base
 
 This project has been analyzed by [ReadMenator](https://github.com/grisuno/ReadMenator),
-a zero-token polyglot static analysis tool. Regenerate with
-`pip install readmenator && readmenator . --rebuild`. Analysis outputs:
+a zero-token polyglot static analysis tool. Analysis outputs are available:
 
 - **[KNOWLEDGE_BASE.md](./KNOWLEDGE_BASE.md)** -- Full architecture reference with all
   classes, functions, imports, dependency graphs, UML class diagrams, security
-  audit findings, community analysis, taint paths, hotspots, cycles, and more.
+  audit findings, community analysis, and more.
 - **[readmenator-agent/](./readmenator-agent/)** -- Agent-friendly, grep-optimized index.
   - `INDEX.md` -- Quick reference: what each file does
-  - `SYMBOLS.md` -- Every symbol with file:line
-  - `ARCHITECTURE.md` -- Internal dependency pairs + external imports
   - `API.md` -- Public function contracts
-  - `GOTCHAS.md` -- Change warnings (blast radius, cycles, hotspots)
-  - `SECURITY.md` -- Findings by severity with fix hints
-  - `MEMORY.md` -- Rules, workflow, style, deliverables, session log
-  - `MANIFEST.json` -- Freshness (git_commit + source_fingerprint) + read order
-  - `KB_<subsystem>.md` -- Per-subsystem context
-  - `recipes/*.md` -- Grounded task guides (add-function, fix-cycle, ...)
+  - `GOTCHAS.md` -- Change warnings
+  - `SECURITY.md` -- Findings by severity
 - **[readmenator-wiki/](./readmenator-wiki/)** -- Navigable wiki (start here for the big picture).
   - `index.md` -- Entry point: overview, reading order, god nodes, connections
   - `community_*.md` -- One synthesis page per code community
-  - `connections.json` -- Typed bridges between communities
-  - `queries.md` -- Suggested questions + answer log
   - `REPORT.md` -- Honest audit: coverage, confidence, limits
-- **[readmenator-graphrag/](./readmenator-graphrag/)** -- Zero-token GraphRAG index.
-  - `index.json` + `REPORTS.md` -- Query with `readmenator . ask "<question>"`
-- **[readmenator-apidocs/](./readmenator-apidocs/)** -- API reference (Sphinx/Doxygen style).
-  - `index.md` + `modules/*.md` -- Signatures, parameters, returns, raises, examples, call graphs
-  - `architecture.md` -- Tiered architecture + execution flows (control flow, call tree, sequence)
-  - `classes.md`, `genindex.md`, `COVERAGE.md` -- Hierarchy, A-Z index, doc coverage + warnings
-  - `index.html` + `api/` -- Offline searchable browser and machine-readable model (`api/index.json`, `api/modules/*.jsonl` one entity per line)
-- **[readmenator-maps/](./readmenator-maps/)** -- Interactive gallery (`index.html`).
-  - 5 system maps: architecture, workflow, sequence, dataflow, lifecycle
-  - `graph-force.html` -- Force-graph explorer (2D/3D, reach, paths, lenses)
-  - `graph-bundle.html` -- Edge bundle explorer (circle + sphere)
-  - `components.html` -- Component diagrams
-- **[docs/](./docs/)** -- Static site (GitHub Pages ready).
-  - Gallery copy + `llms.txt` (agent entry point) + `md/` docs + video
-- **[readmenator-diagrams/](./readmenator-diagrams/)** -- Component diagrams.
-  - `analysis.json` + `graph LR` markdown + per-component pages + `index.html`
-- **[readmenator-rules/](./readmenator-rules/)** -- Suggested Semgrep rules (`*.yml`),
-  `yara_rules.yar` (YARA-lite) + `exclusions.yaml` (false-positive blocklist)
-- **[readmenator.mp4](./readmenator.mp4)** -- Cinematic synthwave overview video
-- **[.cursorrules](./.cursorrules)** -- Generated AI assistant rules
-- **[readmenator_audit.sarif](./readmenator_audit.sarif)** -- SARIF v2.1.0 audit (when security scan is on)
-
-Cache (`.readmenator_cache/`), packaged agent skills (`.claude/skills/`), and the
-GitHub wiki mirror are also produced on `run`/`--rebuild`.
 
 AI agents: Read `readmenator-wiki/index.md` first for the big picture, then `readmenator-agent/INDEX.md` for grep-friendly lookup.
-Developers: Read `KNOWLEDGE_BASE.md` for full architecture reference, open `readmenator-maps/index.html` for the visual gallery.
+Developers: Read `KNOWLEDGE_BASE.md` for full architecture reference.
 <!-- /readmenator-kb-link -->
 

{deploynator-1.3.0 → deploynator-1.3.3}/README.md

@@ -226,55 +226,22 @@ Deployed with [deploynator](https://github.com/grisuno/deploynator)
 ## Knowledge Base
 
 This project has been analyzed by [ReadMenator](https://github.com/grisuno/ReadMenator),
-a zero-token polyglot static analysis tool. Regenerate with
-`pip install readmenator && readmenator . --rebuild`. Analysis outputs:
+a zero-token polyglot static analysis tool. Analysis outputs are available:
 
 - **[KNOWLEDGE_BASE.md](./KNOWLEDGE_BASE.md)** -- Full architecture reference with all
   classes, functions, imports, dependency graphs, UML class diagrams, security
-  audit findings, community analysis, taint paths, hotspots, cycles, and more.
+  audit findings, community analysis, and more.
 - **[readmenator-agent/](./readmenator-agent/)** -- Agent-friendly, grep-optimized index.
   - `INDEX.md` -- Quick reference: what each file does
-  - `SYMBOLS.md` -- Every symbol with file:line
-  - `ARCHITECTURE.md` -- Internal dependency pairs + external imports
   - `API.md` -- Public function contracts
-  - `GOTCHAS.md` -- Change warnings (blast radius, cycles, hotspots)
-  - `SECURITY.md` -- Findings by severity with fix hints
-  - `MEMORY.md` -- Rules, workflow, style, deliverables, session log
-  - `MANIFEST.json` -- Freshness (git_commit + source_fingerprint) + read order
-  - `KB_<subsystem>.md` -- Per-subsystem context
-  - `recipes/*.md` -- Grounded task guides (add-function, fix-cycle, ...)
+  - `GOTCHAS.md` -- Change warnings
+  - `SECURITY.md` -- Findings by severity
 - **[readmenator-wiki/](./readmenator-wiki/)** -- Navigable wiki (start here for the big picture).
   - `index.md` -- Entry point: overview, reading order, god nodes, connections
   - `community_*.md` -- One synthesis page per code community
-  - `connections.json` -- Typed bridges between communities
-  - `queries.md` -- Suggested questions + answer log
   - `REPORT.md` -- Honest audit: coverage, confidence, limits
-- **[readmenator-graphrag/](./readmenator-graphrag/)** -- Zero-token GraphRAG index.
-  - `index.json` + `REPORTS.md` -- Query with `readmenator . ask "<question>"`
-- **[readmenator-apidocs/](./readmenator-apidocs/)** -- API reference (Sphinx/Doxygen style).
-  - `index.md` + `modules/*.md` -- Signatures, parameters, returns, raises, examples, call graphs
-  - `architecture.md` -- Tiered architecture + execution flows (control flow, call tree, sequence)
-  - `classes.md`, `genindex.md`, `COVERAGE.md` -- Hierarchy, A-Z index, doc coverage + warnings
-  - `index.html` + `api/` -- Offline searchable browser and machine-readable model (`api/index.json`, `api/modules/*.jsonl` one entity per line)
-- **[readmenator-maps/](./readmenator-maps/)** -- Interactive gallery (`index.html`).
-  - 5 system maps: architecture, workflow, sequence, dataflow, lifecycle
-  - `graph-force.html` -- Force-graph explorer (2D/3D, reach, paths, lenses)
-  - `graph-bundle.html` -- Edge bundle explorer (circle + sphere)
-  - `components.html` -- Component diagrams
-- **[docs/](./docs/)** -- Static site (GitHub Pages ready).
-  - Gallery copy + `llms.txt` (agent entry point) + `md/` docs + video
-- **[readmenator-diagrams/](./readmenator-diagrams/)** -- Component diagrams.
-  - `analysis.json` + `graph LR` markdown + per-component pages + `index.html`
-- **[readmenator-rules/](./readmenator-rules/)** -- Suggested Semgrep rules (`*.yml`),
-  `yara_rules.yar` (YARA-lite) + `exclusions.yaml` (false-positive blocklist)
-- **[readmenator.mp4](./readmenator.mp4)** -- Cinematic synthwave overview video
-- **[.cursorrules](./.cursorrules)** -- Generated AI assistant rules
-- **[readmenator_audit.sarif](./readmenator_audit.sarif)** -- SARIF v2.1.0 audit (when security scan is on)
-
-Cache (`.readmenator_cache/`), packaged agent skills (`.claude/skills/`), and the
-GitHub wiki mirror are also produced on `run`/`--rebuild`.
 
 AI agents: Read `readmenator-wiki/index.md` first for the big picture, then `readmenator-agent/INDEX.md` for grep-friendly lookup.
-Developers: Read `KNOWLEDGE_BASE.md` for full architecture reference, open `readmenator-maps/index.html` for the visual gallery.
+Developers: Read `KNOWLEDGE_BASE.md` for full architecture reference.
 <!-- /readmenator-kb-link -->
 

{deploynator-1.3.0 → deploynator-1.3.3}/deploynator/__init__.py

@@ -1,4 +1,4 @@
 from deploynator._app import DeploynatorApp
 
-__version__ = "1.3.0"
+__version__ = "1.3.3"
 __all__ = ["DeploynatorApp"]

{deploynator-1.3.0 → deploynator-1.3.3}/deploynator/_app.py

@@ -128,6 +128,8 @@ ensure_pkg() {
 
 ensure_pkg deploynator deploynator "git+https://github.com/grisuno/deploynator.git"
 ensure_pkg readmenator readmenator readmenator
+ensure_pkg build build build
+ensure_pkg twine twine twine
 
 if ! python3 -c "import deploynator" 2>/dev/null; then
     echo "[!] deploynator not available and install failed (offline?)." >&2
@@ -195,8 +197,35 @@ version:
 
         toml_path = os.path.join(base, "deploynator.toml")
         if not os.path.isfile(toml_path):
+            from deploynator._toml import detect_test_commands, _has_python_tests
+            inferred: list[str] | None = None
+            try:
+                detected = detect_test_commands(base)
+                if detected is not None and not (
+                    detected != ["make test-host"]
+                    and detected[0].startswith("make")
+                    and _has_python_tests(base)
+                ):
+                    inferred = detected
+            except ValueError:
+                inferred = None
+            if inferred is not None:
+                commands_repr = "[" + ", ".join(f'"{c}"' for c in inferred) + "]"
+                timeout = 900
+            else:
+                commands_repr = '["python -m pytest tests/ -q"]'
+                timeout = 300
+            content = self.DEPLOY_TOML_TEMPLATE.format(name=project_name)
+            content = content.replace(
+                'commands = ["python -m pytest tests/ -q"]',
+                f"commands = {commands_repr}",
+            ).replace(
+                "timeout_s = 300",
+                f"timeout_s = {timeout}",
+                1,
+            )
             with open(toml_path, "w") as f:
-                f.write(self.DEPLOY_TOML_TEMPLATE.format(name=project_name))
+                f.write(content)
             created.append(toml_path)
 
         script_path = os.path.join(base, "deploy.sh")

deploynator-1.3.3/deploynator/_toml.py

@@ -0,0 +1,287 @@
+from __future__ import annotations
+
+import os
+from dataclasses import dataclass
+
+from deploynator._config import Config
+
+TOML_FILENAME = "deploynator.toml"
+DEFAULT_TEST_COMMANDS: list[str] = ["python -m pytest tests/ -q"]
+DEFAULT_DOCS_COMMAND = "python -m readmenator . --rebuild"
+
+# Auto-detección C: nombres de Makefile y targets preferidos.
+# `test-host` va primero porque en proyectos como miniOS `test`
+# requiere QEMU/imagen (lento), mientras `test-host` corre las
+# suites unitarias rápidas en el host (contrato CI).
+MAKEFILE_NAMES: tuple[str, ...] = ("Makefile", "makefile", "GNUmakefile")
+MAKE_TEST_PRIORITY: list[str] = ["test-host", "test", "check", "tests"]
+C_TEST_TIMEOUT_S: int = 900
+
+_TARGET_RE = None
+
+
+def _target_regex():  # type: ignore[no-untyped-def]
+    global _TARGET_RE
+    if _TARGET_RE is None:
+        import re
+        _TARGET_RE = re.compile(r"^([A-Za-z0-9_][A-Za-z0-9_.\-]*)\s*:(?!=)")
+    return _TARGET_RE
+
+
+def list_make_targets(project_path: str) -> list[str]:
+    """Lee el Makefile y devuelve sus targets sin ejecutar nada.
+
+    Seguro: rechaza symlinks, limita tamaño (Config.max_file_size_bytes).
+    """
+    makefile = ""
+    for name in MAKEFILE_NAMES:
+        candidate = os.path.join(project_path, name)
+        if os.path.islink(candidate):
+            raise ValueError(f"Symlink rejected: {candidate}")
+        if os.path.isfile(candidate):
+            makefile = candidate
+            break
+    if not makefile:
+        return []
+    if os.path.getsize(makefile) > Config.create().max_file_size_bytes:
+        raise ValueError(f"File too large: {makefile}")
+    targets: list[str] = []
+    try:
+        with open(makefile, "r", errors="replace") as f:
+            for line in f:
+                # Solo targets al inicio de línea (sin indentación = no receta).
+                if line[:1] in (" ", "\t"):
+                    continue
+                m = _target_regex().match(line.strip())
+                if m and m.group(1) not in targets:
+                    if not m.group(1).startswith("."):
+                        targets.append(m.group(1))
+    except OSError as exc:
+        raise ValueError(f"Cannot read Makefile: {exc}") from exc
+    return targets
+
+
+def _has_python_tests(project_path: str) -> bool:
+    tests_dir = os.path.join(project_path, "tests")
+    if not os.path.isdir(tests_dir):
+        return False
+    try:
+        for entry in os.listdir(tests_dir):
+            if entry.endswith(".py"):
+                return True
+    except OSError:
+        return False
+
+
+def looks_like_packaging_project(project_path: str) -> bool:
+    """Inferencia runtime (multi-proyecto): ¿es un paquete PyPI?
+
+    Espejo liviano de PyPIRunner.is_packaging_project sin importar
+    _pypi (evita ciclo). El gate final sigue en PyPIRunner al
+    desplegar; aquí solo se usa para el default de pypi_enabled.
+    """
+    pyproject = os.path.join(project_path, "pyproject.toml")
+    if os.path.isfile(pyproject) and not os.path.islink(pyproject):
+        try:
+            import tomllib
+            with open(pyproject, "rb") as f:
+                data = tomllib.load(f)
+            project = data.get("project", {})
+            if isinstance(project, dict) and project.get("name"):
+                return True
+        except Exception:
+            pass
+    for candidate in ("setup.py", "setup.cfg"):
+        candidate_path = os.path.join(project_path, candidate)
+        if os.path.isfile(candidate_path) and not os.path.islink(candidate_path):
+            return True
+    return False
+    return False
+
+
+def detect_test_commands(project_path: str) -> list[str] | None:
+    """Detecta comandos de test para proyectos C/autotools sin toml.
+
+    Runtime multi-proyecto, sin hardcodear nombres de proyecto:
+    Makefile (test-host canónico solo; si no, TODOS los targets de
+    test en una sola invocación `make test test-* ...`, p. ej.
+    `make test test-dsp test-transport`) → CMake (build+ctest) →
+    meson (setup+test).
+    Devuelve None si no hay nada detectable (caller usa pytest default).
+    """
+    try:
+        targets = list_make_targets(project_path)
+    except ValueError:
+        targets = []
+    if targets:
+        # `test-host` es la suite canónica (drivers internos propios):
+        # va sola, manda sobre todo (incluso sobre tests/*.py).
+        if "test-host" in targets:
+            return ["make test-host"]
+        combined: list[str] = []
+        for preferred in MAKE_TEST_PRIORITY[1:]:
+            # `tests` desnudo suele ser helper mkdir (dependencia order-only
+            # `| tests`), no runner: se excluye si hay otro target de test.
+            if preferred == "tests" and any(
+                t in targets for t in ("test", "check")
+            ):
+                continue
+            if preferred in targets and preferred not in combined:
+                combined.append(preferred)
+        for extra in sorted(t for t in targets
+                            if (t.startswith("test-") or t.startswith("test_"))
+                            and t not in combined):
+            combined.append(extra)
+        if combined:
+            return [f"make {' '.join(combined)}"]
+        # Makefile sin target de test: al menos verifica que compila.
+        if "all" in targets:
+            return ["make"]
+        return ["make"]
+    if os.path.isfile(os.path.join(project_path, "CMakeLists.txt")):
+        return [
+            "cmake -S . -B build",
+            "cmake --build build",
+            "ctest --test-dir build",
+        ]
+    if os.path.isfile(os.path.join(project_path, "meson.build")):
+        return ["meson setup build", "meson test -C build"]
+    return None
+
+
+def _auto_toml_config(project_path: str) -> TomlConfig | None:
+    """Config auto para proyectos sin deploynator.toml (C primero).
+
+    Multi-proyecto: pypi_enabled se infiere al vuelo de los ficheros
+    de packaging (pyproject/setup.py/setup.cfg); el gate final sigue
+    en PyPIRunner.is_packaging_project al desplegar.
+    """
+    detected = detect_test_commands(project_path)
+    if detected is None:
+        return None
+    # `make test-host` es la suite canónica C (incluye sus propios
+    # drivers python internos): manda incluso si hay tests/*.py.
+    # Para el resto, si hay tests Python reales se conserva pytest
+    # (evita romper proyectos Python con Makefile auxiliar).
+    if detected != ["make test-host"] and detected[0].startswith("make") and _has_python_tests(project_path):
+        return None
+    name = os.path.basename(os.path.abspath(project_path))
+    return TomlConfig(
+        project_name=name,
+        test_commands=detected,
+        test_timeout_s=C_TEST_TIMEOUT_S,
+        docs_auto=True,
+        pypi_enabled=looks_like_packaging_project(project_path),
+    )
+
+
+@dataclass(frozen=True)
+class TomlConfig:
+    project_name: str = ""
+    version_file: str = "version.json"
+    test_commands: list[str] = None  # type: ignore[assignment]
+    test_timeout_s: int = 300
+    allow_no_tests: bool = False
+    docs_auto: bool = True
+    docs_command: str = DEFAULT_DOCS_COMMAND
+    docs_timeout_s: int = 300
+    deploy_branch: str = "main"
+    deploy_remote: str = "origin"
+    pypi_enabled: bool = True
+    pypi_repo: str = "pypi"
+    pypi_clean_dist: bool = True
+    pypi_timeout_s: int = 600
+
+    def __post_init__(self) -> None:
+        if self.test_commands is None:
+            object.__setattr__(self, "test_commands", list(DEFAULT_TEST_COMMANDS))
+        object.__setattr__(self, "test_timeout_s", _clamp_timeout(self.test_timeout_s))
+        object.__setattr__(self, "docs_timeout_s", _clamp_timeout(self.docs_timeout_s))
+        object.__setattr__(self, "pypi_timeout_s", _clamp_timeout(self.pypi_timeout_s))
+
+
+def _clamp_timeout(value: int) -> int:
+    try:
+        v = int(value)
+    except (TypeError, ValueError):
+        return 300
+    return max(1, min(3600, v))
+
+
+def load_toml_config(project_path: str) -> TomlConfig:
+    toml_path = os.path.join(project_path, TOML_FILENAME)
+    if os.path.islink(toml_path):
+        raise ValueError(f"Symlink rejected: {toml_path}")
+    if not os.path.isfile(toml_path):
+        auto = _auto_toml_config(project_path)
+        if auto is not None:
+            return auto
+        return TomlConfig(project_name=os.path.basename(os.path.abspath(project_path)))
+    if os.path.getsize(toml_path) > Config.create().max_file_size_bytes:
+        raise ValueError(f"File too large: {toml_path}")
+    try:
+        import tomllib
+    except ImportError as exc:
+        raise ValueError(f"tomllib unavailable: {exc}") from exc
+    try:
+        with open(toml_path, "rb") as f:
+            data = tomllib.load(f)
+    except Exception as exc:
+        raise ValueError(f"Invalid {TOML_FILENAME}: {exc}") from exc
+    if not isinstance(data, dict):
+        raise ValueError(f"Invalid {TOML_FILENAME}: root must be a table")
+
+    project_raw = data.get("project", {}) or {}
+    tests_raw = data.get("tests", {}) or {}
+    docs_raw = data.get("docs", {}) or {}
+    deploy_raw = data.get("deploy", {}) or {}
+    pypi_raw = data.get("pypi", {}) or {}
+
+    if not isinstance(project_raw, dict) or not isinstance(tests_raw, dict):
+        raise ValueError(f"Invalid {TOML_FILENAME}: bad sections")
+    if not isinstance(docs_raw, dict) or not isinstance(deploy_raw, dict):
+        raise ValueError(f"Invalid {TOML_FILENAME}: bad sections")
+    if not isinstance(pypi_raw, dict):
+        raise ValueError(f"Invalid {TOML_FILENAME}: bad sections")
+
+    _sentinel: list[str] = []  # type: ignore[assignment]
+    commands = tests_raw.get("commands", _sentinel)
+    if commands is _sentinel:
+        # Sin [tests]commands explícito: auto-detect C, si no pytest.
+        detected = detect_test_commands(project_path)
+        if detected is not None and not (
+            detected != ["make test-host"]
+            and detected[0].startswith("make")
+            and _has_python_tests(project_path)
+        ):
+            commands = detected
+            default_timeout = C_TEST_TIMEOUT_S
+        else:
+            commands = list(DEFAULT_TEST_COMMANDS)
+            default_timeout = 300
+    elif commands is None:
+        commands = list(DEFAULT_TEST_COMMANDS)
+        default_timeout = 300
+    else:
+        default_timeout = 300
+    if not isinstance(commands, list) or not all(isinstance(c, str) for c in commands):
+        raise ValueError(f"Invalid {TOML_FILENAME}: [tests] commands must be list[str]")
+
+    raw_timeout = tests_raw.get("timeout_s", default_timeout)
+
+    return TomlConfig(
+        project_name=str(project_raw.get("name", "") or os.path.basename(os.path.abspath(project_path))),
+        version_file=str(project_raw.get("version_file", "version.json")),
+        test_commands=list(commands),
+        test_timeout_s=_clamp_timeout(raw_timeout),
+        allow_no_tests=bool(tests_raw.get("allow_no_tests", False)),
+        docs_auto=bool(docs_raw.get("auto", True)),
+        docs_command=str(docs_raw.get("command", DEFAULT_DOCS_COMMAND)),
+        docs_timeout_s=_clamp_timeout(docs_raw.get("timeout_s", 300)),
+        deploy_branch=str(deploy_raw.get("branch", "main")),
+        deploy_remote=str(deploy_raw.get("remote", "origin")),
+        pypi_enabled=bool(pypi_raw.get("enabled", True)),
+        pypi_repo=str(pypi_raw.get("repo", "pypi")),
+        pypi_clean_dist=bool(pypi_raw.get("clean_dist", True)),
+        pypi_timeout_s=_clamp_timeout(pypi_raw.get("timeout_s", 600)),
+    )

{deploynator-1.3.0 → deploynator-1.3.3}/example.deploynator.toml

@@ -9,6 +9,10 @@ version_file = "version.json"
 [tests]
 # Comandos en orden. Se ejecutan con shell=False (shlex), cwd=project_path.
 # Default si falta el archivo: ["python -m pytest tests/ -q"]
+# Proyectos C sin toml: auto-detecta el Makefile (test-host > test > check,
+# o primer test-*; si no hay target de test usa `make`). CMake/meson
+# también se detectan. Ejemplo C explícito:
+# commands = ["make test-host"]
 commands = ["python -m pytest tests/ -q"]
 timeout_s = 300
 # Si true y commands=[] → pasa sin tests. Si false y sin tests/ → falla.

{deploynator-1.3.0 → deploynator-1.3.3}/tests/test_runner.py

@@ -101,6 +101,20 @@ class TestTestRunner:
             ok, out = r.run(tmp, _toml([""]))
             assert ok is False
 
+    def test_make_target_runs(self):
+        from deploynator._runner import TestRunner
+        from deploynator._config import Config
+        import shutil
+        if shutil.which("make") is None:
+            pytest.skip("make not available")
+        r = TestRunner(Config.create())
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, "Makefile"), "w") as f:
+                f.write("test-host:\n\techo host-ok\n")
+            ok, out = r.run(tmp, _toml(["make test-host"]))
+            assert ok is True
+            assert "host-ok" in out
+
 
 class TestDocsRunner:
     def test_passing_docs(self):

deploynator-1.3.3/tests/test_toml.py

@@ -0,0 +1,216 @@
+"""RED: TomlConfig contract — deploynator.toml per-project."""
+import os
+import tempfile
+import pytest
+
+
+class TestTomlConfig:
+    def test_load_missing_returns_defaults(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            cfg = load_toml_config(tmp)
+            assert cfg.project_name == os.path.basename(tmp) or cfg.project_name == ""
+            assert cfg.test_commands == ["python -m pytest tests/ -q"]
+            assert cfg.test_timeout_s == 300
+            assert cfg.docs_auto is True
+            assert "readmenator" in cfg.docs_command
+
+    def test_load_valid_toml(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
+                f.write(
+                    '[project]\nname = "my-app"\nversion_file = "VERSION"\n\n'
+                    '[tests]\ncommands = ["pytest -q", "ruff check ."]\ntimeout_s = 60\n'
+                    '[docs]\nauto = false\n'
+                    '[deploy]\nbranch = "develop"\nremote = "upstream"\n'
+                )
+            cfg = load_toml_config(tmp)
+            assert cfg.project_name == "my-app"
+            assert cfg.version_file == "VERSION"
+            assert cfg.test_commands == ["pytest -q", "ruff check ."]
+            assert cfg.test_timeout_s == 60
+            assert cfg.docs_auto is False
+            assert cfg.deploy_branch == "develop"
+            assert cfg.deploy_remote == "upstream"
+
+    def test_symlink_rejected(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            real = os.path.join(tmp, "real.toml")
+            with open(real, "w") as f:
+                f.write('[project]\nname="x"\n')
+            link = os.path.join(tmp, "deploynator.toml")
+            os.symlink(real, link)
+            with pytest.raises(ValueError, match="Symlink"):
+                load_toml_config(tmp)
+
+    def test_oversize_rejected(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
+                f.write("#" * (10_485_760 + 1))
+            with pytest.raises(ValueError, match="too large"):
+                load_toml_config(tmp)
+
+    def test_malformed_toml_raises(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
+                f.write("[tests\ncommands = [[[invalid")
+            with pytest.raises(ValueError):
+                load_toml_config(tmp)
+
+    def test_timeout_clamped(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
+                f.write("[tests]\ntimeout_s = 999999\n")
+            cfg = load_toml_config(tmp)
+            assert cfg.test_timeout_s <= 3600
+            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
+                f.write("[tests]\ntimeout_s = 0\n")
+            cfg = load_toml_config(tmp)
+            assert cfg.test_timeout_s >= 1
+
+    def test_frozen(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            cfg = load_toml_config(tmp)
+            with pytest.raises(Exception):
+                cfg.project_name = "mutated"
+
+
+class TestCMakefileDetection:
+    def _mk(self, tmp, content="all:\n\techo hi\ntest-host:\n\techo host\ntest:\n\techo t\n"):
+        with open(os.path.join(tmp, "Makefile"), "w") as f:
+            f.write(content)
+
+    def test_list_targets_ignores_recipes(self):
+        from deploynator._toml import list_make_targets
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "all:\n\techo hi\ntest-host:\n\techo host\n")
+            targets = list_make_targets(tmp)
+            assert "all" in targets
+            assert "test-host" in targets
+            assert "echo hi" not in targets
+
+    def test_detect_prefers_test_host(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp)
+            assert detect_test_commands(tmp) == ["make test-host"]
+
+    def test_detect_falls_back_to_test(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "all:\n\techo hi\ntest:\n\techo t\n")
+            assert detect_test_commands(tmp) == ["make test"]
+
+    def test_detect_falls_back_to_check(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "all:\n\techo hi\ncheck:\n\techo c\n")
+            assert detect_test_commands(tmp) == ["make check"]
+
+    def test_detect_cmake(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            with open(os.path.join(tmp, "CMakeLists.txt"), "w") as f:
+                f.write("cmake_minimum_required(VERSION 3.10)\n")
+            cmds = detect_test_commands(tmp)
+            assert cmds is not None and any("ctest" in c for c in cmds)
+
+    def test_load_missing_makefile_uses_make(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test-host:\n\techo host\n")
+            cfg = load_toml_config(tmp)
+            assert cfg.test_commands == ["make test-host"]
+            assert cfg.test_timeout_s == 900
+            assert cfg.pypi_enabled is False
+
+    def test_python_with_aux_makefile_keeps_pytest(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test:\n\techo t\n")
+            os.makedirs(os.path.join(tmp, "tests"))
+            with open(os.path.join(tmp, "tests", "test_x.py"), "w") as f:
+                f.write("def test_x(): pass\n")
+            cfg = load_toml_config(tmp)
+            assert cfg.test_commands == ["python -m pytest tests/ -q"]
+
+    def test_test_host_wins_over_python_tests(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test-host:\n\techo host\ntest:\n\techo t\n")
+            os.makedirs(os.path.join(tmp, "tests"))
+            with open(os.path.join(tmp, "tests", "test_x.py"), "w") as f:
+                f.write("def test_x(): pass\n")
+            cfg = load_toml_config(tmp)
+            assert cfg.test_commands == ["make test-host"]
+
+    def test_makefile_symlink_rejected(self):
+        from deploynator._toml import list_make_targets
+        with tempfile.TemporaryDirectory() as tmp:
+            real = os.path.join(tmp, "RealMakefile")
+            with open(real, "w") as f:
+                f.write("test:\n\techo t\n")
+            os.symlink(real, os.path.join(tmp, "Makefile"))
+            with pytest.raises(ValueError, match="Symlink"):
+                list_make_targets(tmp)
+
+
+class TestMultiTargetAndPyPIInference:
+    """Runtime multi-proyecto: todos los targets test en una invocación
+    y pypi_enabled inferido de los ficheros de packaging."""
+
+    def _mk(self, tmp, content):
+        with open(os.path.join(tmp, "Makefile"), "w") as f:
+            f.write(content)
+
+    def test_detect_combines_test_targets(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test:\n\techo t\ntest-dsp:\n\techo d\n"
+                          "test-transport:\n\techo r\ntests:\n\tmkdir -p tests\n")
+            assert detect_test_commands(tmp) == ["make test test-dsp test-transport"]
+
+    def test_detect_test_host_alone_wins(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test-host:\n\techo h\ntest:\n\techo t\n"
+                          "test-dsp:\n\techo d\n")
+            assert detect_test_commands(tmp) == ["make test-host"]
+
+    def test_detect_bare_tests_alone_kept(self):
+        from deploynator._toml import detect_test_commands
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "tests:\n\techo t\n")
+            assert detect_test_commands(tmp) == ["make tests"]
+
+    def test_auto_pypi_enabled_for_packaging(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test:\n\techo t\n")
+            with open(os.path.join(tmp, "pyproject.toml"), "w") as f:
+                f.write('[project]\nname = "x"\nversion = "0.1.0"\n')
+            cfg = load_toml_config(tmp)
+            assert cfg.test_commands == ["make test"]
+            assert cfg.pypi_enabled is True
+
+    def test_auto_pypi_disabled_for_plain_c(self):
+        from deploynator._toml import load_toml_config
+        with tempfile.TemporaryDirectory() as tmp:
+            self._mk(tmp, "test:\n\techo t\n")
+            cfg = load_toml_config(tmp)
+            assert cfg.test_commands == ["make test"]
+            assert cfg.pypi_enabled is False
+
+    def test_looks_like_packaging_setup_py(self):
+        from deploynator._toml import looks_like_packaging_project
+        with tempfile.TemporaryDirectory() as tmp:
+            assert looks_like_packaging_project(tmp) is False
+            with open(os.path.join(tmp, "setup.py"), "w") as f:
+                f.write("from setuptools import setup\nsetup(name='x')\n")
+            assert looks_like_packaging_project(tmp) is True

deploynator-1.3.0/deploynator/_toml.py

@@ -1,100 +0,0 @@
-from __future__ import annotations
-
-import os
-from dataclasses import dataclass
-
-from deploynator._config import Config
-
-TOML_FILENAME = "deploynator.toml"
-DEFAULT_TEST_COMMANDS: list[str] = ["python -m pytest tests/ -q"]
-DEFAULT_DOCS_COMMAND = "python -m readmenator . --rebuild"
-
-
-@dataclass(frozen=True)
-class TomlConfig:
-    project_name: str = ""
-    version_file: str = "version.json"
-    test_commands: list[str] = None  # type: ignore[assignment]
-    test_timeout_s: int = 300
-    allow_no_tests: bool = False
-    docs_auto: bool = True
-    docs_command: str = DEFAULT_DOCS_COMMAND
-    docs_timeout_s: int = 300
-    deploy_branch: str = "main"
-    deploy_remote: str = "origin"
-    pypi_enabled: bool = True
-    pypi_repo: str = "pypi"
-    pypi_clean_dist: bool = True
-    pypi_timeout_s: int = 600
-
-    def __post_init__(self) -> None:
-        if self.test_commands is None:
-            object.__setattr__(self, "test_commands", list(DEFAULT_TEST_COMMANDS))
-        object.__setattr__(self, "test_timeout_s", _clamp_timeout(self.test_timeout_s))
-        object.__setattr__(self, "docs_timeout_s", _clamp_timeout(self.docs_timeout_s))
-        object.__setattr__(self, "pypi_timeout_s", _clamp_timeout(self.pypi_timeout_s))
-
-
-def _clamp_timeout(value: int) -> int:
-    try:
-        v = int(value)
-    except (TypeError, ValueError):
-        return 300
-    return max(1, min(3600, v))
-
-
-def load_toml_config(project_path: str) -> TomlConfig:
-    toml_path = os.path.join(project_path, TOML_FILENAME)
-    if os.path.islink(toml_path):
-        raise ValueError(f"Symlink rejected: {toml_path}")
-    if not os.path.isfile(toml_path):
-        return TomlConfig(project_name=os.path.basename(os.path.abspath(project_path)))
-    if os.path.getsize(toml_path) > Config.create().max_file_size_bytes:
-        raise ValueError(f"File too large: {toml_path}")
-    try:
-        import tomllib
-    except ImportError as exc:
-        raise ValueError(f"tomllib unavailable: {exc}") from exc
-    try:
-        with open(toml_path, "rb") as f:
-            data = tomllib.load(f)
-    except Exception as exc:
-        raise ValueError(f"Invalid {TOML_FILENAME}: {exc}") from exc
-    if not isinstance(data, dict):
-        raise ValueError(f"Invalid {TOML_FILENAME}: root must be a table")
-
-    project_raw = data.get("project", {}) or {}
-    tests_raw = data.get("tests", {}) or {}
-    docs_raw = data.get("docs", {}) or {}
-    deploy_raw = data.get("deploy", {}) or {}
-    pypi_raw = data.get("pypi", {}) or {}
-
-    if not isinstance(project_raw, dict) or not isinstance(tests_raw, dict):
-        raise ValueError(f"Invalid {TOML_FILENAME}: bad sections")
-    if not isinstance(docs_raw, dict) or not isinstance(deploy_raw, dict):
-        raise ValueError(f"Invalid {TOML_FILENAME}: bad sections")
-    if not isinstance(pypi_raw, dict):
-        raise ValueError(f"Invalid {TOML_FILENAME}: bad sections")
-
-    commands = tests_raw.get("commands", list(DEFAULT_TEST_COMMANDS))
-    if commands is None:
-        commands = list(DEFAULT_TEST_COMMANDS)
-    if not isinstance(commands, list) or not all(isinstance(c, str) for c in commands):
-        raise ValueError(f"Invalid {TOML_FILENAME}: [tests] commands must be list[str]")
-
-    return TomlConfig(
-        project_name=str(project_raw.get("name", "") or os.path.basename(os.path.abspath(project_path))),
-        version_file=str(project_raw.get("version_file", "version.json")),
-        test_commands=list(commands),
-        test_timeout_s=_clamp_timeout(tests_raw.get("timeout_s", 300)),
-        allow_no_tests=bool(tests_raw.get("allow_no_tests", False)),
-        docs_auto=bool(docs_raw.get("auto", True)),
-        docs_command=str(docs_raw.get("command", DEFAULT_DOCS_COMMAND)),
-        docs_timeout_s=_clamp_timeout(docs_raw.get("timeout_s", 300)),
-        deploy_branch=str(deploy_raw.get("branch", "main")),
-        deploy_remote=str(deploy_raw.get("remote", "origin")),
-        pypi_enabled=bool(pypi_raw.get("enabled", True)),
-        pypi_repo=str(pypi_raw.get("repo", "pypi")),
-        pypi_clean_dist=bool(pypi_raw.get("clean_dist", True)),
-        pypi_timeout_s=_clamp_timeout(pypi_raw.get("timeout_s", 600)),
-    )

deploynator-1.3.0/tests/test_toml.py

@@ -1,81 +0,0 @@
-"""RED: TomlConfig contract — deploynator.toml per-project."""
-import os
-import tempfile
-import pytest
-
-
-class TestTomlConfig:
-    def test_load_missing_returns_defaults(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            cfg = load_toml_config(tmp)
-            assert cfg.project_name == os.path.basename(tmp) or cfg.project_name == ""
-            assert cfg.test_commands == ["python -m pytest tests/ -q"]
-            assert cfg.test_timeout_s == 300
-            assert cfg.docs_auto is True
-            assert "readmenator" in cfg.docs_command
-
-    def test_load_valid_toml(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
-                f.write(
-                    '[project]\nname = "my-app"\nversion_file = "VERSION"\n\n'
-                    '[tests]\ncommands = ["pytest -q", "ruff check ."]\ntimeout_s = 60\n'
-                    '[docs]\nauto = false\n'
-                    '[deploy]\nbranch = "develop"\nremote = "upstream"\n'
-                )
-            cfg = load_toml_config(tmp)
-            assert cfg.project_name == "my-app"
-            assert cfg.version_file == "VERSION"
-            assert cfg.test_commands == ["pytest -q", "ruff check ."]
-            assert cfg.test_timeout_s == 60
-            assert cfg.docs_auto is False
-            assert cfg.deploy_branch == "develop"
-            assert cfg.deploy_remote == "upstream"
-
-    def test_symlink_rejected(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            real = os.path.join(tmp, "real.toml")
-            with open(real, "w") as f:
-                f.write('[project]\nname="x"\n')
-            link = os.path.join(tmp, "deploynator.toml")
-            os.symlink(real, link)
-            with pytest.raises(ValueError, match="Symlink"):
-                load_toml_config(tmp)
-
-    def test_oversize_rejected(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
-                f.write("#" * (10_485_760 + 1))
-            with pytest.raises(ValueError, match="too large"):
-                load_toml_config(tmp)
-
-    def test_malformed_toml_raises(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
-                f.write("[tests\ncommands = [[[invalid")
-            with pytest.raises(ValueError):
-                load_toml_config(tmp)
-
-    def test_timeout_clamped(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
-                f.write("[tests]\ntimeout_s = 999999\n")
-            cfg = load_toml_config(tmp)
-            assert cfg.test_timeout_s <= 3600
-            with open(os.path.join(tmp, "deploynator.toml"), "w") as f:
-                f.write("[tests]\ntimeout_s = 0\n")
-            cfg = load_toml_config(tmp)
-            assert cfg.test_timeout_s >= 1
-
-    def test_frozen(self):
-        from deploynator._toml import load_toml_config
-        with tempfile.TemporaryDirectory() as tmp:
-            cfg = load_toml_config(tmp)
-            with pytest.raises(Exception):
-                cfg.project_name = "mutated"