Import rubygems 1.5.0 (release candidate @ 09893d9)

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

17 files changed, 1195 insertions, 64 deletions

diff --git a/lib/rubygems/commands/environment_command.rb b/lib/rubygems/commands/environment_command.rb
index f8de984547..f6ec301990 100644
--- a/lib/rubygems/commands/environment_command.rb
+++ b/lib/rubygems/commands/environment_command.rb
@@ -19,7 +19,7 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
           gempath         display path used to search for gems
           version         display the gem format version
           remotesources   display the remote gem servers
-          platform        display the supporte gem platforms
+          platform        display the supported gem platforms
           <omitted>       display everything
     EOF
     return args.gsub(/^\s+/, '')
@@ -48,7 +48,7 @@ Example:
   install: --no-wrappers
   update: --no-wrappers
 
-RubyGems' default local repository can be overriden with the GEM_PATH and
+RubyGems' default local repository can be overridden with the GEM_PATH and
 GEM_HOME environment variables.  GEM_HOME sets the default repository to
 install into.  GEM_PATH allows multiple local repositories to be searched for
 gems.
@@ -126,7 +126,7 @@ lib/rubygems/defaults/operating_system.rb
       end
 
     else
-      raise Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
+      raise Gem::CommandLineError, "Unknown environment option [#{arg}]"
     end
     say out
     true
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb
index d19663e4bd..4c61b6563e 100644
--- a/lib/rubygems/dependency.rb
+++ b/lib/rubygems/dependency.rb
@@ -56,7 +56,7 @@ class Gem::Dependency
     @type        = type
     @prerelease  = false
 
-    # This is for Marshal backwards compatability. See the comments in
+    # This is for Marshal backwards compatibility. See the comments in
     # +requirement+ for the dirty details.
 
     @version_requirements = @requirement
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index 3913f36bc2..23462fbe33 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -84,7 +84,7 @@ class Gem::DependencyInstaller
   ##
   # Returns a list of pairs of gemspecs and source_uris that match
   # Gem::Dependency +dep+ from both local (Dir.pwd) and remote (Gem.sources)
-  # sources.  Gems are sorted with newer gems prefered over older gems, and
+  # sources.  Gems are sorted with newer gems preferred over older gems, and
   # local gems preferred over remote gems.
 
   def find_gems_with_sources(dep)
diff --git a/lib/rubygems/doc_manager.rb b/lib/rubygems/doc_manager.rb
index 055aa22f13..e900396aa4 100644
--- a/lib/rubygems/doc_manager.rb
+++ b/lib/rubygems/doc_manager.rb
@@ -194,7 +194,9 @@ class Gem::DocManager
     rescue Errno::EACCES => e
       dirname = File.dirname e.message.split("-")[1].strip
       raise Gem::FilePermissionError.new(dirname)
-    rescue RuntimeError => ex
+    rescue Interrupt => e
+      raise e
+    rescue Exception => ex
       alert_error "While generating documentation for #{@spec.full_name}"
       ui.errs.puts "... MESSAGE:   #{ex}"
       ui.errs.puts "... RDOC args: #{args.join(' ')}"
diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index 89242aff08..29d5af5b12 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -28,7 +28,7 @@ class Gem::Ext::Builder
 
     File.open('Makefile', 'wb') {|f| f.print mf}
 
-    # try to find make program from Ruby configue arguments first
+    # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
     make_program = $1 || ENV['make']
     unless make_program then
diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb
index d3b5cba75c..ba9fa8a94c 100644
--- a/lib/rubygems/ext/rake_builder.rb
+++ b/lib/rubygems/ext/rake_builder.rb
@@ -25,8 +25,16 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
     # Deal with possible spaces in the path, e.g. C:/Program Files
     dest_path = '"' + dest_path + '"' if dest_path.include?(' ')
 
-    cmd = ENV['rake'] || "\"#{Gem.ruby}\" -rubygems #{Gem.bin_path('rake')}" rescue Gem.default_exec_format % 'rake'
-    cmd += " RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
+    rake = ENV['rake']
+
+    rake ||= begin
+               "\"#{Gem.ruby}\" -rubygems #{Gem.bin_path('rake')}"
+             rescue Gem::Exception
+             end
+
+    rake ||= Gem.default_exec_format % 'rake'
+
+    cmd = "#{rake} RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
 
     run cmd, results
 
diff --git a/lib/rubygems/format.rb b/lib/rubygems/format.rb
index 9f8e7b8fb9..3b38a3a017 100644
--- a/lib/rubygems/format.rb
+++ b/lib/rubygems/format.rb
@@ -22,8 +22,6 @@ class Gem::Format
   attr_accessor :file_entries
   attr_accessor :gem_path
 
-  extend Gem::UserInteraction
-
   ##
   # Constructs a Format representing the gem's data which came from +gem_path+
 
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb
index e1265c2d34..1a585c3c25 100644
--- a/lib/rubygems/indexer.rb
+++ b/lib/rubygems/indexer.rb
@@ -63,7 +63,7 @@ class Gem::Indexer
     require 'tmpdir'
     require 'zlib'
 
-    unless ''.respond_to? :to_xs then
+    unless defined?(Builder::XChar) then
       raise "Gem::Indexer requires that the XML Builder library be installed:" \
            "\n\tgem install builder"
     end
@@ -555,10 +555,18 @@ class Gem::Indexer
   # Sanitize a single string.
 
   def sanitize_string(string)
+    return string unless string
+
     # HACK the #to_s is in here because RSpec has an Array of Arrays of
-    # Strings for authors.  Need a way to disallow bad values on gempsec
+    # Strings for authors.  Need a way to disallow bad values on gemspec
     # generation.  (Probably won't happen.)
