rubygems-update 1.8.6 → 1.8.7

data/History.txt

@@ -1,16 +1,29 @@
-=== 1.8.6 / 2011-07-25
+# coding: UTF-8
 
-* 1 major enhancement:
+=== 1.8.7 / 2011-08-02
 
-  * Restore behavior of Gem::Specification#loaded?  Ruby Bug #5032
+* 5 bug fixes:
+  * Added missing require for `gem uninstall --format-executable`
+  * The correct name of the executable being uninstalled is now displayed with
+    --format-executable
+  * Fixed `gem unpack uninstalled_gem` default version picker
+  * RubyGems no longer claims a nonexistent gem can be uninstalled
+  * `gem which` no longer claims directories are requirable files
+  * `gem cleanup` continues cleaning up gems if one can't be uninstalled due
+    to permissions.  Issue #82
+  * Gem repository directories are no longer created world-writable.  Patch by
+    Sakuro OZAWA.  Ruby Bug #4930
+
+=== 1.8.6 / 2011-07-25
 
 * 1 minor enhancement:
 
   * Add autorequires and delay startup of RubyGems until require is called.
     See Ruby bug #4962
 
-* 1 bug fix:
+* 9 bug fixes:
 
+  * Restore behavior of Gem::Specification#loaded?  Ruby Bug #5032
   * Clean up SourceIndex.add_specs to not be so damn noisy. (tadman)
   * Added missing APPLE_GEM_HOME in paths.
   * Extend YAML::Syck::DefaultKey fixing to `marshal_dump` as well.

data/Manifest.txt

@@ -192,4 +192,3 @@ test/rubygems/test_gem_version.rb
 test/rubygems/test_gem_version_option.rb
 test/rubygems/test_kernel.rb
 util/CL2notes
-util/gem_prelude.rb

data/Rakefile

@@ -116,8 +116,7 @@ def rsync_with dir
     " --exclude '*.rej' --exclude '*.orig' --exclude 'lib/rubygems/defaults/*'"
   sh "rsync #{rsync_options} bin/gem             #{dir}/bin/gem"
   sh "rsync #{rsync_options} lib/                #{dir}/lib"
-  sh "rsync #{rsync_options} test/               #{dir}/test/rubygems"
-  sh "rsync #{rsync_options} util/gem_prelude.rb #{dir}/gem_prelude.rb"
+  sh "rsync #{rsync_options} test/               #{dir}/test"
 end
 
 def diff_with dir
@@ -128,11 +127,10 @@ def diff_with dir
   sh "diff #{diff_options} lib/rubygems        #{dir}/lib/rubygems;    true"
   sh "diff #{diff_options} lib/rbconfig        #{dir}/lib/rbconfig;    true"
   sh "diff #{diff_options} test                #{dir}/test/rubygems;   true"
-  sh "diff #{diff_options} util/gem_prelude.rb #{dir}/gem_prelude.rb;  true"
 end
 
-rubinius_dir = ENV['RUBINIUS_PATH'] || '../../../git/git.rubini.us/code'
-ruby_dir     = ENV['RUBY_PATH']     || '../../ruby/trunk'
+rubinius_dir = ENV['RUBINIUS_PATH'] || '../git.rubini.us/code'
+ruby_dir     = ENV['RUBY_PATH']     || '../../svn/ruby/trunk'
 
 desc "Updates Ruby HEAD with the currently checked-out copy of RubyGems."
 task :update_ruby do

data/lib/rubygems.rb

@@ -118,7 +118,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.8.6'
+  VERSION = '1.8.7'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -444,11 +444,16 @@ module Gem
   def self.ensure_gem_subdirectories dir = Gem.dir
     require 'fileutils'
 
+    old_umask = File.umask
+    File.umask old_umask | 022
+
     %w[cache doc gems specifications].each do |name|
       subdir = File.join dir, name
       next if File.exist? subdir
       FileUtils.mkdir_p subdir rescue nil # in case of perms issues -- lame
     end
+  ensure
+    File.umask old_umask
   end
 
   ##
@@ -1206,7 +1211,7 @@ end
 # Otherwise return a path to the share area as define by
 # "#{ConfigMap[:datadir]}/#{package_name}".
 
