Import rubygems 1.6.0 (released version @ 58d8a0b9)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 27 insertions, 26 deletions

diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb
index ff5800c116..538793181e 100644
--- a/lib/rubygems/user_interaction.rb
+++ b/lib/rubygems/user_interaction.rb
@@ -182,29 +182,24 @@ class Gem::StreamUI
       end
     end
 
-    qstr = case default
-           when nil
-             'yn'
-           when true
-             'Yn'
-           else
-             'yN'
-           end
+    default_answer = case default
+                     when nil
+                       'yn'
+                     when true
+                       'Yn'
+                     else
+                       'yN'
+                     end
 
     result = nil
 
-    while result.nil?
-      result = ask("#{question} [#{qstr}]")
-      result = case result
-      when /^[Yy].*/
-        true
-      when /^[Nn].*/
-        false
-      when /^$/
-        default
-      else
-        nil
-      end
+    while result.nil? do
+      result = case ask "#{question} [#{default_answer}]"
+               when /^y/i then true
+               when /^n/i then false
+               when /^$/  then default
+               else            nil
+               end
     end
 
     return result
@@ -531,20 +526,26 @@ end
 # SilentUI is a UI choice that is absolutely silent.
 
 class Gem::SilentUI < Gem::StreamUI
-
   def initialize
-
     reader, writer = nil, nil
 
-    if Gem.win_platform?
-      reader = File.open('nul', 'r')
-      writer = File.open('nul', 'w')
-    else
+    begin
       reader = File.open('/dev/null', 'r')
       writer = File.open('/dev/null', 'w')
+    rescue Errno::ENOENT
+      reader = File.open('nul', 'r')
+      writer = File.open('nul', 'w')
     end
 
     super reader, writer, writer
   end
+
+  def download_reporter(*args)
+    SilentDownloadReporter.new(@outs, *args)
+  end
+
+  def progress_reporter(*args)
+    SilentProgressReporter.new(@outs, *args)
+  end
 end