Merge pull request #295 from packrat386/update_gems

Update gems and bundler

Author: jkowens

Gemfile

@@ -2,11 +2,12 @@ source "https://rubygems.org"
 
 gem "kramdown"
 gem "nokogiri", '>= 1.5.9'
-gem "jekyll", '>= 1.1.0'
-gem "rdoc", '~> 6.3.1'
+gem "jekyll"
+gem "rdoc"
 gem "haml"
 gem "thor"
 gem 'bourbon'
 gem 'neat'
 gem 'sass'
 gem 'rake'
+gem 'webrick'

Gemfile.lock

@@ -1,75 +1,106 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    bourbon (4.3.4)
-      sass (~> 3.4)
-      thor (~> 0.19)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    bourbon (7.2.0)
+      thor (~> 1.0)
     colorator (1.1.0)
-    ffi (1.11.3)
+    concurrent-ruby (1.1.10)
+    em-websocket (0.5.3)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0)
+    eventmachine (1.2.7)
+    ffi (1.15.5)
     forwardable-extended (2.6.0)
-    haml (5.0.1)
-      temple (>= 0.8.0)
+    haml (6.0.6)
+      temple (>= 0.8.2)
+      thor
       tilt
-    jekyll (3.4.3)
+    http_parser.rb (0.8.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.2.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
-      mercenary (~> 0.3.3)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.0)
-      sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    kramdown (1.13.2)
-    liquid (3.0.6)
-    listen (3.0.8)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    mercenary (0.3.6)
+      terminal-table (~> 2.0)
+    jekyll-sass-converter (2.2.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
     mini_portile2 (2.8.0)
-    neat (2.0.0)
-      sass (~> 3.4)
-      thor (~> 0.19)
-    nokogiri (1.13.6)
+    neat (1.7.4)
+      bourbon (>= 4.0)
+      sass (>= 3.3)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    pathutil (0.14.0)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.7)
+    psych (4.0.6)
+      stringio
+    public_suffix (5.0.0)
     racc (1.6.0)
-    rake (12.3.3)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.8)
-      ffi (>= 0.5.0)
-    rdoc (6.3.1)
-    rouge (1.11.1)
-    safe_yaml (1.0.4)
-    sass (3.4.23)
-    temple (0.8.0)
-    thor (0.19.4)
-    tilt (2.0.7)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
+    rexml (3.2.5)
+    rouge (3.30.0)
+    safe_yaml (1.0.5)
+    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)
+    stringio (3.0.2)
+    temple (0.8.2)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    thor (1.2.1)
+    tilt (2.0.11)
+    unicode-display_width (1.8.0)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bourbon
   haml
-  jekyll (>= 1.1.0)
+  jekyll
   kramdown
   neat
   nokogiri (>= 1.5.9)
   rake
-  rdoc (~> 6.3.1)
+  rdoc
   sass
   thor
+  webrick
 
 BUNDLED WITH
-   1.14.6
+   2.3.22

Rakefile

@@ -28,8 +28,11 @@ end
 
 def readme(pattern = "%s", &block)
   return readme(pattern).each(&block) if block_given?
-  %w[en de es fr hu ja zh ru ko pt-br pt-pt].map do |lang|
-    pattern % "README#{lang == "en" ? "" : ".#{lang}"}"
+
+  %w[
+   README
+  ].map do |extension|
+    pattern % extension
   end
 end
 
@@ -126,13 +129,13 @@ task :pull => ['pull:sinatra']
 
 directory "_sinatra" do
   puts 'Cloning sinatra repo'
-  sh "git clone git://github.com/sinatra/sinatra.git _sinatra"
+  sh "git clone git@github.com:sinatra/sinatra.git _sinatra"
 end
 
 desc 'Pull in the latest from the sinatra repo'
 task 'pull:sinatra' => "_sinatra" do
     puts 'Pulling sinatra.git'
-    sh "cd _sinatra && git pull &>/dev/null"
+    sh "cd _sinatra && git pull &>/dev/null || true"
 end
 
 readme("_sinatra/%s.md") { |fn| file fn => '_sinatra' }
@@ -193,7 +196,7 @@ protection do |fn|
       file_to_convert = File.read(path_to_file + ".md")
     end
 
-    html = RDoc::Markup::ToHtml.new.convert(file_to_convert)
+    html = RDoc::Markup::ToHtml.new(RDoc::Options.new).convert(file_to_convert)
     File.open(f.name, 'wb') { |io| io.write html }
   end
 end
@@ -216,7 +219,7 @@ contrib do |fn|
       file_to_convert = File.read(path_to_file + ".md")
     end
 
-    html = RDoc::Markup::ToHtml.new.convert(file_to_convert)
+    html = RDoc::Markup::ToHtml.new(RDoc::Options.new).convert(file_to_convert)
     File.open(f.name, 'wb') { |io| io.write html }
   end
 end
@@ -234,5 +237,5 @@ task :server do
   exec 'jekyll serve --watch'
 end
 
-CLEAN.include '_site', "_includes/*.html"
+CLEAN.include('_site', "_includes/*.html").exclude('_includes/navbar.html', '_includes/head.html')
 CLOBBER.include "_sinatra/sinatra-contrib", "_sinatra/rack-protection", "_sinatra"