rubygems-update 1.1.0 → 1.1.1

data/lib/rubygems/command_manager.rb

@@ -93,7 +93,7 @@ module Gem
         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'."

data/lib/rubygems/commands/environment_command.rb

@@ -39,7 +39,7 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
     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

data/lib/rubygems/commands/pristine_command.rb

@@ -126,6 +126,7 @@ revert the gem.
       end
 
       installer.generate_bin
+      installer.build_extensions
     end
   end
 

data/lib/rubygems/commands/query_command.rb

@@ -82,13 +82,15 @@ class Gem::Commands::QueryCommand < Gem::Command
       say "*** REMOTE GEMS ***"
       say
 
+      all = options[:all]
+
       begin
-        Gem::SourceInfoCache.cache 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
 

data/lib/rubygems/commands/update_command.rb

@@ -58,7 +58,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
       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 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
 
     pattern = if options[:args].empty? then
-             //
+                //
               else
                 Regexp.union(*options[:args])
               end
@@ -78,12 +78,14 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     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 @@ class Gem::Commands::UpdateCommand < Gem::Command
     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}"
 

data/lib/rubygems/dependency_installer.rb

@@ -72,7 +72,7 @@ class Gem::DependencyInstaller
         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 @@ class Gem::DependencyInstaller
       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,

data/lib/rubygems/doc_manager.rb

@@ -64,6 +64,12 @@ module Gem
 
       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

data/lib/rubygems/indexer.rb

@@ -85,7 +85,7 @@ class Gem::Indexer
                 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"}"

data/lib/rubygems/remote_fetcher.rb

@@ -236,11 +236,13 @@ class Gem::RemoteFetcher
       request.add_field 'Keep-Alive', '30'
 
       # HACK work around EOFError bug in Net::HTTP
+      # NOTE Errno::ECONNABORTED raised a lot on Windows, and make impossible
+      # to install gems.
       retried = false
       begin
         @requests[connection_id] += 1
         response = connection.request(request)
-      rescue EOFError
+      rescue EOFError, Errno::ECONNABORTED
         requests = @requests[connection_id]
         say "connection reset after #{requests} requests, retrying" if
           Gem.configuration.really_verbose

data/lib/rubygems/rubygems_version.rb

@@ -2,5 +2,5 @@
 # This file is auto-generated by build scripts.
 # See:  rake update_version
 module Gem
-  RubyGemsVersion = '1.1.0'
+  RubyGemsVersion = '1.1.1'
 end

data/lib/rubygems/server.rb

@@ -29,7 +29,7 @@ class Gem::Server
 
   DOC_TEMPLATE = <<-'WEBPAGE'
   <?xml version="1.0" encoding="iso-8859-1"?>
-  <!DOCTYPE html 
+  <!DOCTYPE html
        PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -51,7 +51,7 @@ class Gem::Server
         <h1>Summary</h1>
   <p>There are <%=values["gem_count"]%> gems installed:</p>
   <p>
