worklog-opsdevnz 0.1.3__tar.gz → 0.2.1__tar.gz

{worklog_opsdevnz-0.1.3/src/worklog_opsdevnz.egg-info → worklog_opsdevnz-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worklog-opsdevnz
-Version: 0.1.3
+Version: 0.2.1
 Summary: Configurable worklog management CLI for dated development logs
 Author-email: "OpsDev.nz Collective" <john@opsdev.nz>
 License: Apache-2.0
@@ -29,6 +29,7 @@ Requires-Dist: pytest-cov>=4.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.10; extra == "dev"
 Requires-Dist: ruff>=0.4; extra == "dev"
 Requires-Dist: mypy>=1.0; extra == "dev"
+Requires-Dist: zensical>=0.0.44; extra == "dev"
 Dynamic: license-file
 
 # worklog-opsdevnz
@@ -49,6 +50,9 @@ worklog-opsdevnz --version
 
 # Override the editor for this run
 worklog-opsdevnz --editor nvim
+
+# Open the most recent previous entry
+worklog-opsdevnz -p
 ```
 
 ## Configuration
@@ -84,6 +88,7 @@ title = "Next"
 - Configurable section headers per project
 - Custom body templates with `{{DATE}}` and `{{TITLE}}` placeholders
 - Editor integration: `-e` flag → config → `$VISUAL` → `$EDITOR`
+- `-p` / `--previous` flag to open the most recent past entry
 - `--version` flag for installed version
 
 ## Requirements

{worklog_opsdevnz-0.1.3 → worklog_opsdevnz-0.2.1}/README.md

@@ -16,6 +16,9 @@ worklog-opsdevnz --version
 
 # Override the editor for this run
 worklog-opsdevnz --editor nvim
+
+# Open the most recent previous entry
+worklog-opsdevnz -p
 ```
 
 ## Configuration
@@ -51,6 +54,7 @@ title = "Next"
 - Configurable section headers per project
 - Custom body templates with `{{DATE}}` and `{{TITLE}}` placeholders
 - Editor integration: `-e` flag → config → `$VISUAL` → `$EDITOR`
+- `-p` / `--previous` flag to open the most recent past entry
 - `--version` flag for installed version
 
 ## Requirements

{worklog_opsdevnz-0.1.3 → worklog_opsdevnz-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "worklog-opsdevnz"
-version = "0.1.3"
+version = "0.2.1"
 description = "Configurable worklog management CLI for dated development logs"
 readme = "README.md"
 license = {text = "Apache-2.0"}
@@ -37,6 +37,7 @@ dev = [
     "pytest-mock>=3.10",
     "ruff>=0.4",
     "mypy>=1.0",
+    "zensical>=0.0.44",
 ]
 
 [project.urls]
@@ -64,6 +65,11 @@ addopts = "-v --cov=src/worklog_opsdevnz --cov-report=term-missing"
 line-length = 88
 target-version = "py312"
 
+# Explicit rule set (ruff's historical defaults) so CI is stable across
+# ruff upgrades — DTZ/I/etc. are intentionally not enabled: local-date
+# handling is this tool's core domain, not an oversight.
+lint.select = ["E4", "E7", "E9", "F"]
+
 [tool.mypy]
 python_version = "3.12"
 warn_return_any = true

{worklog_opsdevnz-0.1.3 → worklog_opsdevnz-0.2.1}/src/worklog_opsdevnz/cli.py

@@ -9,7 +9,7 @@ import click
 
 from worklog_opsdevnz import __version__
 from worklog_opsdevnz.config import get_config
-from worklog_opsdevnz.paths import resolve_path
+from worklog_opsdevnz.paths import find_previous, resolve_path
 from worklog_opsdevnz.template import generate_content
 
 
@@ -21,11 +21,27 @@ from worklog_opsdevnz.template import generate_content
     default=None,
     help="Override the editor command (overrides config, $VISUAL, $EDITOR).",
 )
-def main(editor: str | None) -> None:
-    """Create or open today's worklog entry."""
+@click.option(
+    "-p",
+    "--previous",
+    is_flag=True,
+    help="Open the most recent worklog entry before today (never creates).",
+)
+def main(editor: str | None, previous: bool) -> None:
+    """Create or open today's worklog entry, or the previous one with -p."""
     entry_date = date.today()
 
     config = get_config()
+
+    if previous:
+        target = find_previous(config, entry_date)
+        if target is None:
+            click.echo("No previous worklog entry found.", err=True)
+            return
+        print(f"Opening previous worklog: {target}")
+        _open_editor(target, editor, config.get("editor"))
+        return
+
     target = resolve_path(config, entry_date)
     target.parent.mkdir(parents=True, exist_ok=True)
 

worklog_opsdevnz-0.2.1/src/worklog_opsdevnz/paths.py

@@ -0,0 +1,73 @@
+"""Path resolution for worklog files."""
+
+from datetime import date, datetime
+from pathlib import Path
+from typing import Any
+
+
+def resolve_path(
+    config: dict[str, Any],
+    entry_date: date,
+) -> Path:
+    """Compute the target file path based on config structure."""
+    base = Path(config.get("worklog_dir", "docs/worklog"))
+    structure = config.get("structure", "year")
+    suffix = config.get("suffix", "worklog")
+
+    if structure == "flat":
+        filename = f"{entry_date.isoformat()}-{suffix}.md"
+        return base / filename
+    elif structure == "year-month":
+        year = entry_date.strftime("%Y")
+        month = entry_date.strftime("%m")
+        filename = f"{entry_date.strftime('%d-%m-%Y')}-{suffix}.md"
+        return base / year / month / filename
+    else:  # "year" (default)
+        year = entry_date.strftime("%Y")
+        filename = f"{entry_date.strftime('%d-%m-%Y')}-{suffix}.md"
+        return base / year / filename
+
+
+_DATE_FORMATS = ("%Y-%m-%d", "%d-%m-%Y")
+
+
+def _parse_entry_date(filename: str, suffix: str) -> date | None:
+    """Extract the entry date from a worklog filename, or None if not parseable."""
+    stem = filename.removesuffix(".md")
+    prefix = stem.removesuffix(f"-{suffix}")
+    for fmt in _DATE_FORMATS:
+        try:
+            return datetime.strptime(prefix, fmt).date()
+        except ValueError:
+            continue
+    return None
+
+
+def find_previous(config: dict[str, Any], today: date) -> Path | None:
+    """Locate the most recent worklog entry strictly before *today*.
+
+    Scans the directory tree implied by the configured structure mode
+    (flat, year, or year-month) for files matching ``*-{suffix}.md``,
+    parses their dates, and returns the newest one older than today.
+    Returns None when no previous entry exists. Never creates anything.
+    """
+    base = Path(config.get("worklog_dir", "docs/worklog"))
+    suffix = config.get("suffix", "worklog")
+    structure = config.get("structure", "year")
+
+    pattern = f"*-{suffix}.md"
+    if structure == "flat":
+        candidates = base.glob(pattern)
+    elif structure == "year-month":
+        candidates = base.glob(f"*/*/{pattern}")
+    else:  # "year" (default)
+        candidates = base.glob(f"*/{pattern}")
+
+    best: tuple[date, Path] | None = None
+    for path in candidates:
+        entry_date = _parse_entry_date(path.name, suffix)
+        if entry_date is None or entry_date >= today:
+            continue
+        if best is None or entry_date > best[0]:
+            best = (entry_date, path)
+    return best[1] if best else None

{worklog_opsdevnz-0.1.3 → worklog_opsdevnz-0.2.1}/src/worklog_opsdevnz/template.py

@@ -36,13 +36,39 @@ def generate_body(config: dict[str, Any]) -> str:
     return "\n".join(lines)
 
 
-def render_template(template_path: str, iso_date: str) -> str:
-    """Render a custom Markdown template with placeholder substitution."""
+def _render_tags(tags: list[str]) -> str:
+    """Render tags as a block-style YAML list substitution.
+
+    Empty list → '[]'. Populated list → leading newline followed by
+    each tag on its own indented line with '-' prefix.
+    """
+    if not tags:
+        return "[]"
+    return "\n" + "\n".join(f"  - {t}" for t in tags)
+
+
+def render_template(
+    template_path: str,
+    iso_date: str,
+    config: dict[str, Any],
+) -> str:
+    """Render a custom Markdown template with placeholder substitution.
+
+    Supports {{DATE}}, {{TITLE}}, {{AUTHOR}}, and {{TAGS}} placeholders.
+    All placeholders are case-sensitive.
+    """
     title = f"Work Log - {iso_date}"
+    tags = _render_tags(config.get("default_tags", []))
+    author = config.get("author", "unknown")
     with open(template_path) as f:
         content = f.read()
     content = content.replace("{{DATE}}", iso_date)
     content = content.replace("{{TITLE}}", title)
+    content = content.replace("{{AUTHOR}}", author)
+    content = content.replace("{{TAGS}}", tags)
+    # Clean trailing whitespace (avoids artifacts when placeholder
+    # substitution leaves space before a newline, e.g. 'tags: \n')
+    content = "\n".join(line.rstrip() for line in content.split("\n"))
     return content
 
 
@@ -52,16 +78,17 @@ def generate_content(
 ) -> str:
     """Generate full worklog content.
 
-    If a 'template' field is set in config, renders that file as the body.
-    Otherwise uses the built-in sections-based body.
-    Frontmatter is always generated regardless of template.
-    """
-    frontmatter = generate_frontmatter(config, iso_date)
+    If a 'template' field is set in config, the template defines the
+    complete entry (including YAML frontmatter). Placeholders are
+    substituted but nothing else is prepended.
 
+    Otherwise uses the built-in default: config-driven frontmatter and
+    sections-based body.
+    """
     template_path = config.get("template")
     if template_path:
-        body = render_template(template_path, iso_date)
-    else:
-        body = generate_body(config)
+        return render_template(template_path, iso_date, config)
 
+    frontmatter = generate_frontmatter(config, iso_date)
+    body = generate_body(config)
     return f"{frontmatter}\n{body}"

{worklog_opsdevnz-0.1.3 → worklog_opsdevnz-0.2.1/src/worklog_opsdevnz.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worklog-opsdevnz
-Version: 0.1.3
+Version: 0.2.1
 Summary: Configurable worklog management CLI for dated development logs
 Author-email: "OpsDev.nz Collective" <john@opsdev.nz>
 License: Apache-2.0
@@ -29,6 +29,7 @@ Requires-Dist: pytest-cov>=4.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.10; extra == "dev"
 Requires-Dist: ruff>=0.4; extra == "dev"
 Requires-Dist: mypy>=1.0; extra == "dev"
+Requires-Dist: zensical>=0.0.44; extra == "dev"
 Dynamic: license-file
 
 # worklog-opsdevnz
@@ -49,6 +50,9 @@ worklog-opsdevnz --version
 
 # Override the editor for this run
 worklog-opsdevnz --editor nvim
+
+# Open the most recent previous entry
+worklog-opsdevnz -p
 ```
 
 ## Configuration
@@ -84,6 +88,7 @@ title = "Next"
 - Configurable section headers per project
 - Custom body templates with `{{DATE}}` and `{{TITLE}}` placeholders
 - Editor integration: `-e` flag → config → `$VISUAL` → `$EDITOR`
+- `-p` / `--previous` flag to open the most recent past entry
 - `--version` flag for installed version
 
 ## Requirements

{worklog_opsdevnz-0.1.3 → worklog_opsdevnz-0.2.1}/src/worklog_opsdevnz.egg-info/requires.txt

@@ -7,3 +7,4 @@ pytest-cov>=4.0
 pytest-mock>=3.10
 ruff>=0.4
 mypy>=1.0
+zensical>=0.0.44

worklog_opsdevnz-0.2.1/tests/test_cli.py

@@ -0,0 +1,137 @@
+"""Tests for CLI entry point."""
+
+from datetime import date, timedelta
+
+from click.testing import CliRunner
+
+from worklog_opsdevnz.cli import main
+
+
+def test_main_creates_file(tmp_path, monkeypatch):
+    """Running with no args creates today's worklog in tmp_path."""
+    monkeypatch.chdir(tmp_path)
+    runner = CliRunner()
+    result = runner.invoke(main, [])
+    assert result.exit_code == 0
+    assert "Created" in result.output
+    expected_leaf = (
+        f"docs/worklog/{date.today().year}/{date.today():%d-%m-%Y}-worklog.md"
+    )
+    assert expected_leaf in result.output
+
+
+def test_main_opens_existing(tmp_path, monkeypatch):
+    """Running again opens the existing file."""
+    monkeypatch.chdir(tmp_path)
+    runner = CliRunner()
+    runner.invoke(main, [])
+    result = runner.invoke(main, [])
+    assert result.exit_code == 0
+    assert "Opening existing" in result.output
+
+
+def test_main_help():
+    """--help works."""
+    runner = CliRunner()
+    result = runner.invoke(main, ["--help"])
+    assert result.exit_code == 0
+    assert "--editor" in result.output
+
+
+def test_main_version():
+    """--version prints the installed version."""
+    runner = CliRunner()
+    result = runner.invoke(main, ["--version"])
+    assert result.exit_code == 0
+    assert "worklog-opsdevnz, version" in result.output
+    # Extract and verify it's a non-empty version string
+    version_str = result.output.strip().split(", version ")[-1]
+    assert version_str
+
+
+def test_main_editor_from_config(tmp_path, monkeypatch):
+    """Editor in worklog.toml is resolved before $VISUAL/$EDITOR."""
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / "worklog.toml").write_text('editor = "fake-editor-test"\n')
+    runner = CliRunner()
+    result = runner.invoke(main, [])
+    assert result.exit_code == 0
+    # config-based editor picked up but not found in PATH
+    assert "Editor 'fake-editor-test' not found" in result.output
+
+
+def test_main_editor_cli_overrides_config(tmp_path, monkeypatch):
+    """-e flag overrides the editor set in worklog.toml."""
+    monkeypatch.chdir(tmp_path)
+    (tmp_path / "worklog.toml").write_text('editor = "fake-editor-test"\n')
+    runner = CliRunner()
+    result = runner.invoke(main, ["-e", "override-editor-test"])
+    assert result.exit_code == 0
+    # CLI override takes priority over config
+    assert "Editor 'override-editor-test' not found" in result.output
+
+
+def test_previous_no_entries(tmp_path, monkeypatch):
+    """-p with no prior entries: message to stderr, exit 0, creates nothing."""
+    monkeypatch.chdir(tmp_path)
+    runner = CliRunner()
+    result = runner.invoke(main, ["-p"])
+    assert result.exit_code == 0
+    assert "No previous worklog entry found." in result.stderr
+    assert not (tmp_path / "docs").exists()
+
+
+def test_previous_opens_most_recent_before_today(tmp_path, monkeypatch):
+    """-p opens the newest prior entry, not today's, and creates no file."""
+    monkeypatch.chdir(tmp_path)
+    today = date.today()
+    year_dir = tmp_path / "docs" / "worklog" / str(today.year)
+    year_dir.mkdir(parents=True)
+    older = (today - timedelta(days=3)).strftime("%d-%m-%Y")
+    recent = (today - timedelta(days=1)).strftime("%d-%m-%Y")
+    (year_dir / f"{older}-worklog.md").write_text("older")
+    (year_dir / f"{recent}-worklog.md").write_text("recent")
+    today_file = year_dir / f"{today:%d-%m-%Y}-worklog.md"
+    today_file.write_text("today")
+
+    runner = CliRunner()
+    result = runner.invoke(main, ["--previous"])
+    assert result.exit_code == 0
+    assert recent in result.output
+    assert today.strftime("%d-%m-%Y") not in result.output
+
+
+def test_previous_does_not_create_today(tmp_path, monkeypatch):
+    """-p must not create today's entry even though it does not exist."""
+    monkeypatch.chdir(tmp_path)
+    today = date.today()
+    year_dir = tmp_path / "docs" / "worklog" / str(today.year)
+    year_dir.mkdir(parents=True)
+    (year_dir / f"{(today - timedelta(days=2)):%d-%m-%Y}-worklog.md").write_text("x")
+
+    runner = CliRunner()
+    runner.invoke(main, ["-p"])
+    assert not (year_dir / f"{today:%d-%m-%Y}-worklog.md").exists()
+
+
+def test_previous_editor_override(tmp_path, monkeypatch):
+    """-p combined with -e applies the editor override to the previous entry."""
+    monkeypatch.chdir(tmp_path)
+    today = date.today()
+    year_dir = tmp_path / "docs" / "worklog" / str(today.year)
+    year_dir.mkdir(parents=True)
+    recent = (today - timedelta(days=1)).strftime("%d-%m-%Y")
+    (year_dir / f"{recent}-worklog.md").write_text("recent")
+
+    runner = CliRunner()
+    result = runner.invoke(main, ["-p", "-e", "override-editor-test"])
+    assert result.exit_code == 0
+    assert "Editor 'override-editor-test' not found" in result.output
+
+
+def test_previous_help():
+    """--help mentions the --previous flag."""
+    runner = CliRunner()
+    result = runner.invoke(main, ["--help"])
+    assert result.exit_code == 0
+    assert "--previous" in result.output

