Merge branch 'feat/test-against-hashie-versions' into 'main'

👷 Ensure compatibility with all versions of Hashie

See merge request oauth-xx/oauth2!649

Author: pboling

.github/workflows/truffle.yml

@@ -62,7 +62,32 @@ jobs:
       # NOTE: This does not use the primary Gemfile at all.
       - name: Install Root Appraisal
         run: bundle
-      - name: Appraisal for ${{ matrix.appraisal }}
+
+      - name: "[Attempt 1] Install Root Appraisal"
+        id: bundleAttempt1
+        run: bundle
+        # Continue to the next step on failure
+        continue-on-error: true
+
+      # Effectively an automatic retry of the previous step.
+      - name: "[Attempt 2] Install Root Appraisal"
+        id: bundleAttempt2
+        # If bundleAttempt1 failed, try again here; Otherwise skip.
+        if: steps.bundleAttempt1.outcome == 'failure'
+        run: bundle
+
+      - name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
+        id: bundleAppraisalAttempt1
+        run: bundle exec appraisal ${{ matrix.appraisal }} bundle
+        # Continue to the next step on failure
+        continue-on-error: true
+
+      # Effectively an automatic retry of the previous step.
+      - name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
+        id: bundleAppraisalAttempt2
+        # If bundleAttempt1 failed, try again here; Otherwise skip.
+        if: steps.bundleAppraisalAttempt1.outcome == 'failure'
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle
+
       - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

.rubocop_gradual.lock

@@ -21,7 +21,7 @@
   "lib/oauth2/response.rb:4048171841": [
     [35, 5, 204, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 996912427]
   ],
