merge: resolve cli.py conflict with upstream/main

Author: Ziang Zhang

README.md

@@ -171,9 +171,9 @@ Settings are saved automatically.
 
 <a href="https://www.star-history.com/?repos=AkshajSinghal%2FTruShell&type=date&legend=top-left">
  <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=AkshajSinghal/TruShell&type=date&theme=dark&legend=top-left" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=AkshajSinghal/TruShell&type=date&legend=top-left" />
-   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=AkshajSinghal/TruShell&type=date&legend=top-left" />
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/chart?repos=TruFoundation/TruShell&type=date&theme=dark&legend=top-left" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/chart?repos=TruFoundation/TruShell&type=date&legend=top-left" />
+   <img alt="Star History Chart" src="https://api.star-history.com/chart?repos=TruFoundation/TruShell&type=date&legend=top-left" />
  </picture>
 </a>
 

pyproject.toml

@@ -35,10 +35,10 @@ dependencies = [
 ]
 
 [project.urls]
-Home = "https://github.com/AkshajSinghal/TruShell"
-Repository = "https://github.com/AkshajSinghal/TruShell"
-Documentation = "https://github.com/AkshajSinghal/TruShell#readme"
-"Bug Tracker" = "https://github.com/AkshajSinghal/TruShell/issues"
+Home = "https://github.com/TruFoundation/TruShell"
+Repository = "https://github.com/TruFoundation/TruShell"
+Documentation = "https://github.com/TruFoundation/TruShell#readme"
+"Bug Tracker" = "https://github.com/TruFoundation/TruShell/issues"
 
 [project.optional-dependencies]
 dev = ["pytest>=8.0.0", "ruff>=0.0.280", "black>=24.10.0"]

tests/conftest.py

@@ -1,9 +1,34 @@
 """Pytest configuration and shared fixtures for TruShell tests."""
 
+import sqlite3
+
 import pytest
+
+from trushell.core import database
 from trushell.core.plugin_manager import PluginManager
 
 
+@pytest.fixture
+def in_memory_database(monkeypatch):
+    """Use one in-memory SQLite connection for database CRUD tests."""
+    connection = sqlite3.connect(":memory:", check_same_thread=False)
+    connection.execute(
+        """CREATE TABLE todos (
+            task TEXT,
+            category TEXT,
+            date_added TEXT,
+            date_completed TEXT,
+            status INTEGER,
+            position INTEGER
+        )"""
+    )
+    monkeypatch.setattr(database, "get_db_connection", lambda: connection)
+
+    yield connection
+
+    connection.close()
+
+
 @pytest.fixture(autouse=True)
 def reset_plugin_manager():
     """Reset PluginManager singleton after each test to ensure isolation."""

tests/test_cli_os_fallback.py

@@ -0,0 +1,55 @@
+from __future__ import annotations
+
+import os
+import subprocess
+
+from trushell import cli
+
+
+def test_os_fallback_runs_argument_vector_without_shell(monkeypatch):
+    calls = {}
+
+    def fake_run(command, shell, check, cwd):
+        calls.update(
+            command=command,
+            shell=shell,
+            check=check,
+            cwd=cwd,
+        )
+        return subprocess.CompletedProcess(args=command, returncode=0)
+
+    monkeypatch.setattr(cli, "_run_external_command", fake_run)
+
+    assert cli._handle_os_fallback('echo "hello world"') is True
+    assert calls == {
+        "command": ["echo", "hello world"],
+        "shell": False,
+        "check": False,
+        "cwd": os.getcwd(),
+    }
+
+
+def test_os_fallback_does_not_interpret_shell_metacharacters(monkeypatch):
+    calls = {}
+
+    def fake_run(command, shell, check, cwd):
+        calls.update(command=command, shell=shell)
+        return subprocess.CompletedProcess(args=command, returncode=0)
+
+    monkeypatch.setattr(cli, "_run_external_command", fake_run)
+
+    assert cli._handle_os_fallback("echo safe; touch injected") is True
+    assert calls == {
+        "command": ["echo", "safe;", "touch", "injected"],
+        "shell": False,
+    }
+
+
+def test_os_fallback_handles_malformed_quoting(monkeypatch, capsys):
+    def fail_if_called(*args, **kwargs):
+        raise AssertionError("external command should not run")
+
+    monkeypatch.setattr(cli, "_run_external_command", fail_if_called)
+
+    assert cli._handle_os_fallback('echo "unterminated') is True
+    assert "OS fallback error" in capsys.readouterr().out