worklog_opsdevnz-0.2.1/tests/test_paths.py

@@ -0,0 +1,79 @@
+"""Tests for path resolution."""
+
+from datetime import date
+
+from worklog_opsdevnz.paths import find_previous, resolve_path
+
+
+def test_resolve_path_flat():
+    config = {"worklog_dir": "docs/worklog", "structure": "flat", "suffix": "worklog"}
+    path = resolve_path(config, date(2026, 5, 23))
+    assert str(path) == "docs/worklog/2026-05-23-worklog.md"
+
+
+def test_resolve_path_year():
+    config = {"worklog_dir": "logs", "structure": "year", "suffix": "log"}
+    path = resolve_path(config, date(2026, 5, 23))
+    assert str(path) == "logs/2026/23-05-2026-log.md"
+
+
+def test_resolve_path_year_month():
+    config = {"worklog_dir": "logs", "structure": "year-month", "suffix": "ops"}
+    path = resolve_path(config, date(2026, 5, 23))
+    assert str(path) == "logs/2026/05/23-05-2026-ops.md"
+
+
+def test_resolve_path_custom_suffix():
+    config = {"structure": "year", "suffix": "retro"}
+    path = resolve_path(config, date(2026, 1, 1))
+    assert str(path).endswith("-retro.md")
+
+
+def test_find_previous_year(tmp_path):
+    base = tmp_path / "logs" / "2026"
+    base.mkdir(parents=True)
+    (base / "28-08-2026-worklog.md").write_text("old")
+    (base / "01-09-2026-worklog.md").write_text("prev")
+    (base / "03-09-2026-worklog.md").write_text("today")
+    config = {"worklog_dir": str(tmp_path / "logs"), "structure": "year", "suffix": "worklog"}
+    result = find_previous(config, date(2026, 9, 3))
+    assert result is not None
+    assert result.name == "01-09-2026-worklog.md"
+
+
+def test_find_previous_year_month(tmp_path):
+    base = tmp_path / "docs" / "worklogs"
+    (base / "2026" / "08").mkdir(parents=True)
+    (base / "2026" / "09").mkdir(parents=True)
+    (base / "2026" / "08" / "27-08-2026-worklog.md").write_text("aug")
+    (base / "2026" / "09" / "01-09-2026-worklog.md").write_text("sep")
+    config = {"worklog_dir": str(base), "structure": "year-month", "suffix": "worklog"}
+    result = find_previous(config, date(2026, 9, 2))
+    assert result is not None
+    assert result.name == "01-09-2026-worklog.md"
+
+
+def test_find_previous_flat_iso_names(tmp_path):
+    base = tmp_path / "wl"
+    base.mkdir()
+    (base / "2026-08-30-worklog.md").write_text("a")
+    (base / "2026-09-01-worklog.md").write_text("b")
+    config = {"worklog_dir": str(base), "structure": "flat", "suffix": "worklog"}
+    result = find_previous(config, date(2026, 9, 2))
+    assert result is not None
+    assert result.name == "2026-09-01-worklog.md"
+
+
+def test_find_previous_ignores_today_unrelated_and_wrong_suffix(tmp_path):
+    base = tmp_path / "logs" / "2026"
+    base.mkdir(parents=True)
+    (base / "03-09-2026-worklog.md").write_text("today")
+    (base / "README.md").write_text("not an entry")
+    (base / "01-09-2026-journal.md").write_text("wrong suffix")
+    config = {"worklog_dir": str(tmp_path / "logs"), "structure": "year", "suffix": "worklog"}
+    assert find_previous(config, date(2026, 9, 3)) is None
+
+
+def test_find_previous_missing_dir(tmp_path):
+    config = {"worklog_dir": str(tmp_path / "nothing"), "structure": "year", "suffix": "worklog"}
+    assert find_previous(config, date(2026, 9, 3)) is None

