Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ permissions:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "windows-latest"]
python-version: ["3.11", "3.12", "3.13"]
steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ select = ["E", "F", "I", "PL", "T20"]
addopts = ["--verbose"]
pythonpath = ["src", "tests"]
testpaths = ["tests"]
filterwarnings = ["error"]

[tool.uv]
required-version = "0.7.8"
10 changes: 5 additions & 5 deletions src/adrpy/repositories/adr/repository.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import re
from typing import Final

from adrpy.injection import lidi
Expand Down Expand Up @@ -26,12 +25,13 @@ def create(self, adr_name: str, template: RenderedTemplate) -> None:
def get_next_ordinal_number(self) -> int:
ordinal_number = 0
for path in self.SETTINGS.adr_dir.glob("*.md"):
# TODO: Use front matter (metadata) to store ordinal number
filename = path.stem
maybe_number_prefix = re.findall(r"\d+", filename)
if not maybe_number_prefix:
parts = filename.split("-", 1)
if not parts or not parts[0].isdigit():
continue
if (prefix_as_int := int(maybe_number_prefix[0])) > ordinal_number:
ordinal_number = prefix_as_int
prefix_as_int = int(parts[0])
ordinal_number = max(ordinal_number, prefix_as_int)
return ordinal_number + 1

@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/repository.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from adrpy.shared_kernel.settings import Settings

TEST_DIRECTORY = Path(__file__).parent / "testdir"
TEST_FILENAME = "testfile"
TEST_FILENAME_WITH_EXTENSION = "testfile.md"
TEST_FILENAME = "0001-testfile"
TEST_FILENAME_WITH_EXTENSION = "0001-testfile.md"


@pytest.fixture()
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,33 @@ def test_should_get_template_file(adr_repository: IADRRepository) -> None:
assert template.content


def test_should_create_file_in_nested_directories(lidi: Lidi) -> None:
def test_should_create_file_in_nested_directories(
lidi: Lidi, adr_repository: IADRRepository
) -> None:
# Given
nested_dir = TEST_DIRECTORY / "nested1" / "nested2"
new_settings = dataclasses.replace(lidi.resolve(Settings), initial_adr_dir=nested_dir)
lidi.bind(Settings, new_settings)
rendered_template = RenderedTemplate(name=TEST_FILENAME, content="TEST_CONTENT")

# When
lidi.resolve(IADRRepository).create(adr_name=rendered_template.name, template=rendered_template)
adr_repository.create(adr_name=rendered_template.name, template=rendered_template)

# Then
with open(nested_dir / TEST_FILENAME_WITH_EXTENSION, "r") as created_file:
content = created_file.read()

assert content == rendered_template.content


def test_should_get_next_ordinal_number(adr_repository: IADRRepository) -> None:
# Given
rendered_template = RenderedTemplate(name=TEST_FILENAME, content="TEST_CONTENT")
adr_repository.create(adr_name=TEST_FILENAME, template=rendered_template)
expected_next_ordinal_number = 2

# When
ordinal_number = adr_repository.get_next_ordinal_number()

# Then
assert ordinal_number == expected_next_ordinal_number