File f379d5bace68b10622d01059a2d3b4caca4dd5a8.patch of Package rubygems

From f379d5bace68b10622d01059a2d3b4caca4dd5a8 Mon Sep 17 00:00:00 2001
From: Ryan Davis <ryand-ruby@zenspider.com>
Date: Wed, 23 Feb 2011 16:48:56 -0800
Subject: [PATCH] - RF#28935: rdoc/ri invokations were quietly ignoring bogus args

---
 lib/rubygems/commands/setup_command.rb             |    1 -
 lib/rubygems/doc_manager.rb                        |    9 +++++----
 test/rubygems/test_gem_commands_install_command.rb |    3 ++-
 test/rubygems/test_gem_commands_update_command.rb  |    7 ++-----
 4 files changed, 9 insertions(+), 11 deletions(-)

Index: lib/rubygems/commands/setup_command.rb
===================================================================
--- lib/rubygems/commands/setup_command.rb.orig
+++ lib/rubygems/commands/setup_command.rb
@@ -329,7 +329,6 @@ abort "#{deprecation_message}"
 
     require 'rdoc/rdoc'
 
-    args << '--quiet'
     args << '--main' << 'README.rdoc'
     args << '.'
     args << 'README.rdoc' << 'UPGRADING.rdoc'
Index: lib/rubygems/doc_manager.rb
===================================================================
--- lib/rubygems/doc_manager.rb.orig
+++ lib/rubygems/doc_manager.rb
@@ -162,7 +162,6 @@ class Gem::DocManager
   def run_rdoc(*args)
     args << @spec.rdoc_options
     args << self.class.configured_args
-    args << '--quiet'
     args << @spec.require_paths.clone
     args << @spec.extra_rdoc_files
     args << '--title' << "#{@spec.full_name} Documentation"
@@ -176,6 +175,8 @@ class Gem::DocManager
       # HACK more
     end
 
+    debug_args = args.dup
+
     r = RDoc::RDoc.new
 
     old_pwd = Dir.pwd
@@ -193,10 +194,10 @@ class Gem::DocManager
     rescue Exception => ex
       alert_error "While generating documentation for #{@spec.full_name}"
       ui.errs.puts "... MESSAGE:   #{ex}"
-      ui.errs.puts "... RDOC args: #{args.join(' ')}"
+      ui.errs.puts "... RDOC args: #{debug_args.join(' ')}"
       ui.errs.puts "\t#{ex.backtrace.join "\n\t"}" if
-      Gem.configuration.backtrace
-      ui.errs.puts "(continuing with the rest of the installation)"
+        Gem.configuration.backtrace
+      terminate_interaction 1
     ensure
       Dir.chdir old_pwd
     end
Index: test/rubygems/test_gem_commands_install_command.rb
===================================================================
--- test/rubygems/test_gem_commands_install_command.rb.orig
+++ test/rubygems/test_gem_commands_install_command.rb
@@ -42,7 +42,8 @@ class TestGemCommandsInstallCommand < Ge
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
       read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
 
-    @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s]
+    @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s,
+                         "--no-ri", "--no-rdoc"]
     assert @cmd.options[:prerelease]
     assert @cmd.options[:version].satisfied_by?(@a2_pre.version)
 
Index: test/rubygems/test_gem_commands_update_command.rb
===================================================================
--- test/rubygems/test_gem_commands_update_command.rb.orig
+++ test/rubygems/test_gem_commands_update_command.rb
@@ -30,8 +30,8 @@ class TestGemCommandsUpdateCommand < Gem
     Gem::Installer.new(@a1_path).install
 
     @cmd.options[:args] = []
-    @cmd.options[:generate_rdoc] = true
-    @cmd.options[:generate_ri]   = true
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
 
     use_ui @ui do
       @cmd.execute
@@ -42,9 +42,6 @@ class TestGemCommandsUpdateCommand < Gem
     assert_equal "Updating #{@a2.name}", out.shift
     assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "Gems updated: #{@a2.name}", out.shift
-    assert_equal "Installing ri documentation for a-2...", out.shift
-    assert_equal "Installing RDoc documentation for a-2...", out.shift
-
     assert_empty out
   end