Merge pull request #347 from github/jekyll-3-0-3

Revert temporary Jekyll 3.0.2 bug workarounds

.gitignore

@@ -10,3 +10,5 @@ assets/vendor/qtip2/basic
 /.sass-cache
 .ruby-version
 /tmp
+Gemfile.lock
+.jekyll-metadata

Gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'github-pages'
+require 'json'
-gem 'jekyll-seo-tag'
+require 'open-uri'
+versions = JSON.parse(open('https://pages.github.com/versions.json').read)
+
+gem 'github-pages', versions['github-pages']
 
 group :development do
   gem 'colored'
@@ -10,7 +13,7 @@ group :development do
 end
 
 group :test do
-  gem 'html-proofer', '2.5.2'
+  gem 'html-proofer', '~> 2.6'
   gem 'rake'
   gem 'rspec'
   gem 'nokogiri'

Gemfile.lock

@@ -1,178 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RedCloth (4.2.9)
-    activesupport (4.2.5.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.8)
-    ast (2.2.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.10.0)
-    colorator (0.1)
-    colored (1.2)
-    diff-lcs (1.2.5)
-    ethon (0.8.1)
-      ffi (>= 1.3.0)
-    execjs (2.6.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
-    fuzzy_match (2.1.0)
-    gemoji (2.1.0)
-    github-pages (44)
-      RedCloth (= 4.2.9)
-      github-pages-health-check (= 0.6.0)
-      jekyll (= 3.0.2)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.3.1)
-      jekyll-gist (= 1.4.0)
-      jekyll-mentions (= 1.0.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.9.1)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 0.1.4)
-      jekyll-sitemap (= 0.9.0)
-      jekyll-textile-converter (= 0.1.0)
-      jemoji (= 0.5.1)
-      kramdown (= 1.9.0)
-      liquid (= 3.0.6)
-      mercenary (~> 0.3)
-      rdiscount (= 2.1.8)
-      redcarpet (= 3.3.3)
-      rouge (= 1.10.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (0.6.0)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      public_suffix (~> 1.4)
-      typhoeus (~> 0.7)
-    html-pipeline (2.3.0)
-      activesupport (>= 2, < 5)
-      nokogiri (>= 1.4)
-    html-proofer (2.5.2)
-      addressable (~> 2.3)
-      colored (~> 1.2)
-      mercenary (~> 0.3.2)
-      nokogiri (~> 1.5)
-      parallel (~> 1.3)
-      typhoeus (~> 0.7)
-      yell (~> 2.0)
-    i18n (0.7.0)
-    jekyll (3.0.2)
-      colorator (~> 0.1)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
-      mercenary (~> 0.3.3)
-      rouge (~> 1.7)
-      safe_yaml (~> 1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-feed (0.3.1)
-    jekyll-gist (1.4.0)
-      octokit (~> 4.2)
-    jekyll-mentions (1.0.0)
-      html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.9.1)
-      jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-seo-tag (0.1.4)
-      jekyll (>= 2.0)
-    jekyll-sitemap (0.9.0)
-    jekyll-textile-converter (0.1.0)
-      RedCloth (~> 4.0)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
-    jemoji (0.5.1)
-      gemoji (~> 2.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 2.0)
-    json (1.8.3)
-    kramdown (1.9.0)
-    liquid (3.0.6)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    mercenary (0.3.5)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    octokit (4.2.0)
-      sawyer (~> 0.6.0, >= 0.5.3)
-    parallel (1.6.1)
-    parser (2.3.0.3)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    public_suffix (1.5.3)
-    rainbow (2.1.0)
-    rake (10.5.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rdiscount (2.1.8)
-    redcarpet (3.3.3)
-    rouge (1.10.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.2)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.37.0)
-      parser (>= 2.3.0.2, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 0.3)
-    ruby-progressbar (1.7.5)
-    safe_yaml (1.0.4)
-    sass (3.4.21)
-    sawyer (0.6.0)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    terminal-table (1.5.2)
-    thread_safe (0.3.5)
-    typhoeus (0.8.0)
-      ethon (>= 0.8.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    unicode-display_width (0.3.1)
-    yell (2.0.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  colored
-  fuzzy_match
-  github-pages
-  html-proofer (= 2.5.2)
-  jekyll-seo-tag
-  nokogiri
-  rake
-  rspec
-  rubocop
-  terminal-table
-
-BUNDLED WITH
-   1.11.2

script/server

@@ -3,7 +3,7 @@
 set -e
 
 echo "spinning up the server..."
-bundle exec jekyll serve -w
+bundle exec jekyll serve --watch --incremental --trace
 
 echo "cleaning up..."
 rm -Rf _site

spec/license_bom_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'byte order marks' do
   Dir["#{licenses_path}/*.html"].each do |file|
-    context "the #{File.basename(file, '.html')} license" do
+    context "the #{File.basename(file, '.txt')} license" do
       it 'does not begin with a byte order mark' do
         bom = File.open(file).read.start_with?("\u0000EF\u0000BB\u0000BF")
         msg = 'License file begins with a Byte Order Mark. See http://stackoverflow.com/a/1068700.'

spec/license_meta_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'license meta' do
   licenses.each do |license|
-    # Manually load the raw license so we don't get thed defaults
+    # Manually load the raw license so we don't get the defaults
-    raw_fields = SafeYAML.load_file("_licenses/#{license['id']}.html")
+    raw_fields = SafeYAML.load_file("_licenses/#{license['id']}.txt")
 
     context "The #{license['title']} license" do
       it 'should only contain supported meta fields' do

spec/license_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'licenses' do
   it 'matches the number of files in the _licenses folder' do
-    expect(licenses.count).to eql(Dir["#{licenses_path}/*.html"].count)
+    expect(licenses.count).to eql(Dir["#{licenses_path}/*.txt"].count)
   end
 
   licenses.each do |license|
@@ -25,22 +25,22 @@ describe 'licenses' do
         end
       end
 
-      context "minimum permissions" do
+      context 'minimum permissions' do
-        let(:permissions) { license["permitted"] }
+        let(:permissions) { license['permitted'] }
-        it "should allow commercial use" do
+        it 'should allow commercial use' do
-          expect(permissions).to include("commercial-use")
+          expect(permissions).to include('commercial-use')
         end
 
-        it "should allow modification" do
+        it 'should allow modification' do
-          expect(permissions).to include("modifications")
+          expect(permissions).to include('modifications')
         end
 
-        it "should allow distribution" do
+        it 'should allow distribution' do
-          expect(permissions).to include("distribution")
+          expect(permissions).to include('distribution')
         end
 
-        it "should allow private use" do
+        it 'should allow private use' do
-          expect(permissions).to include("private-use")
+          expect(permissions).to include('private-use')
         end
       end
     end

spec/spec_helper.rb

@@ -34,7 +34,7 @@ end
 def licenses
   SpecHelper.licenses ||= begin
     site.collections['licenses'].docs.map do |license|
-      id = File.basename(license.basename, '.html')
+      id = File.basename(license.basename, '.txt')
       license.to_liquid.merge('id' => id)
     end
   end