Update gems

roqua · Jun 10, 2024 · c834160 · c834160
1 parent 71ce2a4
commit c834160
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 99 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,15 +2,14 @@ source 'https://rubygems.org'
 
 gem 'nanoc'
 gem 'sass'
-gem 'haml'
+gem 'haml', '~> 5.1'
 gem 'coffee-script'
 
 group :development do
   gem 'adsf'
   gem 'rake'
   gem 'dotenv'
   gem 'httparty'
-  gem 'guard-process'
   gem 'nokogiri'
-  gem 'guard-nanoc'
+  gem 'nanoc-live'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,129 +1,141 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    adsf (1.4.3)
-      rack (>= 1.0.0, < 3.0.0)
-    coderay (1.1.2)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    adsf (1.5.0)
+      rack (>= 1.0.0, < 4.0.0)
+      rackup (~> 2.1)
+    adsf-live (1.5.0)
+      adsf (~> 1.3)
+      em-websocket (~> 0.5)
+      eventmachine (~> 1.2)
+      listen (~> 3.0)
+      rack-livereload (~> 0.3)
+    base64 (0.2.0)
+    coderay (1.1.3)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     colored (1.2)
-    concurrent-ruby (1.1.5)
-    cri (2.15.10)
-    ddmemoize (1.0.0)
-      ddmetrics (~> 1.0)
-      ref (~> 2.0)
-    ddmetrics (1.0.1)
-    ddplugin (1.0.2)
-    diff-lcs (1.3)
-    dotenv (2.7.5)
-    equatable (0.6.1)
-    execjs (2.7.0)
+    concurrent-ruby (1.3.3)
+    cri (2.15.12)
+    csv (3.3.0)
+    ddmetrics (1.1.0)
+    ddplugin (1.0.3)
+    diff-lcs (1.5.1)
+    dotenv (2.8.1)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    execjs (2.9.1)
     ffi (1.17.0)
-    formatador (0.2.5)
-    guard (2.16.1)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (>= 1.0.12, < 2.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-nanoc (2.1.7)
-      guard (~> 2.8)
-      guard-compat (~> 1.0)
-      nanoc (>= 4.11.13, < 5.0)
-    guard-process (1.2.1)
-      guard-compat (~> 1.2, >= 1.2.1)
-      spoon (~> 0.0.1)
-    haml (5.1.2)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
-    httparty (0.17.3)
-      mime-types (~> 3.0)
+    http_parser.rb (0.8.0)
+    httparty (0.22.0)
+      csv
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    json_schema (0.20.8)
-    listen (3.2.1)
+    immutable-ruby (0.2.0)
+      concurrent-ruby (~> 1.1)
+      sorted_set (~> 1.0)
+    json_schema (0.21.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.1)
-    method_source (0.9.2)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
+    memo_wise (1.9.0)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     multi_xml (0.6.0)
-    nanoc (4.11.14)
+    nanoc (4.12.21)
       addressable (~> 2.5)
       colored (~> 1.2)
-      nanoc-cli (= 4.11.14)
-      nanoc-core (= 4.11.14)
+      nanoc-checking (~> 1.0, >= 1.0.2)
+      nanoc-cli (= 4.12.21)
+      nanoc-core (= 4.12.21)
+      nanoc-deploying (~> 1.0)
       parallel (~> 1.12)
       tty-command (~> 0.8)
       tty-which (~> 0.4)
-    nanoc-cli (4.11.14)
+    nanoc-checking (1.0.5)
+      nanoc-cli (~> 4.12, >= 4.12.5)
+      nanoc-core (~> 4.12, >= 4.12.5)
+    nanoc-cli (4.12.21)
       cri (~> 2.15)
       diff-lcs (~> 1.3)
-      nanoc-core (= 4.11.14)
+      nanoc-core (= 4.12.21)
+      pry
       zeitwerk (~> 2.1)
-    nanoc-core (4.11.14)
-      ddmemoize (~> 1.0)
+    nanoc-core (4.12.21)
+      base64 (~> 0.2)
+      concurrent-ruby (~> 1.1)
       ddmetrics (~> 1.0)
       ddplugin (~> 1.0)
-      hamster (~> 3.0)
+      immutable-ruby (~> 0.1)
       json_schema (~> 0.19)
+      memo_wise (~> 1.5)
+      psych (>= 4.0, < 6.0)
       slow_enumerator_tools (~> 1.0)
-      tomlrb (~> 1.2)
       tty-platform (~> 0.2)
       zeitwerk (~> 2.1)
-    nenv (0.3.0)
+    nanoc-deploying (1.0.2)
+      nanoc-checking (~> 1.0)
+      nanoc-cli (~> 4.11, >= 4.11.15)
+      nanoc-core (~> 4.11, >= 4.11.15)
+    nanoc-live (1.0.0)
+      adsf-live (~> 1.4)
+      listen (~> 3.0)
+      nanoc-cli (~> 4.11, >= 4.11.14)
+      nanoc-core (~> 4.11, >= 4.11.14)
     nokogiri (1.15.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    notiffany (0.1.3)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parallel (1.19.1)
-    pastel (0.7.3)
-      equatable (~> 0.6)
+    parallel (1.25.1)
+    pastel (0.8.0)
       tty-color (~> 0.5)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.3)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (5.1.2)
+      stringio
+    public_suffix (5.0.5)
     racc (1.8.0)
-    rack (2.1.2)
-    rake (13.0.1)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.1)
+    rack (3.0.11)
+    rack-livereload (0.6.0)
+      rack (~> 3.0.8)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    ref (2.0.0)
+    rbtree (0.4.6)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    shellany (0.0.1)
+    set (1.0.4)
     slow_enumerator_tools (1.1.0)