-def RbConfig.datadir(package_name)
+def RbConfig.datadir(package_name) # :nodoc:
   warn "#{Gem.location_of_caller.join ':'}:Warning: " \
     "RbConfig.datadir is deprecated and will be removed on or after " \
     "August 2011.  " \

data/lib/rubygems/commands/cleanup_command.rb

@@ -61,6 +61,8 @@ installed elsewhere in GEM_PATH the cleanup command won't touch it.
 
     deps = deplist.strongly_connected_components.flatten.reverse
 
+    original_path = Gem.path
+
     deps.each do |spec|
       if options[:dryrun] then
         say "Dry Run Mode: Would uninstall #{spec.full_name}"
@@ -74,20 +76,21 @@ installed elsewhere in GEM_PATH the cleanup command won't touch it.
           :version => "= #{spec.version}",
         }
 
-        if Gem.user_dir == spec.base_dir then
-          uninstall_options[:install_dir] = spec.base_dir
-        end
+        uninstall_options[:user_install] = Gem.user_dir == spec.base_dir
 
         uninstaller = Gem::Uninstaller.new spec.name, uninstall_options
 
         begin
           uninstaller.uninstall
         rescue Gem::DependencyRemovalException, Gem::InstallError,
-               Gem::GemNotInHomeException => e
+               Gem::GemNotInHomeException, Gem::FilePermissionError => e
           say "Unable to uninstall #{spec.full_name}:"
           say "\t#{e.class}: #{e.message}"
         end
       end
+
+      # Restore path Gem::Uninstaller may have change
+      Gem.use_paths(*original_path)
     end
 
     say "Clean Up Complete"

data/lib/rubygems/commands/setup_command.rb

@@ -124,7 +124,7 @@ By default, this RubyGems will install gem as:
                       open release_notes do |io|
                         text = io.gets '==='
                         text << io.gets('===')
-                        text[0...-3]
+                        text[0...-3].sub(/^# coding:.*?^=/m, '')
                       end
                     else
                       "Oh-no! Unable to find release notes!"

data/lib/rubygems/commands/which_command.rb

@@ -60,7 +60,7 @@ class Gem::Commands::WhichCommand < Gem::Command
     dirs.each do |dir|
       Gem.suffixes.each do |ext|
         full_path = File.join dir, "#{package_name}#{ext}"
-        if File.exist? full_path then
+        if File.exist? full_path and not File.directory? full_path then
           result << full_path
           return result unless options[:show_all]
         end

data/lib/rubygems/gem_openssl.rb

@@ -36,6 +36,8 @@ module Gem
   end
 end
 
+# :stopdoc:
+
 begin
   require 'openssl'
 
@@ -44,7 +46,7 @@ begin
 
   Gem.ssl_available = !!OpenSSL::Digest::SHA1
 
-  class OpenSSL::X509::Certificate # :nodoc:
+  class OpenSSL::X509::Certificate
     # Check the validity of this certificate.
     def check_validity(issuer_cert = nil, time = Time.now)
       ret = if @not_before && @not_before > time
@@ -66,8 +68,6 @@ rescue LoadError, StandardError
   Gem.ssl_available = false
 end
 
-# :stopdoc:
-
 module Gem::SSL
 
   # We make our own versions of the constants here.  This allows us
@@ -88,5 +88,3 @@ module Gem::SSL
 
 end
 
-# :startdoc:
-

data/lib/rubygems/installer.rb

@@ -434,6 +434,7 @@ class Gem::Installer
 
   def check_that_user_bin_dir_is_in_path
     user_bin_dir = @bin_dir || Gem.bindir(gem_home)
+    user_bin_dir.gsub!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
     unless ENV['PATH'].split(File::PATH_SEPARATOR).include? user_bin_dir then
       unless self.class.path_warning then
         alert_warning "You don't have #{user_bin_dir} in your PATH,\n\t  gem executables will not run."

data/lib/rubygems/remote_fetcher.rb

@@ -85,7 +85,7 @@ class Gem::RemoteFetcher
 
     return if found.empty?
 
-    spec, source_uri = found.first
+    spec, source_uri = found.sort_by { |(s,_)| s.version }.last
 
     download spec, source_uri
   end

data/lib/rubygems/requirement.rb

@@ -1,5 +1,7 @@
 require "rubygems/version"
 
+# :stopdoc:
+
 # Hack to handle syck's DefaultKey bug with psych
 #
 # Quick note! If/when psych loads in 1.9, it will redefine
@@ -19,6 +21,8 @@ module YAML
   end
 end
 
+# :startdoc:
+
 ##
 # A Requirement is a set of one or more version restrictions. It supports a
 # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.

data/lib/rubygems/test_case.rb

@@ -97,7 +97,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   undef_method :default_test if instance_methods.include? 'default_test' or
                                 instance_methods.include? :default_test
 
-  @@project_dir = Dir.pwd
+  @@project_dir = Dir.pwd unless defined?(@@project_dir)
 
   ##
   # #setup prepares a sandboxed location to install gems.  All installs are
@@ -116,6 +116,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     @orig_gem_home = ENV['GEM_HOME']
     @orig_gem_path = ENV['GEM_PATH']
 
+    @current_dir = Dir.pwd
     @ui = Gem::MockGemUi.new
 
     tmpdir = nil
@@ -222,7 +223,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       Gem::RemoteFetcher.fetcher = nil
     end
 
-    Dir.chdir @@project_dir
+    Dir.chdir @current_dir
 
     FileUtils.rm_rf @tempdir unless ENV['KEEP_FILES']
 
@@ -256,6 +257,25 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     Gem::Installer.new(gem, :wrappers => true).install
   end
 
+  ##
+  # Builds and installs the Gem::Specification +spec+ into the user dir
+
+  def install_gem_user 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, File.basename(spec.cache_file)).untaint
+
+    i = Gem::Installer.new(gem, :wrappers => true, :user_install => true)
+    i.install
+    i.spec
+  end
+
   ##
   # Uninstalls the Gem::Specification +spec+
   def uninstall_gem spec