-  "oauth2.gemspec:2957552385": [
+  "oauth2.gemspec:3929706977": [
     [5, 23, 12, "Gemspec/RubyVersionGlobalsUsage: Do not use `RUBY_VERSION` in gemspec file.", 31296028]
   ],
   "spec/oauth2/access_token_spec.rb:443932125": [

Appraisals

@@ -27,6 +27,7 @@ appraise "current" do
   gem "mutex_m", ">= 0.2"
   gem "stringio", ">= 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v3.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_7.gemfile"
@@ -36,6 +37,7 @@ end
 
 appraise "ruby-2-3" do
   eval_gemfile "modular/faraday_v0.gemfile"
+  eval_gemfile "modular/hashie_v0.gemfile"
   eval_gemfile "modular/jwt_v1.gemfile"
   eval_gemfile "modular/logger_v1_2.gemfile"
   eval_gemfile "modular/multi_xml_v0_5.gemfile"
@@ -45,6 +47,7 @@ end
 
 appraise "ruby-2-4" do
   eval_gemfile "modular/faraday_v1.gemfile"
+  eval_gemfile "modular/hashie_v1.gemfile"
   eval_gemfile "modular/jwt_v1.gemfile"
   eval_gemfile "modular/logger_v1_2.gemfile"
   eval_gemfile "modular/multi_xml_v0_5.gemfile"
@@ -54,6 +57,7 @@ end
 
 appraise "ruby-2-5" do
   eval_gemfile "modular/faraday_v1.gemfile"
+  eval_gemfile "modular/hashie_v2.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_5.gemfile"
   eval_gemfile "modular/multi_xml_v0_6.gemfile"
@@ -65,6 +69,7 @@ appraise "ruby-2-6" do
   gem "mutex_m", "~> 0.2"
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v3.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_5.gemfile"
   eval_gemfile "modular/multi_xml_v0_6.gemfile"
@@ -76,6 +81,7 @@ appraise "ruby-2-7" do
   gem "mutex_m", "~> 0.2"
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v4.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_6.gemfile"
@@ -87,6 +93,7 @@ appraise "ruby-3-0" do
   gem "mutex_m", "~> 0.2"
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_6.gemfile"
@@ -98,6 +105,7 @@ appraise "ruby-3-1" do
   gem "mutex_m", "~> 0.2"
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_6.gemfile"
@@ -109,6 +117,7 @@ appraise "ruby-3-2" do
   gem "mutex_m", "~> 0.2"
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_7.gemfile"
@@ -120,6 +129,7 @@ appraise "ruby-3-3" do
   gem "mutex_m", "~> 0.2"
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_7.gemfile"
@@ -133,6 +143,7 @@ appraise "audit" do
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/audit.gemfile"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_7.gemfile"
@@ -146,6 +157,7 @@ appraise "coverage" do
   gem "stringio", "~> 3.0"
   eval_gemfile "modular/coverage.gemfile"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_7.gemfile"
@@ -166,6 +178,7 @@ appraise "omnibus" do
   eval_gemfile "modular/coverage.gemfile"
   eval_gemfile "modular/documentation.gemfile"
   eval_gemfile "modular/faraday_v2.gemfile"
+  eval_gemfile "modular/hashie_v5.gemfile"
   eval_gemfile "modular/jwt_v2.gemfile"
   eval_gemfile "modular/logger_v1_7.gemfile"
   eval_gemfile "modular/multi_xml_v0_7.gemfile"

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning v2](https://semver.org/spec/v2.
 - YARD config, GFM compatible with relative file links
 - Documentation site on GitHub Pages
   - [oauth2.galtzo.com](https://oauth2.galtzo.com)
+- [!649](https://gitlab.com/oauth-xx/oauth2/-/merge_requests/649) - Test compatibility with all key minor versions of Hashie v0, v1, v2, v3, v4, v5, HEAD
 ### Changed
 - Updated `spec.homepage_uri` in gemspec to GitHub Pages YARD documentation site
 ### Deprecated

Gemfile.lock

@@ -92,7 +92,7 @@ GEM
     gem_bench (2.0.5)
       bundler (>= 1.14)
       version_gem (~> 1.1, >= 1.1.4)
-    hashie (5.0.0)
+    hashie (0.4.0)
     io-console (0.8.0)
     irb (1.15.2)
       pp (>= 0.6.0)

README.md

@@ -60,6 +60,10 @@ covering the latest patch for each of the following minor versions:
 The last two were extracted from this gem. They are part of the `oauth-xx` org,
 and are developed in tight collaboration with this gem.
 
+Also, where reasonable, tested against the runtime dependencies of those dependencies:
+
+* gem `hashie` @ v0, v1, v2, v3, v4, v5, HEAD ⏩️ [hashie/hashie](https://github.com/hashie/hashie)
+
 #### You should upgrade this gem with confidence\*.
 
 - This gem follows a _strict & correct_ (according to the maintainer of SemVer; [more info][sv-pub-api]) interpretation of SemVer.

doc/OAuth2.html

@@ -326,7 +326,7 @@ <h3 class="signature first" id="configure-class_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 21 04:26:17 2025 by
+  Generated on Wed May 21 08:20:02 2025 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.37 (ruby-3.4.3).
 </div>

doc/OAuth2/AccessToken.html

@@ -3051,7 +3051,7 @@ <h3 class="signature " id="to_hash-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 21 04:26:17 2025 by
+  Generated on Wed May 21 08:20:02 2025 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.37 (ruby-3.4.3).
 </div>

doc/OAuth2/Authenticator.html

@@ -631,7 +631,7 @@ <h3 class="signature first" id="apply-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 21 04:26:17 2025 by
+  Generated on Wed May 21 08:20:02 2025 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.37 (ruby-3.4.3).
 </div>

doc/OAuth2/Client.html

@@ -2651,7 +2651,7 @@ <h3 class="signature " id="token_url-instance_method">
 </div>
 
       <div id="footer">
-  Generated on Wed May 21 04:26:17 2025 by
+  Generated on Wed May 21 08:20:02 2025 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.37 (ruby-3.4.3).
 </div>