Update everything (#120)

mpv-player · Dec 12, 2024 · c25190a · c25190a
1 parent de3bd4e
commit c25190a
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 115 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.8
+3.3.6
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-gem "middleman", "~> 3.4"
-gem "middleman-livereload", '>= 3.4', ' < 3.4.7'
+gem "middleman", "~> 4.1"
+gem "middleman-livereload", '>= 3.4'
 gem 'haml', '>= 4.0.5', '< 6.0' # compatible with legacy middleman
 gem "bootstrap-sass"
 gem "font-awesome-sass", "< 5.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,142 +1,123 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    autoprefixer-rails (10.4.16.0)
+    activesupport (7.0.8.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
+    backports (3.25.0)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    chunky_png (1.4.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.3.4)
+    contracts (0.16.1)
+    dotenv (3.1.4)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    execjs (2.9.1)
-    ffi (1.16.3)
+    execjs (2.10.0)
+    fast_blank (1.0.1)
+    fastimage (2.3.1)
+    ffi (1.17.0)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    hike (1.2.3)
-    hooks (0.4.1)
-      uber (~> 0.0.14)
+    hamster (3.0.0)
+      concurrent-ruby (~> 1.0)
+    hashie (3.6.0)
     http_parser.rb (0.8.0)
-    i18n (0.7.0)
-    json (2.7.2)
-    kramdown (1.17.0)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    middleman (3.4.1)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    memoist (0.16.2)
+    middleman (4.5.1)
       coffee-script (~> 2.2)
-      compass (>= 1.0.0, < 2.0.0)
-      compass-import-once (= 1.0.5)
-      execjs (~> 2.0)
       haml (>= 4.0.5)
-      kramdown (~> 1.2)
-      middleman-core (= 3.4.1)
-      middleman-sprockets (>= 3.1.2)
-      sass (>= 3.4.0, < 4.0)
-      uglifier (~> 2.5)
-    middleman-core (3.4.1)
-      activesupport (~> 4.1)
-      bundler (~> 1.1)
-      capybara (~> 2.4.4)
+      kramdown (>= 2.3.0)
+      middleman-cli (= 4.5.1)
+      middleman-core (= 4.5.1)
+    middleman-cli (4.5.1)
+      thor (>= 0.17.0, < 1.3.0)
+    middleman-core (4.5.1)
+      activesupport (>= 6.1, < 7.1)
+      addressable (~> 2.4)
+      backports (~> 3.6)
+      bundler (~> 2.0)
+      contracts (~> 0.13, < 0.17)
+      dotenv
       erubis
-      hooks (~> 0.3)
-      i18n (~> 0.7.0)
-      listen (~> 3.0.3)
-      padrino-helpers (~> 0.12.3)
-      rack (>= 1.4.5, < 2.0)
-      thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1, < 2.0)
-    middleman-livereload (3.4.6)
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
+      i18n (~> 1.6.0)
+      listen (~> 3.0)
+      memoist (~> 0.14)
+      padrino-helpers (~> 0.15.0)
+      parallel
+      rack (>= 1.4.5, < 3)
+      sassc (~> 2.0)
+      servolux
+      tilt (~> 2.0.9)
+      toml
+      uglifier (~> 3.0)
+      webrick
+    middleman-livereload (3.4.7)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
-    middleman-sprockets (3.5.0)
-      middleman-core (>= 3.3)
-      sprockets (~> 2.12.1)
-      sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.3.0)
-    mime-types (3.5.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0305)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
-    multi_json (1.15.0)
-    nokogiri (1.15.6)
-      mini_portile2 (~> 2.8.2)
-      racc (~> 1.4)
-    padrino-helpers (0.12.9)
-      i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.9)
+    minitest (5.25.4)
+    padrino-helpers (0.15.3)
+      i18n (>= 0.6.7, < 2)
+      padrino-support (= 0.15.3)
       tilt (>= 1.4.1, < 3)
-    padrino-support (0.12.9)
-      activesupport (>= 3.1)
-    racc (1.7.3)
-    rack (1.6.13)
+    padrino-support (0.15.3)
+    parallel (1.26.3)
+    parslet (2.0.0)
+    public_suffix (6.0.1)
+    rack (2.2.10)
     rack-livereload (0.3.17)
       rack
-    rack-test (2.1.0)
-      rack (>= 1.3)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    sass (3.4.25)
+    rexml (3.3.9)
+    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)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sprockets (2.12.5)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.1.0)
-      sprockets (~> 2.0)
-    sprockets-sass (1.3.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
+    servolux (0.13.0)
     temple (0.10.3)
-    thor (1.3.1)
-    thread_safe (0.3.6)
-    tilt (1.4.1)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    uber (0.0.15)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    thor (1.2.2)
+    tilt (2.0.11)
+    toml (0.3.0)
+      parslet (>= 1.8.0, < 3.0.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+    webrick (1.9.1)
 
 PLATFORMS
   ruby
@@ -145,8 +126,8 @@ DEPENDENCIES
   bootstrap-sass
   font-awesome-sass (< 5.0)
   haml (>= 4.0.5, < 6.0)
-  middleman (~> 3.4)
-  middleman-livereload (>= 3.4, < 3.4.7)
+  middleman (~> 4.1)
+  middleman-livereload (>= 3.4)
 
 BUNDLED WITH
-   1.17.3
+   2.5.23
diff --git a/README.md b/README.md
@@ -26,11 +26,10 @@ The website is created using a static website generator called
 [Middleman](http://middlemanapp.com/). Here's what you need to do to get a
 copy of the website running on your local machine.
 
-- Optional: have ``rbenv`` or ``rvm`` installed. These tools will automatically
+- Strongly recommended: have ``rbenv`` or ``rvm`` installed. These tools will automatically
   select the correct version of Ruby based on the ``.ruby-version`` file.
-  Alternatively you will need to install Ruby 2.7 (**not** 3.x) manually.
-- ``gem install bundler:1.17.3``
-- ``bundle _1.17.3_ install``
-- ``rbenv rehash`` (only if using ``rbenv``)
+  Alternatively you will need to install Ruby 3.x manually.
+- ``gem install bundler``
+- ``bundle install``
 - ``bundle exec middleman server``
 - See the website running at: http://localhost:4567/
diff --git a/Rakefile b/Rakefile
@@ -7,7 +7,7 @@ end
 
 desc "Builds mpv's manual"
 task :build_mpv_manual do
-  unless File.exists?('mpv')
+  unless File.exist?('mpv')
     system "git clone https://github.com/mpv-player/mpv.git mpv"
   end
   system("cd mpv && git checkout master && git pull origin master")

diff --git a/config.rb b/config.rb
@@ -1,6 +1,17 @@
 activate :automatic_image_sizes
 activate :directory_indexes
 activate :livereload
+activate :external_pipeline,
+  name: :font_awesome,
+  command: '# Adding Font Awesome assets to source...',
+  source: FontAwesome::Sass.assets_path
+
+activate :external_pipeline,
+  name: :bootstrap,
+  command: '# Adding Bootstrap assets to source...',
+  source: Bootstrap.assets_path
+
+config[:sass_assets_paths] << Bootstrap.stylesheets_path
 
 helpers do
   def installation_path

diff --git a/source/stylesheets/all.sass → source/stylesheets/all.css.sass b/source/stylesheets/all.sass → source/stylesheets/all.css.sass