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

tasktree/cli.py

@@ -26,11 +26,11 @@ app = typer.Typer(
 console = Console()
 
 
-def _list_tasks():
+def _list_tasks(tasks_file: Optional[str] = None):
     """List all available tasks with descriptions."""
-    recipe = _get_recipe()
+    recipe = _get_recipe(tasks_file)
     if recipe is None:
-        console.print("[red]No recipe file found (tasktree.yaml or tt.yaml)[/red]")
+        console.print("[red]No recipe file found (tasktree.yaml, tasktree.yml, tt.yaml, or *.tasks)[/red]")
         raise typer.Exit(1)
 
     table = Table(title="Available Tasks")
@@ -45,11 +45,11 @@ def _list_tasks():
     console.print(table)
 
 
-def _show_task(task_name: str):
+def _show_task(task_name: str, tasks_file: Optional[str] = None):
     """Show task definition with syntax highlighting."""
-    recipe = _get_recipe()
+    recipe = _get_recipe(tasks_file)
     if recipe is None:
-        console.print("[red]No recipe file found (tasktree.yaml or tt.yaml)[/red]")
+        console.print("[red]No recipe file found (tasktree.yaml, tasktree.yml, tt.yaml, or *.tasks)[/red]")
         raise typer.Exit(1)
 
     task = recipe.get_task(task_name)
@@ -79,17 +79,26 @@ def _show_task(task_name: str):
     task_dict = task_yaml[task_name]
     task_yaml[task_name] = {k: v for k, v in task_dict.items() if v}
 
+    # Configure YAML dumper to use literal block style for multiline strings
+    def literal_presenter(dumper, data):
+        """Use literal block style (|) for strings containing newlines."""
+        if '\n' in data:
+            return dumper.represent_scalar('tag:yaml.org,2002:str', data, style='|')
+        return dumper.represent_scalar('tag:yaml.org,2002:str', data)
+
+    yaml.add_representer(str, literal_presenter)
+
     # Format and highlight using Rich
     yaml_str = yaml.dump(task_yaml, default_flow_style=False, sort_keys=False)
     syntax = Syntax(yaml_str, "yaml", theme="ansi_light", line_numbers=False)
     console.print(syntax)
 
 
-def _show_tree(task_name: str):
+def _show_tree(task_name: str, tasks_file: Optional[str] = None):
     """Show dependency tree structure."""
-    recipe = _get_recipe()
+    recipe = _get_recipe(tasks_file)
     if recipe is None:
-        console.print("[red]No recipe file found (tasktree.yaml or tt.yaml)[/red]")
+        console.print("[red]No recipe file found (tasktree.yaml, tasktree.yml, tt.yaml, or *.tasks)[/red]")
         raise typer.Exit(1)
 
     task = recipe.get_task(task_name)
@@ -169,6 +178,7 @@ def main(
     list_opt: Optional[bool] = typer.Option(None, "--list", "-l", help="List all available tasks"),
     show: Optional[str] = typer.Option(None, "--show", "-s", help="Show task definition"),
     tree: Optional[str] = typer.Option(None, "--tree", "-t", help="Show dependency tree"),
+    tasks_file: Optional[str] = typer.Option(None, "--tasks", "-T", help="Path to recipe file (tasktree.yaml, *.tasks, etc.)"),
     init: Optional[bool] = typer.Option(
         None, "--init", "-i", help="Create a blank tasktree.yaml"
     ),
@@ -208,15 +218,15 @@ def main(
     """
 
     if list_opt:
-        _list_tasks()
+        _list_tasks(tasks_file)
         raise typer.Exit()
 
     if show:
-        _show_task(show)
+        _show_task(show, tasks_file)
         raise typer.Exit()
 
     if tree:
-        _show_tree(tree)
+        _show_tree(tree, tasks_file)
         raise typer.Exit()
 
     if init:
@@ -224,17 +234,17 @@ def main(
         raise typer.Exit()
 
     if clean or clean_state or reset:
-        _clean_state()
+        _clean_state(tasks_file)
         raise typer.Exit()
 
     if task_args:
         # --only implies --force
         force_execution = force or only or False
-        _execute_dynamic_task(task_args, force=force_execution, only=only or False, env=env)
+        _execute_dynamic_task(task_args, force=force_execution, only=only or False, env=env, tasks_file=tasks_file)
     else:
-        recipe = _get_recipe()
+        recipe = _get_recipe(tasks_file)
         if recipe is None:
-            console.print("[red]No recipe file found (tasktree.yaml or tt.yaml)[/red]")
+            console.print("[red]No recipe file found (tasktree.yaml, tasktree.yml, tt.yaml, or *.tasks)[/red]")
             console.print("Run [cyan]tt --init[/cyan] to create a blank recipe file")
             raise typer.Exit(1)
 
@@ -245,13 +255,19 @@ def main(
         console.print("Use [cyan]tt <task-name>[/cyan] to run a task")
 
 
-def _clean_state() -> None:
+def _clean_state(tasks_file: Optional[str] = None) -> None:
     """Remove the .tasktree-state file to reset task execution state."""
-    recipe_path = find_recipe_file()
-    if recipe_path is None:
-        console.print("[yellow]No recipe file found[/yellow]")
-        console.print("State file location depends on recipe file location")
-        raise typer.Exit(1)
+    if tasks_file:
+        recipe_path = Path(tasks_file)
+        if not recipe_path.exists():
+            console.print(f"[red]Recipe file not found: {tasks_file}[/red]")
+            raise typer.Exit(1)
+    else:
+        recipe_path = find_recipe_file()
+        if recipe_path is None:
+            console.print("[yellow]No recipe file found[/yellow]")
+            console.print("State file location depends on recipe file location")
+            raise typer.Exit(1)
 
     project_root = recipe_path.parent
     state_path = project_root / ".tasktree-state"
@@ -264,29 +280,48 @@ def _clean_state() -> None:
         console.print(f"[yellow]No state file found at {state_path}[/yellow]")
 
 
-def _get_recipe() -> Optional[Recipe]:
-    """Get parsed recipe or None if not found."""
-    recipe_path = find_recipe_file()
-    if recipe_path is None:
-        return None
+def _get_recipe(recipe_file: Optional[str] = None) -> Optional[Recipe]:
+    """Get parsed recipe or None if not found.
+
+    Args:
+        recipe_file: Optional path to recipe file. If not provided, searches for recipe file.
+    """
+    if recipe_file:
+        recipe_path = Path(recipe_file)
+        if not recipe_path.exists():
+            console.print(f"[red]Recipe file not found: {recipe_file}[/red]")
+            raise typer.Exit(1)
+        # When explicitly specified, project root is current working directory
+        project_root = Path.cwd()
+    else:
+        try:
+            recipe_path = find_recipe_file()
+            if recipe_path is None:
+                return None
+        except ValueError as e:
+            # Multiple recipe files found
+            console.print(f"[red]{e}[/red]")
+            raise typer.Exit(1)
+        # When auto-discovered, project root is recipe file's parent
+        project_root = None
 
     try:
-        return parse_recipe(recipe_path)
+        return parse_recipe(recipe_path, project_root)
     except Exception as e:
         console.print(f"[red]Error parsing recipe: {e}[/red]")
         raise typer.Exit(1)
 
 
-def _execute_dynamic_task(args: list[str], force: bool = False, only: bool = False, env: Optional[str] = None) -> None:
+def _execute_dynamic_task(args: list[str], force: bool = False, only: bool = False, env: Optional[str] = None, tasks_file: Optional[str] = None) -> None:
     if not args:
         return
 
     task_name = args[0]
     task_args = args[1:]
 
-    recipe = _get_recipe()
+    recipe = _get_recipe(tasks_file)
     if recipe is None:
-        console.print("[red]No recipe file found (tasktree.yaml or tt.yaml)[/red]")
+        console.print("[red]No recipe file found (tasktree.yaml, tasktree.yml, tt.yaml, or *.tasks)[/red]")
         raise typer.Exit(1)
 
     # Apply global environment override if provided

tasktree/parser.py

@@ -94,13 +94,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 +121,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
@@ -186,11 +218,13 @@ def _parse_file_with_env(
     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 +238,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 +299,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()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasktree
-Version: 0.0.5
+Version: 0.0.6
 Summary: A task automation tool with incremental execution
 Requires-Python: >=3.11
 Requires-Dist: click>=8.1.0
@@ -188,6 +188,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.5.dist-info → tasktree-0.0.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
 tasktree/__init__.py,sha256=MVmdvKb3JdqLlo0x2_TPGMfgFC0HsDnP79HAzGnFnjI,1081
-tasktree/cli.py,sha256=jeLFmyFjTeF6JXDPLI46H5Xao9br68tPWL7D6LbC7u0,13272
+tasktree/cli.py,sha256=0xusNitT1AtLgR3guUsupnHSXJ0_C749Dx7dfYCENJA,15233
 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/parser.py,sha256=SzWn-V4KMgjxNZrN0ERApb5dd39LPJTfkA2Ih2nYWcs,15580
 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,,
+tasktree-0.0.6.dist-info/METADATA,sha256=GQZHcFVOIXfWmgPbb9pAt7zB0iH22hyGToc0YEwUv34,18287
+tasktree-0.0.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+tasktree-0.0.6.dist-info/entry_points.txt,sha256=lQINlvRYnimvteBbnhH84A9clTg8NnpEjCWqWkqg8KE,40
+tasktree-0.0.6.dist-info/RECORD,,