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

tasktree/parser.py

@@ -287,26 +287,35 @@ def _is_env_variable_reference(value: Any) -> bool:
     return isinstance(value, dict) and "env" in value
 
 
-def _validate_env_variable_reference(var_name: str, value: dict) -> str:
-    """Validate and extract environment variable name from reference.
+def _validate_env_variable_reference(var_name: str, value: dict) -> tuple[str, str | None]:
+    """Validate and extract environment variable name and optional default from reference.
 
     Args:
         var_name: Name of the variable being defined
-        value: Dict that should be { env: ENV_VAR_NAME }
+        value: Dict that should be { env: ENV_VAR_NAME } or { env: ENV_VAR_NAME, default: "value" }
 
     Returns:
-        Environment variable name
+        Tuple of (environment variable name, default value or None)
 
     Raises:
         ValueError: If reference is invalid
     """
-    # Validate dict structure
-    if len(value) != 1:
-        extra_keys = [k for k in value.keys() if k != "env"]
+    # Validate dict structure - allow 'env' and optionally 'default'
+    valid_keys = {"env", "default"}
+    invalid_keys = set(value.keys()) - valid_keys
+    if invalid_keys:
         raise ValueError(
             f"Invalid environment variable reference in variable '{var_name}'.\n"
-            f"Expected: {{ env: VARIABLE_NAME }}\n"
-            f"Found extra keys: {', '.join(extra_keys)}"
+            f"Expected: {{ env: VARIABLE_NAME }} or {{ env: VARIABLE_NAME, default: \"value\" }}\n"
+            f"Found invalid keys: {', '.join(invalid_keys)}"
+        )
+
+    # Validate 'env' key is present
+    if "env" not in value:
+        raise ValueError(
+            f"Invalid environment variable reference in variable '{var_name}'.\n"
+            f"Missing required 'env' key.\n"
+            f"Expected: {{ env: VARIABLE_NAME }} or {{ env: VARIABLE_NAME, default: \"value\" }}"
         )
 
     env_var_name = value["env"]
@@ -315,7 +324,7 @@ def _validate_env_variable_reference(var_name: str, value: dict) -> str:
     if not env_var_name or not isinstance(env_var_name, str):
         raise ValueError(
             f"Invalid environment variable reference in variable '{var_name}'.\n"
-            f"Expected: {{ env: VARIABLE_NAME }}\n"
+            f"Expected: {{ env: VARIABLE_NAME }} or {{ env: VARIABLE_NAME, default: \"value\" }}"
             f"Found: {{ env: {env_var_name!r} }}"
         )
 
@@ -327,23 +336,36 @@ def _validate_env_variable_reference(var_name: str, value: dict) -> str:
             f"and contain only alphanumerics and underscores."
         )
 
-    return env_var_name
+    # Extract and validate default if present
+    default = value.get("default")
+    if default is not None:
+        # Default must be a string (env vars are always strings)
+        if not isinstance(default, str):
+            raise ValueError(
+                f"Invalid default value in variable '{var_name}'.\n"
+                f"Environment variable defaults must be strings.\n"
+                f"Got: {default!r} (type: {type(default).__name__})\n"
+                f"Use a quoted string: {{ env: {env_var_name}, default: \"{default}\" }}"
+            )
+
+    return env_var_name, default
 
 
-def _resolve_env_variable(var_name: str, env_var_name: str) -> str:
+def _resolve_env_variable(var_name: str, env_var_name: str, default: str | None = None) -> str:
     """Resolve environment variable value.
 
     Args:
         var_name: Name of the variable being defined
         env_var_name: Name of environment variable to read
+        default: Optional default value to use if environment variable is not set
 
     Returns:
-        Environment variable value as string
+        Environment variable value as string, or default if not set and default provided
 
     Raises:
-        ValueError: If environment variable is not set
+        ValueError: If environment variable is not set and no default provided
     """
-    value = os.environ.get(env_var_name)
+    value = os.environ.get(env_var_name, default)
 
     if value is None:
         raise ValueError(
@@ -730,11 +752,11 @@ def _resolve_variable_value(
 
         # Check if this is an environment variable reference
         if _is_env_variable_reference(raw_value):
-            # Validate and extract env var name
-            env_var_name = _validate_env_variable_reference(name, raw_value)
+            # Validate and extract env var name and optional default
+            env_var_name, default = _validate_env_variable_reference(name, raw_value)
 
-            # Resolve from os.environ
-            string_value = _resolve_env_variable(name, env_var_name)
+            # Resolve from os.environ (with optional default)
+            string_value = _resolve_env_variable(name, env_var_name, default)
 
             # Still perform variable-in-variable substitution
             from tasktree.substitution import substitute_variables

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasktree
-Version: 0.0.11
+Version: 0.0.12
 Summary: A task automation tool with incremental execution
 Requires-Python: >=3.11
 Requires-Dist: click>=8.1.0
@@ -718,10 +718,13 @@ For more complex scenarios, define environment variables in the `variables` sect
 
 ```yaml
 variables:
-  # Direct env reference (resolved at parse time)
+  # Required env var (error if not set)
   api_key: { env: API_KEY }
-  db_host: { env: DATABASE_HOST }
-
+  
+  # Optional env var with default
+  port: { env: PORT, default: "8080" }
+  log_level: { env: LOG_LEVEL, default: "info" }
+  
   # Or using string substitution
   deploy_user: "{{ env.DEPLOY_USER }}"
 

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

@@ -4,12 +4,12 @@ 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=rHJuYMM4AUjM1E-Jh3SpUpBRKGkciYOvgfgERoXylSE,67364
+tasktree/parser.py,sha256=XdFuELqrrhHc45HeMpo6-gflopZM7kYTqO1lQcFwtFk,68782
 tasktree/state.py,sha256=Cktl4D8iDZVd55aO2LqVyPrc-BnljkesxxkcMcdcfOY,3541
 tasktree/substitution.py,sha256=M_qcP0NKJATrKcNShSqHJatneuth1RVwTk1ci8-ZuxQ,6473
 tasktree/tasks.py,sha256=2QdQZtJAX2rSGbyXKG1z9VF_siz1DUzdvzCgPkykxtU,173
 tasktree/types.py,sha256=R_YAyO5bMLB6XZnkMRT7VAtlkA_Xx6xu0aIpzQjrBXs,4357
-tasktree-0.0.11.dist-info/METADATA,sha256=a41OmLVRm4BbIpZT4e7v-l3g3gmw3DD1Eg0OXnrVsYA,37151
-tasktree-0.0.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tasktree-0.0.11.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
-tasktree-0.0.11.dist-info/RECORD,,
+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,,