@@ -677,12 +697,13 @@ Also, a list:
     end
 
     v = Gem.marshal_version
+
     Gem::Specification.each do |spec|
       path = "#{@gem_repo}quick/Marshal.#{v}/#{spec.original_name}.gemspec.rz"
       data = Marshal.dump spec
       data_deflate = Zlib::Deflate.deflate data
       @fetcher.data[path] = data_deflate
-    end
+    end unless Gem::RemoteFetcher === @fetcher # HACK for test_download_to_cache
 
     nil # force errors
   end

data/lib/rubygems/test_utilities.rb

@@ -139,6 +139,8 @@ end
 ##
 # A StringIO duck-typed class that uses Tempfile instead of String as the
 # backing store.
+#
+# This is available when rubygems/test_utilities is required.
 #--
 # This class was added to flush out problems in Rubinius' IO implementation.
 

data/lib/rubygems/uninstaller.rb

@@ -70,7 +70,7 @@ class Gem::Uninstaller
     list = Gem::Specification.find_all_by_name(@gem, @version)
 
     if list.empty? then
-      raise Gem::InstallError, "cannot uninstall, check `gem list -d #{@gem}`"
+      raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
 
     elsif list.size > 1 and @force_all then
       remove_all list
@@ -141,9 +141,11 @@ class Gem::Uninstaller
 
     return if executables.empty?
 
+    executables = executables.map { |exec| formatted_program_filename exec }
+
     remove = if @force_executables.nil? then
                ask_yes_no("Remove executables:\n" \
-                          "\t#{spec.executables.join ', '}\n\n" \
+                          "\t#{executables.join ', '}\n\n" \
                           "in addition to the gem?",
                           true)
              else
@@ -153,14 +155,17 @@ class Gem::Uninstaller
     unless remove then
       say "Executables and scripts will remain installed."
     else
-      bindir = @bin_dir || Gem.bindir(spec.base_dir)
+      bin_dir = @bin_dir || Gem.bindir(spec.base_dir)
 
-      raise Gem::FilePermissionError, bindir unless File.writable? bindir
+      raise Gem::FilePermissionError, bin_dir unless File.writable? bin_dir
 
-      spec.executables.each do |exe_name|
+      executables.each do |exe_name|
         say "Removing #{exe_name}"
-        FileUtils.rm_f File.join(bindir, formatted_program_filename(exe_name))
-        FileUtils.rm_f File.join(bindir, "#{formatted_program_filename(exe_name)}.bat")
+
+        exe_file = File.join bin_dir, exe_name
+
+        FileUtils.rm_f exe_file
+        FileUtils.rm_f "#{exe_file}.bat"
       end
     end
   end
