Init challenge function added

README.md

@@ -25,7 +25,12 @@ poetry run pytest
 
 ## Run
 ```sh
-poetry run aoccas -y 2021 -d 5 --submit
+poetry run aoccas solve -y 2023 -d 1 --submit
+```
+
+## Initialize new challenge file
+```shell
+poetry run aoccas init-challenge -y 2023 -d 1
 ```
 
 To submit the results you can add the `-s` flag
@@ -38,5 +43,5 @@ Instructions: [How to find the session id](https://github.com/wimglenn/advent-of
 To run it using the aocd plugin you can run:
 
 ```sh
-poetry run aoc -y 2021 -d 1
+poetry run aoc -y 2023 -d 1
 ```

aoc_cas/aoc2023/day1.py

@@ -1,12 +1,12 @@
-def part1(data):
+def part1(data) -> int:
     result = 0
     for line in data.splitlines():
         digits = [int(char) for char in line if char.isdigit()]
         result += digits[0] * 10 + digits[-1]
     return result
 
 
-def part2(data):
+def part2(data) -> int:
     digits = {
         "1": 1,
         "2": 2,

aoc_cas/cli.py

@@ -1,25 +1,50 @@
 import logging
 from datetime import datetime
+from pathlib import Path
 
 import click
 from aocd.models import Puzzle
 from aocd.utils import AOC_TZ
 
 from . import plugin
+import os
 
+log = logging.getLogger()
 
-@click.command()
+
+@click.group()
+def main():
+    logging.basicConfig(format="%(message)s", level=logging.INFO)
+
+
+@main.command()
 @click.option("--year", "-y", default=datetime.now(tz=AOC_TZ).year, type=int)
 @click.option("--day", "-d", default=datetime.now(tz=AOC_TZ).day, type=int)
 @click.option("--submit", "-s", is_flag=True)
-def run_one(year: int, day: int, submit: bool):
-    logging.basicConfig(format="%(message)s", level=logging.INFO)
-
+def solve(year: int, day: int, submit: bool) -> None:
     puzzle = Puzzle(year, day)
-    print(f"--- {year} Day {day}: {puzzle.title} ---")
+    log.info(f"--- {year} Day {day}: {puzzle.title} ---")
     part_1_result, part_2_result = plugin(year, day)
-    print(f"Part1: {part_1_result}")
-    print(f"Part2: {part_2_result}")
+    log.info(f"Part1: {part_1_result}")
+    log.info(f"Part2: {part_2_result}")
     if submit:
         puzzle.answer_a = part_1_result
         puzzle.answer_2 = part_2_result
+
+
+@main.command()
+@click.option("--year", "-y", default=datetime.now(tz=AOC_TZ).year, type=int)
+@click.option("--day", "-d", default=datetime.now(tz=AOC_TZ).day, type=int)
+def init_challenge(year: int, day: int) -> None:
+    year_folder = Path.cwd() / "aoc_cas" / f"aoc{year}"
+    challenge_template = (Path.cwd() / "challenge_template.txt").read_text()
+    if not year_folder.exists():
+        year_folder.mkdir()
+        year_folder.joinpath("__init__.py").touch()
+    python_file = year_folder / f"day{day}.py"
+    if not python_file.exists():
+        python_file.write_text(challenge_template.format(day, year))
+
+    test_folder = Path.cwd() / f"tests/fixtures/{year}"
+    test_folder.mkdir(exist_ok=True)
+    test_folder.joinpath(f"{day}.txt").touch()

challenge_template.txt

@@ -0,0 +1,14 @@
+def part1(data: str) -> int:
+    pass
+
+
+def part2(data: str) -> int:
+    pass
+
+
+if __name__ == "__main__":
+    from aocd import get_data
+
+    data = get_data(year={}, day={})
+    print(part1(data))
+    print(part2(data))

pyproject.toml

@@ -23,7 +23,7 @@ build-backend = "poetry.core.masonry.api"
 line-length = 120
 
 [tool.poetry.scripts]
-aoccas = "aoc_cas.cli:run_one"
+aoccas = "aoc_cas.cli:main"
 
 [tool.poetry.plugins."adventofcode.user"]
 aoccas = "aoc_cas:plugin"

tests/test_examples.py

@@ -8,29 +8,19 @@
 input_files = sorted(here.glob("fixtures/20*/*.txt"))
 
 
-def path2id(input_file):
+def path2id(input_file) -> str:
     *pre, year, fname = input_file.parts
     return f"{year} - {fname[:-4]}"
 
 
-def remove_trailing_comments(lines):
-    while lines and (not lines[-1].strip() or lines[-1].startswith("#")):
-        lines.pop()
-    if len(lines):
-        lines[-1] = lines[-1].split("#")[0].strip()
-    if len(lines) > 1:
-        lines[-2] = lines[-2].split("#")[0].strip()
-
-
 @pytest.mark.parametrize("input_file", input_files, ids=path2id)
-def test_examples(input_file):
+def test_examples(input_file) -> None:
     *pre, year, fname = input_file.parts
     year = int(year)
     day = int(fname[:-4])
     groups = input_file.read_text(encoding="utf-8").split("\n===\n")
     for group in groups:
         lines = group.splitlines()
-        remove_trailing_comments(lines)
         if len(lines) < 3:
             pytest.fail(f"test data {input_file} is malformed")
         *lines, expected_answer_a, expected_answer_b = lines