Merge pull request #165 from omniauth/feat/upgrade-kettle-gems

pboling · web-flow · commit 7b973e729234 · 2025-10-22T00:18:02.000+07:00
diff --git a/.github/workflows/ancient.yml b/.github/workflows/ancient.yml
@@ -3,9 +3,6 @@ name: MRI 2.4, 2.5 (EOL)
 permissions:
   contents: read
 
-env:
-  K_SOUP_COV_DO: false
-
 on:
   push:
     branches:
diff --git a/.github/workflows/dep-heads.yml b/.github/workflows/dep-heads.yml
@@ -47,9 +47,7 @@ jobs:
             rubygems: latest
             bundler: latest
 
-          # truffleruby-24.1
-          #   (according to documentation: targets Ruby 3.3 compatibility)
-          #   (according to runtime: targets Ruby 3.2 compatibility)
+          # truffleruby-24.1 (targets Ruby 3.3 compatibility)
           - ruby: "truffleruby"
             appraisal: "dep-heads"
             exec_cmd: "rake spec:orm:active_record"
diff --git a/.github/workflows/truffle.yml b/.github/workflows/truffle.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         include:
           # NOTE: truffleruby does not support upgrading rubygems.
-          # truffleruby-23.1 (targets Ruby 3.1 compatibility)
+          # truffleruby-23.1 (targets Ruby 3.2 compatibility)
           - ruby: "truffleruby-23.1"
             appraisal: "ar-7-1-r3.1"
             exec_cmd: "rake spec:orm:active_record"
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 *.gem
 
 # Bundler