tests/test_data.py

@@ -39,3 +39,26 @@ def test_run_csv_view_shows_limited_rows(tmp_path: Path) -> None:
     assert "User 50" in output
     assert "User 51" not in output
     assert "...and 3 more rows" in output
+
+
+def test_run_csv_view_short_rows_are_padded(tmp_path: Path) -> None:
+    """Ensure ragged rows are padded with empty cells.
+
+    Use quoted fields so csv.Sniffer has sufficient signal to detect
+    the delimiter reliably on small samples.
+    """
+    from trushell.commands.data import run_csv_view
+
+    file_path = tmp_path / "short_rows.csv"
+    rows = ['"A","B","C"', '"1","2"', '"3","4","5"']
+    file_path.write_text("\n".join(rows), encoding="utf-8")
+
+    output = _strip_ansi(run_csv_view(str(file_path)))
+
+    assert "A" in output
+    assert "B" in output
+    assert "C" in output
+    assert "1" in output
+    assert "3" in output
+    # There should be at least one empty/padded cell visible in output
+    assert "  " in output

tests/test_database.py

@@ -1,4 +1,9 @@
-from trushell.core.database import _ensure_initialized, get_all_todos, get_db_connection, insert_todo
+from trushell.core.database import (
+    _ensure_initialized,
+    get_all_todos,
+    get_db_connection,
+    insert_todo,
+)
 from trushell.core.models import Todo
 
 
@@ -20,10 +25,7 @@ def test_get_db_connection_returns_fresh_connection(monkeypatch, tmp_path) -> No
     conn_two.close()
 
 
-def test_insert_todo_assigns_sequential_positions(monkeypatch, tmp_path) -> None:
-    _use_temp_database(monkeypatch, tmp_path)
-
-    _ensure_initialized()
+def test_insert_todo_assigns_sequential_positions(in_memory_database) -> None:
     insert_todo(Todo(task="first", category="work"))
     insert_todo(Todo(task="second", category="work"))
 
@@ -33,20 +35,14 @@ def test_insert_todo_assigns_sequential_positions(monkeypatch, tmp_path) -> None
     assert [task.position for task in tasks] == [0, 1]
 
 
-def test_get_all_todos_works_with_local_connections(monkeypatch, tmp_path) -> None:
-    _use_temp_database(monkeypatch, tmp_path)
-
-    _ensure_initialized()
+def test_get_all_todos_works_with_local_connections(in_memory_database) -> None:
     insert_todo(Todo(task="alpha", category="study"))
 
     assert len(get_all_todos()) == 1
 
 
-def test_get_all_todos_returns_rows_ordered_by_position(monkeypatch, tmp_path) -> None:
-    _use_temp_database(monkeypatch, tmp_path)
-
-    _ensure_initialized()
-    with get_db_connection() as conn:
+def test_get_all_todos_returns_rows_ordered_by_position(in_memory_database) -> None:
+    with in_memory_database as conn:
         conn.execute(
             "INSERT INTO todos VALUES (?, ?, ?, ?, ?, ?)",
             ("second", "work", "", None, 0, 1),
@@ -62,7 +58,9 @@ def test_get_all_todos_returns_rows_ordered_by_position(monkeypatch, tmp_path) -
     assert [task.position for task in tasks] == [0, 1]
 
 
-def test_ensure_initialized_skips_lock_when_already_initialized(monkeypatch, tmp_path) -> None:
+def test_ensure_initialized_skips_lock_when_already_initialized(
+    monkeypatch, tmp_path
+) -> None:
     _use_temp_database(monkeypatch, tmp_path)
     _ensure_initialized()
 

tests/test_help_docs.py

@@ -21,6 +21,15 @@ def _fake_import_module(path: str):
         _import_module=_fake_import_module,
     )
 
+    # Provide a minimal module object with the expected function and
+    # docstring so `run_help()` can import and print the docstring.
+    def run_settings():
+        """Launch the TruShell settings TUI."""
+        return None
+
+    fake_module = SimpleNamespace(run_settings=run_settings)
+    fake_kernel._import_module = lambda path: fake_module
+
     monkeypatch.setattr("trushell.core.trukernel.get_kernel", lambda: fake_kernel)
 
     run_help("settings")

