Jekyll updates

.ruby-version

@@ -1 +1 @@
-2.7.4
+3.3.4

Gemfile

@@ -8,12 +8,6 @@ version = JSON.parse(OpenURI.open_uri('https://pages.github.com/versions.json').
 
 ruby version['ruby']
 gem 'github-pages', version['github-pages'], group: :jekyll_plugins
-# ffi version 1.17+ incompatible with GitHub jekyll-build-pages, see:
-#   https://github.com/orgs/community/discussions/127006
-#   https://github.com/sqlsaturday/sqlsatwebsite/blob/main/Gemfile
-#   https://rubygems.org/gems/ffi/versions
-# TODO: remove when upstream issue https://github.com/actions/jekyll-build-pages/issues/123 is resolved
-gem 'ffi', '= 1.16.3'
 group :test do
   gem 'html-proofer'
   gem 'rake'

Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    Ascii85 (1.1.1)
     activesupport (7.1.3.4)
       base64
       bigdecimal
@@ -13,7 +14,12 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
+    afm (0.2.2)
     ast (2.4.2)
+    async (2.15.3)
+      console (~> 1.26)
+      fiber-annotation
+      io-event (~> 1.6, >= 1.6.5)
     base64 (0.2.0)
     bigdecimal (3.1.8)
     coffee-script (2.4.1)
@@ -24,6 +30,11 @@ GEM
     commonmarker (0.23.10)
     concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
+    console (1.27.0)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
+    csv (3.3.0)
     dnsruby (1.72.2)
       simpleidn (~> 0.2.1)
     drb (2.2.1)
@@ -34,20 +45,33 @@ GEM
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     execjs (2.9.1)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.2)
-    ffi (1.16.3)
+    faraday (2.10.1)
+      faraday-net_http (>= 2.0, < 3.2)
+      logger
+    faraday-net_http (3.1.1)
+      net-http
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-aarch64-linux-musl)
+    ffi (1.17.0-arm-linux-gnu)
+    ffi (1.17.0-arm-linux-musl)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86-linux-gnu)
+    ffi (1.17.0-x86-linux-musl)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
+    ffi (1.17.0-x86_64-linux-musl)
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.0)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-    github-pages (231)
+    github-pages (232)
       github-pages-health-check (= 1.18.2)
-      jekyll (= 3.9.5)
+      jekyll (= 3.10.0)
       jekyll-avatar (= 0.8.0)
       jekyll-coffeescript (= 1.2.2)
-      jekyll-commonmark-ghpages (= 0.4.0)
+      jekyll-commonmark-ghpages (= 0.5.1)
       jekyll-default-layout (= 0.1.5)
       jekyll-feed (= 0.17.0)
       jekyll-gist (= 1.5.0)
@@ -84,33 +108,37 @@ GEM
       liquid (= 4.0.4)
       mercenary (~> 0.3)
       minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
+      nokogiri (>= 1.16.2, < 2.0)
       rouge (= 3.30.0)
       terminal-table (~> 1.4)
+      webrick (~> 1.8)
     github-pages-health-check (1.18.2)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
       octokit (>= 4, < 8)
       public_suffix (>= 3.0, < 6.0)
       typhoeus (~> 1.3)
+    hashery (2.1.2)
     html-pipeline (2.14.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html-proofer (4.4.3)
+    html-proofer (5.0.9)
       addressable (~> 2.3)
-      mercenary (~> 0.3)
+      async (~> 2.1)
       nokogiri (~> 1.13)
-      parallel (~> 1.10)
+      pdf-reader (~> 2.11)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
       zeitwerk (~> 2.5)
     http_parser.rb (0.8.0)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.9.5)
+    io-event (1.6.5)
+    jekyll (3.10.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (>= 0.7, < 2)
       jekyll-sass-converter (~> 1.0)
@@ -121,16 +149,17 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
+      webrick (>= 1.0)
     jekyll-avatar (0.8.0)
       jekyll (>= 3.0, < 5.0)
     jekyll-coffeescript (1.2.2)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.12)
     jekyll-commonmark (1.4.0)
       commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
