Fix cleanpath undefined, upgrade Jekyll / Bundler / deps (#600)

* Workaround for Ruby 2.5 issue https://bugs.ruby-lang.org/issues/10011

* Update to Jekyll 4.2.0, Bundler 2.2.2 and update deps

* Update Bundler & htmltest in Docker container

* Exclude redirects.json from deployments
  The jekyll-redirect-from plugin 0.13+ creates this file

Author: Simran-B

Dockerfile

@@ -4,8 +4,8 @@ RUN apt-get update && \
     apt-get install -y ruby-full build-essential zlib1g-dev wget python2.7 libpython2.7
 
 RUN cd /tmp && \
-    wget https://github.com/wjdp/htmltest/releases/download/v0.12.1/htmltest_0.12.1_linux_amd64.tar.gz && \
-    tar xvzf htmltest_0.12.1_linux_amd64.tar.gz && \
+    wget https://github.com/wjdp/htmltest/releases/download/v0.13.0/htmltest_0.13.0_linux_amd64.tar.gz && \
+    tar xvzf htmltest_0.13.0_linux_amd64.tar.gz && \
     mv htmltest /usr/local/bin
 
 RUN mkdir /root/gems
@@ -15,7 +15,7 @@ ENV PATH="/root/gems/bin:${PATH}"
 # python md script needs that :S
 ENV LC_ALL=C.UTF-8
 
-RUN gem install bundler:2.1.4 jekyll
+RUN gem install bundler:2.2.2 jekyll
 
 VOLUME /docs
 WORKDIR /docs
@@ -26,4 +26,4 @@ RUN bundler install
 
 EXPOSE 4000
 
-CMD ["bundler", "exec", "jekyll", "serve", "-H", "0.0.0.0", "--incremental", "--trace"]
+CMD ["bundler", "exec", "jekyll", "serve", "-H", "0.0.0.0", "--incremental", "--trace"]

Gemfile

@@ -8,7 +8,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.1.1"
+gem "jekyll", "~> 4.2.0"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 #gem "minima", "~> 2.0"
@@ -27,6 +27,6 @@ end
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
-#gem 'jekyll-sitemap', "~> 1.3.1"
-gem "jekyll-redirect-from", "~> 0.12"
+gem "wdm", "~> 0.1.1" if Gem.win_platform?
+#gem 'jekyll-sitemap', "~> 1.4.0"
+gem "jekyll-redirect-from", "~> 0.16"

Gemfile.lock

@@ -6,12 +6,12 @@ GEM
     algolia_html_extractor (2.6.2)
       json (~> 2.0)
       nokogiri (~> 1.10.4)
-    algoliasearch (1.27.3)
+    algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     colorator (1.1.0)
     concurrent-ruby (1.1.7)
-    em-websocket (0.5.1)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
@@ -24,21 +24,21 @@ GEM
     httpclient (2.8.3)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-algolia (1.6.0)
       algolia_html_extractor (~> 2.6)
       algoliasearch (~> 1.26)
@@ -54,13 +54,13 @@ GEM
       sassc (> 2.0.1, < 3.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.3.1)
+    json (2.4.1)
     kramdown (2.3.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.3.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -72,22 +72,22 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     progressbar (1.10.1)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.21.0)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc (2.4.0-x64-mingw32)
       ffi (~> 1.9)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tzinfo (2.0.2)
+    tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2020.1)
+    tzinfo-data (1.2020.4)
       tzinfo (>= 1.0.0)
     unicode-display_width (1.7.0)
     verbal_expressions (0.1.5)
@@ -96,13 +96,14 @@ GEM
 PLATFORMS
   ruby
   x64-mingw32
+  x86_64-linux
 
 DEPENDENCIES
-  jekyll (~> 4.1.1)
+  jekyll (~> 4.2.0)
   jekyll-algolia (~> 1.0)
-  jekyll-redirect-from (~> 0.12)
+  jekyll-redirect-from (~> 0.16)
   tzinfo-data
-  wdm (~> 0.1.0)
+  wdm (~> 0.1.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.2

TODO.md

@@ -21,3 +21,5 @@
   This should then feed a new thing that generates the examples via the CI
 
 - Rethink the {% tag %}{% include %} thing... namely first one thing that parses something and then outputs variables that then include a template. Feels wrong...
+
+- Add AQL highlighter

_plugins/ExtraFilters.rb

@@ -62,7 +62,7 @@ def join_natural(arr)
         def resolve_symlink(path)
             site = @context.registers[:site]
             source = site.source # base path
-            Pathname.new(File.realpath(path)).relative_path_from(source).to_s
+            Pathname.new(File.realpath(path)).relative_path_from(Pathname.new(source)).to_s
         end
     end
 end

build.sh

@@ -10,5 +10,7 @@ mkdir -p htmltest
 # our baseUrl is /docs so we need to create that structure for htmltest
 # otherwise it would fail to find absolute links like /docs/3.5
 cp -a _site htmltest/docs
+# do not deploy file generated by jekyll-redirect-from v0.13.0+ plugin
+rm -f htmltest/docs/redirects.json
 htmltest -s
-(cd htmltest && tar cvzf docs.tar.gz docs)
+(cd htmltest && tar cvzf docs.tar.gz docs)

netlify.sh

@@ -12,8 +12,8 @@ cp -a _site htmltest/docs
 cp _redirects htmltest
 
 (cd /tmp && \
-    wget -nv https://github.com/wjdp/htmltest/releases/download/v0.10.1/htmltest_0.10.1_linux_amd64.tar.gz && \
-    tar xvzf htmltest_0.10.1_linux_amd64.tar.gz
+    wget -nv https://github.com/wjdp/htmltest/releases/download/v0.13.0/htmltest_0.13.0_linux_amd64.tar.gz && \
+    tar xvzf htmltest_0.13.0_linux_amd64.tar.gz
 )
 
 /tmp/htmltest -s