tasko 0.0.2__tar.gz → 0.0.3__tar.gz

{tasko-0.0.2 → tasko-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasko
-Version: 0.0.2
+Version: 0.0.3
 Summary: Personal task manager
 Author: pybass
 License-Expression: MIT

tasko-0.0.3/pyproject.toml

@@ -0,0 +1,121 @@
+[project]
+name = "tasko"
+version = "0.0.3"
+description = "Personal task manager"
+readme = "README.md"
+license = "MIT"
+license-files = ["LICENSE"]
+requires-python = ">=3.14"
+classifiers = [
+    "Environment :: Console",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Office/Business",
+]
+dependencies = [
+    "rich~=15.0",
+    "textual~=8.2",
+]
+
+[[project.authors]]
+name = "pybass"
+
+[project.urls]
+Repository = "https://github.com/pybass/tasko"
+Issues = "https://github.com/pybass/tasko/issues"
+
+[project.scripts]
+tasko = "tasko.main:main"
+
+[build-system]
+requires = ["uv_build>=0.11,<0.13"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "ruff~=0.16.2",
+    "mypy~=2.3.0",
+    "pytest~=9.1.1",
+    "pytest-asyncio~=1.4.0",
+    "pytest-cov~=7.1.0",
+    "pytest-xdist~=3.8.0",
+    "pip-audit~=2.10.1",
+    "deptry~=0.25.1",
+    "pre-commit~=4.6.2",
+]
+
+[tool.ruff]
+line-length = 130
+target-version = "py314"
+
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "COM812",
+    "D203",
+    "D213",
+    "A005",
+    "PLC0414",
+    "RET503",
+    "G004",
+    "PT001",
+    "PT006",
+    "PT007",
+    "PT023",
+    "FIX",
+    "FBT",
+    "EM",
+    "CPY",
+    "TC",
+    "TRY003",
+    "C901",
+    "PLR0911",
+    "PLR0912",
+    "PLR0913",
+    "PLR2004",
+    "ASYNC109",
+]
+
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = ["pydantic.field_validator"]
+
+[tool.ruff.lint.per-file-ignores]
+"tests/**/*.py" = [
+    "ANN",
+    "S",
+]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+docstring-code-format = true
+
+[tool.mypy]
+python_version = "3.14"
+strict = true
+
+[[tool.mypy.overrides]]
+module = "tests.*"
+disallow_untyped_defs = false
+disallow_incomplete_defs = false
+disallow_untyped_decorators = false
+disallow_untyped_calls = false
+warn_unused_ignores = false
+
+[tool.codespell]
+skip = "uv.lock,.git,.venv,.mypy_cache,.ruff_cache,.pytest_cache,htmlcov"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+addopts = "-ra --strict-markers --strict-config --import-mode=importlib"
+xfail_strict = true
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+filterwarnings = ["error"]
+
+[tool.coverage.run]
+branch = true
+source = ["src"]
+
+[tool.coverage.report]
+show_missing = true
+skip_covered = false

tasko-0.0.2/pyproject.toml → tasko-0.0.3/pyproject.toml.orig

@@ -3,7 +3,7 @@
 # ============================================================================
 [project]
 name = "tasko"
-version = "0.0.2"
+version = "0.0.3"
 description = "Personal task manager"
 readme = "README.md"
 authors = [{ name = "pybass" }]
@@ -35,7 +35,7 @@ tasko = "tasko.main:main"
 # uv.lock does not cover, so an open-ended requirement would let the same tag build differently
 # over time.
 [build-system]
-requires = ["uv_build>=0.11,<0.12"]
+requires = ["uv_build>=0.11,<0.13"]
 build-backend = "uv_build"
 
 
