diff --git a/Gemfile.lock b/Gemfile.lock index 5c91e2b..000cc70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,16 +2,13 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - activesupport (4.2.5) + 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) - blankslate (2.1.2.4) - classifier-reborn (2.0.4) - fast-stemmer (~> 1.0) coffee-script (2.4.1) coffee-script-source execjs @@ -24,40 +21,39 @@ GEM execjs (2.6.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - fast-stemmer (1.0.2) ffi (1.9.10) fuzzy_match (2.1.0) gemoji (2.1.0) - github-pages (43) + github-pages (44) RedCloth (= 4.2.9) github-pages-health-check (= 0.6.0) - jekyll (= 2.4.0) + jekyll (= 3.0.2) jekyll-coffeescript (= 1.0.1) jekyll-feed (= 0.3.1) jekyll-gist (= 1.4.0) - jekyll-mentions (= 0.2.1) + 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) - jemoji (= 0.5.0) + jekyll-textile-converter (= 0.1.0) + jemoji (= 0.5.1) kramdown (= 1.9.0) - liquid (= 2.6.2) - maruku (= 0.7.0) + liquid (= 3.0.6) mercenary (~> 0.3) - pygments.rb (= 0.6.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 (1.9.0) - activesupport (>= 2) - nokogiri (~> 1.4) + html-pipeline (2.3.0) + activesupport (>= 2, < 5) + nokogiri (>= 1.4) html-proofer (2.5.2) addressable (~> 2.3) colored (~> 1.2) @@ -67,29 +63,23 @@ GEM typhoeus (~> 0.7) yell (~> 2.0) i18n (0.7.0) - jekyll (2.4.0) - classifier-reborn (~> 2.0) + jekyll (3.0.2) colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.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 (0.2.1) - html-pipeline (~> 1.9.0) - jekyll (~> 2.0) + 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) @@ -98,47 +88,43 @@ GEM jekyll-seo-tag (0.1.4) jekyll (>= 2.0) jekyll-sitemap (0.9.0) - jekyll-watch (1.3.0) + jekyll-textile-converter (0.1.0) + RedCloth (~> 4.0) + jekyll-watch (1.3.1) listen (~> 3.0) - jemoji (0.5.0) + jemoji (0.5.1) gemoji (~> 2.0) - html-pipeline (~> 1.9) + html-pipeline (~> 2.2) jekyll (>= 2.0) json (1.8.3) kramdown (1.9.0) - liquid (2.6.2) + liquid (3.0.6) listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - maruku (0.7.0) mercenary (0.3.5) mini_portile2 (2.0.0) - minitest (5.8.3) + minitest (5.8.4) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.7.1) + 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) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.11) public_suffix (1.5.3) - pygments.rb (0.6.3) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.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.1) + rspec-core (3.4.2) rspec-support (~> 3.4.0) rspec-expectations (3.4.0) diff-lcs (>= 1.2.0, < 2.0) @@ -154,13 +140,10 @@ GEM faraday (~> 0.8, < 0.10) terminal-table (1.5.2) thread_safe (0.3.5) - toml (0.1.2) - parslet (~> 1.5.0) typhoeus (0.8.0) ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - yajl-ruby (1.2.1) yell (2.0.5) PLATFORMS diff --git a/_licenses/afl-3.0.txt b/_licenses/afl-3.0.html similarity index 100% rename from _licenses/afl-3.0.txt rename to _licenses/afl-3.0.html diff --git a/_licenses/agpl-3.0.txt b/_licenses/agpl-3.0.html similarity index 100% rename from _licenses/agpl-3.0.txt rename to _licenses/agpl-3.0.html diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.html similarity index 100% rename from _licenses/apache-2.0.txt rename to _licenses/apache-2.0.html diff --git a/_licenses/artistic-2.0.txt b/_licenses/artistic-2.0.html similarity index 100% rename from _licenses/artistic-2.0.txt rename to _licenses/artistic-2.0.html diff --git a/_licenses/bsd-2-clause.txt b/_licenses/bsd-2-clause.html similarity index 100% rename from _licenses/bsd-2-clause.txt rename to _licenses/bsd-2-clause.html diff --git a/_licenses/bsd-3-clause-clear.txt b/_licenses/bsd-3-clause-clear.html similarity index 100% rename from _licenses/bsd-3-clause-clear.txt rename to _licenses/bsd-3-clause-clear.html diff --git a/_licenses/bsd-3-clause.txt b/_licenses/bsd-3-clause.html similarity index 100% rename from _licenses/bsd-3-clause.txt rename to _licenses/bsd-3-clause.html diff --git a/_licenses/cc0-1.0.txt b/_licenses/cc0-1.0.html similarity index 100% rename from _licenses/cc0-1.0.txt rename to _licenses/cc0-1.0.html diff --git a/_licenses/epl-1.0.txt b/_licenses/epl-1.0.html similarity index 100% rename from _licenses/epl-1.0.txt rename to _licenses/epl-1.0.html diff --git a/_licenses/eupl-1.1.txt b/_licenses/eupl-1.1.html similarity index 100% rename from _licenses/eupl-1.1.txt rename to _licenses/eupl-1.1.html diff --git a/_licenses/gpl-2.0.txt b/_licenses/gpl-2.0.html similarity index 100% rename from _licenses/gpl-2.0.txt rename to _licenses/gpl-2.0.html diff --git a/_licenses/gpl-3.0.txt b/_licenses/gpl-3.0.html similarity index 100% rename from _licenses/gpl-3.0.txt rename to _licenses/gpl-3.0.html diff --git a/_licenses/isc.txt b/_licenses/isc.html similarity index 100% rename from _licenses/isc.txt rename to _licenses/isc.html diff --git a/_licenses/lgpl-2.1.txt b/_licenses/lgpl-2.1.html similarity index 100% rename from _licenses/lgpl-2.1.txt rename to _licenses/lgpl-2.1.html diff --git a/_licenses/lgpl-3.0.txt b/_licenses/lgpl-3.0.html similarity index 100% rename from _licenses/lgpl-3.0.txt rename to _licenses/lgpl-3.0.html diff --git a/_licenses/lppl-1.3c.txt b/_licenses/lppl-1.3c.html similarity index 100% rename from _licenses/lppl-1.3c.txt rename to _licenses/lppl-1.3c.html diff --git a/_licenses/mit.txt b/_licenses/mit.html similarity index 100% rename from _licenses/mit.txt rename to _licenses/mit.html diff --git a/_licenses/mpl-2.0.txt b/_licenses/mpl-2.0.html similarity index 100% rename from _licenses/mpl-2.0.txt rename to _licenses/mpl-2.0.html diff --git a/_licenses/ms-pl.txt b/_licenses/ms-pl.html similarity index 100% rename from _licenses/ms-pl.txt rename to _licenses/ms-pl.html diff --git a/_licenses/ms-rl.txt b/_licenses/ms-rl.html similarity index 100% rename from _licenses/ms-rl.txt rename to _licenses/ms-rl.html diff --git a/_licenses/ofl-1.1.txt b/_licenses/ofl-1.1.html similarity index 100% rename from _licenses/ofl-1.1.txt rename to _licenses/ofl-1.1.html diff --git a/_licenses/osl-3.0.txt b/_licenses/osl-3.0.html similarity index 100% rename from _licenses/osl-3.0.txt rename to _licenses/osl-3.0.html diff --git a/_licenses/unlicense.txt b/_licenses/unlicense.html similarity index 100% rename from _licenses/unlicense.txt rename to _licenses/unlicense.html diff --git a/_licenses/wtfpl.txt b/_licenses/wtfpl.html similarity index 100% rename from _licenses/wtfpl.txt rename to _licenses/wtfpl.html diff --git a/spec/license_bom_spec.rb b/spec/license_bom_spec.rb index 883d68e..4911462 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}/*.txt"].each do |file| - context "the #{File.basename(file, ".txt")} license" do + Dir["#{licenses_path}/*.html"].each do |file| + context "the #{File.basename(file, ".html")} 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 e0f2b8e..07cd47f 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"]}.txt") + raw_fields = SafeYAML.load_file("_licenses/#{license["id"]}.html") 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 07d944c..87ef083 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}/*.txt"].count) + expect(licenses.count).to eql(Dir["#{licenses_path}/*.html"].count) end licenses.each do |license| diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 64f8cb0..cbe6a6e 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, ".txt") + id = File.basename(license.basename, ".html") license.to_liquid.merge("id" => id) end end