From add5ab0f3218f211779b7aea2693b1140200b64f Mon Sep 17 00:00:00 2001 From: Hubot Date: Mon, 19 Jun 2017 10:27:12 -0500 Subject: [PATCH 1/6] Bump jekyll :gem: to v3.5.0 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 7c8c147b..1bc9f0d1 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.4.3", + "jekyll" => "3.5.0", "jekyll-sass-converter" => "1.5.0", # Converters From 45f6937429fead4b5e3e730ebc653b6d11a4dd26 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Wed, 21 Jun 2017 11:10:05 -0400 Subject: [PATCH 2/6] bump jekyll gist to 1.4.1 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 1bc9f0d1..be96f34b 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -22,7 +22,7 @@ class Dependencies "jekyll-redirect-from" => "0.12.1", "jekyll-sitemap" => "1.0.0", "jekyll-feed" => "0.9.2", - "jekyll-gist" => "1.4.0", + "jekyll-gist" => "1.4.1", "jekyll-paginate" => "1.1.0", "jekyll-coffeescript" => "1.0.1", "jekyll-seo-tag" => "2.2.3", From 7c99af41139d4c1277d38c7f473d2f6b740adee0 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 17 Jul 2017 13:25:21 -0400 Subject: [PATCH 3/6] bump to jekyll v3.5.1 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index be96f34b..b7dc6dd9 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.5.0", + "jekyll" => "3.5.1", "jekyll-sass-converter" => "1.5.0", # Converters From 79d82eb45405503f30fc7882bf11ab36ca5c6cf0 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 20 Jul 2017 09:46:58 -0400 Subject: [PATCH 4/6] bump liquid to 4.0 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 15bbcdf1..670257f5 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies "kramdown" => "1.13.2", # Misc - "liquid" => "3.0.6", + "liquid" => "4.0.0", "rouge" => "1.11.1", "github-pages-health-check" => "1.3.4", From aee0d9c52cf6c7385dd4dd6bebb67812792542a9 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 20 Jul 2017 10:05:13 -0400 Subject: [PATCH 5/6] rename gems to plugins --- lib/github-pages/configuration.rb | 21 +++++++++++++++------ spec/github-pages/configuration_spec.rb | 8 ++++---- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb index ddcd0668..3da69913 100644 --- a/lib/github-pages/configuration.rb +++ b/lib/github-pages/configuration.rb @@ -14,7 +14,7 @@ class Configuration # Default, user overwritable options DEFAULTS = { "jailed" => false, - "gems" => GitHubPages::Plugins::DEFAULT_PLUGINS, + "plugins" => GitHubPages::Plugins::DEFAULT_PLUGINS, "future" => true, "theme" => "jekyll-theme-primer", "kramdown" => { @@ -43,7 +43,6 @@ class Configuration OVERRIDES = { "lsi" => false, "safe" => true, - "plugins" => SecureRandom.hex, "plugins_dir" => SecureRandom.hex, "whitelist" => GitHubPages::Plugins::PLUGIN_WHITELIST, "highlighter" => "rouge", @@ -62,7 +61,7 @@ class Configuration # Jekyll::Site and need to be set properly when the config is updated. CONFIGS_WITH_METHODS = %w( safe lsi highlighter baseurl exclude include future unpublished - show_drafts limit_posts keep_files gems + show_drafts limit_posts keep_files ).freeze class << self @@ -99,9 +98,15 @@ def effective_config(user_config) config = Jekyll::Utils.deep_merge_hashes config, OVERRIDES # Ensure we have those gems we want. - config["gems"] = Array(config["gems"]) | DEFAULT_PLUGINS - config["whitelist"] = config["whitelist"] | config["gems"] if disable_whitelist? - config["whitelist"] = config["whitelist"] | DEVELOPMENT_PLUGINS if development? + config["plugins"] = Array(config["plugins"]) | DEFAULT_PLUGINS + + if disable_whitelist? + config["whitelist"] = config["whitelist"] | config["plugins"] + end + + if development? + config["whitelist"] = config["whitelist"] | DEVELOPMENT_PLUGINS + end config end @@ -135,6 +140,10 @@ def set!(site) CONFIGS_WITH_METHODS.each do |opt| site.public_send("#{opt}=", site.config[opt]) end + + # While Configuration renamed the gems key to plugins, Site retained + # backwards compatability and must be set manually + site.gems = site.config["plugins"] end end end diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb index 060a7319..c40a3792 100644 --- a/spec/github-pages/configuration_spec.rb +++ b/spec/github-pages/configuration_spec.rb @@ -27,11 +27,11 @@ end it "sets default gems" do - expect(effective_config["gems"]).to include("jekyll-coffeescript") + expect(effective_config["plugins"]).to include("jekyll-coffeescript") end it "lets the user specify additional gems" do - expect(effective_config["gems"]).to include("jekyll-sitemap") + expect(effective_config["plugins"]).to include("jekyll-sitemap") end it "honors the user's config" do @@ -73,11 +73,11 @@ end it "sets default gems" do - expect(site.config["gems"]).to include("jekyll-coffeescript") + expect(site.config["plugins"]).to include("jekyll-coffeescript") end it "lets the user specify additional gems" do - expect(site.config["gems"]).to include("jekyll-sitemap") + expect(site.config["plugins"]).to include("jekyll-sitemap") end it "honors the user's config" do From d6fc8b88a68ede24e75ddd9ecba29fb913b232f7 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 20 Jul 2017 10:11:54 -0400 Subject: [PATCH 6/6] stop testing ruby 2.0.x --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb94e013..36d63bbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 2.0 - 2.1 - 2.2 - 2.3.3