Merge pull request #8948 from rubygems/deivid-rodriguez/fix-did-you-mean-suggestions

Fix "did you mean" suggestions for unknown commands

(cherry picked from commit e0d470b)

Author: deivid-rodriguez

.github/workflows/ruby-core.yml

@@ -27,7 +27,7 @@ jobs:
         with:
           repository: ruby/ruby
           path: ruby/ruby
-          ref: 2cce628721728409a26c2d4732f63419785c7fd8 # TODO: Point to v3_4_5 once released
+          ref: v3_4_5
           persist-credentials: false
       - name: Install libraries
         run: |

lib/rubygems/exceptions.rb

@@ -23,15 +23,8 @@ def initialize(unknown_command)
   def self.attach_correctable
     return if defined?(@attached)
 
-    if defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable)
-      if DidYouMean.respond_to?(:correct_error)
-        DidYouMean.correct_error(Gem::UnknownCommandError, Gem::UnknownCommandSpellChecker)
-      else
-        DidYouMean::SPELL_CHECKERS["Gem::UnknownCommandError"] =
-          Gem::UnknownCommandSpellChecker
-
-        prepend DidYouMean::Correctable
-      end
+    if defined?(DidYouMean) && DidYouMean.respond_to?(:correct_error)
+      DidYouMean.correct_error(Gem::UnknownCommandError, Gem::UnknownCommandSpellChecker)
     end
 
     @attached = true

test/rubygems/test_gem_command_manager.rb

@@ -78,7 +78,7 @@ def test_find_command_unknown_suggestions
 
     message = "Unknown command pish".dup
 
-    if defined?(DidYouMean::SPELL_CHECKERS) && defined?(DidYouMean::Correctable)
+    if defined?(DidYouMean)
       message << "\nDid you mean?  \"push\""
     end