Update to RubyGems 1.1.1 r1701.

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

ChangeLog

@@ -1,3 +1,7 @@
+Sat Apr 12 05:55:57 2008  Eric Hodel  <[email protected]>
+
+	* lib/rubygems*, test/rubygems*:  Update to RubyGems 1.1.1 r1701.
+
 Sat Apr 12 03:13:38 2008  Nobuyoshi Nakada  <[email protected]>
 
 	* file.c (file_expand_path): set external encoding.

lib/rubygems.rb

@@ -97,7 +97,7 @@ module Gem
 
   @configuration = nil
   @loaded_specs = {}
-  @platforms = nil
+  @platforms = []
   @ruby = nil
   @sources = []
 
@@ -215,7 +215,7 @@ def self.binary_mode
 
   def self.bindir(install_dir=Gem.dir)
     return File.join(install_dir, 'bin') unless
-    install_dir.to_s == Gem.default_dir
+      install_dir.to_s == Gem.default_dir
     Gem.default_bindir
   end
 
@@ -451,10 +451,21 @@ def self.path
   end
 
   ##
-  # Array of platforms this RubyGems supports.
+  # Set array of platforms this RubyGems supports (primarily for testing).
+
+  def self.platforms=(platforms)
+    @platforms = platforms
+  end
 
+  ##
+  # Array of platforms this RubyGems supports.
+
   def self.platforms
-    @platforms ||= [Gem::Platform::RUBY, Gem::Platform.local]
+    @platforms ||= []
+    if @platforms.empty?
+      @platforms = [Gem::Platform::RUBY, Gem::Platform.local]
+    end
+    @platforms
   end
 
   ##
@@ -463,13 +474,26 @@ def self.platforms
   def self.prefix
     prefix = File.dirname File.expand_path(__FILE__)
 
-    if prefix == File.expand_path(ConfigMap[:sitelibdir]) then
+    if File.dirname(prefix) == File.expand_path(ConfigMap[:sitelibdir]) or
+       File.dirname(prefix) == File.expand_path(ConfigMap[:libdir]) or
+       'lib' != File.basename(prefix) then
       nil
     else
       File.dirname prefix
     end
   end
 
+  ##
+  # Refresh source_index from disk and clear searcher.
+
+  def self.refresh
+    source_index.refresh!
+
+    MUTEX.synchronize do
+      @searcher = nil
+    end
+  end
+
   ##
   # Safely read a file in binary mode on all platforms.
 

lib/rubygems/command_manager.rb

@@ -93,7 +93,7 @@ def process_args(args)
         say Gem::Command::HELP
         terminate_interaction(0)
       when '-v', '--version'
-        say Gem::RubyGemsPackageVersion
+        say Gem::RubyGemsVersion
         terminate_interaction(0)
       when /^-/
         alert_error "Invalid option: #{args[0]}.  See 'gem --help'."

lib/rubygems/commands/environment_command.rb

@@ -39,7 +39,7 @@ def execute
     when nil then
       out = "RubyGems Environment:\n"
 
-      out << "  - RUBYGEMS VERSION: #{Gem::RubyGemsVersion} (#{Gem::RubyGemsPackageVersion})\n"
+      out << "  - RUBYGEMS VERSION: #{Gem::RubyGemsVersion}\n"
 
       out << "  - RUBY VERSION: #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"
       out << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL

lib/rubygems/commands/pristine_command.rb

@@ -126,6 +126,7 @@ def execute
       end
 
       installer.generate_bin
+      installer.build_extensions
     end
   end
 

lib/rubygems/commands/query_command.rb

@@ -82,13 +82,15 @@ def execute
       say "*** REMOTE GEMS ***"
       say
 
+      all = options[:all]
+
       begin
-        Gem::SourceInfoCache.cache.refresh options[:all]
+        Gem::SourceInfoCache.cache all
       rescue Gem::RemoteFetcher::FetchError
         # no network
       end
 
-      output_query_results Gem::SourceInfoCache.search(name, false, true)
+      output_query_results Gem::SourceInfoCache.search(name, false, all)
     end
   end
 

lib/rubygems/commands/sources_command.rb

@@ -69,7 +69,7 @@ def execute
     end
 
     if options[:update] then
-      Gem::SourceInfoCache.cache.refresh true
+      Gem::SourceInfoCache.cache true
       Gem::SourceInfoCache.cache.flush
 
       say "source cache successfully updated"

lib/rubygems/commands/update_command.rb

@@ -58,7 +58,7 @@ def execute
       say "Updating installed gems"
     end
 
-    hig = {}
+    hig = {} # highest installed gems
 
     Gem::SourceIndex.from_installed_gems.each do |name, spec|
       if hig[spec.name].nil? or hig[spec.name].version < spec.version then
@@ -67,7 +67,7 @@ def execute
     end
 
     pattern = if options[:args].empty? then
-             //
+                //
               else
                 Regexp.union(*options[:args])
               end
@@ -78,12 +78,14 @@ def execute
 
     updated = []
 
-    # HACK use the real API
+    installer = Gem::DependencyInstaller.new options
+
     gems_to_update.uniq.sort.each do |name|
       next if updated.any? { |spec| spec.name == name }
+
       say "Updating #{name}"
-      installer = Gem::DependencyInstaller.new options
       installer.install name
+
       installer.installed_gems.each do |spec|
         updated << spec
         say "Successfully installed #{spec.full_name}"
@@ -115,6 +117,7 @@ def do_rubygems_update(version)
     args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
     args << '--no-rdoc' unless options[:generate_rdoc]
     args << '--no-ri' unless options[:generate_ri]
+    args << '--no-format-executable' if options[:no_format_executable]
 
     update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}"
 

lib/rubygems/dependency_installer.rb

@@ -72,7 +72,7 @@ def find_gems_with_sources(dep)
         end
 
         all = requirements.length > 1 ||
-                requirements.first != ">=" || requirements.first != ">"
+                (requirements.first != ">=" and requirements.first != ">")
 
         found = Gem::SourceInfoCache.search_with_source dep, true, all
 
@@ -189,7 +189,13 @@ def install dep_or_name, version = Gem::Requirement.default
       say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
 
       _, source_uri = @specs_and_sources.assoc spec
-      local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri
+      begin
+        local_gem_path = Gem::RemoteFetcher.fetcher.download spec, source_uri,
+                                                             @install_dir
+      rescue Gem::RemoteFetcher::FetchError
+        next if @force
+        raise
+      end
 
       inst = Gem::Installer.new local_gem_path,
                                 :env_shebang => @env_shebang,

lib/rubygems/doc_manager.rb

@@ -64,6 +64,12 @@ def load_rdoc
 
       FileUtils.mkdir_p @doc_dir unless File.exist?(@doc_dir)
 
+      begin
+        gem 'rdoc'
+      rescue Gem::LoadError
+        # use built-in RDoc
+      end
+
       begin
         require 'rdoc/rdoc'
       rescue LoadError => e

lib/rubygems/indexer.rb

@@ -85,7 +85,7 @@ def build_index
                 progress.updated spec.original_name
 
               rescue SignalException => e
-                alert_error "Recieved signal, exiting"
+                alert_error "Received signal, exiting"
                 raise
               rescue Exception => e
                 alert_error "Unable to process #{gemfile}\n#{e.message} (#{e.class})\n\t#{e.backtrace.join "\n\t"}"