tasktree 0.0.5__py3-none-any.whl → 0.0.7__py3-none-any.whl

tasktree/parser.py

@@ -16,12 +16,24 @@ class CircularImportError(Exception):
 
 @dataclass
 class Environment:
-    """Represents an execution environment configuration."""
+    """Represents an execution environment configuration.
+
+    Can be either a shell environment or a Docker environment:
+    - Shell environment: has 'shell' field, executes directly on host
+    - Docker environment: has 'dockerfile' field, executes in container
+    """
 
     name: str
-    shell: str
+    shell: str = ""  # Path to shell (required for shell envs, optional for Docker)
     args: list[str] = field(default_factory=list)
     preamble: str = ""
+    # Docker-specific fields (presence of dockerfile indicates Docker environment)
+    dockerfile: str = ""  # Path to Dockerfile
+    context: str = ""  # Path to build context directory
+    volumes: list[str] = field(default_factory=list)  # Volume mounts
+    ports: list[str] = field(default_factory=list)  # Port mappings
+    env_vars: dict[str, str] = field(default_factory=dict)  # Environment variables
+    working_dir: str = ""  # Working directory (container or host)
 
     def __post_init__(self):
         """Ensure args is always a list."""
@@ -94,13 +106,25 @@ class Recipe:
 
 
 def find_recipe_file(start_dir: Path | None = None) -> Path | None:
-    """Find recipe file (tasktree.yaml or tt.yaml) in current or parent directories.
+    """Find recipe file in current or parent directories.
+
+    Looks for recipe files matching these patterns (in order of preference):
+    - tasktree.yaml
+    - tasktree.yml
+    - tt.yaml
+    - *.tasks
+
+    If multiple recipe files are found in the same directory, raises ValueError
+    with instructions to use --tasks option.
 
     Args:
         start_dir: Directory to start searching from (defaults to cwd)
 
     Returns:
         Path to recipe file if found, None otherwise
+
+    Raises:
+        ValueError: If multiple recipe files found in the same directory
     """
     if start_dir is None:
         start_dir = Path.cwd()
@@ -109,10 +133,30 @@ def find_recipe_file(start_dir: Path | None = None) -> Path | None:
 
     # Search up the directory tree
     while True:
-        for filename in ["tasktree.yaml", "tt.yaml"]:
+        candidates = []
+
+        # Check for exact filenames first
+        for filename in ["tasktree.yaml", "tasktree.yml", "tt.yaml"]:
             recipe_path = current / filename
             if recipe_path.exists():
-                return recipe_path
+                candidates.append(recipe_path)
+
+        # Check for *.tasks files
+        for tasks_file in current.glob("*.tasks"):
+            if tasks_file.is_file():
+                candidates.append(tasks_file)
+
+        if len(candidates) > 1:
+            # Multiple recipe files found - ambiguous
+            filenames = [c.name for c in candidates]
+            raise ValueError(
+                f"Multiple recipe files found in {current}:\n"
+                f"  {', '.join(filenames)}\n\n"
+                f"Please specify which file to use with --tasks (-T):\n"
+                f"  tt --tasks {filenames[0]} <task-name>"
+            )
+        elif len(candidates) == 1:
+            return candidates[0]
 
         # Move to parent directory
         parent = current.parent
@@ -169,28 +213,83 @@ def _parse_file_with_env(
                             f"Environment '{env_name}' must be a dictionary"
                         )
 
-                    # Parse environment configuration
+                    # Parse common environment configuration
                     shell = env_config.get("shell", "")
-                    if not shell:
+                    args = env_config.get("args", [])
+                    preamble = env_config.get("preamble", "")
+                    working_dir = env_config.get("working_dir", "")
+
+                    # Parse Docker-specific fields
+                    dockerfile = env_config.get("dockerfile", "")
+                    context = env_config.get("context", "")
+                    volumes = env_config.get("volumes", [])
+                    ports = env_config.get("ports", [])
+                    env_vars = env_config.get("env_vars", {})
+
+                    # Validate environment type
+                    if not shell and not dockerfile:
                         raise ValueError(
-                            f"Environment '{env_name}' must specify 'shell'"
+                            f"Environment '{env_name}' must specify either 'shell' "
+                            f"(for shell environments) or 'dockerfile' (for Docker environments)"
                         )
 
-                    args = env_config.get("args", [])
-                    preamble = env_config.get("preamble", "")
+                    # Validate Docker environment requirements
+                    if dockerfile and not context:
+                        raise ValueError(
+                            f"Docker environment '{env_name}' must specify 'context' "
+                            f"when 'dockerfile' is specified"
+                        )
+
+                    # Validate that Dockerfile exists if specified
+                    if dockerfile:
+                        dockerfile_path = project_root / dockerfile
+                        if not dockerfile_path.exists():
+                            raise ValueError(
+                                f"Environment '{env_name}': Dockerfile not found at {dockerfile_path}"
+                            )
+
+                    # Validate that context directory exists if specified
+                    if context:
+                        context_path = project_root / context
+                        if not context_path.exists():
+                            raise ValueError(
+                                f"Environment '{env_name}': context directory not found at {context_path}"
+                            )
+                        if not context_path.is_dir():
+                            raise ValueError(
+                                f"Environment '{env_name}': context must be a directory, got {context_path}"
+                            )
+
+                    # Validate environment name (must be valid Docker tag)
+                    if not env_name.replace("-", "").replace("_", "").isalnum():
+                        raise ValueError(
+                            f"Environment name '{env_name}' must be alphanumeric "
+                            f"(with optional hyphens and underscores)"
+                        )
 
                     environments[env_name] = Environment(
-                        name=env_name, shell=shell, args=args, preamble=preamble
+                        name=env_name,
+                        shell=shell,
+                        args=args,
+                        preamble=preamble,
+                        dockerfile=dockerfile,
+                        context=context,
+                        volumes=volumes,
+                        ports=ports,
+                        env_vars=env_vars,
+                        working_dir=working_dir,
                     )
 
     return tasks, environments, default_env
 
 
-def parse_recipe(recipe_path: Path) -> Recipe:
+def parse_recipe(recipe_path: Path, project_root: Path | None = None) -> Recipe:
     """Parse a recipe file and handle imports recursively.
 
     Args:
         recipe_path: Path to the main recipe file
