From 9e83d6afe5a0fd3e84dc7d4f1087239a72d71fa0 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 9 Feb 2016 12:18:05 -0500 Subject: [PATCH 1/5] :gem: bump --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 000cc70..3b61c44 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,10 +24,10 @@ GEM ffi (1.9.10) fuzzy_match (2.1.0) gemoji (2.1.0) - github-pages (44) + github-pages (46) RedCloth (= 4.2.9) github-pages-health-check (= 0.6.0) - jekyll (= 3.0.2) + jekyll (= 3.0.3) jekyll-coffeescript (= 1.0.1) jekyll-feed (= 0.3.1) jekyll-gist (= 1.4.0) @@ -36,7 +36,7 @@ GEM jekyll-redirect-from (= 0.9.1) jekyll-sass-converter (= 1.3.0) jekyll-seo-tag (= 0.1.4) - jekyll-sitemap (= 0.9.0) + jekyll-sitemap (= 0.10.0) jekyll-textile-converter (= 0.1.0) jemoji (= 0.5.1) kramdown (= 1.9.0) @@ -63,7 +63,7 @@ GEM typhoeus (~> 0.7) yell (~> 2.0) i18n (0.7.0) - jekyll (3.0.2) + jekyll (3.0.3) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -87,7 +87,7 @@ GEM sass (~> 3.2) jekyll-seo-tag (0.1.4) jekyll (>= 2.0) - jekyll-sitemap (0.9.0) + jekyll-sitemap (0.10.0) jekyll-textile-converter (0.1.0) RedCloth (~> 4.0) jekyll-watch (1.3.1) @@ -115,7 +115,7 @@ GEM public_suffix (1.5.3) rake (10.5.0) rb-fsevent (0.9.7) - rb-inotify (0.9.5) + rb-inotify (0.9.7) ffi (>= 0.5.0) rdiscount (2.1.8) redcarpet (3.3.3) From 8d2420808854016c95c6b8cd550191737d07db7d Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 9 Feb 2016 12:21:11 -0500 Subject: [PATCH 2/5] Revert "upgrade to jekyll 3 due to" This reverts commit 48c6e3e88785106d0a9357df8385f11891e85565. --- .gitignore | 1 + Gemfile.lock | 164 ------------------ _licenses/{afl-3.0.html => afl-3.0.txt} | 0 _licenses/{agpl-3.0.html => agpl-3.0.txt} | 0 _licenses/{apache-2.0.html => apache-2.0.txt} | 0 .../{artistic-2.0.html => artistic-2.0.txt} | 0 .../{bsd-2-clause.html => bsd-2-clause.txt} | 0 ...ause-clear.html => bsd-3-clause-clear.txt} | 0 .../{bsd-3-clause.html => bsd-3-clause.txt} | 0 _licenses/{cc0-1.0.html => cc0-1.0.txt} | 0 _licenses/{epl-1.0.html => epl-1.0.txt} | 0 _licenses/{eupl-1.1.html => eupl-1.1.txt} | 0 _licenses/{gpl-2.0.html => gpl-2.0.txt} | 0 _licenses/{gpl-3.0.html => gpl-3.0.txt} | 0 _licenses/{isc.html => isc.txt} | 0 _licenses/{lgpl-2.1.html => lgpl-2.1.txt} | 0 _licenses/{lgpl-3.0.html => lgpl-3.0.txt} | 0 _licenses/{lppl-1.3c.html => lppl-1.3c.txt} | 0 _licenses/{mit.html => mit.txt} | 0 _licenses/{mpl-2.0.html => mpl-2.0.txt} | 0 _licenses/{ms-pl.html => ms-pl.txt} | 0 _licenses/{ms-rl.html => ms-rl.txt} | 0 _licenses/{ofl-1.1.html => ofl-1.1.txt} | 0 _licenses/{osl-3.0.html => osl-3.0.txt} | 0 _licenses/{unlicense.html => unlicense.txt} | 0 _licenses/{wtfpl.html => wtfpl.txt} | 0 spec/license_bom_spec.rb | 4 +- spec/license_meta_spec.rb | 2 +- spec/license_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 30 files changed, 6 insertions(+), 169 deletions(-) delete mode 100644 Gemfile.lock rename _licenses/{afl-3.0.html => afl-3.0.txt} (100%) rename _licenses/{agpl-3.0.html => agpl-3.0.txt} (100%) rename _licenses/{apache-2.0.html => apache-2.0.txt} (100%) rename _licenses/{artistic-2.0.html => artistic-2.0.txt} (100%) rename _licenses/{bsd-2-clause.html => bsd-2-clause.txt} (100%) rename _licenses/{bsd-3-clause-clear.html => bsd-3-clause-clear.txt} (100%) rename _licenses/{bsd-3-clause.html => bsd-3-clause.txt} (100%) rename _licenses/{cc0-1.0.html => cc0-1.0.txt} (100%) rename _licenses/{epl-1.0.html => epl-1.0.txt} (100%) rename _licenses/{eupl-1.1.html => eupl-1.1.txt} (100%) rename _licenses/{gpl-2.0.html => gpl-2.0.txt} (100%) rename _licenses/{gpl-3.0.html => gpl-3.0.txt} (100%) rename _licenses/{isc.html => isc.txt} (100%) rename _licenses/{lgpl-2.1.html => lgpl-2.1.txt} (100%) rename _licenses/{lgpl-3.0.html => lgpl-3.0.txt} (100%) rename _licenses/{lppl-1.3c.html => lppl-1.3c.txt} (100%) rename _licenses/{mit.html => mit.txt} (100%) rename _licenses/{mpl-2.0.html => mpl-2.0.txt} (100%) rename _licenses/{ms-pl.html => ms-pl.txt} (100%) rename _licenses/{ms-rl.html => ms-rl.txt} (100%) rename _licenses/{ofl-1.1.html => ofl-1.1.txt} (100%) rename _licenses/{osl-3.0.html => osl-3.0.txt} (100%) rename _licenses/{unlicense.html => unlicense.txt} (100%) rename _licenses/{wtfpl.html => wtfpl.txt} (100%) diff --git a/.gitignore b/.gitignore index 8bf1c4e..2b7f2c0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ assets/vendor/qtip2/basic /.sass-cache .ruby-version /tmp +Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 3b61c44..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,164 +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) - 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 (46) - RedCloth (= 4.2.9) - github-pages-health-check (= 0.6.0) - jekyll (= 3.0.3) - 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.10.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.3) - 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.10.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) - public_suffix (1.5.3) - rake (10.5.0) - rb-fsevent (0.9.7) - rb-inotify (0.9.7) - 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) - 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) - yell (2.0.5) - -PLATFORMS - ruby - -DEPENDENCIES - colored - fuzzy_match - github-pages - html-proofer (= 2.5.2) - jekyll-seo-tag - nokogiri - rake - rspec - terminal-table - -BUNDLED WITH - 1.11.2 diff --git a/_licenses/afl-3.0.html b/_licenses/afl-3.0.txt similarity index 100% rename from _licenses/afl-3.0.html rename to _licenses/afl-3.0.txt diff --git a/_licenses/agpl-3.0.html b/_licenses/agpl-3.0.txt similarity index 100% rename from _licenses/agpl-3.0.html rename to _licenses/agpl-3.0.txt diff --git a/_licenses/apache-2.0.html b/_licenses/apache-2.0.txt similarity index 100% rename from _licenses/apache-2.0.html rename to _licenses/apache-2.0.txt diff --git a/_licenses/artistic-2.0.html b/_licenses/artistic-2.0.txt similarity index 100% rename from _licenses/artistic-2.0.html rename to _licenses/artistic-2.0.txt diff --git a/_licenses/bsd-2-clause.html b/_licenses/bsd-2-clause.txt similarity index 100% rename from _licenses/bsd-2-clause.html rename to _licenses/bsd-2-clause.txt diff --git a/_licenses/bsd-3-clause-clear.html b/_licenses/bsd-3-clause-clear.txt similarity index 100% rename from _licenses/bsd-3-clause-clear.html rename to _licenses/bsd-3-clause-clear.txt diff --git a/_licenses/bsd-3-clause.html b/_licenses/bsd-3-clause.txt similarity index 100% rename from _licenses/bsd-3-clause.html rename to _licenses/bsd-3-clause.txt diff --git a/_licenses/cc0-1.0.html b/_licenses/cc0-1.0.txt similarity index 100% rename from _licenses/cc0-1.0.html rename to _licenses/cc0-1.0.txt diff --git a/_licenses/epl-1.0.html b/_licenses/epl-1.0.txt similarity index 100% rename from _licenses/epl-1.0.html rename to _licenses/epl-1.0.txt diff --git a/_licenses/eupl-1.1.html b/_licenses/eupl-1.1.txt similarity index 100% rename from _licenses/eupl-1.1.html rename to _licenses/eupl-1.1.txt diff --git a/_licenses/gpl-2.0.html b/_licenses/gpl-2.0.txt similarity index 100% rename from _licenses/gpl-2.0.html rename to _licenses/gpl-2.0.txt diff --git a/_licenses/gpl-3.0.html b/_licenses/gpl-3.0.txt similarity index 100% rename from _licenses/gpl-3.0.html rename to _licenses/gpl-3.0.txt diff --git a/_licenses/isc.html b/_licenses/isc.txt similarity index 100% rename from _licenses/isc.html rename to _licenses/isc.txt diff --git a/_licenses/lgpl-2.1.html b/_licenses/lgpl-2.1.txt similarity index 100% rename from _licenses/lgpl-2.1.html rename to _licenses/lgpl-2.1.txt diff --git a/_licenses/lgpl-3.0.html b/_licenses/lgpl-3.0.txt similarity index 100% rename from _licenses/lgpl-3.0.html rename to _licenses/lgpl-3.0.txt diff --git a/_licenses/lppl-1.3c.html b/_licenses/lppl-1.3c.txt similarity index 100% rename from _licenses/lppl-1.3c.html rename to _licenses/lppl-1.3c.txt diff --git a/_licenses/mit.html b/_licenses/mit.txt similarity index 100% rename from _licenses/mit.html rename to _licenses/mit.txt diff --git a/_licenses/mpl-2.0.html b/_licenses/mpl-2.0.txt similarity index 100% rename from _licenses/mpl-2.0.html rename to _licenses/mpl-2.0.txt diff --git a/_licenses/ms-pl.html b/_licenses/ms-pl.txt similarity index 100% rename from _licenses/ms-pl.html rename to _licenses/ms-pl.txt diff --git a/_licenses/ms-rl.html b/_licenses/ms-rl.txt similarity index 100% rename from _licenses/ms-rl.html rename to _licenses/ms-rl.txt diff --git a/_licenses/ofl-1.1.html b/_licenses/ofl-1.1.txt similarity index 100% rename from _licenses/ofl-1.1.html rename to _licenses/ofl-1.1.txt diff --git a/_licenses/osl-3.0.html b/_licenses/osl-3.0.txt similarity index 100% rename from _licenses/osl-3.0.html rename to _licenses/osl-3.0.txt diff --git a/_licenses/unlicense.html b/_licenses/unlicense.txt similarity index 100% rename from _licenses/unlicense.html rename to _licenses/unlicense.txt diff --git a/_licenses/wtfpl.html b/_licenses/wtfpl.txt similarity index 100% rename from _licenses/wtfpl.html rename to _licenses/wtfpl.txt diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index 4911462..883d68e 100644 --- a/spec/license_bom_spec.rb +++ b/spec/license_bom_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' describe "byte order marks" do - Dir["#{licenses_path}/*.html"].each do |file| - context "the #{File.basename(file, ".html")} license" do + Dir["#{licenses_path}/*.txt"].each do |file| + context "the #{File.basename(file, ".txt")} license" do it "does not begin with a byte order mark" do bom = !!(File.open(file).read =~ /\A\xEF\xBB\xBF/) msg = "License file begins with a Byte Order Mark. See http://stackoverflow.com/a/1068700." diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb index 07cd47f..e0f2b8e 100644 --- a/spec/license_meta_spec.rb +++ b/spec/license_meta_spec.rb @@ -4,7 +4,7 @@ describe "license meta" do licenses.each do |license| # Manually load the raw license so we don't get thed 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 diff --git a/spec/license_spec.rb b/spec/license_spec.rb index 87ef083..07d944c 100644 --- a/spec/license_spec.rb +++ b/spec/license_spec.rb @@ -3,7 +3,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| diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cbe6a6e..64f8cb0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -25,7 +25,7 @@ end def licenses $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 From 91e79d2de9a401a4935cc5cd2296bbd1b9e0224e Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 9 Feb 2016 12:23:45 -0500 Subject: [PATCH 3/5] update script/server for jekyll 3 --- .gitignore | 1 + script/server | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2b7f2c0..d5a931a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ assets/vendor/qtip2/basic .ruby-version /tmp Gemfile.lock +.jekyll-metadata diff --git a/script/server b/script/server index 987b025..3994cca 100755 --- a/script/server +++ b/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 From 67d1e8feaa4a460dd5779c98bd5504f8be07db25 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 9 Feb 2016 12:33:29 -0500 Subject: [PATCH 4/5] try using the jekyllrb version hack --- Gemfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 30338b7..8266cb8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,10 @@ source 'https://rubygems.org' -gem 'github-pages' -gem 'jekyll-seo-tag' +require 'json' +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' From 6e387f4ecde1783171e71aab4814e0cc5c533dec Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 9 Feb 2016 12:38:00 -0500 Subject: [PATCH 5/5] update html proofer --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8266cb8..dc0e671 100644 --- a/Gemfile +++ b/Gemfile @@ -13,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'