tasktree 0.0.21__py3-none-any.whl → 0.0.23__py3-none-any.whl

tasktree/console_logger.py

@@ -0,0 +1,66 @@
+from tasktree.logging import Logger, LogLevel
+from rich.console import Console
+
+
+class ConsoleLogger(Logger):
+    """
+    Console-based logger implementation using Rich for formatting.
+
+    Filters log messages based on the current log level. Messages with severity
+    lower than the current level are suppressed. Supports a stack-based level
+    management system for temporary verbosity changes.
+    @athena: a892913fc11c
+    """
+
+    def __init__(self, console: Console, level: LogLevel = LogLevel.INFO) -> None:
+        """
+        Initialize the console logger.
+
+        Args:
+        console: Rich Console instance to use for output
+        level: Initial log level (default: INFO)
+        @athena: 388d9c273a6a
+        """
+        self._console = console
+        self._levels = [level]
+
+    def log(self, level: LogLevel = LogLevel.INFO, *args, **kwargs) -> None:
+        """
+        Log a message to the console if it meets the current level threshold.
+
+        Messages are only printed if their level is at or above the current level
+        (i.e., level.value <= current_level.value, since lower values = higher severity).
+
+        Args:
+        level: The severity level of this message (default: INFO)
+        *args: Positional arguments passed to Rich Console.print()
+        **kwargs: Keyword arguments passed to Rich Console.print()
+        @athena: efae38733da1
+        """
+        if self._levels[-1].value >= level.value:
+            self._console.print(*args, **kwargs)
+
+    def push_level(self, level: LogLevel) -> None:
+        """
+        Push a new log level onto the stack.
+
+        Args:
+        level: The new log level to activate
+        @athena: 07c7493570b1
+        """
+        self._levels.append(level)
+
+    def pop_level(self) -> LogLevel:
+        """
+        Pop the current log level and return to the previous level.
+
+        Returns:
+        The log level that was popped
+
+        Raises:
+        RuntimeError: If attempting to pop the base (initial) log level
+        @athena: 65ac19e00168
+        """
+        if len(self._levels) <= 1:
+            raise RuntimeError("Cannot pop the base log level")
+        return self._levels.pop()

tasktree/docker.py

@@ -9,10 +9,11 @@ import os
 import platform
 import re
 import subprocess
-import time
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from pathspec import PathSpec
+
 try:
     import pathspec
 except ImportError:
@@ -20,6 +21,7 @@ except ImportError:
 
 if TYPE_CHECKING:
     from tasktree.parser import Environment
+    from tasktree.process_runner import ProcessRunner
 
 
 class DockerError(Exception):
@@ -34,7 +36,7 @@ class DockerError(Exception):
 class DockerManager:
     """
     Manages Docker image building and container execution.
-    @athena: ef3cc3d7bcbe
+    @athena: f8f5c2693d84
     """
 
     def __init__(self, project_root: Path):
@@ -46,9 +48,12 @@ class DockerManager:
         @athena: eb7d4c5a27aa
         """
         self._project_root = project_root
-        self._built_images: dict[str, tuple[str, str]] = {}  # env_name -> (image_tag, image_id) cache
+        self._built_images: dict[
+            str, tuple[str, str]
+        ] = {}  # env_name -> (image_tag, image_id) cache
 
-    def _should_add_user_flag(self) -> bool:
+    @staticmethod
+    def _should_add_user_flag() -> bool:
         """
         Check if --user flag should be added to docker run.
 
@@ -57,7 +62,7 @@ class DockerManager:
 
         Returns:
         True if --user flag should be added, False otherwise
-        @athena: 6a872eea6a10
+        @athena: c5932076dfda
         """
         # Skip on Windows - Docker Desktop handles UID mapping differently
         if platform.system() == "Windows":
@@ -66,12 +71,15 @@ class DockerManager:
         # Check if os.getuid() and os.getgid() are available (Linux/macOS)
         return hasattr(os, "getuid") and hasattr(os, "getgid")
 
-    def ensure_image_built(self, env: Environment) -> tuple[str, str]:
+    def ensure_image_built(
+        self, env: Environment, process_runner: ProcessRunner
+    ) -> tuple[str, str]:
         """
         Build Docker image if not already built this invocation.
 
         Args:
         env: Environment definition with dockerfile and context
+        process_runner: ProcessRunner instance for subprocess execution
 
         Returns:
         Tuple of (image_tag, image_id)
@@ -80,7 +88,7 @@ class DockerManager:
 
         Raises:
         DockerError: If docker command not available or build fails
