Merge pull request #8083 from duckinator/duckinator/simplify-suggest-gems-from-name

Remove code that makes suggest_gems_from_name give worse results.

(cherry picked from commit 74a8893)

Author: martinemde

lib/rubygems/spec_fetcher.rb

@@ -176,19 +176,12 @@ def suggest_gems_from_name(gem_name, type = :latest, num_results = 5)
 
     matches = names.map do |n|
       next unless n.match_platform?
-      [n.name, 0] if n.name.downcase.tr("_-", "").include?(gem_name)
+      distance = levenshtein_distance gem_name, n.name.downcase.tr("_-", "")
+      next if distance >= max
+      return [n.name] if distance == 0
+      [n.name, distance]
     end.compact
 
-    if matches.length < num_results
-      matches += names.map do |n|
-        next unless n.match_platform?
-        distance = levenshtein_distance gem_name, n.name.downcase.tr("_-", "")
-        next if distance >= max
-        return [n.name] if distance == 0
-        [n.name, distance]
-      end.compact
-    end
-
     matches = if matches.empty? && type != :prerelease
       suggest_gems_from_name gem_name, :prerelease
     else

test/rubygems/test_gem_commands_exec_command.rb

@@ -493,7 +493,6 @@ def test_version_mismatch
       assert_equal 2, e.exit_code
       assert_equal <<~ERR, @ui.error
         ERROR:  Could not find a valid gem 'a' (= 2) in any repository
-        ERROR:  Possible alternatives: a
       ERR
     end
   end
@@ -574,7 +573,6 @@ def test_conservative_missing_gem
       assert_include @ui.output, "a (= 2) not available locally"
       assert_equal <<~ERROR, @ui.error
         ERROR:  Could not find a valid gem 'a' (= 2) in any repository
-        ERROR:  Possible alternatives: a
       ERROR
     end
   end
@@ -769,8 +767,7 @@ def test_only_prerelease_available
       assert_raise Gem::MockGemUi::TermError do
         invoke "a"
       end
-      assert_equal "ERROR:  Could not find a valid gem 'a' (>= 0) in any repository\n" \
-                   "ERROR:  Possible alternatives: a\n", @ui.error
+      assert_equal "ERROR:  Could not find a valid gem 'a' (>= 0) in any repository\n", @ui.error
       assert_empty @ui.output
       assert_empty @installed_specs
     end

test/rubygems/test_gem_spec_fetcher.rb

@@ -168,20 +168,22 @@ def src.fetch_spec(name)
   def test_suggest_gems_from_name_latest
     spec_fetcher do|fetcher|
       fetcher.spec "example", 1
-      fetcher.spec "other-example", 1
+      fetcher.spec "an-example", 1
       fetcher.spec "examp", 1
+      fetcher.spec "other-example", 1
     end
 
     suggestions = @sf.suggest_gems_from_name("examplw", :latest, 1)
     assert_equal ["example"], suggestions
 
-    suggestions = @sf.suggest_gems_from_name("other")
-    assert_equal ["other-example"], suggestions
+    suggestions = @sf.suggest_gems_from_name("anexample")
+    assert_equal ["an-example"], suggestions
 
-    suggestions = @sf.suggest_gems_from_name("exam")
-    assert suggestions.any? { ["examp"] }
-    assert suggestions.any? { ["example"] }
-    assert suggestions.any? { ["other-example"] }
+    suggestions = @sf.suggest_gems_from_name("xample")
+    assert_equal ["example"], suggestions
+
+    suggestions = @sf.suggest_gems_from_name("other-apple")
+    assert_equal ["other-example"], suggestions
   end
 
   def test_suggest_gems_from_name_prerelease