funcd-bundle 0.3.3__tar.gz → 0.3.5__tar.gz

{funcd_bundle-0.3.3 → funcd_bundle-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: funcd-bundle
-Version: 0.3.3
+Version: 0.3.5
 Summary: Bundle a Python funcd function and its locked dependencies for the funcd runtime
 Project-URL: Homepage, https://github.com/pyvvo/funcd-python
 Project-URL: Repository, https://github.com/pyvvo/funcd-python

{funcd_bundle-0.3.3 → funcd_bundle-0.3.5}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "funcd-bundle"
 # Not bumped per release: the vX.Y.Z git tag is the version, stamped into the build at publish time.
-version = "0.3.3"
+version = "0.3.5"
 description = "Bundle a Python funcd function and its locked dependencies for the funcd runtime"
 authors = [{ name = "The funcd Authors" }]
 readme = "README.md"

{funcd_bundle-0.3.3 → funcd_bundle-0.3.5}/src/funcd_bundle/bundle.py

@@ -84,7 +84,10 @@ def discover(project: Path) -> dict[str, Function]:
         defaults = {project.resolve().name: DEFAULT_HANDLER}
     functions = {}
     for name, manifest in manifests.items():
-        data = yaml.safe_load(manifest.read_text()) or {}
+        try:
+            data = yaml.safe_load(manifest.read_text()) or {}
+        except yaml.YAMLError as err:
+            raise BundleError(f"{manifest}: {err}") from err
         if not isinstance(data, dict):
             raise BundleError(f"{manifest} is not a mapping")
         main = data.get("main") or defaults[name]
@@ -347,6 +350,15 @@ def _with_main(text: str, handler: str) -> str:
                 if text[start:end].endswith("\n"):
                     entry += "\n"
                 return text[:start] + entry + text[end:]
+        if root.flow_style:
+            # a block line after a flow mapping is a second root: the key goes inside, after its brace
+            brace = next(
+                t
+                for t in yaml.scan(text, Loader=yaml.SafeLoader)
+                if isinstance(t, yaml.FlowMappingStartToken)
+            )
+            at = brace.end_mark.index
+            return text[:at] + entry + (", " if root.value else "") + text[at:]
     if text and not text.endswith("\n"):
         text += "\n"
     return text + entry + "\n"

{funcd_bundle-0.3.3 → funcd_bundle-0.3.5}/tests/test_bundle.py

@@ -16,6 +16,7 @@ from collections.abc import Iterator
 from pathlib import Path
 
 import pytest
+import yaml
 
 from funcd_bundle import BundleError, bundle, discover, host_platform
 from funcd_bundle.bundle import _check
@@ -24,6 +25,7 @@ from funcd_bundle.cli import main
 FOREIGN = {"linux/arm64": "linux/amd64", "linux/amd64": "linux/arm64"}
 ELF_MACHINE = {"linux/amd64": 0x3E, "linux/arm64": 0xB7}
 MANIFEST = "runtime: python314\nhandler: handle\nmain: src/handler.py\n"
+EXAMPLES = Path(__file__).resolve().parents[2] / "examples"
 
 
 def _online() -> bool:
@@ -255,6 +257,18 @@ def test_default_handler_follows_funcdctl(tmp_path: Path) -> None:
     )
 
 
+def test_issue_r54_every_example_manifest_names_a_handler_it_ships() -> None:
+    examples = sorted({m.parent for m in EXAMPLES.glob("*/*funcdctl.yaml")})
+    assert examples, f"no example manifests under {EXAMPLES}"
+    missing = []
+    for example in examples:
+        try:
+            discover(example)
+        except BundleError as err:
+            missing.append(str(err))
+    assert not missing, f"funcdctl dev and funcd-bundle cannot find these handlers: {missing}"
+
+
 def test_issue_154_stem_manifest_without_main_names_bundled_handler(tmp_path: Path) -> None:
     manifest = "runtime: python314\nhandler: handle\n"
     project = tmp_path / "project"
@@ -302,7 +316,49 @@ def test_issue_r29_main_key_is_rewritten_not_duplicated(tmp_path: Path, main: st
     )
 
 
+@pytest.mark.parametrize(
+    ("manifest", "want"),
+    [
+        ("{runtime: python314, handler: handle}\n", {"runtime": "python314", "handler": "handle"}),
+        ("!!map &m {\n  runtime: python314,\n}\n", {"runtime": "python314"}),
+        ("{}\n", {}),
+    ],
+    ids=["one-line", "tagged-multi-line", "empty"],
+)
+def test_issue_r49_flow_mapping_manifest_gets_main(
+    tmp_path: Path, manifest: str, want: dict[str, str]
+) -> None:
+    project = tmp_path / "reader"
+    _write(
+        project,
+        {
+            "pyproject.toml": '[project]\nname = "reader"\nversion = "0.1.0"\nrequires-python = ">=3.12"\n',
+            "funcdctl.yaml": manifest,
+            "handler.py": "def handle(ctx, event): ...\n",
+        },
+    )
+    _uv("lock", "--offline", "--python", "3.14", cwd=project)
+    out = bundle(project, "reader", host_platform(), tmp_path / "out", hermetic=False, check=False)
+
+    assert yaml.safe_load((out / "funcdctl.yaml").read_text()) == want | {"main": "handler.py"}, (
+        "the bundle's manifest is valid YAML whose main names the bundled handler"
+    )
+
+
 def test_missing_handler_is_named(tmp_path: Path) -> None:
     _write(tmp_path, {"funcdctl.yaml": "runtime: python314\nmain: src/nope.py\n"})
     with pytest.raises(BundleError, match="nope.py"):
         bundle(tmp_path, tmp_path.name, host_platform(), tmp_path / "out", hermetic=False, check=False)
+
+
+def test_issue_r48_invalid_manifest_yaml_is_reported(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
+) -> None:
+    _write(tmp_path, {"funcdctl.yaml": "runtime: [\n", "handler.py": ""})
+    monkeypatch.chdir(tmp_path)
+
+    assert main(["--no-check", "--out", str(tmp_path / "out")]) == 1, "a manifest that does not parse fails"
+    err = capsys.readouterr().err
+    assert err.startswith(f"funcd-bundle: {tmp_path / 'funcdctl.yaml'}: "), err
+    assert "while parsing a flow node" in err, "the parser message names the problem"
+    assert "Traceback" not in err