@@ -45,7 +45,7 @@ build-backend = "uv_build"
 [dependency-groups]
 dev = [
     # Linting & formatting
-    "ruff~=0.15.22",
+    "ruff~=0.16.2",
     # Type checking
     "mypy~=2.3.0",
     # Testing & coverage
@@ -58,7 +58,7 @@ dev = [
     # Dependency hygiene — imports vs declared deps
     "deptry~=0.25.1",
     # Git pre-commit hooks
-    "pre-commit~=4.6.0",
+    "pre-commit~=4.6.2",
 ]
 
 
@@ -74,7 +74,6 @@ select = ["ALL"]
 ignore = [
     # --- Ecosystem / tool conflicts ---
     "COM812",   # trailing-comma — handled by ruff formatter, must be off here
-    "ISC001",   # single-line-implicit-string-concat — conflicts with ruff formatter
     "D203",     # one-blank-line-before-class — conflicts with D211
     "D213",     # multi-line-summary-second-line — conflicts with D212
 
@@ -94,6 +93,8 @@ ignore = [
     "FIX",      # flake8-fixme — TODOs are fine; tracked elsewhere
     "FBT",      # boolean-trap — too restrictive
     "EM",       # error-message strings — inline messages accepted
+    "CPY",      # flake8-copyright — no copyright headers: internal-only code, ships no license by design (README)
+    "TC",       # flake8-type-checking — TYPE_CHECKING blocks save import time we don't care about; cost: import noise + broken runtime annotations (pydantic)
     "TRY003",   # raise-vanilla-args — too noisy
     "C901",     # complex-structure — judgment call
 
@@ -103,14 +104,13 @@ ignore = [
     "PLR0913",  # too-many-arguments
     "PLR2004",  # magic-value-comparison
 
-    # --- TODO metadata (optional) ---
-    "TD002",    # missing-todo-author
-    "TD003",    # missing-todo-link
-
     # --- Async edge case ---
     "ASYNC109", # async-function-with-timeout — debatable, off
 ]
 
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = ["pydantic.field_validator"]  # N805: @field_validator implies classmethod — cls is correct without a stacked @classmethod
+
 [tool.ruff.lint.per-file-ignores]
 "tests/**/*.py" = ["ANN", "S"]  # tests skip type-annotation (ANN) and assert/security (S) rules
 

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/core/core.py

@@ -2,15 +2,12 @@
 
 import sqlite3
 import time
-from typing import TYPE_CHECKING
+from pathlib import Path
 
 from tasko.core.errors import AppError
 from tasko.core.migrations import MIGRATIONS
 from tasko.core.models import AppState, Priority, Project, Status, Task
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
 
 def _now() -> int:
     """Return the current unix time in whole seconds."""
@@ -82,28 +79,24 @@ class Core:
             raise AppError(f"Task #{task_id} not found.")
         return Task.from_row(row)
 
-    def list_tasks(
-        self, *, project_id: int | None = None, status: Status | None = None, include_done: bool = False
-    ) -> list[Task]:
-        """Return tasks in working order, optionally filtered by project id and/or status; a None filter means "any".
+    def list_tasks(self, *, project_id: int | None = None, include_done: bool = False) -> list[Task]:
+        """Return tasks in working order, optionally filtered to one project; done tasks appear only with include_done.
 
         Working order: doing first, then by priority, then recently updated; done tasks
-        sink to the bottom (recently finished first, since done_at == updated_at). They
-        are excluded by default; asking for status DONE explicitly implies them.
+        sink to the bottom (recently finished first, since done_at == updated_at).
         """
         rows = self._conn.execute(
             """
             SELECT t.*, p.name AS project_name
             FROM tasks t JOIN projects p ON p.id = t.project_id
             WHERE (:project_id IS NULL OR t.project_id = :project_id)
-              AND (:status IS NULL OR t.status = :status)
               AND (:include_done OR t.status != 'done')
             ORDER BY t.status = 'done',
                      t.status = 'doing' DESC,
                      CASE t.priority WHEN 'high' THEN 0 WHEN 'medium' THEN 1 ELSE 2 END,
                      t.updated_at DESC
             """,
-            {"project_id": project_id, "status": status, "include_done": include_done or status is Status.DONE},
+            {"project_id": project_id, "include_done": include_done},
         ).fetchall()
         return [Task.from_row(row) for row in rows]
 

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/core/migrations.py

@@ -1,7 +1,7 @@
 """Database schema migrations, applied in order by Core."""
 
-# Schema v1 (see docs/data-model.md). IF NOT EXISTS / OR IGNORE predate the atomic runner
-# in Core._migrate and are harmless; new migrations don't need to be rerun-safe.
+# Schema v1 (see docs/data-model.md). IF NOT EXISTS / OR IGNORE make a rerun a no-op;
+# with the atomic runner in Core._migrate, new migrations don't need to be rerun-safe.
 _MIGRATION_V1 = """
 CREATE TABLE IF NOT EXISTS projects (
     id   INTEGER PRIMARY KEY AUTOINCREMENT,

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/core/models.py

@@ -1,11 +1,9 @@
 """Domain models: projects, tasks, and their enums."""
 
+import sqlite3
 from dataclasses import dataclass
 from enum import StrEnum
-from typing import TYPE_CHECKING, Any, Self
-
-if TYPE_CHECKING:
-    import sqlite3
+from typing import Any, Self
 
 
 class Status(StrEnum):

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/tui/app.py

@@ -1,19 +1,16 @@
 """Textual application: a thin shell that mounts the main screen."""
 
-from typing import TYPE_CHECKING, ClassVar
+from typing import ClassVar
 
 from textual.app import App
+from textual.binding import BindingType
 
+from tasko.core.core import Core
 from tasko.tui.screens.dialogs import HelpDialog
 from tasko.tui.screens.projects import ProjectsScreen
 from tasko.tui.screens.task_detail import TaskDetailScreen
 from tasko.tui.screens.task_list import TaskListScreen
 
-if TYPE_CHECKING:
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
 
 class TaskoApp(App[None]):
     """Interactive TUI for managing tasks."""

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/tui/screens/dialogs.py

@@ -1,11 +1,13 @@
-"""Reusable modal dialogs: one-line text input, yes/no confirmation, option picking, and key help."""
+"""Reusable modal dialogs: one-line and multi-line text input, yes/no confirmation, option picking, and key help."""
 
+from collections.abc import Sequence
 from importlib.metadata import version
-from typing import TYPE_CHECKING, ClassVar, Final
+from typing import ClassVar, Final
 
 from rich.style import Style
 from rich.table import Table
 from rich.text import Text
+from textual.app import ComposeResult
 from textual.binding import Binding, BindingType
 from textual.containers import Vertical
 from textual.fuzzy import FuzzySearch
@@ -13,19 +15,11 @@ from textual.screen import ModalScreen
 from textual.widgets import Input, Label, OptionList, Static, TextArea
 from textual.widgets.option_list import Option
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
-    from textual.app import ComposeResult
-
 _MATCH_STYLE: Final = Style(bold=True, underline=True)  # characters of a label the fuzzy query matched
 
 
 class Dialog[ResultT](ModalScreen[ResultT]):
-    """Base modal dialog: a centered bordered panel over the dimmed screen; Escape cancels.
-
-    Subclasses define action_cancel with their own "cancelled" result.
-    """
+    """Base modal dialog: a centered bordered panel over the dimmed screen; Escape cancels with None."""
 
     DEFAULT_CSS = """
     Dialog {
@@ -46,6 +40,10 @@ class Dialog[ResultT](ModalScreen[ResultT]):
 
     BINDINGS: ClassVar[list[BindingType]] = [("escape", "cancel", "Cancel")]
 
+    def action_cancel(self) -> None:
+        """Cancel the dialog without a result."""
+        self.dismiss(None)
+
 
 class InputDialog(Dialog[str | None]):
     """Prompt for one line of text; dismisses with the value, or None on cancel."""
@@ -58,7 +56,7 @@ class InputDialog(Dialog[str | None]):
     """
 
     def __init__(self, title: str, value: str = "") -> None:
-        """Set the prompt title and the optional pre-filled value (used by rename)."""
+        """Set the prompt title and the optional pre-filled value."""
         super().__init__()
         self._title = title  # prompt shown above the input
         self._value = value  # initial input content
@@ -77,10 +75,6 @@ class InputDialog(Dialog[str | None]):
         """Enter accepts the value."""
         self.dismiss(event.value)
 
-    def action_cancel(self) -> None:
-        """Escape cancels without a value."""
-        self.dismiss(None)
-
 
 class TextDialog(Dialog[str | None]):
     """Edit multi-line text; dismisses with the text on Ctrl+S, or None on cancel.
@@ -135,10 +129,6 @@ class TextDialog(Dialog[str | None]):
         """Ctrl+A selects the whole text, e.g. to replace or delete a long body at once."""
         self.query_one(TextArea).select_all()
 
-    def action_cancel(self) -> None:
-        """Escape cancels without a value."""
-        self.dismiss(None)
-
 
 class ConfirmDialog(Dialog[bool]):
     """Ask a yes/no question; dismisses with True only on explicit confirmation."""
@@ -170,10 +160,6 @@ class ConfirmDialog(Dialog[bool]):
         """Confirm the action."""
         self.dismiss(True)
 
-    def action_cancel(self) -> None:
-        """Cancel the action."""
-        self.dismiss(False)
-
 
 class HelpDialog(Dialog[None]):
     """Show the current screen's keys as a two-column list; Escape, ? or i closes it."""
@@ -207,10 +193,6 @@ class HelpDialog(Dialog[None]):
             yield Static(grid, id="keys")
             yield Label(f"tasko v{version('tasko')}", id="about")
 
-    def action_cancel(self) -> None:
-        """Close the help."""
-        self.dismiss(None)
-
 
 class SelectDialog(Dialog[str | None]):
     """Pick one option with arrows and Enter; dismisses with the option id, or None on cancel.
@@ -336,7 +318,3 @@ class SelectDialog(Dialog[str | None]):
     def action_last(self) -> None:
         """Jump the list highlight to the last option without leaving the input."""
         self.query_one(OptionList).action_last()
-
-    def action_cancel(self) -> None:
-        """Escape cancels without a choice."""
-        self.dismiss(None)

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/tui/screens/projects.py

@@ -1,28 +1,24 @@
 """Projects screen: a table of projects with management actions."""
 
-from typing import TYPE_CHECKING, ClassVar, Final
+from collections.abc import Callable
+from typing import ClassVar, Final
 
 from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import BindingType
 from textual.screen import Screen
 from textual.widgets import DataTable
 
+from tasko.core.core import Core
 from tasko.core.errors import AppError
 from tasko.tui.screens.dialogs import ConfirmDialog, InputDialog
 from tasko.tui.widgets import StatusBar
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from textual.app import ComposeResult
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
 _DEFAULT_CELL: Final = Text("default", style="green")  # marks the default project; space is not scarce here
 
 
 class ProjectsScreen(Screen[None]):
-    """Project management — rarely visited, reached from the task screen with P."""
+    """Project management — rarely visited, reached from the task list with P."""
 
     BINDINGS: ClassVar[list[BindingType]] = [
         ("j", "cursor_down", "Down"),

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/tui/screens/task_detail.py

@@ -1,32 +1,28 @@
 """Task detail screen: full details of one task with per-field editing."""
 
+from collections.abc import Callable
 from datetime import UTC, datetime
-from typing import TYPE_CHECKING, ClassVar, Final
+from typing import ClassVar, Final
 
 from rich.table import Table
 from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import BindingType
 from textual.containers import VerticalScroll
 from textual.screen import Screen
 from textual.widgets import Static
 
+from tasko.core.core import Core
 from tasko.core.errors import AppError
 from tasko.core.models import Priority, Status, Task
 from tasko.tui.screens.dialogs import ConfirmDialog, InputDialog, SelectDialog, TextDialog
 from tasko.tui.widgets import StatusBar
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from textual.app import ComposeResult
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
 # Same glyphs and colors as the table on the main screen, spelled out with the word.
 _STATUS_TEXT: Final = {
-    Status.TODO: Text("○ todo", style="dim"),
-    Status.DOING: Text("◐ doing", style="yellow"),
-    Status.DONE: Text("● done", style="green"),
+    Status.TODO: Text("· todo", style="dim"),
+    Status.DOING: Text("» doing", style="yellow"),
+    Status.DONE: Text("✓ done", style="green"),
 }
 _PRIORITY_TEXT: Final = {
     Priority.HIGH: Text("high", style="red"),
@@ -123,7 +119,7 @@ class TaskDetailScreen(Screen[None]):
         self.query_one(StatusBar).set_context(Text.assemble(f"task #{task.id}", (f" · {task.project_name}", "dim")))
 
         self.query_one("#title", Static).update(Text(task.title))
-        # Two column groups: live fields on the left (main-table order), dates on the right, all dim.
+        # Two column groups: live fields on the left (main-table order), dates on the right; all dim but the field values.
         meta = Table.grid(padding=(0, 2))
         meta.add_column(style="dim")
         meta.add_column()

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/tui/screens/task_list.py

@@ -1,12 +1,15 @@
 """Main screen: the task table."""
 
-from typing import TYPE_CHECKING, ClassVar, Final
+from typing import ClassVar, Final
 
 from rich.cells import cell_len
 from rich.text import Text
+from textual.app import ComposeResult
+from textual.binding import BindingType
 from textual.screen import Screen
 from textual.widgets import DataTable
 
+from tasko.core.core import Core
 from tasko.core.errors import AppError
 from tasko.core.models import Priority, Status
 from tasko.tui.screens.dialogs import ConfirmDialog, InputDialog, SelectDialog
@@ -14,17 +17,11 @@ from tasko.tui.screens.projects import ProjectsScreen
 from tasko.tui.screens.task_detail import TaskDetailScreen
 from tasko.tui.widgets import StatusBar
 
-if TYPE_CHECKING:
-    from textual.app import ComposeResult
-    from textual.binding import BindingType
-
-    from tasko.core.core import Core
-
-# One-character, color-coded cells: the S/P/B columns must not waste width.
+# One-character, color-coded cells: the status, priority and body columns must not waste width.
 _STATUS_CELLS: Final = {
-    Status.TODO: Text("○", style="dim"),
-    Status.DOING: Text("◐", style="yellow"),
-    Status.DONE: Text("●", style="green"),
+    Status.TODO: Text("·", style="dim"),
+    Status.DOING: Text("»", style="yellow"),
+    Status.DONE: Text("✓", style="green"),
 }
 _PRIORITY_CELLS: Final = {
     Priority.HIGH: Text("↑", style="red"),
@@ -164,14 +161,8 @@ class TaskListScreen(Screen[None]):
         falls back to the selected, then the default project. Wrong target? Escape, move
         the cursor to a row of the right project, or change the project on the task later.
         """
-        task_id = self._cursor_task_id()
-        if task_id is not None:
-            task = self._core.get_task(task_id)
-            project_id, name = task.project_id, task.project_name
-        else:
-            state = self._core.app_state()
-            project_id = state.selected_project_id or state.default_project_id
-            name = self._core.get_project(project_id).name
+        project_id = self._add_target_project_id()
+        name = self._core.get_project(project_id).name
 
         def on_result(title: str | None) -> None:
             if not title:
@@ -192,12 +183,7 @@ class TaskListScreen(Screen[None]):
         """
         options: list[tuple[str, str | Text]] = [(str(p.id), p.name) for p in self._core.list_projects()]
         # Preselect the project plain 'a' would target, so Enter-Enter behaves like 'a'.
-        task_id = self._cursor_task_id()
-        if task_id is not None:
-            current = str(self._core.get_task(task_id).project_id)
-        else:
-            state = self._core.app_state()
-            current = str(state.selected_project_id or state.default_project_id)
+        current = str(self._add_target_project_id())
 
         def on_project(choice: str | None) -> None:
             if choice is None:
@@ -223,6 +209,14 @@ class TaskListScreen(Screen[None]):
 
         self.app.push_screen(SelectDialog("Add task to project:", options, current), on_project)
 
+    def _add_target_project_id(self) -> int:
+        """Project a plain add targets: the cursor row's project, else the selected, else the default one."""
+        task_id = self._cursor_task_id()
+        if task_id is not None:
+            return self._core.get_task(task_id).project_id
+        state = self._core.app_state()
+        return state.selected_project_id or state.default_project_id
+
     def _cursor_task_id(self) -> int | None:
         """Return the id of the task under the cursor, or None on an empty table.
 

{tasko-0.0.2 → tasko-0.0.3}/src/tasko/tui/widgets.py

@@ -1,15 +1,11 @@
 """Shared TUI widgets."""
 
-from typing import TYPE_CHECKING
-
 from rich.text import Text
+from textual.app import ComposeResult
 from textual.containers import Horizontal
+from textual.visual import VisualType
 from textual.widgets import Label
 
-if TYPE_CHECKING:
-    from textual.app import ComposeResult
-    from textual.visual import VisualType
-
 
 class StatusBar(Horizontal):
     """One-line bottom bar: the screen's context on the left, the help key hint on the right.