tasktree 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

tasktree/cli.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import os
+import sys
 from pathlib import Path
 from typing import Any, List, Optional
 
@@ -26,6 +28,46 @@ app = typer.Typer(
 console = Console()
 
 
+def _supports_unicode() -> bool:
+    """Check if the terminal supports Unicode characters.
+
+    Returns:
+        True if terminal supports UTF-8, False otherwise
+    """
+    # Hard stop: classic Windows console (conhost)
+    if os.name == "nt" and "WT_SESSION" not in os.environ:
+        return False
+
+    # Encoding check
+    encoding = sys.stdout.encoding
+    if not encoding:
+        return False
+
+    try:
+        "✓✗".encode(encoding)
+        return True
+    except UnicodeEncodeError:
+        return False
+
+
+def get_action_success_string() -> str:
+    """Get the appropriate success symbol based on terminal capabilities.
+
+    Returns:
+        Unicode tick symbol (✓) if terminal supports UTF-8, otherwise "[ OK ]"
+    """
+    return "✓" if _supports_unicode() else "[ OK ]"
+
+
+def get_action_failure_string() -> str:
+    """Get the appropriate failure symbol based on terminal capabilities.
+
+    Returns:
+        Unicode cross symbol (✗) if terminal supports UTF-8, otherwise "[ FAIL ]"
+    """
+    return "✗" if _supports_unicode() else "[ FAIL ]"
+
+
 def _format_task_arguments(arg_specs: list[str | dict]) -> str:
     """Format task arguments for display in list output.
 
@@ -324,7 +366,7 @@ def _clean_state(tasks_file: Optional[str] = None) -> None:
 
     if state_path.exists():
         state_path.unlink()
-        console.print(f"[green]✓ Removed {state_path}[/green]")
+        console.print(f"[green]{get_action_success_string()} Removed {state_path}[/green]")
         console.print("All tasks will run fresh on next execution")
     else:
         console.print(f"[yellow]No state file found at {state_path}[/yellow]")
@@ -410,9 +452,9 @@ def _execute_dynamic_task(args: list[str], force: bool = False, only: bool = Fal
     state.save()
     try:
         executor.execute_task(task_name, args_dict, force=force, only=only)
-        console.print(f"[green]✓ Task '{task_name}' completed successfully[/green]")
+        console.print(f"[green]{get_action_success_string()} Task '{task_name}' completed successfully[/green]")
     except Exception as e:
-        console.print(f"[red]✗ Task '{task_name}' failed: {e}[/red]")
+        console.print(f"[red]{get_action_failure_string()} Task '{task_name}' failed: {e}[/red]")
         raise typer.Exit(1)
 
 

tasktree/substitution.py

@@ -5,6 +5,7 @@ and {{ env.NAME }} placeholders with their corresponding values.
 """
 
 import re
+from random import choice
 from typing import Any
 
 
@@ -15,11 +16,11 @@ PLACEHOLDER_PATTERN = re.compile(
 )
 
 
-def substitute_variables(text: str, variables: dict[str, str]) -> str:
+def substitute_variables(text: str | dict[str, Any], variables: dict[str, str]) -> str | dict[str, Any]:
     """Substitute {{ var.name }} placeholders with variable values.
 
     Args:
-        text: Text containing {{ var.name }} placeholders
+        text: Text containing {{ var.name }} placeholders, or an argument dict with elements to be substituted
         variables: Dictionary mapping variable names to their string values
 
     Returns:
@@ -28,23 +29,42 @@ def substitute_variables(text: str, variables: dict[str, str]) -> str:
     Raises:
         ValueError: If a referenced variable is not defined
     """
-    def replace_match(match: re.Match) -> str:
-        prefix = match.group(1)
-        name = match.group(2)
-
-        # Only substitute var: placeholders
-        if prefix != "var":
-            return match.group(0)  # Return unchanged
-
-        if name not in variables:
-            raise ValueError(
-                f"Variable '{name}' is not defined. "
-                f"Variables must be defined before use."
-            )
-
-        return variables[name]
-
-    return PLACEHOLDER_PATTERN.sub(replace_match, text)
+    if isinstance(text, dict):
+        # The dict will only contain a single key, the value of this key should also be a dictionary, which contains
+        # the actual details of the argument.
+        assert len(text.keys()) == 1
+
+        for arg_name in text.keys():
+            # Pull out and substitute the individual fields of an argument one at a time
+            for field in  [ "default", "min", "max" ]:
+                if field in text[arg_name]:
+                    text[arg_name][field] = substitute_variables(text[arg_name][field], variables)
+
+            # choices is a list of things
+            if "choices" in text[arg_name]:
+                text[arg_name]["choices"] = [substitute_variables(c, variables) for c in text[arg_name]["choices"]]
+
+            return text
+        else:
+            raise ValueError("Empty arg dictionary")
+    else:
+        def replace_match(match: re.Match) -> str:
+            prefix = match.group(1)
+            name = match.group(2)
+
+            # Only substitute var: placeholders
+            if prefix != "var":
+                return match.group(0)  # Return unchanged
+
+            if name not in variables:
+                raise ValueError(
+                    f"Variable '{name}' is not defined. "
+                    f"Variables must be defined before use."
+                )
+
+            return variables[name]
+
+        return PLACEHOLDER_PATTERN.sub(replace_match, text)
 
 
 def substitute_arguments(text: str, args: dict[str, Any], exported_args: set[str] | None = None) -> str:

{tasktree-0.0.12.dist-info → tasktree-0.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasktree
-Version: 0.0.12
+Version: 0.0.14
 Summary: A task automation tool with incremental execution
 Requires-Python: >=3.11
 Requires-Dist: click>=8.1.0

{tasktree-0.0.12.dist-info → tasktree-0.0.14.dist-info}/RECORD

@@ -1,15 +1,15 @@
 tasktree/__init__.py,sha256=MVmdvKb3JdqLlo0x2_TPGMfgFC0HsDnP79HAzGnFnjI,1081
-tasktree/cli.py,sha256=uL4RGap1U7-_4mcdEGbsELR4cvm1aUaqbvnX8XJFNKc,17652
+tasktree/cli.py,sha256=ywaLXEehOHcMsBioL4RxPQ1vTWIG1V7Hb0TZ1YI2F_g,18820
 tasktree/docker.py,sha256=qvja8G63uAcC73YMVY739egda1_CcBtoqzm0qIJU_Q8,14443
 tasktree/executor.py,sha256=Q7Bks5B88i-IyZDpxGSps9MM3uflz0U3yn4Rtq_uHMM,42266
 tasktree/graph.py,sha256=oXLxX0Ix4zSkVBg8_3x9K7WxSFpg136sp4MF-d2mDEQ,9682
 tasktree/hasher.py,sha256=0GrnCfwAXnwq_kpnHFFb12B5_2VFNXx6Ng7hTdcCyXo,4415
 tasktree/parser.py,sha256=XdFuELqrrhHc45HeMpo6-gflopZM7kYTqO1lQcFwtFk,68782
 tasktree/state.py,sha256=Cktl4D8iDZVd55aO2LqVyPrc-BnljkesxxkcMcdcfOY,3541
-tasktree/substitution.py,sha256=M_qcP0NKJATrKcNShSqHJatneuth1RVwTk1ci8-ZuxQ,6473
+tasktree/substitution.py,sha256=UAq69YO4uGkvFfd5mtGy6CwFZ_uxZGf4HGpnvCBVBuc,7499
 tasktree/tasks.py,sha256=2QdQZtJAX2rSGbyXKG1z9VF_siz1DUzdvzCgPkykxtU,173
 tasktree/types.py,sha256=R_YAyO5bMLB6XZnkMRT7VAtlkA_Xx6xu0aIpzQjrBXs,4357
-tasktree-0.0.12.dist-info/METADATA,sha256=fdh62_US58sghqn46-f0072dEnFECrJccRa6tL7m2DU,37234
-tasktree-0.0.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tasktree-0.0.12.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
-tasktree-0.0.12.dist-info/RECORD,,
+tasktree-0.0.14.dist-info/METADATA,sha256=JnlgocAOtAq_Q-vWrOkYM6mofrCeH8xiGFKYqaQmX4M,37234
+tasktree-0.0.14.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tasktree-0.0.14.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
+tasktree-0.0.14.dist-info/RECORD,,