tests/test_tasks.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+from typing import Any
+
+
+def test_update_task_changes_text_single_word(monkeypatch) -> None:
+    """Existing parser handles single-word task updates correctly."""
+    from trushell.commands.tasks import update_task
+
+    captured: dict[str, Any] = {}
+
+    def fake_update_todo(index: int, task: str | None, category: str | None) -> None:
+        captured["index"] = index
+        captured["task"] = task
+        captured["category"] = category
+
+    monkeypatch.setattr("trushell.commands.tasks.update_todo", fake_update_todo)
+
+    update_task("1 NewTask")
+
+    assert captured["index"] == 0
+    assert captured["task"] == "NewTask"
+    assert captured["category"] is None
+
+
+def test_update_task_multiword_known_bug(monkeypatch) -> None:
+    """Pin the current (known) parsing bug for quoted multi-word values.
+
+    The current implementation splits with `maxsplit=2` and then strips
+    surrounding quotes from individual parts. This results in
+    `updatetask 1 "New text"` producing `task == "New"` and
+    `category == "text"`. The behaviour is preserved here so the
+    regression is detected if/fwhen the parsing is fixed.
+    """
+    from trushell.commands.tasks import update_task
+
+    captured: dict[str, Any] = {}
+
+    def fake_update_todo(index: int, task: str | None, category: str | None) -> None:
+        captured["index"] = index
+        captured["task"] = task
+        captured["category"] = category
+
+    monkeypatch.setattr("trushell.commands.tasks.update_todo", fake_update_todo)
+
+    update_task('1 "New text"')
+
+    assert captured["index"] == 0
+    # The current broken behaviour yields only the first word as the task
+    assert captured["task"] == "New"
+    # and treats the remainder as the category
+    assert captured["category"] == "text"

trushell/cli.py

@@ -25,17 +25,16 @@
 
 
 def app_with_lower() -> None:
-    """Entry point that normalizes the first argument to lowercase for case-insensitive invocation."""
-    # Create a local copy to avoid mutating the global sys.argv
-    argv = sys.argv.copy()
-    if len(argv) > 1:
-        if argv[1].lower() not in {"--help", "-h", "version"}:
-            raw = " ".join(argv[1:]).lower()
+    """Normalize command names without changing the caller's argument list."""
+    if len(sys.argv) > 1:
+        argv_copy = sys.argv.copy()
+        if argv_copy[1].lower() not in {"--help", "-h", "version"}:
+            first = argv_copy[1].lower()
+            rest = argv_copy[2:]
+            raw = " ".join([first] + rest)
             get_kernel().execute_command(raw)
             return
 
-    if argv != sys.argv:
-        sys.argv = argv
     app()
 
 
@@ -114,7 +113,7 @@ def action_quit_app(self) -> None:
 
 
 def _run_external_command(
-    command: str,
+    command: str | list[str],
     shell: bool = True,
     check: bool = False,
     cwd: str | None = None,
@@ -302,8 +301,13 @@ def _handle_os_fallback(raw_command: str) -> bool:
         return False
 
     try:
-        completed = _run_external_command(command, shell=True, check=False, cwd=os.getcwd())
-    except (OSError, subprocess.SubprocessError) as error:
+        completed = _run_external_command(
+            shlex.split(command),
+            shell=False,
+            check=False,
+            cwd=os.getcwd(),
+        )
+    except (OSError, subprocess.SubprocessError, ValueError) as error:
         typer.secho("❓ Command not recognized by TruShell or your host OS.", fg=typer.colors.YELLOW)
         typer.secho(f"OS fallback error: {error}", fg=typer.colors.RED)
         return True

trushell/commands/data.py

@@ -36,8 +36,7 @@ def run_csv_view(args: str) -> str:
                 dialect = csv.Sniffer().sniff(sample, delimiters=",\t")
             except csv.Error:
                 delimiter = "\t" if "\t" in sample else ","
-                dialect = csv.get_dialect("excel")
-                dialect.delimiter = delimiter
+                dialect = csv.excel_tab if delimiter == "\t" else csv.excel
 
             reader = csv.reader(handle, dialect)
             headers = next(reader, None)