cook-build 0.4.1__tar.gz → 0.4.3__tar.gz

{cook-build-0.4.1 → cook-build-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cook-build
-Version: 0.4.1
+Version: 0.4.3
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE

{cook-build-0.4.1 → cook-build-0.4.3}/cook/__main__.py

@@ -45,14 +45,15 @@ class Command:
     Abstract base class for commands.
     """
     NAME: Optional[str] = None
+    ALLOW_EMPTY_PATTERN: bool = False
 
     def configure_parser(self, parser: argparse.ArgumentParser) -> None:
         parser.add_argument("--re", "-r", action="store_true",
                             help="use regular expressions for pattern matching instead of glob")
         parser.add_argument("--all", "-a", action="store_true",
                             help="include tasks starting with `_` prefix")
-        parser.add_argument("tasks", nargs="*",
-                            help="task or tasks to execute as regular expressions")
+        parser.add_argument("tasks", nargs="*" if self.ALLOW_EMPTY_PATTERN else "+",
+                            help="task or tasks to execute as regular expressions or glob patterns")
 
     def execute(self, controller: Controller, args: argparse.Namespace) -> None:
         raise NotImplementedError
@@ -103,6 +104,7 @@ class LsCommand(Command):
     List tasks.
     """
     NAME = "ls"
+    ALLOW_EMPTY_PATTERN = True
 
     def configure_parser(self, parser: argparse.ArgumentParser) -> None:
         parser.add_argument("--stale", "-s", action="store_true", help="only show stale tasks")

{cook-build-0.4.1 → cook-build-0.4.3}/cook/controller.py

@@ -221,13 +221,9 @@ class Controller:
                 try:
                     item: Optional[Tuple["Task", sys._OptExcInfo]] = \
                         output_queue.get(timeout=interval)
-                except Empty:
+                except Empty:  # pragma: no cover
                     continue
 
-                # Check if the stop event is set and abort if so.
-                if stop.is_set():
-                    break
-
                 assert item is not None, "output queue returned `None`; this is a bug"
 
                 # Unpack the results.
@@ -240,7 +236,11 @@ class Controller:
                     }
                     self.connection.execute(QUERIES["upsert_task_failed"], params)
                     self.connection.commit()
-                    raise util.FailedTaskError(task=task) from exc_info[1]
+                    raise util.FailedTaskError(exc_info[1], task=task) from exc_info[1]
+
+                # Check if the stop event is set and abort if so.
+                if stop.is_set():
+                    break
 
                 # Add tasks that are now leaf nodes to the tree.
                 predecessors = list(dependencies.predecessors(task))
@@ -250,13 +250,6 @@ class Controller:
                     if out_degree == 0:
                         input_queue.put(node)
 
-                # Verify that targets were created.
-                for target in task.targets:
-                    if not target.is_file():
-                        raise util.FailedTaskError(f"`{task}` did not create `{target}`",
-                                                   task=task)
-                    LOGGER.debug("%s created `%s`", task, target)
-
                 # Update the status in the database.
                 params = {
                     "name": task.name,
@@ -295,8 +288,17 @@ class Controller:
 
             start = datetime.now()
             try:
+                # Execute the task.
                 LOGGER.info("executing %s ...", task)
                 task.execute(stop)
+
+                # Check that all targets were created.
+                for target in task.targets:
+                    if not target.is_file():
+                        raise FileNotFoundError(f"task {task} did not create target {target}")
+                    LOGGER.debug("%s created `%s`", task, target)
+
+                # Add the result to the output queue and report success.
                 output_queue.put((task, None))
                 delta = util.format_timedelta(datetime.now() - start)
                 LOGGER.log(logging.DEBUG if task.name.startswith("_") else logging.INFO,
@@ -305,6 +307,7 @@ class Controller:
                 exc_info = sys.exc_info()
                 delta = util.format_timedelta(datetime.now() - start)
                 LOGGER.exception("failed to execute %s after %s", task, delta, exc_info=exc_info)
+                stop.set()
                 output_queue.put((task, sys.exc_info()))
 
         # Put anything on the queue in case the parent is waiting.

{cook-build-0.4.1 → cook-build-0.4.3}/cook_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cook-build
-Version: 0.4.1
+Version: 0.4.3
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE

{cook-build-0.4.1 → cook-build-0.4.3}/setup.py

@@ -14,7 +14,7 @@ long_description = long_description \
 
 setup(
     name="cook-build",
-    version="0.4.1",
+    version="0.4.3",
     long_description=long_description,
     long_description_content_type="text/x-rst",
     python_requires=">=3.8",

{cook-build-0.4.1 → cook-build-0.4.3}/tests/test_controller.py

@@ -220,11 +220,57 @@ def test_stop_long_running_subprocess(m: Manager, conn: Connection) -> None:
     thread = threading.Thread(target=_target)
     thread.start()
 
-    with patch("cook.util.StopEvent", return_value=stop), Timer() as timer:
+    with patch("cook.util.StopEvent", return_value=stop), Timer() as timer, \
+            pytest.raises(FailedTaskError, match="SIGTERM: 15"):
         c.execute(task)
 
     assert 1 < timer.duration and timer.duration < 2
     assert not thread.is_alive()
 
 
+def test_set_stop_between_tasks(m: Manager, conn: Connection) -> None:
+    calls = []
+
+    def _action(task):
+        calls.append(task)
+        time.sleep(0.5)
+
+    task1 = m.create_task("sleep1", action=FunctionAction(_action))
+    task2 = m.create_task("sleep2", action=FunctionAction(_action))
+    c = Controller(m.resolve_dependencies(), conn)
+
+    # Set the stop interval shortly after dispatching the tasks.
+    stop = StopEvent(10)
+
+    def _target():
+        time.sleep(0.3)
+        stop.set()
+    thread = threading.Thread(target=_target)
+    thread.start()
+
+    with patch("cook.util.StopEvent", return_value=stop), Timer() as timer:
+        c.execute([task1, task2])
+
+    assert 0.5 < timer.duration and timer.duration < 1
+    assert not thread.is_alive()
+    assert len(calls) == 1
+
+
+def test_no_start_after_failure(m: Manager, conn: Connection) -> None:
+    calls = []
+
+    def _action(task):
+        calls.append(task)
+        raise ValueError
+
+    task1 = m.create_task("sleep1", action=FunctionAction(_action))
+    task2 = m.create_task("sleep2", action=FunctionAction(_action))
+    c = Controller(m.resolve_dependencies(), conn)
+
+    with pytest.raises(FailedTaskError):
+        c.execute([task1, task2])
+
+    assert len(calls) == 1
+
+
 # TODO: add tests to verify what happens when tasks are cancelled, e.g., by `KeyboardInterrupt`.

{cook-build-0.4.1 → cook-build-0.4.3}/tests/test_main.py

@@ -15,7 +15,7 @@ def test_blah_recipe_run(tmp_wd: Path) -> None:
 
 
 @pytest.mark.parametrize("patterns, expected", [
-    ([], ["create_source", "compile", "link", "run"]),
+    (["*"], ["create_source", "compile", "link", "run"]),
     (["c*"], ["create_source", "compile"]),
     (["--re", r"^\w{3}\w?$"], ["link", "run"]),
     (["run"], ["run"]),