deploynator 1.3.1__tar.gz → 1.3.4__tar.gz

{deploynator-1.3.1 → deploynator-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: deploynator
-Version: 1.3.1
+Version: 1.3.4
 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

{deploynator-1.3.1 → deploynator-1.3.4}/deploynator/__init__.py

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

{deploynator-1.3.1 → deploynator-1.3.4}/deploynator/__main__.py

@@ -28,6 +28,10 @@ def build_parser() -> argparse.ArgumentParser:
         "--workdir", type=str, default="",
         help="Working directory (default: current dir)",
     )
+    parser.add_argument(
+        "--verbose", "-v", action="store_true",
+        help="Verbose output (twine --verbose, full command + untruncated errors)",
+    )
 
     subparsers = parser.add_subparsers(dest="command", help="Available commands")
 
@@ -199,6 +203,7 @@ def main(argv: list[str] | None = None) -> NoReturn | None:
             no_test=getattr(args, "no_test", False),
             no_docs=getattr(args, "no_docs", False),
             no_pypi=getattr(args, "no_pypi", False),
+            verbose=getattr(args, "verbose", False),
         )
         sys.exit(0 if all(r.success for r in results) else 1)
 

{deploynator-1.3.1 → deploynator-1.3.4}/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")
@@ -327,6 +356,7 @@ version:
         no_test: bool = False,
         no_docs: bool = False,
         no_pypi: bool = False,
+        verbose: bool = False,
     ) -> list[DeployResult]:
         base = os.getcwd()
         ctype = CommitType.from_string(commit_type)
@@ -395,6 +425,7 @@ version:
                 run_docs=not no_docs,
                 force_bump=bump or None,
                 run_pypi=not no_pypi,
+                verbose=verbose,
             )
             results.append(result)
             self._print_result(result)

{deploynator-1.3.1 → deploynator-1.3.4}/deploynator/_deploy.py

@@ -107,6 +107,7 @@ class DeployOrchestrator:
         run_docs: bool = True,
         force_bump: Optional[str] = None,
         run_pypi: bool = True,
+        verbose: bool = False,
     ) -> DeployResult:
         repo_path = self._resolve_project_path(project)
 
@@ -334,7 +335,8 @@ class DeployOrchestrator:
                     print("[!] PyPI packaging detected but no credentials "
                           "(TWINE_PASSWORD/PYPI_TOKEN/~/.pypirc). Skipping upload.")
                 else:
-                    ok, msg = self._pypi.run(repo_path, toml_cfg, new_version_str, token=token)
+                    ok, msg = self._pypi.run(repo_path, toml_cfg, new_version_str, token=token,
+                                             verbose=verbose)
                     print(f"[{'OK' if ok else 'FAIL'}] {msg}")
                     if not ok:
                         return DeployResult(
@@ -343,10 +345,10 @@ class DeployOrchestrator:
                             success=False,
                             platforms_pushed=platforms_pushed,
                             releases_created=releases_created,
-                            error=msg[:2000],
+                            error=msg if verbose else msg[:2000],
                         )
             else:
-                ok, msg = self._pypi.run(repo_path, toml_cfg, new_version_str)
+                ok, msg = self._pypi.run(repo_path, toml_cfg, new_version_str, verbose=verbose)
                 print(f"[{'OK' if ok else 'FAIL'}] {msg}")
                 if not ok:
                     return DeployResult(
@@ -355,7 +357,7 @@ class DeployOrchestrator:
                         success=False,
                         platforms_pushed=platforms_pushed,
                         releases_created=releases_created,
-                        error=msg[:2000],
+                        error=msg if verbose else msg[:2000],
                     )
 
         return DeployResult(

{deploynator-1.3.1 → deploynator-1.3.4}/deploynator/_pypi.py

@@ -105,7 +105,7 @@ class PyPIRunner:
                     shutil.rmtree(target)
 
     def run(self, project_path: str, toml: TomlConfig, version: str,
-            token: str | None = None) -> tuple[bool, str]:
+            token: str | None = None, verbose: bool = False) -> tuple[bool, str]:
         if not self.is_packaging_project(project_path):
             return True, "PyPI skipped: no packaging files"
         try:
