Merge pull request #8074 from rubygems/deivid-rodriguez/incomplete-errors

Fix `Gem::MissingSpecVersionError#to_s` not showing exception message

(cherry picked from commit 78c88f6)

Author: deivid-rodriguez

lib/rubygems/command_manager.rb

@@ -230,18 +230,11 @@ def find_command_possibilities(cmd_name)
   def load_and_instantiate(command_name)
     command_name = command_name.to_s
     const_name = command_name.capitalize.gsub(/_(.)/) { $1.upcase } << "Command"
-    load_error = nil
 
     begin
-      begin
-        require "rubygems/commands/#{command_name}_command"
-      rescue LoadError => e
-        load_error = e
-      end
+      require "rubygems/commands/#{command_name}_command"
       Gem::Commands.const_get(const_name).new
-    rescue StandardError => e
-      e = load_error if load_error
-
+    rescue StandardError, LoadError => e
       alert_error clean_text("Loading command: #{command_name} (#{e.class})\n\t#{e}")
       ui.backtrace e
     end

lib/rubygems/errors.rb

@@ -30,6 +30,7 @@ def initialize(name, requirement, extra_message=nil)
       @name        = name
       @requirement = requirement
       @extra_message = extra_message
+      super(message)
     end
 
     def message # :nodoc:
@@ -53,8 +54,8 @@ class MissingSpecVersionError < MissingSpecError
     attr_reader :specs
 
     def initialize(name, requirement, specs)
-      super(name, requirement)
       @specs = specs
+      super(name, requirement)
     end
 
     private

test/rubygems/rubygems/commands/ins_command.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Gem::Commands::InsCommand < Gem::Command
+  def initialize
+    super("ins", "Does something different from install", {})
+  end
+end

test/rubygems/rubygems/commands/interrupt_command.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Gem::Commands::InterruptCommand < Gem::Command
+  def initialize
+    super("interrupt", "Raises an Interrupt Exception", {})
+  end
+
+  def execute
+    raise Interrupt, "Interrupt exception"
+  end
+end

test/rubygems/rubygems_plugin.rb

@@ -2,23 +2,4 @@
 
 require "rubygems/command_manager"
 
-##
-# This is an example of exactly what NOT to do.
-#
-# DO NOT include code like this in your rubygems_plugin.rb
-
-module Gem::Commands
-  remove_const(:InterruptCommand) if defined?(InterruptCommand)
-end
-
-class Gem::Commands::InterruptCommand < Gem::Command
-  def initialize
-    super("interrupt", "Raises an Interrupt Exception", {})
-  end
-
-  def execute
-    raise Interrupt, "Interrupt exception"
-  end
-end
-
 Gem::CommandManager.instance.register_command :interrupt

test/rubygems/test_gem.rb

@@ -21,8 +21,6 @@ def setup
     common_installer_setup
 
     @additional = %w[a b].map {|d| File.join @tempdir, d }
-
-    util_remove_interrupt_command
   end
 
   def test_self_finish_resolve
@@ -1524,8 +1522,6 @@ def test_load_env_plugins
       nil
     end
 
-    util_remove_interrupt_command
-
     # Should attempt to cause a StandardError
     with_plugin("standarderror") { Gem.load_env_plugins }
     begin
@@ -1534,8 +1530,6 @@ def test_load_env_plugins
       nil
     end
 
-    util_remove_interrupt_command
-
     # Should attempt to cause an Exception
     with_plugin("scripterror") { Gem.load_env_plugins }
     begin
@@ -1791,11 +1785,6 @@ def util_exec_gem
     spec
   end
 
-  def util_remove_interrupt_command
-    Gem::Commands.send :remove_const, :InterruptCommand if
-      Gem::Commands.const_defined? :InterruptCommand
-  end
-
   def util_cache_dir
     File.join Gem.dir, "cache"
   end

test/rubygems/test_gem_command_manager.rb

@@ -50,16 +50,17 @@ def test_find_logout_alias_comamnd
   end
 
   def test_find_command_ambiguous_exact
-    ins_command = Class.new
-    Gem::Commands.send :const_set, :InsCommand, ins_command
+    old_load_path = $:.dup
+    $: << File.expand_path("test/rubygems", PROJECT_DIR)
 
     @command_manager.register_command :ins
 
     command = @command_manager.find_command "ins"
 
-    assert_kind_of ins_command, command
+    assert_kind_of Gem::Commands::InsCommand, command
   ensure
-    Gem::Commands.send :remove_const, :InsCommand
+    $:.replace old_load_path
+    @command_manager.unregister_command :ins
   end
 
   def test_find_command_unknown

test/rubygems/test_gem_commands_help_command.rb

@@ -11,8 +11,6 @@ def setup
     super
 
     @cmd = Gem::Commands::HelpCommand.new
-
-    load File.expand_path("rubygems_plugin.rb", __dir__) unless Gem::Commands.const_defined? :InterruptCommand
   end
 
   def test_gem_help_bad