-        @athena: 9b3c11c29fbb
+        @athena: 42b53d2685e0
         """
         # Check if already built this invocation
         if env.name in self._built_images:
@@ -115,7 +123,7 @@ class DockerManager:
 
             docker_build_cmd.append(str(context_path))
 
-            subprocess.run(
+            process_runner.run(
                 docker_build_cmd,
                 check=True,
                 capture_output=False,  # Show build output to user
@@ -143,6 +151,7 @@ class DockerManager:
         cmd: str,
         working_dir: Path,
         container_working_dir: str,
+        process_runner: ProcessRunner,
     ) -> subprocess.CompletedProcess:
         """
         Execute command inside Docker container.
@@ -152,16 +161,17 @@ class DockerManager:
         cmd: Command to execute
         working_dir: Host working directory (for resolving relative volume paths)
         container_working_dir: Working directory inside container
+        process_runner: ProcessRunner instance to use for subprocess execution
 
         Returns:
         CompletedProcess from subprocess.run
 
         Raises:
         DockerError: If docker run fails
-        @athena: 2c963babb5ca
+        @athena: ef024ea2c182
         """
         # Ensure image is built (returns tag and ID)
-        image_tag, image_id = self.ensure_image_built(env)
+        image_tag, image_id = self.ensure_image_built(env, process_runner)
 
         # Build docker run command
         docker_cmd = ["docker", "run", "--rm"]
@@ -197,11 +207,14 @@ class DockerManager:
 
         # Add shell and command
         shell = env.shell or "sh"
-        docker_cmd.extend([shell, "-c", cmd])
+        shell_args = (
+            env.args or [] if isinstance(env.args, list) else list(env.args.values())
+        )
+        docker_cmd.extend([shell, *shell_args, "-c", cmd])
 
         # Execute
         try:
-            result = subprocess.run(
+            result = process_runner.run(
                 docker_cmd,
                 cwd=working_dir,
                 check=True,
@@ -250,13 +263,14 @@ class DockerManager:
 
         return f"{resolved_host_path}:{container_path}"
 
-    def _check_docker_available(self) -> None:
+    @staticmethod
+    def _check_docker_available() -> None:
         """
         Check if docker command is available.
 
         Raises:
         DockerError: If docker is not available
-        @athena: 16ba713e3962
+        @athena: 8deaf8c5c05e
         """
         try:
             subprocess.run(
@@ -271,7 +285,8 @@ class DockerManager:
                 "Visit https://docs.docker.com/get-docker/ for installation instructions."
             )
 
-    def _get_image_id(self, image_tag: str) -> str:
+    @staticmethod
+    def _get_image_id(image_tag: str) -> str:
         """
         Get the full image ID for a given tag.
 
@@ -283,7 +298,7 @@ class DockerManager:
 
         Raises:
         DockerError: If cannot inspect image
-        @athena: e4bc075fe857
+        @athena: 9e5aa77003ee
         """
         try:
             result = subprocess.run(
@@ -312,9 +327,7 @@ def is_docker_environment(env: Environment) -> bool:
     return bool(env.dockerfile)
 
 
-def resolve_container_working_dir(
-    env_working_dir: str, task_working_dir: str
-) -> str:
+def resolve_container_working_dir(env_working_dir: str, task_working_dir: str) -> str:
     """
     Resolve working directory inside container.
 
@@ -345,7 +358,7 @@ def resolve_container_working_dir(
         return f"/{task_working_dir.lstrip('/')}"
 
 
-def parse_dockerignore(dockerignore_path: Path) -> "pathspec.PathSpec | None":
+def parse_dockerignore(dockerignore_path: Path) -> PathSpec | None:
     """
     Parse .dockerignore file into pathspec matcher.
 
@@ -354,7 +367,7 @@ def parse_dockerignore(dockerignore_path: Path) -> "pathspec.PathSpec | None":
 
     Returns:
     PathSpec object for matching, or None if file doesn't exist or pathspec not available
-    @athena: 62bc07a3c6d0
+    @athena: 13fca9ee5a73
     """
     if pathspec is None:
         # pathspec library not available - can't parse .dockerignore
@@ -432,13 +445,13 @@ def extract_from_images(dockerfile_content: str) -> list[tuple[str, str | None]]
     Returns:
     List of (image_reference, digest) tuples where digest may be None for unpinned images
     Example: [("rust:1.75", None), ("rust", "sha256:abc123...")]
-    @athena: ede7ed483bdd
+    @athena: de0d013fdd05
     """
     # Regex pattern to match FROM lines
     # Handles: FROM [--platform=...] image[:tag][@digest] [AS alias]
     from_pattern = re.compile(
         r"^\s*FROM\s+"  # FROM keyword
-        r"(?:--platform=[^\s]+\s+)?"  # Optional platform flag
+        r"(?:--platform=\S+\s+)?"  # Optional platform flag
         r"([^\s@]+)"  # Image name (possibly with :tag)
         r"(?:@(sha256:[a-f0-9]+))?"  # Optional @digest
         r"(?:\s+AS\s+\w+)?"  # Optional AS alias