+        project_root: Optional project root directory. If not provided, uses recipe file's parent directory.
+                     When using --tasks option, this should be the current working directory.
 
     Returns:
         Recipe object with all tasks (including recursively imported tasks)
@@ -204,7 +303,9 @@ def parse_recipe(recipe_path: Path) -> Recipe:
     if not recipe_path.exists():
         raise FileNotFoundError(f"Recipe file not found: {recipe_path}")
 
-    project_root = recipe_path.parent
+    # Default project root to recipe file's parent if not specified
+    if project_root is None:
+        project_root = recipe_path.parent
 
     # Parse main file - it will recursively handle all imports
     tasks, environments, default_env = _parse_file_with_env(
@@ -263,8 +364,9 @@ def _parse_file(
     tasks: dict[str, Task] = {}
     file_dir = file_path.parent
 
-    # Default working directory is the file's directory
-    default_working_dir = str(file_dir.relative_to(project_root)) if file_dir != project_root else "."
+    # Default working directory is the project root (where tt is invoked)
+    # NOT the directory where the tasks file is located
+    default_working_dir = "."
 
     # Track local import namespaces for dependency rewriting
     local_import_namespaces: set[str] = set()
@@ -388,6 +490,7 @@ def _parse_file(
             working_dir=working_dir,
             args=task_data.get("args", []),
             source_file=str(file_path),
+            env=task_data.get("env", ""),
         )
 
         tasks[full_name] = task

tasktree/state.py

@@ -13,7 +13,7 @@ class TaskState:
     """State for a single task execution."""
 
     last_run: float
-    input_state: dict[str, float] = field(default_factory=dict)
+    input_state: dict[str, float | str] = field(default_factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         """Convert to dictionary for JSON serialization."""

{tasktree-0.0.5.dist-info → tasktree-0.0.7.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: tasktree
-Version: 0.0.5
+Version: 0.0.7
 Summary: A task automation tool with incremental execution
 Requires-Python: >=3.11
 Requires-Dist: click>=8.1.0
 Requires-Dist: colorama>=0.4.6
+Requires-Dist: pathspec>=0.11.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: typer>=0.9.0
@@ -108,52 +109,6 @@ Boom! Done. `build` will always run, because there's no sensible way to know wha
 
 This is a toy example, but you can image how it plays out on a more complex project.
 
-## Migrating from v1.x to v2.0
-
-Version 2.0 requires all task definitions to be under a top-level `tasks:` key.
-
-### Quick Migration
-
-Wrap your existing tasks in a `tasks:` block:
-
-```yaml
-# Before (v1.x)
-build:
-  cmd: cargo build
-
-# After (v2.0)
-tasks:
-  build:
-    cmd: cargo build
-```
-
-### Why This Change?
-
-1. **Clearer structure**: Explicit separation of tasks from configuration
-2. **No naming conflicts**: You can now create tasks named "imports" or "environments"
-3. **Better error messages**: More helpful validation errors
-4. **Consistency**: All recipe files use the same format
-
-### Error Messages
-
-If you forget to update, you'll see a clear error:
-
-```
-Invalid recipe format in tasktree.yaml
-
-Task definitions must be under a top-level "tasks:" key.
-
-Found these keys at root level: build, test
-
-Did you mean:
-
-tasks:
-  build:
-    cmd: ...
-  test:
-    cmd: ...
-```
-
 ## Installation
 
 ### From PyPI (Recommended)
@@ -188,6 +143,37 @@ cd tasktree
 pipx install .
 ```
 
+## Editor Support
+
+Task Tree includes a [JSON Schema](schema/tasktree-schema.json) that provides autocomplete, validation, and documentation in modern editors.
+
+### VS Code
+
+Install the [YAML extension](https://marketplace.visualstudio.com/items?itemName=redhat.vscode-yaml), then add to your workspace `.vscode/settings.json`:
+
+```json
+{
+  "yaml.schemas": {
+    "https://raw.githubusercontent.com/kevinchannon/tasktree/main/schema/tasktree-schema.json": [
+      "tasktree.yaml",
+      "tt.yaml"
+    ]
+  }
+}
+```
+
+Or add a comment at the top of your `tasktree.yaml`:
+
+```yaml
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kevinchannon/tasktree/main/schema/tasktree-schema.json
+
+tasks:
+  build:
+    cmd: cargo build
+```
+
+See [schema/README.md](schema/README.md) for IntelliJ/PyCharm and command-line validation.
+
 ## Quick Start
 
 Create a `tasktree.yaml` (or `tt.yaml`) in your project:

tasktree-0.0.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+tasktree/__init__.py,sha256=MVmdvKb3JdqLlo0x2_TPGMfgFC0HsDnP79HAzGnFnjI,1081
+tasktree/cli.py,sha256=0xusNitT1AtLgR3guUsupnHSXJ0_C749Dx7dfYCENJA,15233
+tasktree/docker.py,sha256=duIT5HkGBvLNOPdbgdXuqqUSwJgdWsb4Sxv_HVm8hzA,13118
+tasktree/executor.py,sha256=8xNKPYkekhaGd_gCO7PT7E-n0JeHVtDgIbxACuvPUzU,28707
+tasktree/graph.py,sha256=lA3ExNM_ag0AlC6iW20unseCjRg5wCZXbmXs2M6TnQw,5578
+tasktree/hasher.py,sha256=dCyakihE4rHoOVCbt8hgTQZVuez3P1V0SrWUl-aM2Tw,1670
+tasktree/parser.py,sha256=gkbzlTOwudJsU5gvgSCpVVY2GoYZlo_kLBVsIRbeZiU,19076
+tasktree/state.py,sha256=Cktl4D8iDZVd55aO2LqVyPrc-BnljkesxxkcMcdcfOY,3541
+tasktree/tasks.py,sha256=2QdQZtJAX2rSGbyXKG1z9VF_siz1DUzdvzCgPkykxtU,173
+tasktree/types.py,sha256=w--sKjRTc8mGYkU5eAduqV86SolDqOYspAPuVKIuSQQ,3797
+tasktree-0.0.7.dist-info/METADATA,sha256=YthtlFiUCaHTgO8n5jUsiJQ3py4pQ23_Zh3Ycshi4fk,17439
+tasktree-0.0.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tasktree-0.0.7.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
+tasktree-0.0.7.dist-info/RECORD,,

tasktree-0.0.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-tasktree/__init__.py,sha256=MVmdvKb3JdqLlo0x2_TPGMfgFC0HsDnP79HAzGnFnjI,1081
-tasktree/cli.py,sha256=jeLFmyFjTeF6JXDPLI46H5Xao9br68tPWL7D6LbC7u0,13272
-tasktree/executor.py,sha256=_E37tShHuiOj0Mvx2GbS9y3GIozC3hpzAVhAjbvYJqg,18638
-tasktree/graph.py,sha256=9ngfg93y7EkOIN_lUQa0u-JhnwiMN1UdQQvIFw8RYCE,4181
-tasktree/hasher.py,sha256=puJey9wF_p37k_xqjhYr_6ICsbAfrTBWHec6MqKV4BU,814
-tasktree/parser.py,sha256=5WXoqN2cUtO9icIPDSvK5889XinBcAQMBCyNoJ2ZO6w,14152
-tasktree/state.py,sha256=rxKtS3SbsPtAuraHbN807RGWfoYYkQ3pe8CxUstwo2k,3535
-tasktree/tasks.py,sha256=2QdQZtJAX2rSGbyXKG1z9VF_siz1DUzdvzCgPkykxtU,173
-tasktree/types.py,sha256=w--sKjRTc8mGYkU5eAduqV86SolDqOYspAPuVKIuSQQ,3797
-tasktree-0.0.5.dist-info/METADATA,sha256=ncZRu7zCKZRd5YGG5fAWAL1TtH1mXbtnTqAne3RHdeA,17456
-tasktree-0.0.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-tasktree-0.0.5.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
-tasktree-0.0.5.dist-info/RECORD,,