+    jekyll-commonmark-ghpages (0.5.1)
+      commonmarker (>= 0.23.7, < 1.1.0)
+      jekyll (>= 3.9, < 4.0)
       jekyll-commonmark (~> 1.4.0)
       rouge (>= 2.0, < 5.0)
     jekyll-default-layout (0.1.5)
@@ -226,26 +255,43 @@ GEM
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
     mercenary (0.3.6)
-    mini_portile2 (2.8.7)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.24.1)
     mutex_m (0.2.0)
-    nokogiri (1.15.6)
-      mini_portile2 (~> 2.8.2)
+    net-http (0.4.1)
+      uri
+    nokogiri (1.16.7-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86-linux)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    parallel (1.25.1)
-    parser (3.3.4.0)
+    parallel (1.26.1)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
       racc
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
+    pdf-reader (2.12.0)
+      Ascii85 (~> 1.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
     public_suffix (5.1.1)
     racc (1.8.1)
     rainbow (3.1.1)
@@ -254,10 +300,10 @@ GEM
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     regexp_parser (2.9.2)
-    rexml (3.3.2)
+    rexml (3.3.4)
       strscan
     rouge (3.30.0)
-    rubocop (1.65.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -268,12 +314,12 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.0)
       parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
+    ruby-rc4 (0.1.5)
     rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
@@ -287,27 +333,43 @@ GEM
     simpleidn (0.2.3)
     strscan (3.1.0)
     terminal-table (1.6.0)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
+    webrick (1.8.1)
     yell (2.2.2)
     zeitwerk (2.6.17)
 
 PLATFORMS
-  ruby
+  aarch64-linux
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86-linux
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  ffi (= 1.16.3)
-  github-pages (= 231)
+  github-pages (= 232)
   html-proofer
   rake
   rubocop
   rubocop-rake
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.3.4p94
 
 BUNDLED WITH
-   2.1.4
+   2.5.14

Rakefile

@@ -2,19 +2,11 @@
 
 abort('Please run this using `bundle exec rake`') unless ENV['BUNDLE_BIN_PATH']
 require 'html-proofer'
+require 'rubocop/rake_task'
 
-desc 'remove all local files'
-task :distclean do
-  sh 'rm -rf `cat .gitignore`'
-rescue StandardError => e
-  puts e
-end
-
-# TODO: bundle exec rake update does not work as expected
-desc 'update gems'
-task :update do
-  sh 'bundle update'
-  sh 'bundle clean'
+desc 'run rubocop'
+task :rubocop do
+  RuboCop::RakeTask.new
 rescue StandardError => e
   puts e
 end
@@ -67,7 +59,7 @@ task test: :build do
       'http://psas.scripts.mit.edu/home/2016-stamp-workshop/',
       # URLs require authentication
       'https://societyinforisk.org/SiRAcon-20#LR220',
-      # Dead URLs
+      # Dead URLs not available on https://web.archive.org
       'https://vimeo.com/31654452',
       'http://www.ustream.tv/recorded/18541162',
       'https://dev.issa.org/Library/Journals/2006/May/Parker%20-%20Replacing%20Risk-Based%20Security.pdf',
@@ -82,4 +74,4 @@ task test: :build do
   end
 end
 
-task default: [:test]
+task default: %i[rubocop test]

bootstrap.sh

@@ -2,6 +2,7 @@
 # use rbenv to install base ruby stack (ruby, gem, bundler)
 set -ex # halt script on error, echo on
 
-rbenv install `cat .ruby-version`
+# NOTE: rbenv not needed for current versions used with `brew rbenv-sync`
+# rbenv install "$(cat .ruby-version)"
 bundle install
 bundle package

clean.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+# clean ruby environment (for major ruby version updates)
+set -ex # halt script on error, echo on
+
+rm -rf "$(grep -v '^#' .gitignore)"
+rm Gemfile.lock