From 0d32533cb9c8bbd4ccdb832cd63790b368eb36c6 Mon Sep 17 00:00:00 2001 From: Parker Moore <237985+parkr@users.noreply.github.com> Date: Mon, 24 Jun 2024 15:33:32 -0700 Subject: [PATCH 1/7] Upgrade to Jekyll 3.10.0 No functionality is changed. Since Ruby 3.0 dropped webrick and Ruby 3.4 is going to drop csv, this adds them back as dependencies. https://jekyllrb.com/news/2024/06/23/jekyll-3-10-0-released/ --- 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 2da2c956..76607aeb 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.9.5", + "jekyll" => "3.10.0", "jekyll-sass-converter" => "1.5.2", "webrick" => "1.8.1", From f94a6468037ec955b9d098b13d53973d0a03111d Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:22:19 -0700 Subject: [PATCH 2/7] bump jekyll-commonmark-ghpages --- 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 76607aeb..8a21e7b9 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies # Converters "kramdown" => "2.4.0", "kramdown-parser-gfm" => "1.1.0", - "jekyll-commonmark-ghpages" => "0.4.0", + "jekyll-commonmark-ghpages" => "0.5.0", # Misc "liquid" => "4.0.4", From 3ecc50f8b97df882d786a15c5fa543699f68ea89 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:34:55 -0700 Subject: [PATCH 3/7] Update lib/github-pages/dependencies.rb --- 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 8a21e7b9..f131b29a 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -14,7 +14,7 @@ class Dependencies # Converters "kramdown" => "2.4.0", "kramdown-parser-gfm" => "1.1.0", - "jekyll-commonmark-ghpages" => "0.5.0", + "jekyll-commonmark-ghpages" => "0.5.1", # Misc "liquid" => "4.0.4", From 7b839b231b0a8e753951ebb370bd1ad184281e85 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:47:06 -0700 Subject: [PATCH 4/7] Add webrick to core --- spec/github-pages/dependencies_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/github-pages/dependencies_spec.rb b/spec/github-pages/dependencies_spec.rb index 619e9739..574ec14d 100644 --- a/spec/github-pages/dependencies_spec.rb +++ b/spec/github-pages/dependencies_spec.rb @@ -5,7 +5,7 @@ describe(GitHubPages::Dependencies) do CORE_DEPENDENCIES = %w( jekyll kramdown kramdown-parser-gfm liquid rouge jekyll-sass-converter - github-pages-health-check + github-pages-health-check webrick ).freeze PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES From 48dca23c8ce904c9235ef38915ad067f43cc24ff Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:47:49 -0700 Subject: [PATCH 5/7] cosmetic --- spec/github-pages/dependencies_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/github-pages/dependencies_spec.rb b/spec/github-pages/dependencies_spec.rb index 574ec14d..b0248e90 100644 --- a/spec/github-pages/dependencies_spec.rb +++ b/spec/github-pages/dependencies_spec.rb @@ -5,7 +5,8 @@ describe(GitHubPages::Dependencies) do CORE_DEPENDENCIES = %w( jekyll kramdown kramdown-parser-gfm liquid rouge jekyll-sass-converter - github-pages-health-check webrick + github-pages-health-check + webrick ).freeze PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES From f430f404e8863be299ef39a0d6032c5d71da9193 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Wed, 17 Jul 2024 17:54:03 -0700 Subject: [PATCH 6/7] nil webrick test --- spec/github-pages/integration_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb index d673a418..f76fa9b2 100644 --- a/spec/github-pages/integration_spec.rb +++ b/spec/github-pages/integration_spec.rb @@ -309,4 +309,10 @@ def rm_destination expect(contents).to match("markdown: CommonMarkGhPages") end end + + context "webrick" do + it "does nothing" do + # all is well + end + end end From 0a6fecc6683a7780fa9840389d3b49bc9cd18b73 Mon Sep 17 00:00:00 2001 From: Yoann Chaudet Date: Tue, 6 Aug 2024 10:30:26 -0700 Subject: [PATCH 7/7] Attempt to move webrick to the gemspec instead --- github-pages.gemspec | 1 + lib/github-pages/dependencies.rb | 1 - spec/github-pages/dependencies_spec.rb | 1 - spec/github-pages/integration_spec.rb | 6 ------ 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/github-pages.gemspec b/github-pages.gemspec index 9d9594b7..faeb2b4c 100644 --- a/github-pages.gemspec +++ b/github-pages.gemspec @@ -27,6 +27,7 @@ Gem::Specification.new do |s| s.add_dependency("mercenary", "~> 0.3") s.add_dependency("nokogiri", ">= 1.16.2", "< 2.0") s.add_dependency("terminal-table", "~> 1.4") + s.add_dependency("webrick", "~> 1.8") s.add_development_dependency("jekyll_test_plugin_malicious", "~> 0.2") s.add_development_dependency("pry", "~> 0.10") s.add_development_dependency("rspec", "~> 3.3") diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index f131b29a..52ffa371 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -9,7 +9,6 @@ class Dependencies # Jekyll "jekyll" => "3.10.0", "jekyll-sass-converter" => "1.5.2", - "webrick" => "1.8.1", # Converters "kramdown" => "2.4.0", diff --git a/spec/github-pages/dependencies_spec.rb b/spec/github-pages/dependencies_spec.rb index b0248e90..619e9739 100644 --- a/spec/github-pages/dependencies_spec.rb +++ b/spec/github-pages/dependencies_spec.rb @@ -6,7 +6,6 @@ CORE_DEPENDENCIES = %w( jekyll kramdown kramdown-parser-gfm liquid rouge jekyll-sass-converter github-pages-health-check - webrick ).freeze PLUGINS = described_class::VERSIONS.keys - CORE_DEPENDENCIES diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb index f76fa9b2..d673a418 100644 --- a/spec/github-pages/integration_spec.rb +++ b/spec/github-pages/integration_spec.rb @@ -309,10 +309,4 @@ def rm_destination expect(contents).to match("markdown: CommonMarkGhPages") end end - - context "webrick" do - it "does nothing" do - # all is well - end - end end