worklog_opsdevnz-0.2.1/tests/test_template.py

@@ -0,0 +1,285 @@
+"""Tests for frontmatter and body generation."""
+
+import pytest
+
+from worklog_opsdevnz.template import (
+    generate_frontmatter,
+    generate_body,
+    generate_content,
+    render_template,
+)
+
+
+def test_generate_frontmatter():
+    config = {
+        "author": "Test Author",
+        "default_tags": ["internal", "test"],
+    }
+    fm = generate_frontmatter(config, "2026-05-23")
+    assert "title: " in fm
+    assert "Work Log - 2026-05-23" in fm
+    assert "date: 2026-05-23" in fm
+    assert "author: Test Author" in fm
+    assert "  - internal" in fm
+    assert "  - test" in fm
+    assert "draft: false" in fm
+    assert fm.startswith("---")
+    assert fm.strip().endswith("---")
+
+
+def test_generate_body_with_sections():
+    config = {
+        "sections": [
+            {"title": "Focus", "content": ""},
+            {"title": "Notes", "content": "some note"},
+        ]
+    }
+    body = generate_body(config)
+    assert "## Focus" in body
+    assert "## Notes" in body
+    assert "some note" in body
+
+
+def test_generate_content_full():
+    config = {
+        "author": "opsdev",
+        "default_tags": ["log"],
+        "sections": [{"title": "Today", "content": ""}],
+    }
+    content = generate_content(config, "2026-05-23")
+    assert content.startswith("---")
+    assert "Work Log - 2026-05-23" in content
+    assert "## Today" in content
+
+
+def test_render_template_with_placeholders(tmp_path):
+    template = tmp_path / "my-template.md"
+    template.write_text(
+        "---\n"
+        'title: "{{TITLE}}"\n'
+        "date: {{DATE}}\n"
+        "author: {{AUTHOR}}\n"
+        "tags: {{TAGS}}\n"
+        "draft: false\n"
+        "---\n\n"
+        "# {{TITLE}}\n\n"
+        "Date: {{DATE}}\n\n"
+        "Free-form notes."
+    )
+
+    config = {"author": "opsdev", "default_tags": ["dev", "log"]}
+    result = render_template(str(template), "2026-05-26", config)
+
+    # Placeholders replaced
+    assert "{{DATE}}" not in result
+    assert "{{TITLE}}" not in result
+    assert "{{AUTHOR}}" not in result
+    assert "{{TAGS}}" not in result
+
+    # Content verified
+    assert "# Work Log - 2026-05-26" in result
+    assert "Date: 2026-05-26" in result
+    assert "Free-form notes." in result
+    assert 'title: "Work Log - 2026-05-26"' in result
+    assert "date: 2026-05-26" in result
+    assert "author: opsdev" in result
+    assert "draft: false" in result
+
+    # Tags rendered as block-style YAML
+    assert "  - dev" in result
+    assert "  - log" in result
+
+
+def test_render_template_file_not_found():
+    with pytest.raises(FileNotFoundError):
+        render_template("/nonexistent/template.md", "2026-05-26", {})
+
+
+def test_generate_content_with_template(tmp_path):
+    """When template is set, it defines the complete entry.
+    
+    No auto-generated frontmatter is prepended.
+    """
+    template = tmp_path / "my-template.md"
+    template.write_text(
+        "---\n"
+        'title: "{{TITLE}}"\n'
+        "date: {{DATE}}\n"
+        "author: {{AUTHOR}}\n"
+        "tags: {{TAGS}}\n"
+        "draft: false\n"
+        "---\n\n"
+        "# {{TITLE}}\n\n"
+        "Date: {{DATE}}"
+    )
+
+    config = {
+        "author": "opsdev",
+        "default_tags": ["log"],
+        "template": str(template),
+    }
+    content = generate_content(config, "2026-05-26")
+
+    # Template defines the full entry — its frontmatter is present
+    assert content.startswith("---")
+    assert 'title: "Work Log - 2026-05-26"' in content
+    assert "date: 2026-05-26" in content
+    assert "author: opsdev" in content
+    assert "  - log" in content
+    assert "draft: false" in content
+
+    # Body comes from template
+    assert "# Work Log - 2026-05-26" in content
+    assert "Date: 2026-05-26" in content
+
+    # No duplicate frontmatter — only one '---' block
+    assert content.count("---") == 2  # opening + closing
+
+    # Sections are NOT present (template controls everything)
+    assert "## Focus for Today" not in content
+
+
+def test_generate_content_without_template():
+    """No template field → built-in sections body, unchanged behaviour."""
+    config = {
+        "author": "opsdev",
+        "default_tags": ["log"],
+        "sections": [{"title": "Today", "content": ""}],
+    }
+    content = generate_content(config, "2026-05-26")
+    assert "## Today" in content
+
+
+# ── {{TAGS}} rendering ────────────────────────────────────────────
+
+
+def test_render_template_tags_empty(tmp_path):
+    """Empty default_tags → {{TAGS}} substitutes as '[]'."""
+    template = tmp_path / "t.md"
+    template.write_text("tags: {{TAGS}}\n")
+
+    result = render_template(str(template), "2026-06-01", {"default_tags": []})
+    assert "tags: []" in result
+    assert "{{TAGS}}" not in result
+
+
+def test_render_template_tags_populated(tmp_path):
+    """Populated default_tags → {{TAGS}} renders as block-style YAML list."""
+    template = tmp_path / "t.md"
+    template.write_text("tags: {{TAGS}}\n")
+
+    config = {"default_tags": ["dev", "log", "ops"]}
+    result = render_template(str(template), "2026-06-01", config)
+
+    # Block-style: leading newline + indented items, no trailing whitespace
+    assert "tags:\n  - dev\n  - log\n  - ops" in result
+    assert "{{TAGS}}" not in result
+
+
+def test_render_template_tags_not_configured(tmp_path):
+    """No default_tags in config → {{TAGS}} substitutes as '[]'."""
+    template = tmp_path / "t.md"
+    template.write_text("tags: {{TAGS}}\n")
+
+    result = render_template(str(template), "2026-06-01", {})
+    assert "tags: []" in result
+
+
+# ── {{AUTHOR}} rendering ──────────────────────────────────────────
+
+
+def test_render_template_author_configured(tmp_path):
+    """{{AUTHOR}} pulls the author value from config."""
+    template = tmp_path / "t.md"
+    template.write_text("author: {{AUTHOR}}\n")
+
+    result = render_template(str(template), "2026-06-01", {"author": "opsdev"})
+    assert "author: opsdev" in result
+    assert "{{AUTHOR}}" not in result
+
+
+def test_render_template_author_fallback(tmp_path):
+    """{{AUTHOR}} falls back to 'unknown' when not in config."""
+    template = tmp_path / "t.md"
+    template.write_text("author: {{AUTHOR}}\n")
+
+    result = render_template(str(template), "2026-06-01", {})
+    assert "author: unknown" in result
+
+
+# ── Full-entry template edge cases ────────────────────────────────
+
+
+def test_generate_content_template_defines_full_entry(tmp_path):
+    """Template with custom YAML fields — the tool only substitutes placeholders."""
+    template = tmp_path / "custom.md"
+    template.write_text(
+        "---\n"
+        'title: "{{TITLE}}"\n'
+        "date: {{DATE}}\n"
+        "author: {{AUTHOR}}\n"
+        "tags: {{TAGS}}\n"
+        "mood: creative\n"
+        "project: outcome-engineering\n"
+        "draft: false\n"
+        "---\n\n"
+        "# {{TITLE}}\n\n"
+        "Custom body content."
+    )
+
+    config = {
+        "author": "opsdev",
+        "default_tags": ["dev"],
+        "template": str(template),
+    }
+    content = generate_content(config, "2026-06-05")
+
+    # Custom fields preserved verbatim
+    assert "mood: creative" in content
+    assert "project: outcome-engineering" in content
+
+    # Placeholders substituted
+    assert 'title: "Work Log - 2026-06-05"' in content
+    assert "date: 2026-06-05" in content
+    assert "author: opsdev" in content
+    assert "  - dev" in content
+
+    # Body preserved
+    assert "Custom body content." in content
+
+    # No auto-generated frontmatter prepended
+    assert content.count("---") == 2  # only the template's opening/closing
+
+
+def test_generate_content_template_no_frontmatter(tmp_path):
+    """Template without frontmatter — entry has no frontmatter at all."""
+    template = tmp_path / "body-only.md"
+    template.write_text("# {{TITLE}}\n\nJust body content.")
+
+    config = {"template": str(template)}
+    content = generate_content(config, "2026-06-05")
+
+    # No frontmatter markers, just the rendered template
+    assert "---" not in content
+    assert "# Work Log - 2026-06-05" in content
+    assert "Just body content." in content
+
+
+def test_render_template_case_sensitive(tmp_path):
+    """Lowercase placeholders are NOT substituted."""
+    template = tmp_path / "t.md"
+    template.write_text(
+        "title: {{title}}\n"
+        "date: {{date}}\n"
+        "author: {{author}}\n"
+        "tags: {{tags}}\n"
+    )
+
+    config = {"author": "opsdev", "default_tags": ["dev"]}
+    result = render_template(str(template), "2026-06-05", config)
+
+    # Lowercase placeholders left untouched
+    assert "{{title}}" in result
+    assert "{{date}}" in result
+    assert "{{author}}" in result
+    assert "{{tags}}" in result