-    string ? string.to_s.to_xs : string
+    string = string.to_s
+
+    begin
+      Builder::XChar.encode string
+    rescue NameError, NoMethodError
+      string.to_xs
+    end
   end
 
   ##
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index 7321d2e2e5..09d260dfb8 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -14,6 +14,7 @@ require 'rubygems/format'
 require 'rubygems/exceptions'
 require 'rubygems/ext'
 require 'rubygems/require_paths_builder'
+require 'rubygems/user_interaction'
 
 ##
 # The installer class processes RubyGem .gem files and installs the files
@@ -44,7 +45,7 @@ class Gem::Installer
 
   include Gem::UserInteraction
 
-  include Gem::RequirePathsBuilder if QUICKLOADER_SUCKAGE
+  include Gem::RequirePathsBuilder if Gem::QUICKLOADER_SUCKAGE
 
   ##
   # The directory a gem's executables will be installed into
@@ -176,7 +177,7 @@ class Gem::Installer
     generate_bin
     write_spec
 
-    write_require_paths_file_if_needed if QUICKLOADER_SUCKAGE
+    write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
 
     # HACK remove?  Isn't this done in multiple places?
     cached_gem = File.join @gem_home, "cache", @gem.split(/\//).pop
@@ -481,7 +482,6 @@ TEXT
   def build_extensions
     return if @spec.extensions.empty?
     say "Building native extensions.  This could take a while..."
-    start_dir = Dir.pwd
     dest_path = File.join @gem_dir, @spec.require_paths.first
     ran_rake = false # only run rake once
 
@@ -502,29 +502,37 @@ TEXT
                   nil
                 end
 
-      begin
-        Dir.chdir File.join(@gem_dir, File.dirname(extension))
-        results = builder.build(extension, @gem_dir, dest_path, results)
 
-        say results.join("\n") if Gem.configuration.really_verbose
+      extension_dir = begin
+                        File.join @gem_dir, File.dirname(extension)
+                      rescue TypeError # extension == nil
+                        @gem_dir
+                      end
+                        
+
+      begin
+        Dir.chdir extension_dir do
+          results = builder.build(extension, @gem_dir, dest_path, results)
 
+          say results.join("\n") if Gem.configuration.really_verbose
+        end
       rescue
         results = results.join "\n"
 
-        File.open('gem_make.out', 'wb') { |f| f.puts results }
+        gem_make_out = File.join extension_dir, 'gem_make.out'
+
+        open gem_make_out, 'wb' do |io| io.puts results end
 
         message = <<-EOF
 ERROR: Failed to build gem native extension.
 
-#{results}
+        #{results}
 
 Gem files will remain installed in #{@gem_dir} for inspection.
-Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
-        EOF
+Results logged to #{gem_make_out}
+EOF
 
         raise ExtensionBuildError, message
-      ensure
-        Dir.chdir start_dir
       end
     end
   end
diff --git a/lib/rubygems/installer_test_case.rb b/lib/rubygems/installer_test_case.rb
new file mode 100644
index 0000000000..c1f86d547b
--- /dev/null
+++ b/lib/rubygems/installer_test_case.rb
@@ -0,0 +1,142 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
+require 'rubygems/test_case'
+require 'rubygems/installer'
+
+class Gem::Installer
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_accessor :gem_dir
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :format
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :gem_home
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :env_shebang
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :ignore_dependencies
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :format_executable
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :security_policy
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :spec
+
+  ##
+  # Available through requiring rubygems/installer_test_case
+
+  attr_writer :wrappers
+end
+
+##
+# A test case for Gem::Installer.
+
+class Gem::InstallerTestCase < Gem::TestCase
+
+  def setup
+    super
+
+    @spec = quick_gem 'a'
+
+    @gem = File.join @tempdir, @spec.file_name
+
+    @installer = util_installer @spec, @gem, @gemhome
+
+    @user_spec = quick_gem 'b'
+    @user_gem = File.join @tempdir, @user_spec.file_name
+
+    @user_installer = util_installer @user_spec, @user_gem, Gem.user_dir
+    @user_installer.gem_dir = File.join(Gem.user_dir, 'gems',
+                                        @user_spec.full_name)
+  end
+
+  def util_gem_bindir(version = '2')
+    File.join util_gem_dir(version), "bin"
+  end
+
+  def util_gem_dir(version = '2')
+    File.join @gemhome, "gems", "a-#{version}" # HACK
+  end
+
+  def util_inst_bindir
+    File.join @gemhome, "bin"
+  end
+
+  def util_make_exec(version = '2', shebang = "#!/usr/bin/ruby")
+    @spec.executables = ["my_exec"]
+
+    FileUtils.mkdir_p util_gem_bindir(version)
+    exec_path = File.join util_gem_bindir(version), "my_exec"
+    File.open exec_path, 'w' do |f|
+      f.puts shebang
+    end
+  end
+
+  def util_setup_gem(ui = @ui) # HACK fix use_ui to make this automatic
+    @spec.files = File.join('lib', 'code.rb')
+    @spec.executables << 'executable'
+    @spec.extensions << File.join('ext', 'a', 'mkrf_conf.rb')
+
+    Dir.chdir @tempdir do
+      FileUtils.mkdir_p 'bin'
+      FileUtils.mkdir_p 'lib'
+      FileUtils.mkdir_p File.join('ext', 'a')
+      File.open File.join('bin', 'executable'), 'w' do |f| f.puts '1' end
+      File.open File.join('lib', 'code.rb'), 'w' do |f| f.puts '1' end
+      File.open File.join('ext', 'a', 'mkrf_conf.rb'), 'w' do |f|
+        f << <<-EOF
+          File.open 'Rakefile', 'w' do |rf| rf.puts "task :default" end
+        EOF
+      end
+
+      use_ui ui do
+        FileUtils.rm @gem
+        Gem::Builder.new(@spec).build
+      end
+    end
+
+    @installer = Gem::Installer.new @gem
+  end
+
+  def util_installer(spec, gem_path, gem_home)
+    util_build_gem spec
+    FileUtils.mv File.join(@gemhome, 'cache', spec.file_name),
+                 @tempdir
+
+    installer = Gem::Installer.new gem_path
+    installer.gem_dir = util_gem_dir
+    installer.gem_home = gem_home
+    installer.spec = spec
+
+    installer
+  end
+
+end
+
diff --git a/lib/rubygems/mock_gem_ui.rb b/lib/rubygems/mock_gem_ui.rb
new file mode 100644
index 0000000000..f45f769b38
--- /dev/null
+++ b/lib/rubygems/mock_gem_ui.rb
@@ -0,0 +1,69 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
+require 'stringio'
+require 'rubygems/user_interaction'
+
+##
+# This Gem::StreamUI subclass records input and output to StringIO for
+# retrieval during tests.
+
+class Gem::MockGemUi < Gem::StreamUI
+  class TermError < RuntimeError; end
+
+  module TTY
+
+    attr_accessor :tty
+
+    def tty?()
+      @tty = true unless defined?(@tty)
+      @tty
+    end
+
+    def noecho
+      yield self
+    end
+  end
+
+  def initialize(input = "")
+    ins = StringIO.new input
+    outs = StringIO.new
+    errs = StringIO.new
+
+    ins.extend TTY
+    outs.extend TTY
+    errs.extend TTY
+
+    super ins, outs, errs
+
+    @terminated = false
+  end
+
+  def input
+    @ins.string
+  end
+
+  def output
+    @outs.string
+  end
+
+  def error
+    @errs.string
+  end
+
+  def terminated?
+    @terminated
+  end
+
+  def terminate_interaction(status=0)
+    @terminated = true
+
+    raise TermError unless status == 0
+    raise Gem::SystemExitException, status
+  end
+
+end
+
diff --git a/lib/rubygems/package/tar_test_case.rb b/lib/rubygems/package/tar_test_case.rb
new file mode 100644
index 0000000000..5970756ac8
--- /dev/null
+++ b/lib/rubygems/package/tar_test_case.rb
@@ -0,0 +1,143 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
+require 'rubygems/test_case'
+require 'rubygems/package'
+
+##
+# A test case for Gem::Package::Tar* classes
+
+class Gem::Package::TarTestCase < Gem::TestCase
+
+  def ASCIIZ(str, length)
+    str + "\0" * (length - str.length)
+  end
+
+  def SP(s)
+    s + " "
+  end
+
+  def SP_Z(s)
+    s + " \0"
+  end
+
+  def Z(s)
+    s + "\0"
+  end
+
+  def assert_headers_equal(expected, actual)
+    expected = expected.to_s unless String === expected
+    actual = actual.to_s unless String === actual
+
+    fields = %w[
+      name 100
+      mode 8
+      uid 8
+      gid 8
+      size 12
+      mtime 12
+      checksum 8
+      typeflag 1
+      linkname 100
+      magic 6
+      version 2
+      uname 32
+      gname 32
+      devmajor 8
+      devminor 8
+      prefix 155
+    ]
+
+    offset = 0
+
+    until fields.empty? do
+      name = fields.shift
+      length = fields.shift.to_i
+
+      if name == "checksum" then
+        chksum_off = offset
+        offset += length
+        next
+      end
+
+      assert_equal expected[offset, length], actual[offset, length],
+                   "Field #{name} of the tar header differs."
+
+      offset += length
+    end
+
+    assert_equal expected[chksum_off, 8], actual[chksum_off, 8]
+  end
+
+  def calc_checksum(header)
+    sum = header.unpack("C*").inject{|s,a| s + a}
+    SP(Z(to_oct(sum, 6)))
+  end
+
+  def header(type, fname, dname, length, mode, checksum = nil)
+    checksum ||= " " * 8
+
+    arr = [                  # struct tarfile_entry_posix
+      ASCIIZ(fname, 100),    # char name[100];     ASCII + (Z unless filled)
+      Z(to_oct(mode, 7)),    # char mode[8];       0 padded, octal null
+      Z(to_oct(0, 7)),       # char uid[8];        ditto
+      Z(to_oct(0, 7)),       # char gid[8];        ditto
+      Z(to_oct(length, 11)), # char size[12];      0 padded, octal, null
+      Z(to_oct(0, 11)),      # char mtime[12];     0 padded, octal, null
+      checksum,              # char checksum[8];   0 padded, octal, null, space
+      type,                  # char typeflag[1];   file: "0"  dir: "5"
+      "\0" * 100,            # char linkname[100]; ASCII + (Z unless filled)
+      "ustar\0",             # char magic[6];      "ustar\0"
+      "00",                  # char version[2];    "00"
+      ASCIIZ("wheel", 32),   # char uname[32];     ASCIIZ
+      ASCIIZ("wheel", 32),   # char gname[32];     ASCIIZ
+      Z(to_oct(0, 7)),       # char devmajor[8];   0 padded, octal, null
+      Z(to_oct(0, 7)),       # char devminor[8];   0 padded, octal, null
+      ASCIIZ(dname, 155)     # char prefix[155];   ASCII + (Z unless filled)
+    ]
+
+    format = "C100C8C8C8C12C12C8CC100C6C2C32C32C8C8C155"
+    h = if RUBY_VERSION >= "1.9" then
+          arr.join
+        else
+          arr = arr.join("").split(//).map{|x| x[0]}
+          arr.pack format
+        end
+    ret = h + "\0" * (512 - h.size)
+    assert_equal(512, ret.size)
+    ret
+  end
+
+  def tar_dir_header(name, prefix, mode)
+    h = header("5", name, prefix, 0, mode)
+    checksum = calc_checksum(h)
+    header("5", name, prefix, 0, mode, checksum)
+  end
+
+  def tar_file_header(fname, dname, mode, length)
+    h = header("0", fname, dname, length, mode)
+    checksum = calc_checksum(h)
+    header("0", fname, dname, length, mode, checksum)
+  end
+
+  def to_oct(n, pad_size)
+    "%0#{pad_size}o" % n
+  end
+
+  def util_entry(tar)
+    io = TempIO.new tar
+
+    header = Gem::Package::TarHeader.from io
+
+    Gem::Package::TarReader::Entry.new header, io
+  end
+
+  def util_dir_entry
+    util_entry tar_dir_header("foo", "bar", 0)
+  end
+
+end
+
diff --git a/lib/rubygems/require_paths_builder.rb b/lib/rubygems/require_paths_builder.rb
index 61bc1af920..2ccfb32083 100644
--- a/lib/rubygems/require_paths_builder.rb
+++ b/lib/rubygems/require_paths_builder.rb
@@ -20,5 +20,5 @@ module Gem::RequirePathsBuilder
       file.puts spec.bindir if spec.bindir
     end
   end
-end if QUICKLOADER_SUCKAGE
+end if Gem::QUICKLOADER_SUCKAGE
 
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index 56584adc07..f66288498b 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -336,7 +336,7 @@ class Gem::Specification
   end
 
   ##
-  # List of depedencies that will automatically be activated at runtime.
+  # List of dependencies that will automatically be activated at runtime.
 
   def runtime_dependencies
     dependencies.select { |d| d.type == :runtime || d.type == nil }
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
new file mode 100644
index 0000000000..447a30f780
--- /dev/null
+++ b/lib/rubygems/test_case.rb
@@ -0,0 +1,745 @@
+######################################################################
+# This file is imported from the rubygems project.
+# DO NOT make modifications in this repo. They _will_ be reverted!
+# File a patch instead and assign it to Ryan Davis or Eric Hodel.
+######################################################################
+
+at_exit { $SAFE = 1 }
+
+if defined? Gem::QuickLoader
+  Gem::QuickLoader.load_full_rubygems_library
+else
+  require 'rubygems'
+end
+
+begin
+  gem 'minitest'
+rescue Gem::LoadError
+end
+
+require 'minitest/autorun'
+require 'fileutils'
+require 'tmpdir'
+require 'uri'
+require 'rubygems/package'
+require 'rubygems/test_utilities'
+require 'pp'
+require 'yaml'
+require 'zlib'
+
+begin
+  YAML::ENGINE.yamler = 'psych'
+rescue LoadError
+end if YAML.const_defined? :ENGINE
+
+begin
+  gem 'rdoc'
+rescue Gem::LoadError
+end
+
+require 'rdoc/rdoc'
+
+require 'rubygems/mock_gem_ui'
+
+module Gem
+
+  ##
+  # Allows setting the gem path searcher.  This method is available when
+  # requiring 'rubygems/test_case'
+
+  def self.searcher=(searcher)
+    @searcher = searcher
+  end
+
+  ##
+  # Allows setting the default SourceIndex.  This method is available when
+  # requiring 'rubygems/test_case'
+
+  def self.source_index=(si)
+    @@source_index = si
+  end
+
+  ##
+  # Allows toggling Windows behavior.  This method is available when requiring
+  # 'rubygems/test_case'
+
+  def self.win_platform=(val)
+    @@win_platform = val
+  end
+
+  ##
+  # Allows setting path to ruby.  This method is available when requiring
+  # 'rubygems/test_case'
+
+  def self.ruby= ruby
+    @ruby = ruby
+  end
+
+  ##
+  # When rubygems/test_case is required the default user interaction is a
+  # MockGemUi.
+
+  module DefaultUserInteraction
+    @ui = Gem::MockGemUi.new
+  end
+end
+
+##
+# RubyGemTestCase provides a variety of methods for testing rubygems and
+# gem-related behavior in a sandbox.  Through RubyGemTestCase you can install
+# and uninstall gems, fetch remote gems through a stub fetcher and be assured
+# your normal set of gems is not affected.
+#
+# Tests are always run at a safe level of 1.
+
+class Gem::TestCase < MiniTest::Unit::TestCase
+
+  include Gem::DefaultUserInteraction
+
+  undef_method :default_test if instance_methods.include? 'default_test' or
+                                instance_methods.include? :default_test
+
+  ##
+  # #setup prepares a sandboxed location to install gems.  All installs are
+  # directed to a temporary directory.  All install plugins are removed.
+  #
+  # If the +RUBY+ environment variable is set the given path is used for
+  # Gem::ruby.  The local platform is set to <tt>i386-mswin32</tt> for Windows
+  # or <tt>i686-darwin8.10.1</tt> otherwise.
+  #
+  # If the +KEEP_FILES+ environment variable is set the files will not be
+  # removed from <tt>/tmp/test_rubygems_#{$$}.#{Time.now.to_i}</tt>.
+
+  def setup
+    super
+
+    @orig_gem_home = ENV['GEM_HOME']
+    @orig_gem_path = ENV['GEM_PATH']
+
+    @ui = Gem::MockGemUi.new
+    tmpdir = nil
+    Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
+    if ENV['KEEP_FILES'] then
+      @tempdir = File.join tmpdir, "test_rubygems_#{$$}.#{Time.now.to_i}"
+    else
+      @tempdir = File.join tmpdir, "test_rubygems_#{$$}"
+    end
+    @tempdir.untaint
+    @gemhome  = File.join @tempdir, 'gemhome'
+    @userhome = File.join @tempdir, 'userhome'
+
+    Gem.ensure_gem_subdirectories @gemhome
+
+    @orig_ruby = if ruby = ENV['RUBY'] then
+                   Gem.class_eval { ruby, @ruby = @ruby, ruby }
+                   ruby
+                 end
+
+    Gem.ensure_gem_subdirectories @gemhome
+
+    @orig_ENV_HOME = ENV['HOME']
+    ENV['HOME'] = @userhome
+    Gem.instance_variable_set :@user_home, nil
+
+    FileUtils.mkdir_p @gemhome
+    FileUtils.mkdir_p @userhome
+
+    Gem.use_paths(@gemhome)
+    Gem.loaded_specs.clear
+
+    Gem.configuration.verbose = true
+    Gem.configuration.update_sources = true
+
+    @gem_repo = "http://gems.example.com/"
+    @uri = URI.parse @gem_repo
+    Gem.sources.replace [@gem_repo]
+
+    Gem::SpecFetcher.fetcher = nil
+
+    @orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
+    Gem::ConfigMap[:BASERUBY] = Gem::ConfigMap[:ruby_install_name]
+
+    @orig_arch = Gem::ConfigMap[:arch]
+
+    if win_platform?
+      util_set_arch 'i386-mswin32'
+    else
+      util_set_arch 'i686-darwin8.10.1'
+    end
+
+    @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
+
+    @private_key = File.expand_path('../../../test/rubygems/private_key.pem',
+                                    __FILE__)
+    @public_cert = File.expand_path('../../../test/rubygems/public_cert.pem',
+                                    __FILE__)
+
+    Gem.post_build_hooks.clear
+    Gem.post_install_hooks.clear
+    Gem.post_uninstall_hooks.clear
+    Gem.pre_install_hooks.clear
+    Gem.pre_uninstall_hooks.clear
+
+    Gem.post_build do |installer|
+      @post_build_hook_arg = installer
+      true
+    end
+
+    Gem.post_install do |installer|
+      @post_install_hook_arg = installer
+    end
+
+    Gem.post_uninstall do |uninstaller|
+      @post_uninstall_hook_arg = uninstaller
+    end
+
+    Gem.pre_install do |installer|
+      @pre_install_hook_arg = installer
+      true
+    end
+
+    Gem.pre_uninstall do |uninstaller|
+      @pre_uninstall_hook_arg = uninstaller
+    end
+
+    @orig_LOAD_PATH = $LOAD_PATH.dup
+  end
+
+  ##
+  # #teardown restores the process to its original state and removes the
+  # tempdir unless the +KEEP_FILES+ environment variable was set.
+
+  def teardown
+    $LOAD_PATH.replace @orig_LOAD_PATH
+
+    Gem::ConfigMap[:BASERUBY] = @orig_BASERUBY
+    Gem::ConfigMap[:arch] = @orig_arch
+
+    if defined? Gem::RemoteFetcher then
+      Gem::RemoteFetcher.fetcher = nil
+    end
+
+    FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']
+
+    ENV['GEM_HOME'] = @orig_gem_home
+    ENV['GEM_PATH'] = @orig_gem_path
+
+    Gem.clear_paths
+
+    _ = @orig_ruby
+    Gem.class_eval { @ruby = _ } if _
+
+    if @orig_ENV_HOME then
+      ENV['HOME'] = @orig_ENV_HOME
+    else
+      ENV.delete 'HOME'
+    end
+  end
+
+  ##
+  # Builds and installs the Gem::Specification +spec+
+
+  def install_gem spec
+    require 'rubygems/installer'
+
+    use_ui Gem::MockGemUi.new do
+      Dir.chdir @tempdir do
+        Gem::Builder.new(spec).build
+      end
+    end
+
+    gem = File.join(@tempdir, spec.file_name).untaint
+
+    Gem::Installer.new(gem, :wrappers => true).install
+  end
+
+  ##
+  # Uninstalls the Gem::Specification +spec+
+  def uninstall_gem spec
+    require 'rubygems/uninstaller'
+
+    uninstaller = Gem::Uninstaller.new spec.name, :executables => true,
+                 :user_install => true
+    uninstaller.uninstall
+  end
+
+  ##
+  # Enables pretty-print for all tests
+
+  def mu_pp(obj)
+    s = ''
+    s = PP.pp obj, s
+    s = s.force_encoding(Encoding.default_external) if defined? Encoding
+    s.chomp
+  end
+
+  ##
+  # Reads a Marshal file at +path+
+
+  def read_cache(path)
+    open path.dup.untaint, 'rb' do |io|
+      Marshal.load io.read
+    end
+  end
+
+  ##
+  # Reads a binary file at +path+
+
+  def read_binary(path)
+    Gem.read_binary path
+  end
+
+  ##
+  # Writes a binary file to +path+ which is relative to +@gemhome+
+
+  def write_file(path)
+    path = File.join @gemhome, path
+    dir = File.dirname path
+    FileUtils.mkdir_p dir
+
+    open path, 'wb' do |io|
+      yield io if block_given?
+    end
+
+    path
+  end
+
+  ##
+  # Creates a Gem::Specification with a minimum of extra work.  +name+ and
+  # +version+ are the gem's name and version,  platform, author, email,
+  # homepage, summary and description are defaulted.  The specification is
+  # yielded for customization.
+  #
+  # The gem is added to the installed gems in +@gemhome+ and to the current
+  # source_index.
+  #
+  # Use this with #write_file to build an installed gem.
+
+  def quick_gem(name, version='2')
+    require 'rubygems/specification'
+
+    spec = Gem::Specification.new do |s|
+      s.platform = Gem::Platform::RUBY
+      s.name = name
+      s.version = version
+      s.author = 'A User'
+      s.email = 'example@example.com'
+      s.homepage = 'http://example.com'
+      s.has_rdoc = true
+      s.summary = "this is a summary"
+      s.description = "This is a test description"
+
+      yield(s) if block_given?
+    end
+
+    path = File.join "specifications", spec.spec_name
+    written_path = write_file path do |io|
+      io.write(spec.to_ruby)
+    end
+
+    spec.loaded_from = written_path
+
+    Gem.source_index.add_spec spec
+
+    return spec
+  end
+
+  ##
+  # Builds a gem from +spec+ and places it in <tt>File.join @gemhome,
+  # 'cache'</tt>.  Automatically creates files based on +spec.files+
+
+  def util_build_gem(spec)
+    dir = File.join(@gemhome, 'gems', spec.full_name)
+    FileUtils.mkdir_p dir
+
+    Dir.chdir dir do
+      spec.files.each do |file|
+        next if File.exist? file
+        FileUtils.mkdir_p File.dirname(file)
+        File.open file, 'w' do |fp| fp.puts "# #{file}" end
+      end
+
+      use_ui Gem::MockGemUi.new do
+        Gem::Builder.new(spec).build
+      end
+
+      FileUtils.mv spec.file_name,
+                   File.join(@gemhome, 'cache', "#{spec.original_name}.gem")
+    end
+  end
+
+  ##
+  # Removes all installed gems from +@gemhome+.
+
+  def util_clear_gems
+    FileUtils.rm_r File.join(@gemhome, 'gems')
+    FileUtils.rm_r File.join(@gemhome, 'specifications')
+    Gem.source_index.refresh!
+  end
+
+  ##
+  # Creates a gem with +name+, +version+ and +deps+.  The specification will
+  # be yielded before gem creation for customization.  The gem will be placed
+  # in <tt>File.join @tempdir, 'gems'</tt>.  The specification and .gem file
+  # location are returned.
+
+  def util_gem(name, version, deps = nil, &block)
+    if deps then
+      block = proc do |s|
+        deps.each do |n, req|
+          s.add_dependency n, (req || '>= 0')
+        end
+      end
+    end
+
+    spec = quick_gem(name, version, &block)
+
+    util_build_gem spec
+
+    cache_file = File.join @tempdir, 'gems', "#{spec.original_name}.gem"
+    FileUtils.mv File.join(@gemhome, 'cache', "#{spec.original_name}.gem"),
+                 cache_file
+    FileUtils.rm File.join(@gemhome, 'specifications', spec.spec_name)
+
+    spec.loaded_from = nil
+    spec.loaded = false
+
+    [spec, cache_file]
+  end
+
+  ##
+  # Gzips +data+.
+
+  def util_gzip(data)
+    out = StringIO.new
+
+    Zlib::GzipWriter.wrap out do |io|
+      io.write data
+    end
+
+    out.string
+  end
+
+  ##
+  # Creates several default gems which all have a lib/code.rb file.  The gems
+  # are not installed but are available in the cache dir.
+  #
+  # +@a1+:: gem a version 1, this is the best-described gem.
+  # +@a2+:: gem a version 2
+  # +@a3a:: gem a version 3.a
+  # +@a_evil9+:: gem a_evil version 9, use this to ensure similarly-named gems
+  #              don't collide with a.
+  # +@b2+:: gem b version 2
+  # +@c1_2+:: gem c version 1.2
+  # +@pl1+:: gem pl version 1, this gem has a legacy platform of i386-linux.
+  #
+  # Additional +prerelease+ gems may also be created:
+  #
+  # +@a2_pre+:: gem a version 2.a
+
+  def util_make_gems(prerelease = false)
+    @a1 = quick_gem 'a', '1' do |s|
+      s.files = %w[lib/code.rb]
+      s.require_paths = %w[lib]
+      s.date = Gem::Specification::TODAY - 86400
+      s.homepage = 'http://a.example.com'
+      s.email = %w[example@example.com example2@example.com]
+      s.authors = %w[Example Example2]
+      s.description = <<-DESC
+This line is really, really long.  So long, in fact, that it is more than eighty characters long!  The purpose of this line is for testing wrapping behavior because sometimes people don't wrap their text to eighty characters.  Without the wrapping, the text might not look good in the RSS feed.
+
+Also, a list:
+  * An entry that's actually kind of sort
+  * an entry that's really long, which will probably get wrapped funny.  That's ok, somebody wasn't thinking straight when they made it more than eighty characters.
+      DESC
+    end
+
+    init = proc do |s|
+      s.files = %w[lib/code.rb]
+      s.require_paths = %w[lib]
+    end
+
+    @a2 = quick_gem('a', '2', &init)
+    @a3a = quick_gem('a', '3.a', &init)
+    @a_evil9 = quick_gem('a_evil', '9', &init)
+    @b2 = quick_gem('b', '2', &init)
+    @c1_2   = quick_gem('c', '1.2',   &init)
+    @pl1     = quick_gem 'pl', '1' do |s| # l for legacy
+      s.files = %w[lib/code.rb]
+      s.require_paths = %w[lib]
+      s.platform = Gem::Platform.new 'i386-linux'
+      s.instance_variable_set :@original_platform, 'i386-linux'
+    end
+
+    if prerelease
+      @a2_pre = quick_gem('a', '2.a', &init)
+      write_file File.join(*%W[gems #{@a2_pre.original_name} lib code.rb])
+      util_build_gem @a2_pre
+    end
+
+    write_file File.join(*%W[gems #{@a1.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@a2.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@a3a.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@b2.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@c1_2.original_name} lib code.rb])
+    write_file File.join(*%W[gems #{@pl1.original_name} lib code.rb])
+
+    [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2, @pl1].each do |spec|
+      util_build_gem spec
+    end
+
+    FileUtils.rm_r File.join(@gemhome, 'gems', @pl1.original_name)
+
+    Gem.source_index = nil
+  end
+
+  ##
+  # Set the platform to +arch+
+
+  def util_set_arch(arch)
+    Gem::ConfigMap[:arch] = arch
+    platform = Gem::Platform.new arch
+
+    Gem.instance_variable_set :@platforms, nil
+    Gem::Platform.instance_variable_set :@local, nil
+
+    platform
+  end
+
+  ##
+  # Sets up a fake fetcher using the gems from #util_make_gems.  Optionally
+  # additional +prerelease+ gems may be included.
+  #
+  # Gems created by this method may be fetched using Gem::RemoteFetcher.
+
+  def util_setup_fake_fetcher(prerelease = false)
+    require 'zlib'
+    require 'socket'
+    require 'rubygems/remote_fetcher'
+
+    @fetcher = Gem::FakeFetcher.new
+
+    util_make_gems(prerelease)
+
+    @all_gems = [@a1, @a2, @a3a, @a_evil9, @b2, @c1_2].sort
+    @all_gem_names = @all_gems.map { |gem| gem.full_name }
+
+    gem_names = [@a1.full_name, @a2.full_name, @a3a.full_name, @b2.full_name]
+    @gem_names = gem_names.sort.join("\n")
+
+    @source_index = Gem::SourceIndex.new
+    @source_index.add_spec @a1
+    @source_index.add_spec @a2
+    @source_index.add_spec @a3a
+    @source_index.add_spec @a_evil9
+    @source_index.add_spec @c1_2
+    @source_index.add_spec @a2_pre if prerelease
+
+    Gem::RemoteFetcher.fetcher = @fetcher
+  end
+
+  ##
+  # Sets up Gem::SpecFetcher to return information from the gems in +specs+.
+  # Best used with +@all_gems+ from #util_setup_fake_fetcher.
+
+  def util_setup_spec_fetcher(*specs)
+    specs = Hash[*specs.map { |spec| [spec.full_name, spec] }.flatten]
+    si = Gem::SourceIndex.new specs
+
+    spec_fetcher = Gem::SpecFetcher.fetcher
+
+    spec_fetcher.specs[@uri] = []
+    si.gems.sort_by { |_, spec| spec }.each do |_, spec|
+      spec_tuple = [spec.name, spec.version, spec.original_platform]
+      spec_fetcher.specs[@uri] << spec_tuple
+    end
+
+    spec_fetcher.latest_specs[@uri] = []
+    si.latest_specs.sort.each do |spec|
+      spec_tuple = [spec.name, spec.version, spec.original_platform]
+      spec_fetcher.latest_specs[@uri] << spec_tuple
+    end
+
+    spec_fetcher.prerelease_specs[@uri] = []
+    si.prerelease_specs.sort.each do |spec|
+      spec_tuple = [spec.name, spec.version, spec.original_platform]
+      spec_fetcher.prerelease_specs[@uri] << spec_tuple
+    end
+
+    (si.gems.merge si.prerelease_gems).sort_by { |_,spec| spec }.each do |_, spec|
+      path = "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{spec.original_name}.gemspec.rz"
+      data = Marshal.dump spec
+      data_deflate = Zlib::Deflate.deflate data
+      @fetcher.data[path] = data_deflate
+    end
+
+    si
+  end
+
+  ##
+  # Deflates +data+
+
+  def util_zip(data)
+    Zlib::Deflate.deflate data
+  end
+
+  ##
+  # Is this test being run on a Windows platform?
+
+  def self.win_platform?
+    Gem.win_platform?
+  end
+
+  ##
+  # Is this test being run on a Windows platform?
+
+  def win_platform?
+    Gem.win_platform?
+  end
+
+  ##
+  # Returns whether or not we're on a version of Ruby built with VC++ (or
+  # Borland) versus Cygwin, Mingw, etc.
+
+  def self.vc_windows?
+    RUBY_PLATFORM.match('mswin')
+  end
+
+  ##
+  # Returns whether or not we're on a version of Ruby built with VC++ (or
+  # Borland) versus Cygwin, Mingw, etc.
+
+  def vc_windows?
+    RUBY_PLATFORM.match('mswin')
+  end
+
+  ##
+  # Returns the make command for the current platform. For versions of Ruby
+  # built on MS Windows with VC++ or Borland it will return 'nmake'. On all
+  # other platforms, including Cygwin, it will return 'make'.
+
+  def self.make_command
+    ENV["make"] || (vc_windows? ? 'nmake' : 'make')
+  end
+
+  ##
+  # Returns the make command for the current platform. For versions of Ruby
+  # built on MS Windows with VC++ or Borland it will return 'nmake'. On all
+  # other platforms, including Cygwin, it will return 'make'.
+
+  def make_command
+    ENV["make"] || (vc_windows? ? 'nmake' : 'make')
+  end
+
+  ##
+  # Returns whether or not the nmake command could be found.
+
+  def nmake_found?
+    system('nmake /? 1>NUL 2>&1')
+  end
+
+  ##
+  # Allows tests to use a random (but controlled) port number instead of
+  # a hardcoded one. This helps CI tools when running parallels builds on
+  # the same builder slave.
+
+  def self.process_based_port
+    @@process_based_port ||= 8000 + $$ % 1000
+  end
+
+  ##
+  # See ::process_based_port
+
+  def process_based_port
+    self.class.process_based_port
+  end
+
+  ##
+  # Allows the proper version of +rake+ to be used for the test.
+
+  def build_rake_in
+    gem_ruby = Gem.ruby
+    Gem.ruby = @@ruby
+    env_rake = ENV["rake"]
+    ENV["rake"] = @@rake
+    yield @@rake
+  ensure
+    Gem.ruby = gem_ruby
+    if env_rake
+      ENV["rake"] = env_rake
+    else
+      ENV.delete("rake")
+    end
+  end
+
+  ##
+  # Finds the path to the ruby executable
+
+  def self.rubybin
+    ruby = ENV["RUBY"]
+    return ruby if ruby
+    ruby = "ruby"
+    rubyexe = "#{ruby}.exe"
+
+    3.times do
+      if File.exist? ruby and File.executable? ruby and !File.directory? ruby
+        return File.expand_path(ruby)
+      end
+      if File.exist? rubyexe and File.executable? rubyexe
+        return File.expand_path(rubyexe)
+      end
+      ruby = File.join("..", ruby)
+    end
+
+    begin
+      require "rbconfig"
+      File.join(RbConfig::CONFIG["bindir"],
+                RbConfig::CONFIG["ruby_install_name"] +
+                RbConfig::CONFIG["EXEEXT"])
+    rescue LoadError
+      "ruby"
+    end
+  end
+
+  @@ruby = rubybin
+  env_rake = ENV['rake']
+  ruby19_rake = File.expand_path("../../../bin/rake", __FILE__)
+  @@rake = if env_rake then
+             ENV["rake"]
+           elsif File.exist? ruby19_rake then
+             @@ruby + " " + ruby19_rake
+           else
+             'rake'
+           end
+
+  ##
+  # Construct a new Gem::Dependency.
+
+  def dep name, *requirements
+    Gem::Dependency.new name, *requirements
+  end
+
+  ##
+  # Constructs a new Gem::Requirement.
+
+  def req *requirements
+    return requirements.first if Gem::Requirement === requirements.first
+    Gem::Requirement.create requirements
+  end
+
+  ##
+  # Constructs a new Gem::Specification.
+
+  def spec name, version, &block
+    Gem::Specification.new name, v(version), &block
+  end
+
+  ##
+  # Construct a new Gem::Version.
+
+  def v string
+    Gem::Version.create string
+  end
+
+end
+
diff --git a/lib/rubygems/uninstaller.rb b/lib/rubygems/uninstaller.rb
index 185926e949..df45771846 100644
--- a/lib/rubygems/uninstaller.rb
+++ b/lib/rubygems/uninstaller.rb
@@ -127,43 +127,42 @@ class Gem::Uninstaller
   # +gemspec+.
 
   def remove_executables(spec)
-    return if spec.nil?
+    return if spec.nil? or spec.executables.empty?
 
-    unless spec.executables.empty? then
-      bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
+    bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
 
-      list = @source_index.find_name(spec.name).delete_if { |s|
-        s.version == spec.version
-      }
+    list = @source_index.find_name(spec.name).delete_if { |s|
+      s.version == spec.version
+    }
 
-      executables = spec.executables.clone
+    executables = spec.executables.clone
 
-      list.each do |s|
-        s.executables.each do |exe_name|
-          executables.delete exe_name
-        end
+    list.each do |s|
+      s.executables.each do |exe_name|
+        executables.delete exe_name
       end
+    end
 
-      return if executables.empty?
+    return if executables.empty?
 
-      answer = if @force_executables.nil? then
-                 ask_yes_no("Remove executables:\n" \
-                            "\t#{spec.executables.join(", ")}\n\nin addition to the gem?",
-                            true) # " # appease ruby-mode - don't ask
-               else
-                 @force_executables
-               end
+    remove = if @force_executables.nil? then
+               ask_yes_no("Remove executables:\n" \
+                          "\t#{spec.executables.join ', '}\n\n" \
+                          "in addition to the gem?",
+                          true)
+             else
+               @force_executables
+             end
 
-      unless answer then
-        say "Executables and scripts will remain installed."
-      else
-        raise Gem::FilePermissionError, bindir unless File.writable? bindir
+    unless remove then
+      say "Executables and scripts will remain installed."
+    else
+      raise Gem::FilePermissionError, bindir unless File.writable? bindir
 
-        spec.executables.each do |exe_name|
-          say "Removing #{exe_name}"
-          FileUtils.rm_f File.join(bindir, exe_name)
-          FileUtils.rm_f File.join(bindir, "#{exe_name}.bat")
-        end
+      spec.executables.each do |exe_name|
+        say "Removing #{exe_name}"
+        FileUtils.rm_f File.join(bindir, exe_name)
+        FileUtils.rm_f File.join(bindir, "#{exe_name}.bat")
       end
     end
   end
diff --git a/lib/rubygems/user_interaction.rb b/lib/rubygems/user_interaction.rb
index 06b847cf41..9822a23c35 100644
--- a/lib/rubygems/user_interaction.rb
+++ b/lib/rubygems/user_interaction.rb
@@ -72,7 +72,7 @@ module Gem::DefaultUserInteraction
 end
 
 ##
-# Make the default UI accessable without the "ui." prefix.  Classes
+# Make the default UI accessible without the "ui." prefix.  Classes
 # including this module may use the interaction methods on the default UI
 # directly.  Classes may also reference the ui and ui= methods.
 #
@@ -224,7 +224,7 @@ class Gem::StreamUI
     result
   end
 
-  if RUBY_VERSION >= "1.9" then
+  if RUBY_VERSION > '1.9.2' then
     ##
     # Ask for a password. Does not echo response to terminal.
 
@@ -477,12 +477,20 @@ class Gem::StreamUI
     end
 
     def fetch(file_name, total_bytes)
-      @file_name, @total_bytes = file_name, total_bytes
+      @file_name = file_name
+      @total_bytes = total_bytes.to_i
+      @units = @total_bytes.zero? ? 'B' : '%'
+
       update_display(false)
     end
 
     def update(bytes)
-      new_progress = ((bytes.to_f * 100) / total_bytes.to_f).ceil
+      new_progress = if @units == 'B' then
+                       bytes
+                     else
+                       ((bytes.to_f * 100) / total_bytes.to_f).ceil
+                     end
+
       return if new_progress == @progress
 
       @progress = new_progress
@@ -490,7 +498,7 @@ class Gem::StreamUI
     end
 
     def done
-      @progress = 100
+      @progress = 100 if @units == '%'
       update_display(true, true)
     end
 
@@ -498,8 +506,9 @@ class Gem::StreamUI
 
     def update_display(show_progress = true, new_line = false)
       return unless @out.tty?
-      if show_progress
-        @out.print "\rFetching: %s (%3d%%)" % [@file_name, @progress]
+
+      if show_progress then
+        @out.print "\rFetching: %s (%3d%s)" % [@file_name, @progress, @units]
       else
         @out.print "Fetching: %s" % @file_name
       end