Separate template file, compare expected value, better watch setup

Author: flwyd

2021/generate.raku

@@ -14,51 +14,15 @@ sub MAIN(Str:D $day-dir-name) {
   my $day-num = $class-name.match(/\d+$/).Str;
   my $script = $day-dir.add($day-dir.basename ~ '.raku');
   $day-dir.mkdir;
-  for <input.example.txt input.actual.txt>.map({ $day-dir.add($_) }) {
-    $_.spurt('') unless $_.f;
+  unless $script.f {
+    my %replace = :CLASS_NAME($class-name), :DAY_NUM($day-num);
+    my $pat = /__(<{%replace.keys.join('|')}>)__/;
+    my $template = $*PROGRAM-NAME.IO.sibling('template.raku').slurp;
+    $script.spurt($template.subst($pat, { %replace<<$0>> }, :g));
+    $script.chmod(0o755);
+  }
+  for <input.example.txt input.actual.txt>.map({ $day-dir.add($_) }) -> $input {
+    $input.spurt('') unless $input.f;
+    .spurt("part1: \npart2: \n") unless .f given $input.extension('expected');
   }
-  $script.spurt(qq:to/END/) unless $script.f;
-    #!/usr/bin/env raku
-    # Copyright 2021 Google LLC
-    #
-    # Use of this source code is governed by an MIT-style
-    # license that can be found in the LICENSE file or at
-    # https://opensource.org/licenses/MIT.
-    #
-    # https://adventofcode.com/2021/day/$day-num
-
-    class $class-name \{
-      has \$.input;
-
-      method solve-part1(--> Cool:D) \{
-        return "TODO";
-      }
-
-      method solve-part2(--> Cool:D) \{
-        return "TODO";
-      }
-    }
-
-    sub MAIN(*@input-files) \{
-      for @input-files -> \$input-file \{
-        if (my \$input = \$input-file.IO.slurp) \{
-          say "Running $class-name part 1 on \$input-file";
-          my \$start1 = now;
-          my \$solver = {$class-name}.new(:input(\$input));
-          say \$solver.solve-part1();
-          "Part 1 took %.3fms\\n".printf((now - \$start1)*1000);
-          say '';
-          say "Running $class-name part 2 on \$input-file";
-          my \$start2 = now;
-          \$solver = {$class-name}.new(:input(\$input));
-          say \$solver.solve-part2();
-          "Part 2 took %.3fms\\n".printf((now - \$start2)*1000);
-        } else \{
-          say "EMPTY INPUT FILE: \$input-file";
-        }
-        say '=' x 40;
-      }
-    }
-    END
-  $script.chmod(0o755);
 }

2021/runday

@@ -0,0 +1,34 @@
+#!/bin/zsh
+# Copyright 2021 Google LLC
+#
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+
+# Run the AoC solution for a day on all of its input, saving logs to out/
+# Run an each change with ./watch day1 or watchexec ./runday day1
+
+if [ $# -eq 0 ]; then
+  echo "Usage: runday day1"
+  exit 1
+fi
+BASEDIR="${0:h}"
+DAYDIR="$BASEDIR/$1"
+if [[ ! -d "$DAYDIR" ]]; then
+  echo "No such directory: $DAYDIR"
+  exit 1
+fi
+cd "$DAYDIR"
+PROGRAM="$1.raku"
+if [[ ! -f "$PROGRAM" ]]; then
+  echo "Missing file: $PROGRAM"
+  exit 1
+fi
+DATEFMT='%Y%m%d-%H%M%S'
+mkdir -p out
+OUTFILE="out/$(date +$DATEFMT).log"
+CMD=(raku "$PROGRAM" input.example*.txt input.actual.txt)
+echo
+echo "$CMD > $OUTFILE"
+echo
+$CMD 2>&1 | tee "$OUTFILE"

2021/template.raku

@@ -0,0 +1,65 @@
+#!/usr/bin/env raku
+# Copyright 2021 Google LLC
+#
+# Use of this source code is governed by an MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT.
+#
+# https://adventofcode.com/2021/day/__DAY_NUM__
+
+class __CLASS_NAME__ {
+  has $.input is required;
+  has $.input-lines = $!input.lines;
+
+  method solve-part1() of Str(Cool) {
+    "TODO";
+  }
+
+  method solve-part2() of Str(Cool) {
+    "TODO";
+  }
+}
+
+class RunContext {
+  has $.input-file;
+  has $.input;
+  has %.expected is rw;
+
+  method run-part(Int $part) {
+    my $expected = $.expected«$part» // '';
+    say "Running __CLASS_NAME__ part $part on $!input-file expecting '$expected'";
+    my $solver = __CLASS_NAME__.new(:$!input);
+    my $method = $solver.^find_method("solve-part$part").assuming: $solver;
+    my $start = now;
+    my $result = $method();
+    my $end = now;
+    say $result;
+    "Part $part took %.3fms\n".printf(($end - $start) * 1000);
+    if $expected {
+      if $expected eq $result {
+        say "\c[CHECK MARK] PASS with expected value '$result'";
+      } else {
+        say "\c[CROSS MARK] FAIL expected '$expected' but got '$result'";
+      }
+    }
+  }
+}
+
+sub MAIN(*@input-files) {
+  for @input-files -> $input-file {
+    if $input-file.IO.slurp -> $input {
+      my $context = RunContext.new(:$input, :$input-file);
+      if (my $expected-file = $input-file.IO.extension('expected')).f {
+        for $expected-file.lines {
+          $context.expected«$0» = $1.trim if m/part (\d+) \: \s* (.*)/;
+        }
+      }
+      $context.run-part(1);
+      say '';
+      $context.run-part(2);
+    } else {
+      say "EMPTY INPUT FILE: $input-file";
+    }
+    say '=' x 40;
+  }
+}

2021/watch

@@ -12,23 +12,14 @@ if [ $# -eq 0 ]; then
   echo "Usage: watch day1"
   exit 1
 fi
-DIR=$1
-PROGRAM="${DIR:a:t}.raku"
-DATEFMT='%Y%m%d-%H%M%S'
-cd $DIR
-mkdir -p out
-
-function runscript {
-  outfile="out/$(date +$DATEFMT).log"
-  cmd=(raku "$PROGRAM" input.example* input.actual.txt)
-  echo "$cmd > $outfile"
-  echo
-  $cmd 2>&1 | tee "$outfile"
-  echo
-}
-
-runscript
-
+DIR="${0:h}/$1"
+if [[ ! -d "$DIR" ]]; then
+  echo "No such directory: $DIR"
+  exit 1
+fi
+cd "${0:h}/$1"
+CMD=("../runday" "$1")
+$CMD
 fswatch -0 -o *.raku input.* | while read -d "" event ; do
-  runscript
+  $CMD
 done