Merge branch 'main' into born-expansion

Gemfile

@@ -3,8 +3,8 @@ source 'https://rubygems.org'
 gem 'thin'
 gem 'sinatra'
 gem 'sinatra-contrib'
-gem 'prawn', '2.2.2'
-gem 'prawn-templates', '0.1.1'
+gem 'prawn'
+gem 'prawn-templates'
 gem 'deep_merge', '~> 1.2', '>= 1.2.1'
 
 group :development do

Gemfile.lock

@@ -1,73 +1,71 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.0.3)
+    Ascii85 (1.1.0)
     afm (0.2.2)
-    backports (3.15.0)
-    daemons (1.3.1)
+    daemons (1.4.1)
     deep_merge (1.2.2)
     eventmachine (1.2.7)
-    ffi (1.11.1)
+    ffi (1.15.5)
     hashery (2.1.2)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    multi_json (1.13.1)
-    mustermann (1.0.3)
-    pdf-core (0.7.0)
-    pdf-reader (2.2.0)
-      Ascii85 (~> 1.0.0)
+    listen (3.8.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    pdf-core (0.9.0)
+    pdf-reader (2.11.0)
+      Ascii85 (~> 1.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    prawn (2.2.2)
-      pdf-core (~> 0.7.0)
-      ttfunk (~> 1.5)
-    prawn-templates (0.1.1)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
+    prawn-templates (0.1.2)
       pdf-reader (~> 2.0)
       prawn (~> 2.2)
-    rack (2.0.7)
-    rack-protection (2.0.5)
-      rack
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rack (2.2.8)
+    rack-protection (3.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rerun (0.13.0)
+    rerun (0.14.0)
       listen (~> 3.0)
     ruby-rc4 (0.1.5)
-    ruby_dep (1.5.0)
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.5)
+    ruby2_keywords (0.0.5)
+    sinatra (3.1.0)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.5)
-      backports (>= 2.8.2)
+    sinatra-contrib (3.1.0)
       multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.0.5)
-      sinatra (= 2.0.5)
-      tilt (>= 1.3, < 3)
-    thin (1.7.2)
+      mustermann (~> 3.0)
+      rack-protection (= 3.1.0)
+      sinatra (= 3.1.0)
+      tilt (~> 2.0)
+    thin (1.8.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    tilt (2.0.9)
-    ttfunk (1.5.1)
+    tilt (2.2.0)
+    ttfunk (1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   deep_merge (~> 1.2, >= 1.2.1)
-  prawn (= 2.2.2)
-  prawn-templates (= 0.1.1)
+  prawn
+  prawn-templates
   rerun
   sinatra
   sinatra-contrib
   thin
 
 BUNDLED WITH
-   1.17.2
+   2.3.7

README.md

@@ -126,3 +126,19 @@ Some notes:
   }
 }
 ```
+
+# Building
+
+Requires Ruby 3.1 or better for support.
+
+On Debian or derivatives this requires `apt-get install ruby-dev` in order to allow eventmachine to work (which is a hard dependency for thin, the webserver we're using for charred.
+
+In order to run in normal use, simply run:
+
+```
+# sudo apt-get install ruby-dev bundler
+# bundler install # on some distros this might be bundler3.1
+# cd src
+# HOST=0.0.0.0 PORT=7878 RACK_ENV=production ruby app.rb
+```
+