-    spoon (0.0.6)
-      ffi
-    temple (0.8.2)
-    thor (1.0.1)
-    tilt (2.0.10)
-    tomlrb (1.2.9)
-    tty-color (0.5.1)
-    tty-command (0.9.0)
-      pastel (~> 0.7.0)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
+    stringio (3.1.0)
+    temple (0.10.3)
+    tilt (2.3.0)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
     tty-platform (0.3.0)
-    tty-which (0.4.2)
-    zeitwerk (2.2.2)
+    tty-which (0.5.0)
+    webrick (1.8.1)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
@@ -132,11 +144,10 @@ DEPENDENCIES
   adsf
   coffee-script
   dotenv
-  guard-nanoc
-  guard-process
-  haml
+  haml (~> 5.1)
   httparty
   nanoc
+  nanoc-live
   nokogiri
   rake
   sass

diff --git a/Guardfile b/Guardfile
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Marketing website for RoQua
 3. Work on your branch. Make sure it builds properly. Tip: You can use guard to do compiling for you.
 
    ```bash
-   bundle exec guard
+   bundle exec nanoc -W
    ```
 
 4. Ensure it looks good

diff --git a/content/about.haml b/content/about.haml
@@ -3,7 +3,7 @@ title: About
 ---
 
 :ruby
-  PEOPLE = [
+  @people = [
     {photo: 'erwin', first_name: 'Erwin',name_and_title: 'Erwin Veermans, MSc', job: 'Technisch projectleider', job2: 'ICT-er / Natuurkundige', extra_info: 'Mede-oprichter', email: '[email protected]'},
     {photo: 'dennis', first_name: 'Dennis',name_and_title: 'Dennis Raven, PhD', job: 'Wetenschappelijk coördinator', job2: 'Socioloog / Bedrijfskundige', email: '[email protected]'},
     {photo: 'herman', first_name: 'Herman', name_and_title: 'Herman Hegeman, BAS', job: 'Systeembeheerder', email: '[email protected]'},
@@ -15,7 +15,7 @@ title: About
     {photo: 'jij', first_name: 'Jij?', name_and_title: 'Developer', job: "Wij zijn altijd geïnteresseerd in talent, we nodigen je graag een keertje uit op de #{link_to 'thee of koffie', @items['/career.*'].path} !"}
   ]
 
-  ALUMNI = [
+  @alumni = [
     {photo: 'sjoerd', first_name: 'Sjoerd', name_and_title: 'Sjoerd Sytema, PhD', job: 'Inhoudelijk projectleider', job2: 'Socioloog', extra_info: 'Mede-oprichter'},
     {photo: 'arnold', first_name: 'Arnold', name_and_title: 'Arnold van der Meulen', job: 'Developer', job2: 'Computer Scientist'},
     {photo: 'rei', first_name: 'Rei', name_and_title: 'Rei Monden, PhD', job: 'R Developer', job2: 'Statisticus', email: '[email protected]'},
@@ -31,7 +31,7 @@ title: About
   .container
     %h2.header.text_b wij:
     .row
-      - PEOPLE.each_with_index do |person, idx|
+      - @people.each_with_index do |person, idx|
         .col.s6.m4.l3{class: (idx % 3 == 0 ? "offset-l1" : "")}
           = render '/_employee_card.*', **person
 
@@ -43,7 +43,7 @@ title: About
   .container
     %h2.header.text_b alumni:
     .row
-      - ALUMNI.each_with_index do |person, idx|
+      - @alumni.each_with_index do |person, idx|
         .col.s6.m4.l3{class: (idx % 3 == 0 ? "offset-l1" : "")}
           = render '/_employee_card.*', **person