@@ -257,6 +262,7 @@ class Gem::Uninstaller
 
   def formatted_program_filename(filename)
     if @format_executable then
+      require 'rubygems/installer'
       Gem::Installer.exec_format % File.basename(filename)
     else
       filename

data/lib/rubygems/user_interaction.rb

@@ -136,7 +136,7 @@ class Gem::StreamUI
   end
 
   def tty?
-    if RUBY_PLATFORM =~ /mingw|mswin/
+    if RUBY_VERSION < '1.9.3' and RUBY_PLATFORM =~ /mingw|mswin/ then
       @usetty
     else
       @usetty && @ins.tty?

data/test/rubygems/test_gem.rb

@@ -598,6 +598,20 @@ class TestGem < Gem::TestCase
     assert File.directory? File.join(@gemhome, "cache")
   end
 
+  def test_self_ensure_gem_directories_safe_permissions
+    FileUtils.rm_r @gemhome
+    Gem.use_paths @gemhome
+
+    old_umask = File.umask
+    File.umask 0
+    Gem.ensure_gem_subdirectories @gemhome
+
+    assert_equal 0, File::Stat.new(@gemhome).mode & 022
+    assert_equal 0, File::Stat.new(File.join(@gemhome, "cache")).mode & 022
+  ensure
+    File.umask old_umask
+  end unless win_platform?
+
   def test_self_ensure_gem_directories_missing_parents
     gemdir = File.join @tempdir, 'a/b/c/gemdir'
     FileUtils.rm_rf File.join(@tempdir, 'a') rescue nil
@@ -985,9 +999,9 @@ class TestGem < Gem::TestCase
     end
   end
 
-  if Gem.win_platform? then
+  if Gem.win_platform? && '1.9' > RUBY_VERSION
+    # Ruby 1.9 properly handles ~ path expansion, so no need to run such tests.
     def test_self_user_home_userprofile
-      skip 'Ruby 1.9 properly handles ~ path expansion' unless '1.9' > RUBY_VERSION
 
       Gem.clear_paths
 
@@ -1006,8 +1020,6 @@ class TestGem < Gem::TestCase
     end
 
     def test_self_user_home_user_drive_and_path
-      skip 'Ruby 1.9 properly handles ~ path expansion' unless '1.9' > RUBY_VERSION
-
       Gem.clear_paths
 
       # safe-keep env variables

data/test/rubygems/test_gem_commands_cleanup_command.rb

@@ -38,6 +38,44 @@ class TestGemCommandsCleanupCommand < Gem::TestCase
     refute_path_exists @b_1.gem_dir
   end
 
+  def test_execute_all_user
+    @a_1_1 = quick_spec 'a', '1.1'
+    @a_1_1 = install_gem_user @a_1_1 # pick up user install path
+
+    Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
+
+    assert_path_exists @a_1.gem_dir
+    assert_path_exists @a_1_1.gem_dir
+
+    @cmd.options[:args] = %w[a]
+
+    @cmd.execute
+
+    refute_path_exists @a_1.gem_dir
+    refute_path_exists @a_1_1.gem_dir
+  end
+
+  def test_execute_all_user_no_sudo
+    FileUtils.chmod 0555, @gemhome
+
+    @a_1_1 = quick_spec 'a', '1.1'
+    @a_1_1 = install_gem_user @a_1_1 # pick up user install path
+
+    Gem::Specification.dirs = [Gem.dir, Gem.user_dir]
+
+    assert_path_exists @a_1.gem_dir
+    assert_path_exists @a_1_1.gem_dir
+
+    @cmd.options[:args] = %w[a]
+
+    @cmd.execute
+
+    assert_path_exists @a_1.gem_dir
+    refute_path_exists @a_1_1.gem_dir
+  ensure
+    FileUtils.chmod 0755, @gemhome
+  end unless win_platform?
+
   def test_execute_dry_run
     @cmd.options[:args] = %w[a]
     @cmd.options[:dryrun] = true

data/test/rubygems/test_gem_commands_sources_command.rb

@@ -6,6 +6,8 @@ class TestGemCommandsSourcesCommand < Gem::TestCase
   def setup
     super
 