worklog_opsdevnz-0.1.3/src/worklog_opsdevnz/paths.py

@@ -1,28 +0,0 @@
-"""Path resolution for worklog files."""
-
-from datetime import date
-from pathlib import Path
-from typing import Any
-
-
-def resolve_path(
-    config: dict[str, Any],
-    entry_date: date,
-) -> Path:
-    """Compute the target file path based on config structure."""
-    base = Path(config.get("worklog_dir", "docs/worklog"))
-    structure = config.get("structure", "year")
-    suffix = config.get("suffix", "worklog")
-
-    if structure == "flat":
-        filename = f"{entry_date.isoformat()}-{suffix}.md"
-        return base / filename
-    elif structure == "year-month":
-        year = entry_date.strftime("%Y")
-        month = entry_date.strftime("%m")
-        filename = f"{entry_date.strftime('%d-%m-%Y')}-{suffix}.md"
-        return base / year / month / filename
-    else:  # "year" (default)
-        year = entry_date.strftime("%Y")
-        filename = f"{entry_date.strftime('%d-%m-%Y')}-{suffix}.md"
-        return base / year / filename

worklog_opsdevnz-0.1.3/tests/test_cli.py

@@ -1,71 +0,0 @@
-"""Tests for CLI entry point."""
-
-from datetime import date
-
-from click.testing import CliRunner
-
-from worklog_opsdevnz.cli import main
-
-
-def test_main_creates_file(tmp_path, monkeypatch):
-    """Running with no args creates today's worklog in tmp_path."""
-    monkeypatch.chdir(tmp_path)
-    runner = CliRunner()
-    result = runner.invoke(main, [])
-    assert result.exit_code == 0
-    assert "Created" in result.output
-    expected_leaf = (
-        f"docs/worklog/{date.today().year}/{date.today():%d-%m-%Y}-worklog.md"
-    )
-    assert expected_leaf in result.output
-
-
-def test_main_opens_existing(tmp_path, monkeypatch):
-    """Running again opens the existing file."""
-    monkeypatch.chdir(tmp_path)
-    runner = CliRunner()
-    runner.invoke(main, [])
-    result = runner.invoke(main, [])
-    assert result.exit_code == 0
-    assert "Opening existing" in result.output
-
-
-def test_main_help():
-    """--help works."""
-    runner = CliRunner()
-    result = runner.invoke(main, ["--help"])
-    assert result.exit_code == 0
-    assert "--editor" in result.output
-
-
-def test_main_version():
-    """--version prints the installed version."""
-    runner = CliRunner()
-    result = runner.invoke(main, ["--version"])
-    assert result.exit_code == 0
-    assert "worklog-opsdevnz, version" in result.output
-    # Extract and verify it's a non-empty version string
-    version_str = result.output.strip().split(", version ")[-1]
-    assert version_str
-
-
-def test_main_editor_from_config(tmp_path, monkeypatch):
-    """Editor in worklog.toml is resolved before $VISUAL/$EDITOR."""
-    monkeypatch.chdir(tmp_path)
-    (tmp_path / "worklog.toml").write_text('editor = "fake-editor-test"\n')
-    runner = CliRunner()
-    result = runner.invoke(main, [])
-    assert result.exit_code == 0
-    # config-based editor picked up but not found in PATH
-    assert "Editor 'fake-editor-test' not found" in result.output
-
-
-def test_main_editor_cli_overrides_config(tmp_path, monkeypatch):
-    """-e flag overrides the editor set in worklog.toml."""
-    monkeypatch.chdir(tmp_path)
-    (tmp_path / "worklog.toml").write_text('editor = "fake-editor-test"\n')
-    runner = CliRunner()
-    result = runner.invoke(main, ["-e", "override-editor-test"])
-    assert result.exit_code == 0
-    # CLI override takes priority over config
-    assert "Editor 'override-editor-test' not found" in result.output

