Merge pull request #669 from perladvent/archive-2025

oalders · web-flow · commit 44cf756c3d2b · 2026-04-14T14:23:31.000-04:00
chore: archive 2025 and prepare 2026 scaffold
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,7 +7,7 @@ shared. Adding an image is by no means required and you should feel free to
 ignore this message entirely. However, if you'd like to add an image, it's as
 simple as:
 
-* Adding the image to the `2025/share/static` folder like `2025/share/static/some-graphic.png`
+* Adding the image to the `2026/share/static` folder like `2026/share/static/some-graphic.png`
 * Including the image as HTML in your article
 
 The HTML would look like:
diff --git a/2026/advent.ini b/2026/advent.ini
@@ -0,0 +1,28 @@
+title    = Perl Advent Calendar 2026
+tagline  = twenty-four merry days of Perl
+year     = 2026
+end_date = 2026-12-24
+uri      = https://perladvent.org/2026/
+category = Perl
+editor   = PerlAdvent Org
+default_author = Mark Fowler <mark@twoshortplanks.com>
+
+article_dir = articles
+share_dir   = share
+
+[Palette]
+generic00 = #fff
+generic01 = #d00
+
+bodyBG    = #333
+
+feedLinkFG= #0a0
+titleFG   = genericWhite
+
+taglineBG = #fff
+taglineFG = #a00
+
+codeBG        = genericBlack
+codeFG        = genericWhite
+codeNumbersBG = #800
+codeNumbersBorder = genericWhite
diff --git a/2026/articles/.gitkeep b/2026/articles/.gitkeep
diff --git a/2026/incoming/.gitkeep b/2026/incoming/.gitkeep
diff --git a/2026/share/static/.gitkeep b/2026/share/static/.gitkeep
diff --git a/ANNUAL-UPDATES.md b/ANNUAL-UPDATES.md
@@ -1,7 +1,67 @@
 # Preparing for a New Calendar Year
 
-Run the following script:
+Run the following steps once the previous December's articles are complete
+(typically in January or February):
+
+## 1. Archive the previous year
+
+Add the previous year's topics to `archives.yaml`:
+
+```bash
+./year2yaml YYYY
+```
+
+For example, after the 2025 calendar:
+
+```bash
+./year2yaml 2025
+```
+
+`year2yaml` reads the `Topic:` header from each article and appends a new
+section to `archives.yaml`.  Entries are classified as `module` (linked to
+MetaCPAN) when the topic name contains `::`, and as `topic` otherwise.
+Single-word CPAN modules without `::` in their name (e.g. `LWP`, `Moose`)
+will be classified as `topic` — edit `archives.yaml` by hand afterwards if
+you want those to carry a MetaCPAN link.
+
+Comma-separated topics on a single `Topic:` line are split into individual
+entries automatically.  Space-separated module names are also split, provided
+every space-delimited token contains `::`.
+
+## 2. Prepare the new year's scaffold
 
 ```bash
 ./script/prepare-new-year.sh
 ```
+
+This script:
+
+* Creates `YYYY/advent.ini` (copied from the previous year with the year
+  updated throughout)
+* Updates year references in `in-season.html`, `README.md`,
+  `.github/pull_request_template.md`, `script/build-site.sh`, and
+  `script/stats.sh`
+
+After the script runs, create the empty directories that the build system
+expects and add `.gitkeep` files so they are tracked by git:
+
+```bash
+NEW_YEAR=$(date +%Y)
+mkdir -p "$NEW_YEAR/articles" "$NEW_YEAR/incoming" "$NEW_YEAR/share/static"
+touch "$NEW_YEAR/articles/.gitkeep" \
+      "$NEW_YEAR/incoming/.gitkeep" \
+      "$NEW_YEAR/share/static/.gitkeep"
+```
+
+## 3. Review and commit
+
+Check the updated files, then commit everything:
+
+```bash
+git add archives.yaml year2yaml \
+        "$NEW_YEAR/" \
+        in-season.html README.md \
+        .github/pull_request_template.md \
+        script/build-site.sh script/stats.sh
+git commit -m "chore: archive PREV_YEAR and prepare scaffold for NEW_YEAR"
+```
diff --git a/CLAUDE.md b/CLAUDE.md
@@ -81,15 +81,27 @@ perl script/render-incoming.pl
 http_this --autoindex out/2025
 ```
 
-### Annual Maintenance (run in January)
+### Annual Maintenance (run in January/February)
+
+See `ANNUAL-UPDATES.md` for the full step-by-step guide. In brief:
+
 ```bash
