Merge pull request #123 from viteinfinite/feature/upgrade-to-middleman4

Make pomo.tv buildable again

Author: chriseidhof

Gemfile

@@ -2,13 +2,13 @@
 # the following line to use "http://" instead
 source 'https://rubygems.org'
 
-gem "middleman", "~>3.3.12"
+gem "middleman", "~>4.3.2"
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload", "~> 3.4.6"
 
 # Publish to github pages
-gem 'middleman-gh-pages', :git => "https://github.com/orta/middleman-gh-pages.git"
+gem 'middleman-gh-pages', "~> 0.4.1"
 gem 'middleman-blog'
 
 # For faster file watcher updates on Windows:
@@ -24,7 +24,7 @@ gem 'dotenv'
 gem 'yt'
 
 # Search with lunr.js
-gem 'middleman-search', '~> 0.5.0'
+gem 'middleman-search', :git => "https://github.com/sn3p/middleman-search.git", :branch => "update-lunr"
 
 # Validates the feeds
 gem 'feedvalidator'

Gemfile.lock

@@ -1,167 +1,151 @@
 GIT
-  remote: https://github.com/orta/middleman-gh-pages.git
-  revision: 87ce11bd60627aeaaea9af2c70a0a1f94be7b6b4
+  remote: https://github.com/sn3p/middleman-search.git
+  revision: 6077d7b76d010ade046a32711536cab3601e4910
+  branch: update-lunr
   specs:
-    middleman-gh-pages (0.0.3)
-      rake (> 0.9.3)
+    middleman-search (0.10.0)
+      middleman-core (>= 3.2)
+      nokogiri (~> 1.6)
+      therubyracer (~> 0.12.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.14)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.0.7.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    chunky_png (1.3.5)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    backports (3.11.4)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
-    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)
-    dotenv (2.0.2)
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.4)
+    contracts (0.13.0)
+    dotenv (2.6.0)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.8)
-    execjs (2.6.0)
-    feedvalidator (0.2.0)
-    ffi (1.9.10)
-    haml (4.0.7)
+    eventmachine (1.2.7)
+    execjs (2.7.0)
+    fast_blank (1.0.0)
+    fastimage (2.1.5)
+    feedvalidator (0.2.1)
+    ffi (1.9.25)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    hike (1.2.3)
-    hitimes (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.6.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    kramdown (1.9.0)
-    libv8 (3.16.14.13)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    middleman (3.3.12)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    kramdown (1.17.0)
+    libv8 (3.16.14.19)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    memoist (0.16.0)
+    middleman (4.3.2)
       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.3.12)
-      middleman-sprockets (>= 3.1.2)
-      sass (>= 3.4.0, < 4.0)
-      uglifier (~> 2.5)
-    middleman-blog (3.5.3)
-      addressable (~> 2.3.5)
-      middleman-core (~> 3.2)
+      middleman-cli (= 4.3.2)
+      middleman-core (= 4.3.2)
+    middleman-blog (4.0.3)
+      addressable (~> 2.3)
+      middleman-core (>= 4.0.0)
       tzinfo (>= 0.3.0)
-    middleman-core (3.3.12)
-      activesupport (~> 4.1.0)
-      bundler (~> 1.1)
+    middleman-cli (4.3.2)
+      thor (>= 0.17.0, < 2.0)
+    middleman-core (4.3.2)
+      activesupport (>= 4.2, < 5.1)
+      addressable (~> 2.3)
+      backports (~> 3.6)
+      bundler
+      contracts (~> 0.13.0)
+      dotenv
       erubis
-      hooks (~> 0.3)
-      i18n (~> 0.7.0)
-      listen (>= 2.7.9, < 3.0)
-      padrino-helpers (~> 0.12.3)
-      rack (>= 1.4.5, < 2.0)
-      rack-test (~> 0.6.2)
-      thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.4.1, < 2.0)
-    middleman-livereload (3.1.1)
-      em-websocket (>= 0.2.0)
-      middleman-core (>= 3.0.2)
-      multi_json (~> 1.0)
-      rack-livereload
-    middleman-search (0.5.0)
-      middleman-core (~> 3.2)
-      nokogiri (~> 1.5)
-      therubyracer (~> 0.12)
-    middleman-sprockets (3.4.2)
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
+      i18n (~> 0.9.0)
+      listen (~> 3.0.0)
+      memoist (~> 0.14)
+      padrino-helpers (~> 0.13.0)
+      parallel
+      rack (>= 1.4.5, < 3)
+      sassc (~> 2.0)
+      servolux
+      tilt (~> 2.0.9)
+      uglifier (~> 3.0)
+    middleman-gh-pages (0.4.1)
+      rake (> 0.9.3)
+    middleman-livereload (3.4.6)
+      em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
-      sprockets (~> 2.12.1)
-      sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.3.0)
-    mini_portile2 (2.0.0)
-    minitest (5.8.3)
-    multi_json (1.11.2)
-    nokogiri (1.6.7.1)
-      mini_portile2 (~> 2.0.0.rc2)
-    padrino-helpers (0.12.5)
+      rack-livereload (~> 0.3.15)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    padrino-helpers (0.13.3.4)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.5)
-      tilt (~> 1.4.1)
-    padrino-support (0.12.5)
+      padrino-support (= 0.13.3.4)
+      tilt (>= 1.4.1, < 3)
+    padrino-support (0.13.3.4)
       activesupport (>= 3.1)
-    rack (1.6.4)
-    rack-livereload (0.3.16)
+    parallel (1.13.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-livereload (0.3.17)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     ref (2.0.0)
-    sass (3.4.20)
-    sprockets (2.12.4)
-      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)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
+    servolux (0.13.0)
+    temple (0.8.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    timers (4.0.4)
-      hitimes
-    tzinfo (1.2.2)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tilt (2.0.9)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uber (0.0.15)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    yt (0.25.14)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+    yt (0.32.2)
       activesupport
+      yt-support (>= 0.1)
+    yt-support (0.1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   dotenv
   feedvalidator
-  middleman (~> 3.3.12)
+  middleman (~> 4.3.2)
   middleman-blog
-  middleman-gh-pages!
-  middleman-livereload (~> 3.1.0)
-  middleman-search (~> 0.5.0)
+  middleman-gh-pages (~> 0.4.1)
+  middleman-livereload (~> 3.4.6)
+  middleman-search!
   tzinfo-data
   wdm (~> 0.1.0)
   yt
 
 BUNDLED WITH
-   1.10.6
+   1.16.2