worklog_opsdevnz-0.1.3/tests/test_paths.py

@@ -1,29 +0,0 @@
-"""Tests for path resolution."""
-
-from datetime import date
-
-from worklog_opsdevnz.paths import resolve_path
-
-
-def test_resolve_path_flat():
-    config = {"worklog_dir": "docs/worklog", "structure": "flat", "suffix": "worklog"}
-    path = resolve_path(config, date(2026, 5, 23))
-    assert str(path) == "docs/worklog/2026-05-23-worklog.md"
-
-
-def test_resolve_path_year():
-    config = {"worklog_dir": "logs", "structure": "year", "suffix": "log"}
-    path = resolve_path(config, date(2026, 5, 23))
-    assert str(path) == "logs/2026/23-05-2026-log.md"
-
-
-def test_resolve_path_year_month():
-    config = {"worklog_dir": "logs", "structure": "year-month", "suffix": "ops"}
-    path = resolve_path(config, date(2026, 5, 23))
-    assert str(path) == "logs/2026/05/23-05-2026-ops.md"
-
-
-def test_resolve_path_custom_suffix():
-    config = {"structure": "year", "suffix": "retro"}
-    path = resolve_path(config, date(2026, 1, 1))
-    assert str(path).endswith("-retro.md")

worklog_opsdevnz-0.1.3/tests/test_template.py

