tasktree 0.0.16__py3-none-any.whl → 0.0.18__py3-none-any.whl

tasktree/parser.py

@@ -232,14 +232,16 @@ class Recipe:
             # (CLI will provide its own "Task not found" error)
             try:
                 reachable_tasks = collect_reachable_tasks(self.tasks, root_task)
-                variables_to_eval = collect_reachable_variables(self.tasks, reachable_tasks)
+                variables_to_eval = collect_reachable_variables(self.tasks, self.environments, reachable_tasks)
             except ValueError:
                 # Root task not found - fall back to eager evaluation
                 # This allows the recipe to be parsed even with invalid task names
                 # so the CLI can provide its own error message
+                reachable_tasks = self.tasks.keys()
                 variables_to_eval = set(self.raw_variables.keys())
         else:
             # Eager path: evaluate all variables (for --list command)
+            reachable_tasks = self.tasks.keys()
             variables_to_eval = set(self.raw_variables.keys())
 
         # Evaluate the selected variables using helper function
@@ -256,7 +258,10 @@ class Recipe:
         # Substitute evaluated variables into all tasks
         from tasktree.substitution import substitute_variables
 
-        for task in self.tasks.values():
+        for task_name, task in self.tasks.items():
+            if task_name not in reachable_tasks:
+                continue
+
             task.cmd = substitute_variables(task.cmd, self.evaluated_variables)
             task.desc = substitute_variables(task.desc, self.evaluated_variables)
             task.working_dir = substitute_variables(task.working_dir, self.evaluated_variables)
@@ -1311,15 +1316,17 @@ def collect_reachable_tasks(tasks: dict[str, Task], root_task: str) -> set[str]:
 
 def collect_reachable_variables(
     tasks: dict[str, Task],
+    environments: dict[str, Environment],
     reachable_task_names: set[str]
 ) -> set[str]:
     """Extract variable names used by reachable tasks.
 
-    Searches for {{ var.* }} placeholders in task definitions to determine
+    Searches for {{ var.* }} placeholders in task and environment definitions to determine
     which variables are actually needed for execution.
 
     Args:
         tasks: Dictionary mapping task names to Task objects
+        environments: Dictionary mapping environment names to Environment objects
         reachable_task_names: Set of task names that will be executed
 
     Returns:
@@ -1398,6 +1405,42 @@ def collect_reachable_variables(
                                     for match in var_pattern.finditer(val):
                                         variables.add(match.group(1))
 
+        if task.env:
+            if task.env in environments:
+                env = environments[task.env]
+
+                if env.dockerfile and env.dockerfile != "":
+                    for match in var_pattern.finditer(env.dockerfile):
+                        variables.add(match.group(1))
+
+                    if env.context != "":
+                        for match in var_pattern.finditer(env.context):
+                            variables.add(match.group(1))
+
+                    if 0 != len(env.volumes):
+                        for v in env.volumes:
+                            for match in var_pattern.finditer(v):
+                                variables.add(match.group(1))
+
+                    if 0 != len(env.ports):
+                        for p in env.ports:
+                            for match in var_pattern.finditer(p):
+                                variables.add(match.group(1))
+
+                    if 0 != len(env.env_vars):
+                        for k, v in env.env_vars.items():
+                            for match in var_pattern.finditer(v):
+                                variables.add(match.group(1))
+
+                    if env.working_dir != "":
+                        for match in var_pattern.finditer(env.working_dir):
+                            variables.add(match.group(1))
+
+                    if 0 != len(env.extra_args):
+                        for e in env.extra_args:
+                            for match in var_pattern.finditer(e):
+                                variables.add(match.group(1))
+
     return variables
 
 

{tasktree-0.0.16.dist-info → tasktree-0.0.18.dist-info}/METADATA

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

{tasktree-0.0.16.dist-info → tasktree-0.0.18.dist-info}/RECORD

@@ -4,11 +4,11 @@ tasktree/docker.py,sha256=qvja8G63uAcC73YMVY739egda1_CcBtoqzm0qIJU_Q8,14443
 tasktree/executor.py,sha256=QQcABThmof0MLTtwpJKpyqh80hr3YRIqqs3NZ-Ry-Bk,44873
 tasktree/graph.py,sha256=yITp71RfhJ7sdC-2zRf89SHYZqQyF3XVAnaqX-XnMdE,15821
 tasktree/hasher.py,sha256=0GrnCfwAXnwq_kpnHFFb12B5_2VFNXx6Ng7hTdcCyXo,4415
-tasktree/parser.py,sha256=yOe6G1Fg2FqmEjaPD73FD2aiYP9sZisTx1DZPofx9wc,87049
+tasktree/parser.py,sha256=o2AQuk9xeM9JCtyMzDeM0uJBsbJEhzPDxsPg9GwmJt4,88940
 tasktree/state.py,sha256=Cktl4D8iDZVd55aO2LqVyPrc-BnljkesxxkcMcdcfOY,3541
 tasktree/substitution.py,sha256=qG7SyEHn1PAKteWA0AgA1dUNbJfwQTupCLRq9FvOBD0,10724
 tasktree/types.py,sha256=R_YAyO5bMLB6XZnkMRT7VAtlkA_Xx6xu0aIpzQjrBXs,4357
-tasktree-0.0.16.dist-info/METADATA,sha256=ssKlllByyOeVMGDuHa11XLDhcGoxPfepRRoO776A_Ig,37234
-tasktree-0.0.16.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tasktree-0.0.16.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
-tasktree-0.0.16.dist-info/RECORD,,
+tasktree-0.0.18.dist-info/METADATA,sha256=u70mwnKCeb3sQkn5_B4cf0AOc8mI-FhvdTUbW0hoB3A,37234
+tasktree-0.0.18.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tasktree-0.0.18.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
+tasktree-0.0.18.dist-info/RECORD,,