+    util_setup_fake_fetcher
+
     @cmd = Gem::Commands::SourcesCommand.new
 
     @new_repo = "http://beta-gems.example.com"

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -69,19 +69,6 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
     Gem::Installer.exec_format = nil
   end
 
-  def test_execute_not_installed
-    @cmd.options[:args] = ["foo"]
-    e = assert_raises Gem::InstallError do
-      use_ui @ui do
-        @cmd.execute
-      end
-    end
-
-    assert_match(/\Acannot uninstall, check `gem list -d foo`$/, e.message)
-    output = @ui.output.split "\n"
-    assert_empty output, "UI output should be empty after an uninstall error"
-  end
-
   def test_execute_prerelease
     @spec = quick_spec "pre", "2.b"
     @gem = File.join @tempdir, @spec.file_name

data/test/rubygems/test_gem_commands_which_command.rb

@@ -22,6 +22,20 @@ class TestGemCommandsWhichCommand < Gem::TestCase
     assert_equal '', @ui.error
   end
 
+  def test_execute_directory
+    @cmd.handle_options %w[directory]
+
+    use_ui @ui do
+      assert_raises Gem::MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    assert_equal '', @ui.output
+    assert_match %r%Can.t find ruby library file or shared library directory\n%,
+                 @ui.error
+  end
+
   def test_execute_one_missing
     # TODO: this test fails in isolation
 
@@ -53,7 +67,7 @@ class TestGemCommandsWhichCommand < Gem::TestCase
   end
 
   def util_foo_bar
-    files = %w[lib/foo_bar.rb Rakefile]
+    files = %w[lib/foo_bar.rb lib/directory/baz.rb Rakefile]
     @foo_bar = quick_spec 'foo_bar' do |gem|
       gem.files = files
     end

data/test/rubygems/test_gem_installer.rb

@@ -208,9 +208,10 @@ load Gem.bin_path('a', 'executable', version)
   end
 
   def test_generate_bin_bindir_with_user_install_warning
+    bin_dir = Gem.win_platform? ? File.expand_path(ENV["WINDIR"]) : "/usr/bin"
 
     options = {
-      :bin_dir => "/usr/bin",
+      :bin_dir => bin_dir,
       :install_dir => "/non/existant"
     }
 

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -346,6 +346,28 @@ gems:
     assert_equal 'unsupported URI scheme ftp', e.message
   end
 
+  def test_download_to_cache
+    @a2, @a2_gem = util_gem 'a', '2'
+
+    util_setup_spec_fetcher @a1, @a2
+    @fetcher.instance_variable_set :@a1, @a1
+    @fetcher.instance_variable_set :@a2, @a2
+    def @fetcher.fetch_path uri, mtime = nil, head = false
+      case uri.request_uri
+      when /#{@a1.spec_name}/ then
+        Gem.deflate Marshal.dump @a1
+      when /#{@a2.spec_name}/ then
+        Gem.deflate Marshal.dump @a2
+      else
+        uri.to_s
+      end
+    end
+
+    gem = Gem::RemoteFetcher.fetcher.download_to_cache dep 'a'
+
+    assert_equal @a2.file_name, File.basename(gem)
+  end
+
   def test_explicit_proxy
     use_ui @ui do
       fetcher = Gem::RemoteFetcher.new @proxy_uri

data/test/rubygems/test_gem_stream_ui.rb

@@ -35,7 +35,8 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask
-    skip 'TTY detection broken on windows' if Gem.win_platform?
+    skip 'TTY detection broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
     timeout(1) do
       expected_answer = "Arthur, King of the Britons"
@@ -46,7 +47,8 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_no_tty
-    skip 'TTY handling is broken on windows' if Gem.win_platform?
+    skip 'TTY detection broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
     @in.tty = false
 
@@ -57,7 +59,8 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password
-    skip 'Always uses $stdin on windows' if Gem.win_platform?
+    skip 'Always uses $stdin on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
     timeout(1) do
       expected_answer = "Arthur, King of the Britons"
@@ -68,7 +71,8 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_for_password_no_tty
-    skip 'TTY handling is broken on windows' if Gem.win_platform?
+    skip 'TTY handling is broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
     @in.tty = false
 
@@ -79,7 +83,8 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_yes_no_no_tty_with_default
-    skip 'TTY handling is broken on windows' if Gem.win_platform?
+    skip 'TTY handling is broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
     @in.tty = false
 