+/vendor/bundle/
 /.bundle/
 /gemfiles/*.lock
 /gemfiles/.bundle/
diff --git a/.rubocop_gradual.lock b/.rubocop_gradual.lock
@@ -1,6 +1,6 @@
 {
-  "README.md:2643134253": [
-    [277, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
+  "README.md:4219525257": [
+    [292, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
   ],
   "bin/bundle:247448467": [
     [64, 5, 20, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2485198147]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -232,7 +232,7 @@ NOTE: To build without signing the gem set `SKIP_GEM_SIGNING` to any value in th
 
 #### Automated process
 
-1. Update version.rb to contain the correct version-to-be-released.
+1. Update version.rb to contian the correct version-to-be-released.
 2. Run `bundle exec kettle-changelog`.
 3. Run `bundle exec kettle-release`.
 
diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,7 @@
 
 source "https://gem.coop"
 
+git_source(:codeberg) { |repo_name| "https://codeberg.org/#{repo_name}" }
 git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}" }
 
 #### IMPORTANT #######################################################
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -166,7 +166,7 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.15.1)
-    kettle-dev (1.1.33)
+    kettle-dev (1.1.38)
     kettle-soup-cover (1.0.10)
       simplecov (~> 0.22)
       simplecov-cobertura (~> 3.0)
@@ -176,15 +176,17 @@ GEM
       simplecov-rcov (~> 0.3, >= 0.3.7)
       simplecov_json_formatter (~> 0.1, >= 0.1.4)
       version_gem (~> 1.1, >= 1.1.8)
-    kettle-test (1.0.3)
+    kettle-test (1.0.6)
       appraisal2 (~> 3.0)
+      backports (~> 3.0)
       rspec (~> 3.0)
       rspec-block_is_expected (~> 1.0, >= 1.0.6)
+      rspec-pending_for (~> 0.1, >= 0.1.19)
       rspec-stubbed_env (~> 1.0, >= 1.0.4)
       rspec_junit_formatter (~> 0.6)
       silent_stream (~> 1.0, >= 1.0.12)
       timecop-rspec (~> 1.0, >= 1.0.3)
-      version_gem (~> 1.1, >= 1.1.8)
+      version_gem (~> 1.1, >= 1.1.9)
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
@@ -514,7 +516,6 @@ DEPENDENCIES
   addressable (>= 2.8, < 3)
   anonymous_active_record (~> 1.0, >= 1.0.9)
   appraisal2 (~> 3.0)
-  backports (~> 3.25, >= 3.25.1)
   benchmark (~> 0.4, >= 0.4.1)
   bundler-audit (~> 0.9.2)
   couch_potato (~> 1.17)
diff --git a/README.md b/README.md
@@ -1,16 +1,31 @@
-| 📍 NOTE                                                                                                                                                     |
-|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| RubyGems.org was [recently compromised][draper-security] in a [hostile takeover][draper-takeover] about which [many lies][draper-lies] have been told.      |
-| I'm in the process of adding warnings to some important gems because I [don't condone the theft][draper-theft] of the bundler and rubygems-update projects. |
-| Once publishing to [gem.coop][gem-coop] is available I will stop publishing to RubyGems.org.                                                                |
-| Please see [here][gem-coop] and [here][martin-ann] for more info on what comes next.                                                                        |
-
+| 📍 NOTE                                                                                                                                                           |
+|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| RubyGems (the [GitHub org][rubygems-org], not the website) [suffered][draper-security] a [hostile takeover][ellen-takeover] in September 2025.                    |
+| Ultimately [4 maintainers][simi-removed] were [hard removed][martin-removed] and a reason has been given for only 1 of those, while 2 others resigned in protest. |
+| It is a [complicated story][draper-takeover] which is difficult to [parse quickly][draper-lies].                                                                  |
+| I'm adding notes like this to gems because I [don't condone theft][draper-theft] of repositories or gems from their rightful owners.                              |
+| If a similar theft happened with my repos/gems, I'd hope some would stand up for me.                                                                              |
+| Disenfranchised former-maintainers have started [gem.coop][gem-coop].                                                                                             |
+| Once available I will publish there exclusively; unless RubyCentral makes amends with the community.                                                              |
+| The ["Technology for Humans: Joel Draper"][reinteractive-podcast] podcast episode by [reinteractive][reinteractive] is the most cogent summary I'm aware of.      |
+| See [here][gem-naming], [here][gem-coop] and [here][martin-ann] for more info on what comes next.                                                                 |
+| What I'm doing: A (WIP) proposal for [bundler/gem scopes][gem-scopes], and a (WIP) proposal for a federated [gem server][gem-server].                             |
+
+[rubygems-org]: https://github.com/rubygems/
 [draper-security]: https://joel.drapper.me/p/ruby-central-security-measures/
 [draper-takeover]: https://joel.drapper.me/p/ruby-central-takeover/
+[ellen-takeover]: https://pup-e.com/blog/goodbye-rubygems/
+[simi-removed]: https://www.reddit.com/r/ruby/s/gOk42POCaV
+[martin-removed]: https://bsky.app/profile/martinemde.com/post/3m3occezxxs2q
 [draper-lies]: https://joel.drapper.me/p/ruby-central-fact-check/
 [draper-theft]: https://joel.drapper.me/p/ruby-central/
+[reinteractive]: https://reinteractive.com/ruby-on-rails
 [gem-coop]: https://gem.coop
+[gem-naming]: https://github.com/gem-coop/gem.coop/issues/12
 [martin-ann]: https://martinemde.com/2025/10/05/announcing-gem-coop.html
+[gem-scopes]: https://github.com/galtzo-floss/bundle-namespace
+[gem-server]: https://github.com/galtzo-floss/gem-server
+[reinteractive-podcast]: https://youtu.be/_H4qbtC5qzU?si=BvuBU90R2wAqD2E6
 
 [![Galtzo FLOSS Logo by Aboling0, CC BY-SA 4.0][🖼️galtzo-i]][🖼️galtzo-discord] [![omniauth Logo by tomeara(?), MIT License][🖼️omniauth-i]][🖼️omniauth] [![ruby-lang Logo, Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5][🖼️ruby-lang-i]][🖼️ruby-lang]
 
@@ -399,7 +414,7 @@ end
 `locate_conditions` takes a `Proc` object, and must return a `Hash` object, which will be used
 as the argument to the locate method for your ORM.  The proc is evaluated in the
 callback context, and has access to your `Identity` model (using `model`) and receives the request
-object as a parameter.  Note  that `model.auth_key` defaults to `email`, but is also configurable.
+object as a parameter.  Note that `model.auth_key` defaults to `email`, but is also configurable.
 
 Note: Be careful when customizing `locate_conditions`.  The best way to modify the conditions is
 to copy the default value, and then add to the hash.  Removing the default condition will almost
diff --git a/Rakefile b/Rakefile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# kettle-dev Rakefile v1.1.32 - 2025-10-07
+# kettle-dev Rakefile v1.1.38 - 2025-10-21
 # Ruby 2.3 (Safe Navigation) or higher required
 #
 # MIT License (see License.txt)
@@ -51,6 +51,7 @@ task :default do
   puts "Default task complete."
 end
 
+# External gems that define tasks - add here!
 require "kettle/dev"
 
 ### RELEASE TASKS
diff --git a/gemfiles/modular/erb/r2.3/default.gemfile b/gemfiles/modular/erb/r2.3/default.gemfile
@@ -0,0 +1,6 @@
+# The cake is a lie.
+# erb v2.2, the oldest release, was never compatible with Ruby 2.3.
+# In addition, erb does not follow SemVer, and old rubies get dropped in a patch.
+# This means we have no choice but to use the erb that shipped with Ruby 2.3
+# /opt/hostedtoolcache/Ruby/2.3.8/x64/lib/ruby/gems/2.3.0/gems/erb-2.2.2/lib/erb.rb:670:in `prepare_trim_mode': undefined method `match?' for "-":String (NoMethodError)
+# gem "erb", ">= 2.2"   # ruby >= 2.3.0
diff --git a/omniauth-identity.gemspec b/omniauth-identity.gemspec
@@ -2,13 +2,18 @@
 # frozen_string_literal: true
 
 gem_version =
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1") # rubocop:disable Gemspec/RubyVersionGlobalsUsage
+  if RUBY_VERSION >= "3.1" # rubocop:disable Gemspec/RubyVersionGlobalsUsage
     # Loading Version into an anonymous module allows version.rb to get code coverage from SimpleCov!
     # See: https://github.com/simplecov-ruby/simplecov/issues/557#issuecomment-2630782358
     # See: https://github.com/panorama-ed/memo_wise/pull/397
     Module.new.tap { |mod| Kernel.load("#{__dir__}/lib/omniauth/identity/version.rb", mod) }::OmniAuth::Identity::Version::VERSION
   else
-    require_relative "lib/omniauth/identity/version"
+    # NOTE: Use __FILE__ or __dir__ until removal of Ruby 1.x support
+    # __dir__ introduced in Ruby 1.9.1
+    # lib = File.expand_path("../lib", __FILE__)
+    lib = File.expand_path("lib", __dir__)
+    $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+    require "omniauth/identity/version"
     OmniAuth::Identity::Version::VERSION
   end
 
@@ -148,18 +153,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("gitmoji-regex", "~> 1.0", ">= 1.0.3")            # ruby >= 2.3.0
 
   # HTTP recording for deterministic specs
-  # Ruby 2.3 / 2.4 can fail with:
-  # | An error occurred while loading spec_helper.
-  # | Failure/Error: require "vcr"
-  # |
-  # | NoMethodError:
-  # |   undefined method `delete_prefix' for "CONTENT_LENGTH":String
-  # | # ./spec/config/vcr.rb:3:in `require'
-  # | # ./spec/config/vcr.rb:3:in `<top (required)>'
-  # | # ./spec/spec_helper.rb:8:in `require_relative'
-  # | # ./spec/spec_helper.rb:8:in `<top (required)>'
-  # So that's why we need backports.
-  spec.add_development_dependency("backports", "~> 3.25", ">= 3.25.1")  # ruby >= 0
   # In Ruby 3.5 (HEAD) the CGI library has been pared down, so we also need to depend on gem "cgi" for ruby@head
   # This is done in the "head" appraisal.
   # See: https://github.com/vcr/vcr/issues/1057

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`		`- "README.md:2643134253": [`
`3`		- [277, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
	`2`	`+ "README.md:4219525257": [`
	`3`	+ [292, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
`4`	`4`	`],`
`5`	`5`	`"bin/bundle:247448467": [`
`6`	`6`	`[64, 5, 20, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2485198147]`