⬆️ ruby-openid2 v3.1.0

oauth-xx · Sep 25, 2024 · 8d4e184 · 8d4e184
1 parent fa4a86b
commit 8d4e184
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 24 deletions.
diff --git a/.rubocop_gradual.lock b/.rubocop_gradual.lock
@@ -2,12 +2,12 @@
   "lib/rots/server_app.rb:4029472662": [
     [66, 7, 44, "Style/SafeNavigation: Use safe navigation (`&.`) instead of checking if an object exists before calling the method.", 3155555354]
   ],
-  "rots.gemspec:1296023203": [
-    [55, 3, 27, "Gemspec/DependencyVersion: Dependency version specification is required.", 3231645354],
-    [57, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2950165766],
-    [58, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 856856768],
-    [63, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 4231415917],
-    [65, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2088193405]
+  "rots.gemspec:4033797215": [
+    [58, 3, 27, "Gemspec/DependencyVersion: Dependency version specification is required.", 3231645354],
+    [59, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2950165766],
+    [60, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 856856768],
+    [65, 3, 31, "Gemspec/DependencyVersion: Dependency version specification is required.", 4231415917],
+    [67, 3, 30, "Gemspec/DependencyVersion: Dependency version specification is required.", 2088193405]
   ],
   "spec/rots/mocks/integration_spec.rb:2999786939": [
     [9, 16, 13, "RSpec/DescribeClass: The first argument to describe should be the class or module being tested.", 3245556507],

diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-ruby 3.3.5
+ruby 2.7.8
diff --git a/Gemfile b/Gemfile
@@ -11,6 +11,11 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in ranked-model.gemspec
 gemspec
 
+gem "net-http", "~> 0.4", ">= 0.4.1"
+gem "uri", "~> 0.13", ">= 0.13.1"
+gem "logger", "~> 1.6", ">= 1.6.1"
+gem "rexml", "~> 3.3", ">= 3.3.7"
+
 platform :mri do
   # Debugging
   gem "byebug", ">= 11"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,13 +3,12 @@ PATH
   specs:
     rots (1.0.0)
       date
-      net-http (~> 0.4, >= 0.4.1)
       openssl
       optparse
       psych (~> 5.1)
       rack (>= 2)
       rackup (>= 2)
-      ruby-openid2 (~> 3.0, >= 3.0.3)
+      ruby-openid2 (~> 3.1, >= 3.1.0)
       stringio
       version_gem (~> 1.1, >= 1.1.4)
       webrick
@@ -126,10 +125,7 @@ GEM
       rubocop (~> 1.51)
     rubocop-thread_safety (0.5.1)
       rubocop (>= 0.90.0)
-    ruby-openid2 (3.0.3)
-      logger (~> 1.6, >= 1.6.1)
-      net-http (~> 0.4, >= 0.4.1)
-      rexml (~> 3.3, >= 3.3.7)
+    ruby-openid2 (3.1.0)
       version_gem (~> 1.1, >= 1.1.4)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
@@ -188,17 +184,21 @@ PLATFORMS
 DEPENDENCIES
   byebug (>= 11)
   kettle-soup-cover (~> 1.0, >= 1.0.2)
+  logger (~> 1.6, >= 1.6.1)
   minitest (>= 5, < 6)
+  net-http (~> 0.4, >= 0.4.1)
   rack-openid2 (>= 2)
   rack-session (>= 1)
   rake (>= 10)
+  rexml (~> 3.3, >= 3.3.7)
   rots!
   rspec (~> 3.13)
   rspec-block_is_expected (~> 1.0, >= 1.0.6)
   rubocop-lts (~> 10.1)
   rubocop-packaging (~> 0.5, >= 0.5.2)
   rubocop-rspec (~> 3.0)
   standard (~> 1.40)
+  uri (~> 0.13, >= 0.13.1)
   yard (~> 0.9, >= 0.9.34)
   yard-junk (~> 0.0.10)
 

diff --git a/README.md b/README.md
@@ -118,6 +118,13 @@ RSpec.describe("openid") do
 end
 ```
 
+### Note about the deprecation of stdlib gems `logger`, `rexml`, `stringio`, `net-http`, and `uri`
+
+They will not be direct dependencies until the situation with bundler is resolved.
+You will need to add them directly to downstream tools.
+
+See [this discussion](https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363) for more information.
+
 ## How does it work?
 
 When you install the ROTS gem, a binary called rots is provided for starting the server (for more

diff --git a/gemfiles/ancient.gemfile b/gemfiles/ancient.gemfile
@@ -12,6 +12,8 @@ source "https://rubygems.org"
 # Thus we load the necessary development dependencies of the gem here.
 gem "rack-openid2", ">= 2"
 gem "rack-session", ">= 1"
+gem "logger", "~> 1.6", ">= 1.6.1"
+gem "rexml", "~> 3.3", ">= 3.3.7"
 
 gem "minitest", ">= 5", "< 6"
 gem "rake"

diff --git a/gemfiles/ancient.gemfile.lock b/gemfiles/ancient.gemfile.lock
@@ -3,13 +3,12 @@ PATH
   specs:
     rots (1.0.0)
       date
-      net-http (~> 0.4, >= 0.4.1)
       openssl
       optparse
       psych (~> 5.1)
       rack (>= 2)
       rackup (>= 2)
-      ruby-openid2 (~> 3.0, >= 3.0.3)
+      ruby-openid2 (~> 3.1, >= 3.1.0)
       stringio
       version_gem (~> 1.1, >= 1.1.4)
       webrick
@@ -22,8 +21,6 @@ GEM
     diff-lcs (1.5.1)
     logger (1.6.1)
     minitest (5.25.1)
-    net-http (0.4.1)
-      uri
     openssl (3.2.0)
     optparse (0.5.0)
     psych (5.1.2)
@@ -54,13 +51,9 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    ruby-openid2 (3.0.3)
-      logger (~> 1.6, >= 1.6.1)
-      net-http (~> 0.4, >= 0.4.1)
-      rexml (~> 3.3, >= 3.3.7)
+    ruby-openid2 (3.1.0)
       version_gem (~> 1.1, >= 1.1.4)
     stringio (3.1.1)
-    uri (0.13.1)
     version_gem (1.1.4)
     webrick (1.8.2)
     yaml (0.3.0)
@@ -71,10 +64,12 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  logger (~> 1.6, >= 1.6.1)
   minitest (>= 5, < 6)
   rack-openid2 (>= 2)
   rack-session (>= 1)
   rake
+  rexml (~> 3.3, >= 3.3.7)
   rots!
   rspec
   rspec-block_is_expected

diff --git a/gemfiles/coverage.gemfile b/gemfiles/coverage.gemfile
@@ -6,4 +6,10 @@ source "https://rubygems.org"
 # On CI we only need the gemspecs' dependencies (including development dependencies).
 # Exceptions, if any, will be found in gemfiles/*.gemfile
 
+# See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
+gem "net-http", "~> 0.4", ">= 0.4.1"
+gem "uri", "~> 0.13", ">= 0.13.1"
+gem "logger", "~> 1.6", ">= 1.6.1"
+gem "rexml", "~> 3.3", ">= 3.3.7"
+
 gemspec path: "../"
diff --git a/gemfiles/style.gemfile b/gemfiles/style.gemfile
@@ -6,4 +6,10 @@ source "https://rubygems.org"
 # On CI we only need the gemspecs' dependencies (including development dependencies).
 # Exceptions, if any, will be found in gemfiles/*.gemfile
 
+# See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
+gem "net-http", "~> 0.4", ">= 0.4.1"
+gem "uri", "~> 0.13", ">= 0.13.1"
+gem "logger", "~> 1.6", ">= 1.6.1"
+gem "rexml", "~> 3.3", ">= 3.3.7"
+
 gemspec path: "../"
diff --git a/gemfiles/vanilla.gemfile b/gemfiles/vanilla.gemfile
@@ -6,4 +6,10 @@ source "https://rubygems.org"
 # On CI we only need the gemspecs' dependencies (including development dependencies).
 # Exceptions, if any, will be found in gemfiles/*.gemfile
 
+# See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
+gem "net-http", "~> 0.4", ">= 0.4.1"
+gem "uri", "~> 0.13", ">= 0.13.1"
+gem "logger", "~> 1.6", ">= 1.6.1"
+gem "rexml", "~> 3.3", ">= 3.3.7"
+
 gemspec path: "../"
diff --git a/rots.gemspec b/rots.gemspec
@@ -52,14 +52,16 @@ Gem::Specification.new do |spec|
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.7.0"
 
+  # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
+  # spec.add_dependency("net-http", "~> 0.4", ">= 0.4.1")
+
   spec.add_dependency("date")
-  spec.add_dependency("net-http", "~> 0.4", ">= 0.4.1")
   spec.add_dependency("openssl")
   spec.add_dependency("optparse")
   spec.add_dependency("psych", "~> 5.1")
   spec.add_dependency("rack", ">= 2")
   spec.add_dependency("rackup", ">= 2")
-  spec.add_dependency("ruby-openid2", "~> 3.0", ">= 3.0.3")
+  spec.add_dependency("ruby-openid2", "~> 3.1", ">= 3.1.0")
   spec.add_dependency("stringio")
   spec.add_dependency("version_gem", "~> 1.1", ">= 1.1.4")
   spec.add_dependency("webrick")