@@ -93,7 +98,8 @@ class TestGemStreamUI < Gem::TestCase
   end
 
   def test_ask_yes_no_no_tty_without_default
-    skip 'TTY handling is broken on windows' if Gem.win_platform?
+    skip 'TTY handling is broken on windows' if
+      Gem.win_platform? unless RUBY_VERSION > '1.9.2'
 
     @in.tty = false
 

data/test/rubygems/test_gem_uninstaller.rb

@@ -94,7 +94,7 @@ class TestGemUninstaller < Gem::InstallerTestCase
     exec_path = File.join Gem.user_dir, 'bin', 'foo-executable-bar'
     assert_equal false, File.exist?(exec_path), 'removed exec from bin dir'
 
-    assert_equal "Removing executable\n", @ui.output
+    assert_equal "Removing foo-executable-bar\n", @ui.output
   ensure
     Gem::Installer.exec_format = nil
   end
@@ -158,6 +158,16 @@ class TestGemUninstaller < Gem::InstallerTestCase
     assert_same uninstaller, @post_uninstall_hook_arg
   end
 
+  def test_uninstall_nonexistent
+    uninstaller = Gem::Uninstaller.new 'bogus', :executables => true
+
+    e = assert_raises Gem::InstallError do
+      uninstaller.uninstall
+    end
+
+    assert_equal 'gem "bogus" is not installed', e.message
+  end
+
   def test_uninstall_not_ok
     quick_gem 'z' do |s|
       s.add_runtime_dependency @spec.name

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 1
   - 8
-  - 6
-  version: 1.8.6
+  - 7
+  version: 1.8.7
 platform: ruby
 authors: 
 - Jim Weirich
@@ -15,9 +15,30 @@ authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
+  ZXQwHhcNMDcxMjIxMDIwNDE0WhcNMDgxMjIwMDIwNDE0WjBBMRAwDgYDVQQDDAdk
+  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
+  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
+  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
+  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
+  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
+  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
+  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
+  sCANiQ8BAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DANBgkqhkiG9w0BAQUFAAOCAQEAHagT4lfX
+  kP/hDaiwGct7XPuVGbrOsKRVD59FF5kETBxEc9UQ1clKWngf8JoVuEoKD774dW19
+  bU0GOVWO+J6FMmT/Cp7nuFJ79egMf/gy4gfUfQMuvfcr6DvZUPIs9P/TlK59iMYF
+  DIOQ3DxdF3rMzztNUCizN4taVscEsjCcgW6WkUJnGdqlu3OHWpQxZBJkBTjPCoc6
+  UW6on70SFPmAy/5Cq0OJNGEWBfgD9q7rrs/X8GGwUWqXb85RXnUVi/P8Up75E0ag
+  14jEc90kN+C7oI/AGCBN0j6JnEtYIEJZibjjDJTSMWlUKKkj30kq7hlUC2CepJ4v
+  x52qPcexcYZR7w==
+  -----END CERTIFICATE-----
 
-date: 2011-07-26 00:00:00 Z
+date: 2011-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -27,12 +48,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 1
         segments: 
         - 2
+        - 3
         - 1
-        - 0
-        version: 2.1.0
+        version: 2.3.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -132,14 +153,13 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 17
         segments: 
         - 2
         - 9
-        - 4
-        version: 2.9.4
+        version: "2.9"
   type: :development
   version_requirements: *id008
 description: |-
@@ -376,16 +396,17 @@ files:
 - test/rubygems/test_gem_version_option.rb
 - test/rubygems/test_kernel.rb
 - util/CL2notes
-- util/gem_prelude.rb
 - .gemtest
 homepage: http://rubygems.org
 licenses: []
 
+metadata: {}
+
 post_install_message: 
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.8.6 Documentation
+- --title=RubyGems 1.8.7 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -411,9 +432,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RubyGems is a package management framework for Ruby
 test_files: 
 - test/rubygems/test_config.rb

data/util/gem_prelude.rb