@@ -120,7 +120,10 @@ class PyPIRunner:
             timeout=toml.pypi_timeout_s,
         )
         if build.returncode != 0:
-            err = (build.stderr or build.stdout or "").strip()[-2000:]
+            raw = (build.stderr or build.stdout or "").strip()
+            if verbose and raw:
+                print(raw)
+            err = raw if verbose else raw[-2000:]
             hint = "" if "build" not in err.lower() else " (pip install build)"
             return False, f"PyPI build failed for {version}{hint}: {err}"
         dist_dir = os.path.join(project_path, "dist")
@@ -128,11 +131,15 @@ class PyPIRunner:
         if not artifacts:
             return False, f"PyPI build produced no artifacts for {version}"
         cmd = [sys.executable, "-m", "twine", "upload", "--non-interactive"]
+        if verbose:
+            cmd += ["--verbose"]
         if toml.pypi_repo == "testpypi":
             cmd += ["--repository", "testpypi"]
         elif toml.pypi_repo not in ("pypi", "testpypi"):
             cmd += ["--repository-url", toml.pypi_repo]
         cmd += [os.path.join("dist", a) for a in artifacts]
+        if verbose:
+            print(f"[...] {subprocess.list2cmdline(cmd)} (cwd={project_path})")
         env = dict(os.environ)
         token = token or os.environ.get("PYPI_TOKEN")
         if token and not os.environ.get("TWINE_PASSWORD"):
@@ -150,6 +157,9 @@ class PyPIRunner:
         except subprocess.TimeoutExpired:
             return False, f"PyPI upload timed out after {toml.pypi_timeout_s}s"
         if upload.returncode != 0:
-            err = (upload.stderr or upload.stdout or "").strip()[-2000:]
+            raw = (upload.stderr or upload.stdout or "").strip()
+            if verbose and raw:
+                print(raw)
+            err = raw if verbose else raw[-2000:]
             return False, f"PyPI upload failed for {version}: {err}"
         return True, f"PyPI uploaded {version}: {', '.join(artifacts)}"

{deploynator-1.3.1 → deploynator-1.3.4}/deploynator/_toml.py

@@ -71,14 +71,42 @@ def _has_python_tests(project_path: str) -> bool:
                 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.
 
-    Orden: Makefile (test-host > test > check > tests, o primer
-    test* disponible) → CMake (build+ctest) → meson (setup+test).
+    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:
@@ -86,12 +114,26 @@ def detect_test_commands(project_path: str) -> list[str] | None:
     except ValueError:
         targets = []
     if targets:
-        for preferred in MAKE_TEST_PRIORITY:
-            if preferred in targets:
-                return [f"make {preferred}"]
-        test_like = sorted(t for t in targets if t.startswith("test-") or t.startswith("test_"))
-        if test_like:
-            return [f"make {test_like[0]}"]
+        # `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"]
@@ -108,7 +150,12 @@ def detect_test_commands(project_path: str) -> list[str] | None:
 
 
 def _auto_toml_config(project_path: str) -> TomlConfig | None:
-    """Config auto para proyectos sin deploynator.toml (C primero)."""
+    """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
@@ -124,7 +171,7 @@ def _auto_toml_config(project_path: str) -> TomlConfig | None:
         test_commands=detected,
         test_timeout_s=C_TEST_TIMEOUT_S,
         docs_auto=True,
-        pypi_enabled=False,
+        pypi_enabled=looks_like_packaging_project(project_path),
     )
 
 

{deploynator-1.3.1 → deploynator-1.3.4}/tests/test_toml.py

@@ -159,3 +159,58 @@ class TestCMakefileDetection:
             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