cook-build 0.7.2__tar.gz → 0.7.4__tar.gz

{cook_build-0.7.2/src/cook_build.egg-info → cook_build-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cook-build
-Version: 0.7.2
+Version: 0.7.4
 Summary: A task-centric build system with simple declarative recipes specified in Python
 Author: Till Hoffmann
 License: BSD-3-Clause

{cook_build-0.7.2 → cook_build-0.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cook-build"
-version = "0.7.2"
+version = "0.7.4"
 description = "A task-centric build system with simple declarative recipes specified in Python"
 readme = "README.md"
 license = {text = "BSD-3-Clause"}
@@ -37,6 +37,7 @@ Issues = "https://github.com/tillahoffmann/cook-build/issues"
 dev = [
     "build>=1.3.0",
     "furo>=2025.9.25",
+    "pre-commit>=4.5.1",
     "pyright>=1.1.406",
     "pytest>=8.4.2",
     "pytest-asyncio>=0.24.0",

{cook_build-0.7.2 → cook_build-0.7.4}/src/cook/__init__.py

@@ -1,10 +1,12 @@
 from .controller import Controller
 from .manager import Manager, create_task
 from .task import Task
+from .util import dict2args
 
 __all__ = [
     "Controller",
     "create_task",
+    "dict2args",
     "Manager",
     "Task",
 ]

{cook_build-0.7.2 → cook_build-0.7.4}/src/cook/__main__.py

@@ -342,12 +342,10 @@ def __main__(cli_args: list[str] | None = None) -> None:
                 ]
             )
             if args.module:
-                # Temporarily add the current working directory to the path.
-                try:
-                    sys.path.append(os.getcwd())
-                    importlib.import_module(args.module)
-                finally:
-                    sys.path.pop()
+                # Add the current working directory to the path so local modules can be
+                # imported.
+                sys.path.append(os.getcwd())
+                importlib.import_module(args.module)
             elif args.recipe.is_file():
                 # Parse the recipe.
                 spec = importlib.util.spec_from_file_location("recipe", args.recipe)

{cook_build-0.7.2 → cook_build-0.7.4}/src/cook/actions.py

@@ -122,21 +122,22 @@ class SubprocessAction(Action):
             True
     """
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, args: str | list[str], **kwargs) -> None:
         # Validate shell argument early
-        if kwargs.get("shell", False) and args and not isinstance(args[0], str):
+        if kwargs.get("shell", False) and not isinstance(args, str):
             raise ValueError("shell=True requires string args")
         self.args = args
         self.kwargs = kwargs
 
     async def execute(self, task: "Task") -> None:
         # Get the command arguments
-        (args,) = self.args
+        args = self.args
         shell = self.kwargs.get("shell", False)
         other_kwargs = {k: v for k, v in self.kwargs.items() if k != "shell"}
 
         # Create the subprocess
         if shell:
+            assert isinstance(args, str)
             process = await asyncio.create_subprocess_shell(args, **other_kwargs)
         else:
             # Exec mode: args can be a string (single command) or list
@@ -167,16 +168,17 @@ class SubprocessAction(Action):
     @property
     def hexdigest(self) -> str:
         hasher = hashlib.sha1()
-        (args,) = self.args
+        args = self.args
         if isinstance(args, str):
             hasher.update(args.encode())
         else:
             for arg in args:
                 hasher.update(arg.encode())
+                hasher.update(b"\0")
         return hasher.hexdigest()
 
     def __repr__(self) -> str:
-        args, *_ = self.args
+        args = self.args
         if not isinstance(args, str):
             args = " ".join(map(shlex.quote, args))
         return f"{self.__class__.__name__}({repr(args)})"
@@ -199,13 +201,13 @@ class CompositeAction(Action):
 
     @property
     def hexdigest(self) -> str | None:
-        parts = []
+        hasher = hashlib.sha1()
         for action in self.actions:
             hexdigest = action.hexdigest
             if hexdigest is None:
                 return None
-            parts.append(hexdigest)
-        return "".join(parts)
+            hasher.update(bytearray.fromhex(hexdigest))
+        return hasher.hexdigest()
 
 
 class ModuleAction(SubprocessAction):

{cook_build-0.7.2 → cook_build-0.7.4}/src/cook/controller.py

@@ -39,11 +39,6 @@ QUERIES = {
         "last_digested" TIMESTAMP NOT NULL
     );
     """,
-    "select_task": """
-        SELECT "digest"
-        FROM "files"
-        WHERE "name" = :name
-    """,
     "upsert_task_completed": """
         INSERT INTO "tasks" ("name", "digest", "last_completed")
         VALUES (:name, :digest, :last_completed)
@@ -80,7 +75,6 @@ class Controller:
     def __init__(self, dependencies: nx.DiGraph, connection: Connection) -> None:
         self.dependencies = dependencies
         self.connection = connection
-        self._digest_cache: dict[Path, tuple[float, bytes]] = {}
 
     def resolve_stale_tasks(self, tasks: list["Task"] | None = None) -> set["Task"]:
         self.is_stale(tasks or list(self.dependencies))
@@ -88,7 +82,7 @@ class Controller:
             node for node, data in self.dependencies.nodes(True) if data.get("is_stale")
         }
 
-    def _evaluate_task_hexdigest(self, task: "Task") -> str | None:
+    def _evaluate_task_hexdigest(self, task: "Task") -> str:
         """
         Evaluate the digest of a task by combining the digest of all its dependencies.
         """
@@ -102,8 +96,7 @@ class Controller:
             )
             dependency = Path(dependency).resolve()
             if not dependency.is_file():
-                LOGGER.debug("dependency %s of %s is missing", dependency, task)
-                return None
+                raise FileNotFoundError(f"dependency {dependency} of {task} is missing")
             dependencies.append(dependency)
 
         hasher = hashlib.sha1()
@@ -198,9 +191,11 @@ class Controller:
             return True
 
         # If one of the dependencies is missing, the task is stale.
-        current_digest = self._evaluate_task_hexdigest(task)
-        if current_digest is None:
+        try:
+            current_digest = self._evaluate_task_hexdigest(task)
+        except FileNotFoundError:
             LOGGER.debug("%s is stale because one of its dependencies is missing", task)
+            return True
 
         # If the digest has changed, the task is stale.
         (cached_digest,) = cached_digest
@@ -290,7 +285,9 @@ class Controller:
             dep_futures = [task_futures[dep] for dep in dep_tasks]
             await asyncio.gather(*dep_futures)
 
-        digest = self._evaluate_task_hexdigest(task)
+        digest: str | None = None
+        if not dry_run:
+            digest = self._evaluate_task_hexdigest(task)
         start: datetime | None = None
 
         try:
@@ -332,6 +329,7 @@ class Controller:
 
             # Update DB for completion
             if not dry_run:
+                assert digest is not None
                 params = {
                     "name": task.name,
                     "digest": digest,

{cook_build-0.7.2 → cook_build-0.7.4}/src/cook/manager.py

@@ -63,7 +63,7 @@ class Manager:
                     raise ValueError(f"{context} did not return a task")
             self.tasks[task.name] = task
             return task
-        except:
+        except Exception:
             filename, lineno = util.get_location()
             LOGGER.exception(
                 "failed to create task with name '%s' at %s:%d", name, filename, lineno

{cook_build-0.7.2 → cook_build-0.7.4}/src/cook/util.py

@@ -32,6 +32,7 @@ def evaluate_hexdigest(path: PathOrStr, size=2**16, hasher: str = "sha1") -> str
 class Timer:
     def __init__(self):
         self.start = None
+        self.end = None
 
     def __enter__(self) -> Timer:
         self.start = time()
@@ -97,3 +98,47 @@ def format_datetime(dt: datetime) -> str:
     Format a date-time.
     """
     return str(dt).rsplit(".", 2)[0]
+
+
+def dict2args(*positional, flags: dict | None = None, **kwargs) -> list[str]:
+    """
+    Convert arguments to command-line argument strings.
+
+    Args:
+        *positional: Positional arguments appended after flags.
+        flags: Dictionary for flag names that aren't valid Python identifiers
+            (e.g., names containing dashes).
+        **kwargs: Keyword arguments converted to flags.
+
+    Returns:
+        List of command-line argument strings.
+
+    Example:
+
+        .. doctest::
+
+            >>> from cook.util import dict2args
+            >>> dict2args(output="file.txt", verbose=True, count=3)
+            ['--output=file.txt', '--verbose', '--count=3']
+            >>> dict2args("input.txt", "output.txt", verbose=True)
+            ['--verbose', 'input.txt', 'output.txt']
+            >>> dict2args(flags={"dry-run": True, "num-workers": 4})
+            ['--dry-run', '--num-workers=4']
+            >>> dict2args(values=[1, 2, 3])
+            ['--values=1,2,3']
+    """
+    if flags is not None:
+        kwargs = flags | kwargs
+    args = []
+    for key, value in kwargs.items():
+        if isinstance(value, bool):
+            if value:
+                args.append(f"--{key}")
+        elif isinstance(value, (list, tuple)):
+            if not value:
+                raise ValueError(f"empty sequence for argument {key!r}")
+            args.append(f"--{key}={','.join(map(str, value))}")
+        else:
+            args.append(f"--{key}={value}")
+    args.extend(str(arg) for arg in positional)
+    return args

{cook_build-0.7.2 → cook_build-0.7.4/src/cook_build.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cook-build
-Version: 0.7.2
+Version: 0.7.4
 Summary: A task-centric build system with simple declarative recipes specified in Python
 Author: Till Hoffmann
 License: BSD-3-Clause

{cook_build-0.7.2 → cook_build-0.7.4}/tests/test_contexts.py

@@ -110,14 +110,14 @@ def test_normalize_action(m: Manager) -> None:
         task = m.create_task("foo", action="bar")
         assert (
             isinstance(task.action, SubprocessAction)
-            and task.action.args[0] == "bar"
+            and task.action.args == "bar"
             and task.action.kwargs["shell"]
         )
 
         task = m.create_task("bar", action=["baz"])
         assert (
             isinstance(task.action, SubprocessAction)
-            and task.action.args[0] == ["baz"]
+            and task.action.args == ["baz"]
             and not task.action.kwargs.get("shell")
         )
 
@@ -131,7 +131,7 @@ def test_normalize_action(m: Manager) -> None:
         assert isinstance(task.action, FunctionAction)
 
         task = m.create_task("fizz", action=[pytest, "foo", "bar"])
-        assert isinstance(task.action, ModuleAction) and task.action.args[0] == [
+        assert isinstance(task.action, ModuleAction) and task.action.args == [
             sys.executable,
             "-m",
             "pytest",

cook_build-0.7.4/tests/test_util.py

@@ -0,0 +1,69 @@
+import hashlib
+from datetime import datetime, timedelta
+from pathlib import Path
+
+import pytest
+
+from cook import util
+
+
+def test_evaluate_digest(tmp_wd: Path) -> None:
+    fn = tmp_wd / "foo.txt"
+    fn.write_text("bar")
+    assert util.evaluate_hexdigest(fn) == hashlib.sha1(b"bar").hexdigest()
+
+
+def test_format_timedelta() -> None:
+    assert (
+        util.format_timedelta(timedelta(1, 13, 17, 28, 40, 3, 8)) == "57 days, 3:40:13"
+    )
+    assert util.format_timedelta(timedelta(microseconds=999)) == "0:00:00.000999"
+
+
+def test_format_datetime() -> None:
+    assert (
+        util.format_datetime(datetime(2023, 7, 25, 13, 7, 9, 777))
+        == "2023-07-25 13:07:09"
+    )
+
+
+def test_dict2args() -> None:
+    # Basic string value
+    assert util.dict2args(output="file.txt") == ["--output=file.txt"]
+
+    # Boolean True adds flag, False omits it
+    assert util.dict2args(verbose=True) == ["--verbose"]
+    assert util.dict2args(verbose=False) == []
+
+    # Numeric values
+    assert util.dict2args(count=3) == ["--count=3"]
+
+    # Lists/tuples joined with commas
+    assert util.dict2args(values=[1, 2, 3]) == ["--values=1,2,3"]
+    assert util.dict2args(items=("a", "b")) == ["--items=a,b"]
+
+    # Multiple arguments preserve order (Python 3.7+)
+    result = util.dict2args(output="out.txt", verbose=True, count=5)
+    assert result == ["--output=out.txt", "--verbose", "--count=5"]
+
+    # Positional arguments come after flags
+    result = util.dict2args("input.txt", "output.txt", verbose=True)
+    assert result == ["--verbose", "input.txt", "output.txt"]
+
+    # flags parameter for names with dashes or other non-identifier chars
+    assert util.dict2args(flags={"dry-run": True}) == ["--dry-run"]
+    assert util.dict2args(flags={"num-workers": 4}) == ["--num-workers=4"]
+
+    # flags and kwargs combined (kwargs take precedence)
+    result = util.dict2args(flags={"output": "old.txt"}, output="new.txt")
+    assert result == ["--output=new.txt"]
+
+    # All together: flags, kwargs, and positional
+    result = util.dict2args("file.txt", flags={"dry-run": True}, verbose=True)
+    assert result == ["--dry-run", "--verbose", "file.txt"]
+
+    # Empty sequences raise ValueError
+    with pytest.raises(ValueError, match="empty sequence"):
+        util.dict2args(values=[])
+    with pytest.raises(ValueError, match="empty sequence"):
+        util.dict2args(items=())

cook_build-0.7.2/tests/test_util.py

@@ -1,25 +0,0 @@
-import hashlib
-from datetime import datetime, timedelta
-from pathlib import Path
-
-from cook import util
-
-
-def test_evaluate_digest(tmp_wd: Path) -> None:
-    fn = tmp_wd / "foo.txt"
-    fn.write_text("bar")
-    assert util.evaluate_hexdigest(fn) == hashlib.sha1(b"bar").hexdigest()
-
-
-def test_format_timedelta() -> None:
-    assert (
-        util.format_timedelta(timedelta(1, 13, 17, 28, 40, 3, 8)) == "57 days, 3:40:13"
-    )
-    assert util.format_timedelta(timedelta(microseconds=999)) == "0:00:00.000999"
-
-
-def test_format_datetime() -> None:
-    assert (
-        util.format_datetime(datetime(2023, 7, 25, 13, 7, 9, 777))
-        == "2023-07-25 13:07:09"
-    )