@@ -1,304 +0,0 @@
-# depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
-# vim: filetype=ruby
-
-# NOTICE: Ruby is during initialization here.
-# * Encoding.default_external does not reflects -E.
-# * Should not expect Encoding.default_internal.
-# * Locale encoding is available.
-
-if defined?(Gem) then
-
-  # :stopdoc:
-
-  module Kernel
-
-    def gem(gem_name, *requirements)
-      Gem.push_gem_version_on_load_path(gem_name, *requirements)
-    end
-    private :gem
-  end
-
-  module Gem
-
-    ConfigMap = {
-      :EXEEXT            => RbConfig::CONFIG["EXEEXT"],
-      :RUBY_SO_NAME      => RbConfig::CONFIG["RUBY_SO_NAME"],
-      :arch              => RbConfig::CONFIG["arch"],
-      :bindir            => RbConfig::CONFIG["bindir"],
-      :libdir            => RbConfig::CONFIG["libdir"],
-      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
-      :ruby_version      => RbConfig::CONFIG["ruby_version"],
-      :rubylibprefix     => RbConfig::CONFIG["rubylibprefix"],
-      :sitedir           => RbConfig::CONFIG["sitedir"],
-      :sitelibdir        => RbConfig::CONFIG["sitelibdir"],
-    }
-
-    def self.dir
-      @gem_home ||= nil
-      set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
-      @gem_home
-    end
-
-    def self.path
-      @gem_path ||= nil
-      unless @gem_path
-        paths = [ENV['GEM_PATH'] || default_path]
-        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
-        set_paths(paths.compact.join(File::PATH_SEPARATOR))
-      end
-      @gem_path
-    end
-
-    def self.post_install(&hook)
-      @post_install_hooks << hook
-    end
-
-    def self.post_uninstall(&hook)
-      @post_uninstall_hooks << hook
-    end
-
-    def self.pre_install(&hook)
-      @pre_install_hooks << hook
-    end
-
-    def self.pre_uninstall(&hook)
-      @pre_uninstall_hooks << hook
-    end
-
-    def self.set_home(home)
-      home = home.dup.force_encoding(Encoding.find('filesystem'))
-      home.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
-      @gem_home = home
-    end
-
-    def self.set_paths(gpaths)
-      if gpaths
-        @gem_path = gpaths.split(File::PATH_SEPARATOR)
-
-        if File::ALT_SEPARATOR then
-          @gem_path.map! do |path|
-            path.gsub File::ALT_SEPARATOR, File::SEPARATOR
-          end
-        end
-
-        @gem_path << Gem.dir
-      else
-        # TODO: should this be Gem.default_path instead?
-        @gem_path = [Gem.dir]
-      end
-
-      @gem_path.uniq!
-      @gem_path.map!{|x|x.force_encoding(Encoding.find('filesystem'))}
-    end
-
-    def self.user_home
-      @user_home ||= File.expand_path("~").force_encoding(Encoding.find('filesystem'))
-    rescue
-      if File::ALT_SEPARATOR then
-        "C:/"
-      else
-        "/"
-      end
-    end
-
-    # begin rubygems/defaults
-    # NOTE: this require will be replaced with in-place eval before compilation.
-    require 'lib/rubygems/defaults.rb'
-    # end rubygems/defaults
-
-
-    ##
-    # Methods before this line will be removed when QuickLoader is replaced
-    # with the real RubyGems
-
-    GEM_PRELUDE_METHODS = Gem.methods(false)
-
-    begin
-      verbose, debug = $VERBOSE, $DEBUG
-      $VERBOSE = $DEBUG = nil
-
-      begin
-        require 'rubygems/defaults/operating_system'
-      rescue ::LoadError
-      end
-
-      if defined?(RUBY_ENGINE) then
-        begin
-          require "rubygems/defaults/#{RUBY_ENGINE}"
-        rescue ::LoadError
-        end
-      end
-    ensure
-      $VERBOSE, $DEBUG = verbose, debug
-    end
-
-    module QuickLoader
-
-      @loaded_full_rubygems_library = false
-
-      def self.load_full_rubygems_library
-        return if @loaded_full_rubygems_library
-
-        @loaded_full_rubygems_library = true
-
-        class << Gem
-          Gem::GEM_PRELUDE_METHODS.each do |method_name|
-            undef_method method_name
-          end
-          undef_method :const_missing
-          undef_method :method_missing
-        end
-
-        Kernel.module_eval do
-          undef_method :gem if method_defined? :gem
-        end
-
-        $".delete path_to_full_rubygems_library
-        $".each do |path|
-          if /#{Regexp.escape File::SEPARATOR}rubygems\.rb\z/ =~ path
-            raise LoadError, "another rubygems is already loaded from #{path}"
-          end
-        end
-        require 'rubygems'
-      end
-
-      def self.fake_rubygems_as_loaded
-        path = path_to_full_rubygems_library
-        $" << path unless $".include?(path)
-      end
-
-      def self.path_to_full_rubygems_library
-        installed_path = File.join(Gem::ConfigMap[:rubylibprefix], Gem::ConfigMap[:ruby_version])
-        if $:.include?(installed_path)
-          return File.join(installed_path, 'rubygems.rb')
-        else # e.g., on test-all
-          $:.each do |dir|
-            if File.exist?( path = File.join(dir, 'rubygems.rb') )
-              return path
-            end
-          end
-          raise LoadError, 'rubygems.rb'
-        end
-      end
-
-      GemPaths = {}
-      GemVersions = {}
-
-      def push_gem_version_on_load_path(gem_name, *requirements)
-        if requirements.empty?
-          unless GemPaths.has_key?(gem_name) then
-            raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
-          end
-
-          # highest version gems already active
-          return false
-        else
-          if requirements.length > 1 then
-            QuickLoader.load_full_rubygems_library
-            return gem(gem_name, *requirements)
-          end
-
-          requirement, version = requirements[0].split
-          requirement.strip!
-
-          if loaded_version = GemVersions[gem_name] then
-            case requirement
-            when ">", ">=" then
-              return false if
-                (loaded_version <=> Gem.integers_for(version)) >= 0
-            when "~>" then
-              required_version = Gem.integers_for version
-
-              return false if loaded_version.first == required_version.first
-            end
-          end
-
-          QuickLoader.load_full_rubygems_library
-          gem gem_name, *requirements
-        end
-      end
-
-      def integers_for(gem_version)
-        numbers = gem_version.split(".").collect {|n| n.to_i}
-        numbers.pop while numbers.last == 0
-        numbers << 0 if numbers.empty?
-        numbers
-      end
-
-      def push_all_highest_version_gems_on_load_path
-        Gem.path.each do |path|
-          gems_directory = File.join(path, "gems")
-
-          if File.exist?(gems_directory) then
-            Dir.entries(gems_directory).each do |gem_directory_name|
-              next if gem_directory_name == "." || gem_directory_name == ".."
-
-              next unless gem_name = gem_directory_name[/(.*)-(.*)/, 1]
-              new_version = integers_for($2)
-              current_version = GemVersions[gem_name]
-
-              if !current_version or (current_version <=> new_version) < 0 then
-                GemVersions[gem_name] = new_version
-                GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
-              end
-            end
-          end
-        end
-
-        require_paths = []
-
-        GemPaths.each_value do |path|
-          if File.exist?(file = File.join(path, ".require_paths")) then
-            paths = File.read(file).split.map do |require_path|
-              File.join path, require_path
-            end
-
-            require_paths.concat paths
-          else
-            require_paths << file if File.exist?(file = File.join(path, "bin"))
-            require_paths << file if File.exist?(file = File.join(path, "lib"))
-          end
-        end
-
-        # "tag" the first require_path inserted into the $LOAD_PATH to enable
-        # indexing correctly with rubygems proper when it inserts an explicitly
-        # gem version
-        unless require_paths.empty? then
-          require_paths.first.instance_variable_set(:@gem_prelude_index, true)
-        end
-        # gem directories must come after -I and ENV['RUBYLIB']
-        $:[$:.index{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = require_paths
-      end
-
-      def const_missing(constant)
-        QuickLoader.load_full_rubygems_library
-
-        if Gem.const_defined?(constant) then
-          Gem.const_get constant
-        else
-          super
-        end
-      end
-
-      def method_missing(method, *args, &block)
-        QuickLoader.load_full_rubygems_library
-        super unless Gem.respond_to?(method)
-        Gem.send(method, *args, &block)
-      end
-    end
-
-    extend QuickLoader
-
-  end
-
-  begin
-    Gem.push_all_highest_version_gems_on_load_path
-    Gem::QuickLoader.fake_rubygems_as_loaded
-  rescue Exception => e
-    puts "Error loading gem paths on load path in gem_prelude"
-    puts e
-    puts e.backtrace.join("\n")
-  end
-
-end
-