-  <%= values["specs"].map { |v| "<a href=\"#{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>. 
+  <%= values["specs"].map { |v| "<a href=\"##{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>.
   <h1>Gems</h1>
 
   <dl>
@@ -77,7 +77,7 @@ class Gem::Server
 
   	<% if spec["has_deps"] then %>
   	 - depends on
-  		<%= spec["dependencies"].map { |v| "<a href=\"#{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>. 
+  		<%= spec["dependencies"].map { |v| "<a href=\"##{v["name"]}\">#{v["name"]}</a>" }.join ', ' %>.
   	<% end %>
   	</dt>
   	<dd>
@@ -91,8 +91,8 @@ class Gem::Server
   		    Executables are
   		<%end%>
 
-  		<%= spec["executables"].map { |v| "<span class=\"context-item-name\">#{v["executable"]}</span>"}.join ', ' %>. 
-  		
+  		<%= spec["executables"].map { |v| "<span class=\"context-item-name\">#{v["executable"]}</span>"}.join ', ' %>.
+
   	<%end%>
   	<br/>
   	<br/>

data/lib/rubygems/source_index.rb

@@ -25,6 +25,8 @@ class Gem::SourceIndex
 
   include Gem::UserInteraction
 
+  attr_reader :gems # :nodoc:
+
   class << self
     include Gem::UserInteraction
 
@@ -50,14 +52,10 @@ class Gem::SourceIndex
     end
 
     ##
-    # Return a list of directories in the current gem path that
-    # contain specifications.
-    # 
-    # return::
-    #   List of directory paths (all ending in "../specifications").
+    # Returns a list of directories from Gem.path that contain specifications.
 
     def installed_spec_directories
-      Gem.path.collect { |dir| File.join(dir, "specifications") }        
+      Gem.path.collect { |dir| File.join(dir, "specifications") }
     end
 
     ##
@@ -272,12 +270,11 @@ class Gem::SourceIndex
   end
 
   ##
-  # Refresh the source index from the local file system.
-  #
-  # return:: Returns a pointer to itself.
+  # Replaces the gems in the source index from specifications in the
+  # installed_spec_directories,
 
   def refresh!
-    load_gems_in(self.class.installed_spec_directories)
+    load_gems_in(*self.class.installed_spec_directories)
   end
 
   ##
@@ -347,10 +344,6 @@ class Gem::SourceIndex
     Marshal.dump(self)
   end
 
-  protected
-
-  attr_reader :gems
-
   private
 
   def fetcher

data/lib/rubygems/source_info_cache.rb

@@ -22,8 +22,8 @@ require 'rubygems/user_interaction'
 #   Gem::SourceInfoCache
 #     @cache_data = {
 #       source_uri => Gem::SourceInfoCacheEntry
-#         @size => source index size
-#         @source_index => Gem::SourceIndex
+#         @size = source index size
+#         @source_index = Gem::SourceIndex
 #       ...
 #     }
 
@@ -177,13 +177,30 @@ class Gem::SourceInfoCache
     self.class.latest_user_cache_file
   end
 
+  ##
+  # Merges the complete cache file into this Gem::SourceInfoCache.
+
   def read_all_cache_data
     if @only_latest then
       @only_latest = false
-      @cache_data = read_cache_data cache_file
+      all_data = read_cache_data cache_file
+
+      cache_data.update all_data do |source_uri, latest_sice, all_sice|
+        all_sice.source_index.gems.update latest_sice.source_index.gems
+
+        Gem::SourceInfoCacheEntry.new all_sice.source_index, latest_sice.size
+      end
+
+      begin
+        refresh true
+      rescue Gem::RemoteFetcher::FetchError
+      end
     end
   end
 
+  ##
+  # Reads cached data from +file+.
+
   def read_cache_data(file)
     # Marshal loads 30-40% faster from a String, and 2MB on 20061116 is small
     data = open file, 'rb' do |fp| fp.read end
@@ -205,6 +222,8 @@ class Gem::SourceInfoCache
     end
 
     cache_data
+  rescue Errno::ENOENT
+    {}
   rescue => e
     if Gem.configuration.really_verbose then
       say "Exception during cache_data handling: #{e.class} - #{e}"
@@ -245,6 +264,7 @@ class Gem::SourceInfoCache
 
   def reset_cache_data
     @cache_data = nil
+    @only_latest = true
   end
 
   ##
@@ -324,10 +344,7 @@ class Gem::SourceInfoCache
       end
     end
 
-    if File.writable? dir then
-      open path, "wb" do |io| io.write Marshal.dump({}) end
-      return path
-    end
+    return path if File.writable? dir
 
     nil
   end
@@ -347,11 +364,13 @@ class Gem::SourceInfoCache
   end
 
   ##
-  # Write data to the proper cache.
+  # Write data to the proper cache files.
 
   def write_cache
-    open cache_file, 'wb' do |io|
-      io.write Marshal.dump(cache_data)
+    if not File.exist?(cache_file) or not @only_latest then
+      open cache_file, 'wb' do |io|
+        io.write Marshal.dump(cache_data)
+      end
     end
 
     open latest_cache_file, 'wb' do |io|

data/lib/rubygems/version_option.rb

@@ -23,8 +23,7 @@ module Gem::VersionOption
                "Specify the platform of gem to #{task}", *wrap) do
                  |value, options|
       unless options[:added_platform] then
-        Gem.platforms.clear
-        Gem.platforms << Gem::Platform::RUBY
+        Gem.platforms = [Gem::Platform::RUBY]
         options[:added_platform] = true
       end
 

data/setup.rb

@@ -9,8 +9,11 @@
 if ENV['RUBYOPT'] and defined? Gem then
   ENV.delete 'RUBYOPT'
 
-  ruby = File.join Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']
-  ruby << Config::CONFIG['EXEEXT']
+  require 'rbconfig'
+  config = defined?(RbConfig) ? RbConfig : Config
+
+  ruby = File.join config::CONFIG['bindir'], config::CONFIG['ruby_install_name']
+  ruby << config::CONFIG['EXEEXT']
 
   exec(ruby, 'setup.rb', *ARGV)
 end
@@ -52,10 +55,10 @@ include FileUtils::Verbose
 
 # check ruby version
 
-required_version = Gem::Version::Requirement.create("> 1.8.2")
+required_version = Gem::Version::Requirement.create("> 1.8.3")
 
-unless required_version.satisfied_by? Gem::Version.new(RUBY_VERSION) then
-  abort "Expected Ruby version #{required_version}, was #{RUBY_VERSION}"
+unless required_version.satisfied_by? Gem.ruby_version then
+  abort "Expected Ruby version #{required_version}, was #{Gem.ruby_version}"
 end
 
 # install stuff
@@ -64,8 +67,8 @@ lib_dir = nil
 bin_dir = nil
 
 if ARGV.grep(/^--prefix/).empty? then
-  lib_dir = Config::CONFIG['sitelibdir']
-  bin_dir = Config::CONFIG['bindir']
+  lib_dir = Gem::ConfigMap[:sitelibdir]
+  bin_dir = Gem::ConfigMap[:bindir]
 else
   prefix = nil
 
@@ -81,11 +84,22 @@ else
 
   raise "invalid --prefix #{prefix.inspect}" if prefix.nil?
 
-  lib_dir = File.join prefix, 'lib'
-  bin_dir = File.join prefix, 'bin'
+  # Apple installed RubyGems into libdir, and RubyGems <= 1.1.0 gets confused
+  # about installation location, so switch back to sitelibdir.
+  if defined?(APPLE_GEM_HOME) and
+      # just in case Apple and RubyGems don't get this patched up proper.
+     (prefix == Gem::ConfigMap[:libdir] or
+      # this one is important
+      prefix == File.join(Gem::ConfigMap[:libdir], 'ruby')) then
+    lib_dir = Gem::ConfigMap[:sitelibdir]
+    bin_dir = Gem::ConfigMap[:bindir]
+  else
+    lib_dir = File.join prefix, 'lib'
+    bin_dir = File.join prefix, 'bin'
 
-  mkdir_p lib_dir
-  mkdir_p bin_dir
+    mkdir_p lib_dir
+    mkdir_p bin_dir
+  end
 end
 
 Dir.chdir 'lib' do
@@ -200,8 +214,12 @@ rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
 # install RDoc
 
 gem_doc_dir = File.join Gem.dir, 'doc'
+rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
+rubygems_doc_dir = File.join gem_doc_dir, rubygems_name
 
-if File.writable? gem_doc_dir then
+if File.writable? gem_doc_dir and
+   (not File.exist? rubygems_doc_dir or
+    File.writable? rubygems_doc_dir) then
   puts "Removing old RubyGems RDoc and ri"
   Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
     rm_rf dir
@@ -216,18 +234,14 @@ if File.writable? gem_doc_dir then
     r.document args
   end
 
-  rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
-
-  doc_dir = File.join Gem.dir, 'doc', rubygems_name
-
   unless ARGV.include? '--no-ri' then
-    ri_dir = File.join doc_dir, 'ri'
+    ri_dir = File.join rubygems_doc_dir, 'ri'
     puts "Installing #{rubygems_name} ri into #{ri_dir}"
     run_rdoc '--ri', '--op', ri_dir
   end
 
   unless ARGV.include? '--no-rdoc' then
-    rdoc_dir = File.join(doc_dir, 'rdoc')
+    rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
     puts "Installing #{rubygems_name} rdoc into #{rdoc_dir}"
     run_rdoc '--op', rdoc_dir
   end
@@ -284,7 +298,7 @@ puts
 puts "-" * 78
 puts
 
-release_notes = File.join 'doc', 'release_notes',
+release_notes = File.join File.dirname(__FILE__), 'doc', 'release_notes',
                           "rel_#{Gem::RubyGemsVersion.gsub '.', '_'}.rdoc"
 
 if File.exist? release_notes then