-# Add previous year to archives database
-./year2yaml 2024
+# 1. Add previous year to archives database
+./year2yaml 2025
 
-# Prepare for new year
+# 2. Create new year scaffold and update year references site-wide
 ./script/prepare-new-year.sh
+
+# 3. Create empty directories tracked by git
+NEW_YEAR=$(date +%Y)
+mkdir -p "$NEW_YEAR/articles" "$NEW_YEAR/incoming" "$NEW_YEAR/share/static"
+touch "$NEW_YEAR/articles/.gitkeep" "$NEW_YEAR/incoming/.gitkeep" "$NEW_YEAR/share/static/.gitkeep"
 ```
 
+`year2yaml` classifies topics as `module` (links to MetaCPAN) when the topic
+contains `::`, and as `topic` otherwise. Review `archives.yaml` afterwards for
+single-word CPAN modules that lack `::` (e.g. `LWP`, `Moose`).
+
 ## Article Format (POD)
 
 Articles are written in POD (Plain Old Documentation) with these required headers:
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ cpm install -g WWW::AdventCalendar App::HTTPThis
 Then build all recent calendars
 
 ```bash
-for year in $(seq 2011 2025); do cd $year && advcal -c advent.ini -o `pwd` && cd ..; done
+for year in $(seq 2011 2026); do cd $year && advcal -c advent.ini -o `pwd` && cd ..; done
 ```
 
 ### 3. Test (locally)
diff --git a/archives.yaml b/archives.yaml
@@ -1236,3 +1236,62 @@
   - { "topic" : "Camel" }
   25:
   - { "topic" : "Merry Christmas, bless us, everyone" }
+
+
+2025:
+  01:
+  - { "topic" : "Perl IDE Developer Survey" }
+  02:
+  - { "module" : "App::BlurFill" }
+  03:
+  - { "topic" : "idi" }
+  04:
+  - { "topic" : "System Security Auditing" }
+  05:
+  - { "topic" : "LWP" }
+  - { "topic" : "JSON" }
+  - { "topic" : "constant" }
+  06:
+  - { "module" : "Mojolicious::Lite" }
+  - { "topic" : "JSON" }
+  - { "topic" : "HTTPie" }
+  07:
+  - { "module" : "Storage::Abstract" }
+  08:
+  - { "module" : "Data::Random::Contact" }
+  - { "module" : "Getopt::Long" }
+  09:
+  - { "module" : "Test2::Plugin::SubtestFilter" }
+  10:
+  - { "topic" : "PAGI" }
+  11:
+  - { "topic" : "Art with Perl" }
+  13:
+  - { "topic" : "No Estimates" }
+  14:
+  - { "topic" : "Critical Chain Project Management" }
+  15:
+  - { "module" : "Mojolicious::Plugin::Mount" }
+  16:
+  - { "topic" : "OpenTelemetry" }
+  - { "topic" : "Observability" }
+  17:
+  - { "topic" : "Moose" }
+  18:
+  - { "module" : "App::Transpierce" }
+  19:
+  - { "topic" : "The Underbar podcast" }
+  20:
+  - { "topic" : "OpenQA" }
+  - { "topic" : "Open Build Service" }
+  21:
+  - { "topic" : "Source code" }
+  22:
+  - { "topic" : "bitvectors" }
+  23:
+  - { "module" : "Imager::QRCode" }
+  24:
+  - { "module" : "Audio::Nama" }
+  - { "topic" : "Tickit" }
+  - { "module" : "Tie::Simple" }
+  - { "module" : "Parse::RecDescent" }
diff --git a/in-season.html b/in-season.html
@@ -1,7 +1,7 @@
 <!-- use this redirect splash screen in December and January -->
 <html>
   <head>
-    <meta http-equiv="refresh" content="0; URL=2025" />
+    <meta http-equiv="refresh" content="0; URL=2026" />
   </head>
   <body>
   </body>
diff --git a/script/build-site.sh b/script/build-site.sh
@@ -3,13 +3,13 @@
 # Usage ./script/build-site.sh
 #
 # To build just a single year
-# ./script/build-site.sh --single-year 2025
+# ./script/build-site.sh --single-year 2026
 #
 # To build the entire month for the current year
-# ./script/build-site.sh --single-year 2025 --today 2025-12-31
+# ./script/build-site.sh --single-year 2026 --today 2026-12-31
 #
 # Watch the filesystem:
-# find 2025/articles | entr ./script/build-site.sh --single-year 2025 --today 2025-12-25
+# find 2026/articles | entr ./script/build-site.sh --single-year 2026 --today 2026-12-25
 
 pwd
 set -eu -o pipefail
@@ -52,7 +52,7 @@ for year in $(seq 2000 2010); do
     cp -R "$year" out/
 done
 
-for year in 1999 $(seq 2011 2025); do
+for year in 1999 $(seq 2011 2026); do
     if [[ ${single_year:-} && $single_year -ne $year ]]; then
         continue
     fi
@@ -80,7 +80,7 @@ for year in 1999 $(seq 2011 2025); do
     cd ..
 done
 
-for year in $(seq 2000 2025); do
+for year in $(seq 2000 2026); do
     if test -d "out/$year"; then
         cp favicon.ico "out/$year/"
     fi
diff --git a/script/stats.sh b/script/stats.sh
@@ -9,7 +9,7 @@ for year in $(seq 2000 2010); do
     echo "$year $(printf "%0.s🎄" $(seq 1 "$found"))"
 done
 
-for year in $(seq 2011 2025); do
+for year in $(seq 2011 2026); do
     found=$(find "$year/articles" | grep -c pod$)
     echo "$year $(printf "%0.s🎄" $(seq 1 "$found"))"
 done
diff --git a/year2yaml b/year2yaml
@@ -40,19 +40,33 @@ for my $day (1 .. 25) {
 	next unless -e $file;
 	open my $ifh, '<', $file or die "Cannot open $file for reading: $!";
 	while (my $line = <$ifh>) {
-		if ($line =~ /^Topic: (\S+)/) {
-			my $topic = $1;
-			$topic =~ s/,//g; # remove commas
-			print "Found topic $topic\n";
-			push @modlist, $topic;
+		if ($line =~ /^Topic: (.+?)\s*$/) {
+			my @topics = split /\s*,\s*/, $1;
+			for my $topic (@topics) {
+				$topic =~ s/^\s+|\s+$//g;
+				# If topic contains spaces but all space-separated parts look like
+				# module names (contain ::), split them into individual entries
+				if ($topic =~ / /) {
+					my @parts = split /\s+/, $topic;
+					if (!grep { !/::/ } @parts) {
+						print "Found module $_\n" for @parts;
+						push @modlist, map { { module => $_ } } @parts;
+						next;
+					}
+				}
+				my $key = ($topic =~ /::/) ? 'module' : 'topic';
+				print "Found $key $topic\n";
+				push @modlist, { $key => $topic };
+			}
 		}
 		last unless $line =~ /\S/;
 	}
 	close $ifh;
 	next unless @modlist;
 	$ytext .= sprintf "  %2.2i:\n", $day;
-	for my $m (@modlist) {
-		$ytext .= qq#  - { "module" : "$m" }\n#;
+	for my $entry (@modlist) {
+		my ($key, $val) = %$entry;
+		$ytext .= qq#  - { "$key" : "$val" }\n#;
 	}
 }
 
