Refactor / Enable multiple input/output-pairs per day ++ (#72)

* Support testing against multiple input/output pairs

* solve day09 in deno

* rewrite day09 -> day25

* refac lang/  - reuse time start and stop

* update CONTRIBUTING.md

* Add test.sh at root-level

* add lib/-folder at root-level

Author: Arxcis

.github/workflows/day-00-example.yaml

@@ -5,14 +5,14 @@ on:
       - main
     paths:
       - 'days/day-00-example/**'
-      - 'languages/**'
+      - 'lang/**'
       - 'Makefile'
   pull_request:
     branches:
       - main
     paths:
       - 'days/day-00-example/**'
-      - 'languages/**'
+      - 'lang/**'
       - 'Makefile'
   workflow_dispatch:
 

CONTRIBUTING.md

@@ -4,34 +4,53 @@
 
 1. Pop some popcorn :popcorn: (or whatever you enjoy :lollipop: :champagne: :milk_glass: :wine_glass: :tropical_drink: :chocolate_bar: :beer:)
 2. Fork
-3. Write a solution, in the language of your choice. Example: `vim day-03/solutions/super-optimized.py`
-4. Test your solution.
+3. Write a solution, in the language of your choice. Example: `vim days/day-03/solutions/super-optimized.py`
+4. Test your solution
 
 ```sh
-cd days/day03
-../../languages/python.sh input.txt output.txt solutions/super-optimized.py
+$ ./lang/python.sh "days/day-03/solutions/super-optimized.py" "days/day-03/io/my.input days/day-03/io/my.output"
+
+# ..or use the short-hand
+$ ./lang/python.sh "days/day-03/**/*.py" "days/day-03/io/*"
+
+cat INPUT | python3  day03.klyve.py          13ms       ✅
+cat INPUT | python3  day03.preng.py          11ms       ✅
+cat INPUT | python3  one-liner.py            12ms       ✅
 ```
 
-5. Add the test to `day03/test.sh`, to let the CI know how to test your solution.
-6. Make a Pull Request to the `main` branch.
-7. One of the maintainers will merge when the tests pass!
-8. Remember to have fun :tada:
+5. Make sure `days/day03/test.sh` tests your solution.
+
+6. To test the whole day do:
+```sh
+./days/day03/test.sh
+# or
+make test.day03
+# or
+make docker.day03
+```
+
+7. When you are happy with local testing, make a Pull Request to the `main` branch.
+8. One of the maintainers will merge PR's, at the of each day.
+9. Remember to have fun :tada:
 
 
 ## How do I add a language?
 
 1. Add the language you want to the `Dockerfile`
-2. Add a language test-script in `languages/<new-language>.sh`
+2. Add a language test-script in `lang/<new-language>.sh`
 3. Add an example solution in `days/day-00-example/solutions/example.<new-language>`
 4. Make a PR to `main`-branch.
-5. One of the maintainers will do `make docker.build` and `make docker.push` and merge your PR on his machine ASAP :racing_car:
+5. One of the maintainers will push a new docker-image to dockerhub.com, based on your PR.
+6. ...then make sure Github workflows uses the new docker-image.
+7. ...then merge the PR.
 
 ## How are solutions tested?
 
-Every solution gets the `input.txt`-file delivered to `stdin` using `cat`, and whatever is written to `stdout` is compared for equality against `output.txt` using `diff`. This is identical for every language.
+Every solution gets the `io/*.input`-files for a given day delivered to `stdin`, using `cat`. Whatever is written to `stdout` by the solution, is then compared for equality against `io/*.output`-files, using `diff`. This is identical for every language.
 
 ```sh
 #!/usr/bin/env bash
-cat input.txt | <solution-in-any-language> | diff - output.txt
+cat day-03/io/my.input | <solution-in-any-language> | diff - day-03/io/my.output
 ```
+
 See [day-00-example/solutions/](https://github.com/Arxcis/adventofcode2020/tree/main/days/day-00-example/solutions), for examples on how to read from `stdin` and how to write to `stdout` in different languages.

Makefile

@@ -14,7 +14,7 @@ export DOCKER_TAG="jonasjso/adventofcode2020:2020-12-07-with-deno"
 	;\
 
 test.all:
-	for day in $$(ls days); do ./days/$$day/test.sh; done
+	./test.sh
 
 test.versions:
 	./scripts/print-versions.sh
@@ -131,6 +131,8 @@ docker.day07:
 	make docker.test DAY=day-07
 docker.day08:
 	make docker.test DAY=day-08
+docker.day09:
+	make docker.test DAY=day-09
 docker.day10:
 	make docker.test DAY=day-10
 docker.day11:

README.md

@@ -5,24 +5,24 @@ Welcome to this community project, where we collaboratively solve the 2020 editi
 
 ## Solutions per language per day
 
-| Language  | Total  | 01   |  02 |  03 |  04  |  05 | 06  | 07  | 08  | 09 | 10 |11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|
-|-----------|--------|------|-----|-----|------|-----|-----|-----|-----|----|----|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|
-| python3   | **18** |  2   |  1  |  3  |  4   |  4  |  3  | 1   |     |    |    ||||||||||||||||
-| golang    | **13** |  2   |  2  |  2  |  1   |  2  |  2  | 1   | 1   |    |    ||||||||||||||||
-| sml       |  **8** |  1   |  1  |  1  |  1   |  1  |  1  | 1   | 1   |    |    ||||||||||||||||
-| deno.ts   |  **8** |  1   |  1  |  1  |  1   |  1  |  1  | 1   | 1   |    |    ||||||||||||||||
-| c         |  **6** |  1   |  1  |  1  |  1   |  1  |  1  |     |     |    |    ||||||||||||||||
-| zig       |  **5** |  1   |  1  |  1  |  1   |  1  |     |     |     |    |    ||||||||||||||||
-| node.js   |  **4** |  1   |     |     |  1   |     |  1  | 1   |     |    |    ||||||||||||||||
-| c++       |  **2** |  1   |  1  |     |      |     |     |     |     |    |    ||||||||||||||||
-| ruby      |  **2** |  1   |     |     |  1   |     |     |     |     |    |    ||||||||||||||||
-| rust      |  **1** |  1   |     |     |      |     |     |     |     |    |    ||||||||||||||||
-| bash      |  **0** |      |     |     |      |     |     |     |     |    |    ||||||||||||||||
-| java      |  **0** |      |     |     |      |     |     |     |     |    |    ||||||||||||||||
-| php       |  **0** |      |     |     |      |     |     |     |     |    |    ||||||||||||||||
-| **Total** | **65** |**12**|**8**|**9**|**10**|**9**|**9**|**5**|**3**|    |    ||||||||||||||||
-
-*Last updated: 2020-12-09 18:56:00Z*
+| Language  | Total  | 01   |  02 |  03 |  04  |  05  | 06  | 07  | 08  | 09  | 10 |11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|
+|-----------|--------|------|-----|-----|------|------|-----|-----|-----|-----|----|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|
+| python3   | **18** |  2   |  1  |  3  |  4   |  4   |  3  | 1   |     |     |    ||||||||||||||||
+| golang    | **13** |  2   |  2  |  2  |  1   |  2   |  2  | 1   | 1   |     |    ||||||||||||||||
+| sml       |  **8** |  1   |  1  |  1  |  1   |  1   |  1  | 1   | 1   |     |    ||||||||||||||||
+| deno.ts   |  **8** |  1   |  1  |  1  |  1   |  1   |  1  | 1   | 1   | 1   |    ||||||||||||||||
+| c         |  **6** |  1   |  1  |  1  |  1   |  1   |  1  |     |     |     |    ||||||||||||||||
+| zig       |  **5** |  1   |  1  |  1  |  1   |  1   |     |     |     |     |    ||||||||||||||||
+| node.js   |  **4** |  1   |     |     |  1   |      |  1  | 1   |     |     |    ||||||||||||||||
+| c++       |  **2** |  1   |  1  |     |      |      |     |     |     |     |    ||||||||||||||||
+| ruby      |  **2** |  1   |     |     |  1   |      |     |     |     |     |    ||||||||||||||||
+| rust      |  **1** |  1   |     |     |      |      |     |     |     |     |    ||||||||||||||||
+| bash      |  **0** |      |     |     |      |      |     |     |     |     |    ||||||||||||||||
+| java      |  **0** |      |     |     |      |      |     |     |     |     |    ||||||||||||||||
+| php       |  **0** |      |     |     |      |      |     |     |     |     |    ||||||||||||||||
+| **Total** | **68** |**12**|**8**|**9**|**11**|**10**|**9**|**5**|**3**|**1**|    ||||||||||||||||
+
+*Last updated: 2020-12-09 21:30:00Z*
 
 See all languages we support in our [Dockerfile](./Dockerfile).
 
@@ -85,12 +85,11 @@ If you enjoy working on this project, consider sharing it with your friends. The
 
 ## Getting started
 
-### Test a single solution
+### Test individual solutions
 
 ```
-$ cd days/day01
-$ ../../languages/rust.sh input.txt output.txt solutions/day01.rs
-cat INPUT | rustc day-01/solutions/day01.rs ✅
+$ ./lang/rust.sh "days/day-01/solutions/day01.rs" "days/day-01/io/*"
+cat INPUT | rustc    day01.rs                662ms      ✅
 ```
 
 ### Test one or more days

days/day-00-example/input.txt days/day-00-example/io/alice.inputdays/day-00-example/input.txt renamed to days/day-00-example/io/alice.input

@@ -0,0 +1,8 @@
+1
+2
+3
+4
+8
+12
+3000
+28731

days/day-00-example/output.txt days/day-00-example/io/alice.outputdays/day-00-example/output.txt renamed to days/day-00-example/io/alice.output

@@ -0,0 +1,2 @@
+31761
+28735

days/day-00-example/io/bob.input

@@ -5,16 +5,17 @@ D=$(dirname $(realpath $0))
 
 echo ""
 echo "--- Day 0: Examples ---"
-$D/../../languages/rust.sh   $D/input.txt $D/output.txt $D/solutions/example.rs
-$D/../../languages/go.sh     $D/input.txt $D/output.txt $D/solutions/example.go
-$D/../../languages/c.sh      $D/input.txt $D/output.txt $D/solutions/example.c
-$D/../../languages/cpp.sh    $D/input.txt $D/output.txt $D/solutions/example.cpp
-$D/../../languages/sml.sh    $D/input.txt $D/output.txt $D/solutions/example.sml
-$D/../../languages/bash.sh   $D/input.txt $D/output.txt $D/solutions/example.bash
-$D/../../languages/php.sh    $D/input.txt $D/output.txt $D/solutions/example.php
-$D/../../languages/python.sh $D/input.txt $D/output.txt $D/solutions/example.py
-$D/../../languages/deno.sh   $D/input.txt $D/output.txt $D/solutions/example.ts
-$D/../../languages/node.sh   $D/input.txt $D/output.txt $D/solutions/example.mjs
-$D/../../languages/ruby.sh   $D/input.txt $D/output.txt $D/solutions/example.rb
-$D/../../languages/java.sh   $D/input.txt $D/output.txt $D/solutions Example
+
+$D/../../lang/rust.sh   "$D/solutions/*.rs"   "$D/io/*"
+$D/../../lang/go.sh     "$D/solutions/*.go"   "$D/io/*"
+$D/../../lang/c.sh      "$D/solutions/*.c"    "$D/io/*"
+$D/../../lang/cpp.sh    "$D/solutions/*.cpp"  "$D/io/*"
+$D/../../lang/sml.sh    "$D/solutions/*.sml"  "$D/io/*"
+$D/../../lang/bash.sh   "$D/solutions/*.bash" "$D/io/*"
+$D/../../lang/python.sh "$D/solutions/*.py"   "$D/io/*"
+$D/../../lang/deno.sh   "$D/solutions/*.ts"   "$D/io/*"
+$D/../../lang/node.sh   "$D/solutions/*.mjs"  "$D/io/*"
+$D/../../lang/ruby.sh   "$D/solutions/*.rb"   "$D/io/*"
+$D/../../lang/php.sh    "$D/solutions/*.php"  "$D/io/*"
+
 echo ""