@@ -1,99 +0,0 @@
-"""Tests for frontmatter and body generation."""
-
-import pytest
-
-from worklog_opsdevnz.template import (
-    generate_frontmatter,
-    generate_body,
-    generate_content,
-    render_template,
-)
-
-
-def test_generate_frontmatter():
-    config = {
-        "author": "Test Author",
-        "default_tags": ["internal", "test"],
-    }
-    fm = generate_frontmatter(config, "2026-05-23")
-    assert "title: " in fm
-    assert "Work Log - 2026-05-23" in fm
-    assert "date: 2026-05-23" in fm
-    assert "author: Test Author" in fm
-    assert "  - internal" in fm
-    assert "  - test" in fm
-    assert "draft: false" in fm
-    assert fm.startswith("---")
-    assert fm.strip().endswith("---")
-
-
-def test_generate_body_with_sections():
-    config = {
-        "sections": [
-            {"title": "Focus", "content": ""},
-            {"title": "Notes", "content": "some note"},
-        ]
-    }
-    body = generate_body(config)
-    assert "## Focus" in body
-    assert "## Notes" in body
-    assert "some note" in body
-
-
-def test_generate_content_full():
-    config = {
-        "author": "opsdev",
-        "default_tags": ["log"],
-        "sections": [{"title": "Today", "content": ""}],
-    }
-    content = generate_content(config, "2026-05-23")
-    assert content.startswith("---")
-    assert "Work Log - 2026-05-23" in content
-    assert "## Today" in content
-
-
-def test_render_template_with_placeholders(tmp_path):
-    template = tmp_path / "my-template.md"
-    template.write_text("# {{TITLE}}\n\nDate: {{DATE}}\n\nFree-form notes.")
-
-    result = render_template(str(template), "2026-05-26")
-    assert "# Work Log - 2026-05-26" in result
-    assert "Date: 2026-05-26" in result
-    assert "Free-form notes." in result
-    assert "{{DATE}}" not in result
-    assert "{{TITLE}}" not in result
-
-
-def test_render_template_file_not_found():
-    with pytest.raises(FileNotFoundError):
-        render_template("/nonexistent/template.md", "2026-05-26")
-
-
-def test_generate_content_with_template(tmp_path):
-    template = tmp_path / "my-template.md"
-    template.write_text("# {{TITLE}}\n\nDate: {{DATE}}")
-
-    config = {
-        "author": "opsdev",
-        "default_tags": ["log"],
-        "template": str(template),
-    }
-    content = generate_content(config, "2026-05-26")
-    assert content.startswith("---")
-    assert "Work Log - 2026-05-26" in content
-    assert "author: opsdev" in content
-    assert "# Work Log - 2026-05-26" in content
-    assert "Date: 2026-05-26" in content
-    # Frontmatter generated, body from template — not sections
-    assert "## " not in content.split("---\n")[2] if "---\n" in content else True
-
-
-def test_generate_content_without_template():
-    """No template field → built-in sections body, unchanged behaviour."""
-    config = {
-        "author": "opsdev",
-        "default_tags": ["log"],
-        "sections": [{"title": "Today", "content": ""}],
-    }
-    content = generate_content(config, "2026-05-26")
-    assert "## Today" in content