RubyGems - rubygems-update - Versions diffs - 0.9.4 → 0.9.5 - Mend

rubygems-update 0.9.4 → 0.9.5

Potentially problematic release.

This version of rubygems-update might be problematic. Click here for more details.

Files changed (225) hide show

data/ChangeLog +587 -0
data/README +0 -1
data/Rakefile +39 -12
data/TODO +0 -5
data/bin/gem +7 -7
data/bin/update_rubygems +1 -1
data/examples/application/an-app.gemspec +1 -1
data/gemspecs/cgikit-1.1.0.gemspec +1 -2
data/gemspecs/jabber4r.gemspec +1 -1
data/gemspecs/linguistics.gemspec +1 -1
data/gemspecs/ook.gemspec +1 -1
data/gemspecs/progressbar.gemspec +1 -1
data/gemspecs/redcloth.gemspec +1 -1
data/gemspecs/rublog.gemspec +1 -1
data/gemspecs/ruby-doom.gemspec +1 -1
data/gemspecs/rubyjdwp.gemspec +1 -1
data/gemspecs/statistics.gemspec +1 -1
data/lib/rubygems.rb +167 -105
data/lib/rubygems/builder.rb +12 -10
data/lib/rubygems/command.rb +177 -60
data/lib/rubygems/command_manager.rb +30 -38
data/lib/rubygems/commands/build_command.rb +42 -46
data/lib/rubygems/commands/cert_command.rb +72 -69
data/lib/rubygems/commands/check_command.rb +63 -63
data/lib/rubygems/commands/cleanup_command.rb +25 -7
data/lib/rubygems/commands/contents_command.rb +70 -62
data/lib/rubygems/commands/dependency_command.rb +131 -86
data/lib/rubygems/commands/environment_command.rb +67 -46
data/lib/rubygems/commands/fetch_command.rb +62 -0
data/lib/rubygems/commands/generate_index_command.rb +57 -0
data/lib/rubygems/commands/help_command.rb +163 -73
data/lib/rubygems/commands/install_command.rb +114 -128
data/lib/rubygems/commands/list_command.rb +10 -8
data/lib/rubygems/commands/lock_command.rb +101 -0
data/lib/rubygems/commands/mirror_command.rb +105 -0
data/lib/rubygems/commands/outdated_command.rb +24 -15
data/lib/rubygems/commands/pristine_command.rb +118 -88
data/lib/rubygems/commands/query_command.rb +109 -77
data/lib/rubygems/commands/rdoc_command.rb +13 -10
data/lib/rubygems/commands/search_command.rb +10 -8
data/lib/rubygems/commands/server_command.rb +48 -0
data/lib/rubygems/commands/sources_command.rb +104 -83
data/lib/rubygems/commands/specification_command.rb +65 -51
data/lib/rubygems/commands/uninstall_command.rb +17 -12
data/lib/rubygems/commands/unpack_command.rb +68 -68
data/lib/rubygems/commands/update_command.rb +72 -25
data/lib/rubygems/commands/which_command.rb +86 -0
data/lib/rubygems/config_file.rb +202 -78
data/lib/rubygems/custom_require.rb +7 -88
data/lib/rubygems/dependency.rb +65 -0
data/lib/rubygems/dependency_installer.rb +232 -0
data/lib/rubygems/dependency_list.rb +133 -105
data/lib/rubygems/digest/md5.rb +4 -1
data/lib/rubygems/digest/sha2.rb +1 -1
data/lib/rubygems/doc_manager.rb +41 -19
data/lib/rubygems/exceptions.rb +63 -0
data/lib/rubygems/ext.rb +18 -0
data/lib/rubygems/ext/builder.rb +56 -0
data/lib/rubygems/ext/configure_builder.rb +24 -0
data/lib/rubygems/ext/ext_conf_builder.rb +23 -0
data/lib/rubygems/ext/rake_builder.rb +27 -0
data/lib/rubygems/format.rb +16 -6
data/lib/rubygems/gem_openssl.rb +43 -6
data/lib/rubygems/gem_path_searcher.rb +84 -0
data/lib/rubygems/gem_runner.rb +20 -5
data/lib/rubygems/indexer.rb +163 -0
data/lib/rubygems/indexer/abstract_index_builder.rb +80 -0
data/lib/rubygems/indexer/marshal_index_builder.rb +17 -0
data/lib/rubygems/indexer/master_index_builder.rb +53 -0
data/lib/rubygems/indexer/quick_index_builder.rb +48 -0
data/lib/rubygems/install_update_options.rb +87 -0
data/lib/rubygems/installer.rb +316 -562
data/lib/rubygems/local_remote_options.rb +106 -0
data/lib/rubygems/old_format.rb +5 -13
data/lib/rubygems/open-uri.rb +2 -0
data/lib/rubygems/package.rb +28 -32
data/lib/rubygems/platform.rb +187 -0
data/lib/rubygems/remote_fetcher.rb +46 -29
data/lib/rubygems/remote_installer.rb +11 -18
data/lib/rubygems/requirement.rb +157 -0
data/lib/rubygems/rubygems_version.rb +1 -1
data/lib/rubygems/security.rb +715 -457
data/lib/rubygems/server.rb +77 -59
data/lib/rubygems/source_index.rb +154 -83
data/lib/rubygems/source_info_cache.rb +73 -30
data/lib/rubygems/source_info_cache_entry.rb +12 -3
data/lib/rubygems/specification.rb +378 -145
data/lib/rubygems/uninstaller.rb +183 -0
data/lib/rubygems/user_interaction.rb +38 -9
data/lib/rubygems/validator.rb +53 -24
data/lib/rubygems/version.rb +126 -289
data/lib/rubygems/version_option.rb +49 -0
data/pkgs/sources/lib/sources.rb +1 -4
data/pkgs/sources/sources.gemspec +3 -3
data/scripts/gemdoc.rb +0 -1
data/setup.rb +166 -1505
data/test/bogussources.rb +0 -1
data/test/data/gem-private_key.pem +27 -0
data/test/data/gem-public_cert.pem +20 -0
data/test/functional.rb +3 -105
data/test/gemutilities.rb +145 -24
data/test/insure_session.rb +0 -1
data/test/{test_datadir.rb → test_config.rb} +7 -13
data/test/test_gem.rb +360 -9
data/test/test_gem_builder.rb +34 -0
data/test/{test_command.rb → test_gem_command.rb} +119 -62
data/test/{test_parse_commands.rb → test_gem_command_manager.rb} +64 -40
data/test/test_gem_commands_build_command.rb +75 -0
data/test/test_gem_commands_cert_command.rb +122 -0
data/test/test_gem_commands_check_command.rb +25 -0
data/test/test_gem_commands_contents_command.rb +92 -0
data/test/test_gem_commands_dependency_command.rb +108 -0
data/test/test_gem_commands_environment_command.rb +117 -0
data/test/test_gem_commands_fetch_command.rb +34 -0
data/test/test_gem_commands_generate_index_command.rb +32 -0
data/test/test_gem_commands_install_command.rb +160 -0
data/test/test_gem_commands_mirror_command.rb +56 -0
data/test/test_gem_commands_pristine_command.rb +100 -0
data/test/test_gem_commands_query_command.rb +82 -0
data/test/test_gem_commands_sources_command.rb +147 -0
data/test/test_gem_commands_specification_command.rb +93 -0
data/test/test_gem_commands_unpack_command.rb +55 -0
data/test/test_gem_config_file.rb +210 -0
data/test/test_gem_dependency.rb +89 -0
data/test/test_gem_dependency_installer.rb +542 -0
data/test/test_gem_dependency_list.rb +212 -0
data/test/test_gem_doc_manager.rb +32 -0
data/test/test_gem_ext_configure_builder.rb +13 -17
data/test/test_gem_ext_ext_conf_builder.rb +9 -9
data/test/test_gem_ext_rake_builder.rb +23 -11
data/test/test_gem_format.rb +69 -0
data/test/test_gem_gem_path_searcher.rb +57 -0
data/test/test_gem_gem_runner.rb +35 -0
data/test/test_gem_indexer.rb +119 -0
data/test/test_gem_install_update_options.rb +40 -0
data/test/test_gem_installer.rb +796 -0
data/test/test_gem_local_remote_options.rb +84 -0
data/test/test_gem_outdated_command.rb +11 -9
data/test/test_gem_platform.rb +240 -0
data/test/{test_remote_fetcher.rb → test_gem_remote_fetcher.rb} +124 -55
data/test/{test_remote_installer.rb → test_gem_remote_installer.rb} +3 -4
data/test/test_gem_requirement.rb +223 -0
data/test/test_gem_server.rb +71 -0
data/test/test_gem_source_index.rb +429 -0
data/test/test_gem_source_info_cache.rb +79 -17
data/test/test_gem_source_info_cache_entry.rb +11 -9
data/test/test_gem_specification.rb +738 -0
data/test/test_gem_stream_ui.rb +117 -0
data/test/test_gem_validator.rb +70 -0
data/test/test_gem_version.rb +191 -0
data/test/test_gem_version_option.rb +77 -0
data/test/{test_require_gem.rb → test_kernel.rb} +19 -12
data/test/test_open_uri.rb +1 -2
data/test/test_package.rb +45 -34
metadata +116 -141
data/Releases +0 -127
data/bin/gem_mirror +0 -73
data/bin/gem_server +0 -6
data/bin/gemlock +0 -127
data/bin/gemri +0 -24
data/bin/gemwhich +0 -89
data/bin/index_gem_repository.rb +0 -302
data/lib/gemconfigure.rb +0 -24
data/lib/rubygems/gem_commands.rb +0 -273
data/pkgs/sources/sources-0.0.1.gem +0 -0
data/post-install.rb +0 -121
data/test/brokenbuildgem.rb +0 -35
data/test/data/PostMessage-0.0.1.gem +0 -0
data/test/data/a-0.0.1.gem +0 -0
data/test/data/a-0.0.2.gem +0 -0
data/test/data/b-0.0.2.gem +0 -0
data/test/data/broken-1.0.0.gem +0 -0
data/test/data/broken_build/broken-build.gemspec +0 -20
data/test/data/broken_build/ext/extconf.rb +0 -3
data/test/data/broken_build/ext/foo.c +0 -1
data/test/data/c-1.2.gem +0 -0
data/test/data/gemhome/cache/a-0.0.1.gem +0 -0
data/test/data/gemhome/cache/a-0.0.2.gem +0 -0
data/test/data/gemhome/cache/b-0.0.2.gem +0 -0
data/test/data/gemhome/cache/c-1.2.gem +0 -0
data/test/data/gemhome/gems/a-0.0.1/lib/code.rb +0 -1
data/test/data/gemhome/gems/a-0.0.2/lib/code.rb +0 -1
data/test/data/gemhome/gems/b-0.0.2/lib/code.rb +0 -1
data/test/data/gemhome/gems/c-1.2/lib/code.rb +0 -1
data/test/data/gemhome/specifications/a-0.0.1.gemspec +0 -8
data/test/data/gemhome/specifications/a-0.0.2.gemspec +0 -8
data/test/data/gemhome/specifications/b-0.0.2.gemspec +0 -8
data/test/data/gemhome/specifications/c-1.2.gemspec +0 -8
data/test/data/legacy/keyedlist-0.4.0.ruby +0 -11
data/test/data/legacy/keyedlist-0.4.0.yaml +0 -16
data/test/data/lib/code.rb +0 -1
data/test/data/one/README.one +0 -1
data/test/data/one/lib/one.rb +0 -9
data/test/data/one/one-0.0.1.gem +0 -0
data/test/data/one/one.gemspec +0 -17
data/test/data/one/one.yaml +0 -40
data/test/data/post_install.gemspec +0 -19
data/test/functional_extension_gems.rb +0 -48
data/test/functional_generate_yaml_index.rb +0 -104
data/test/gemenvironment.rb +0 -59
data/test/io_capture.rb +0 -33
data/test/mock/gems/gems/sources-0.0.1/lib/sources.rb +0 -11
data/test/mock/gems/specifications/sources-0.0.1.gemspec +0 -8
data/test/onegem.rb +0 -35
data/test/test_builder.rb +0 -34
data/test/test_check_command.rb +0 -34
data/test/test_configfile.rb +0 -42
data/test/test_dependency_list.rb +0 -169
data/test/test_file_list.rb +0 -101
data/test/test_format.rb +0 -49
data/test/test_gem_sources_command.rb +0 -135
data/test/test_gemloadpaths.rb +0 -51
data/test/test_gempaths.rb +0 -170
data/test/test_installer.rb +0 -369
data/test/test_loadmanager.rb +0 -48
data/test/test_process_commands.rb +0 -52
data/test/test_source_index.rb +0 -231
data/test/test_specific_extras.rb +0 -46
data/test/test_specification.rb +0 -565
data/test/test_user_interaction.rb +0 -48
data/test/test_validator.rb +0 -59
data/test/test_version_comparison.rb +0 -321
data/test/testgem.rc +0 -7
data/test/user_capture.rb +0 -7
data/test/yaml_data.rb +0 -63

@@ -1,21 +1,23 @@
-require 'rubygems'
-Gem.manage_gems
 require 'webrick'
-require 'yaml'
-require 'optparse'
 require 'rdoc/template'
+require 'yaml'
+require 'zlib'
+require 'rubygems'
+##
 # Gem::Server and allows users to serve gems for consumption by
 # `gem --remote-install`.
-#
+#
 # gem_server starts an HTTP server on the given port and serves the folowing:
 # * "/" - Browsing of gem spec files for installed gems
-# * "/yaml" - Full yaml dump of metadata for installed gems
+# * "/Marshal" - Full SourceIndex dump of metadata for installed gems
+# * "/yaml" - YAML dump of metadata for installed gems - deprecated
 # * "/gems" - Direct access to download the installable gems
 #
 # == Usage
 #
-#   gem_server [-p portnum] [-d gem_path]
+#   gem server [-p portnum] [-d gem_path]
 #
 # port_num:: The TCP port the HTTP server will bind to
 # gem_path::
@@ -23,6 +25,8 @@ require 'rdoc/template'
 #   subdirectories.
 class Gem::Server
+  include Gem::UserInteraction
   DOC_TEMPLATE = <<-WEBPAGE
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE html
@@ -33,7 +37,7 @@ class Gem::Server
 <head>
   <title>RubyGems Documentation Index</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <link rel="stylesheet" href="rdoc-style.css" type="text/css" media="screen" />
+  <link rel="stylesheet" href="gem-server-rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body>
   <div id="fileHeader">
@@ -71,13 +75,13 @@ IFNOT:rdoc_installed
   <span title="rdoc not installed">[rdoc]</span>
 ENDIF:rdoc_installed
 IF:homepage
-<a href="%homepage%" target="_blank" title="%homepage%">[www]</a>
+<a href="%homepage%" title="%homepage%">[www]</a>
 ENDIF:homepage
 IFNOT:homepage
 <span title="no homepage available">[www]</span>
 ENDIF:homepage
 IF:has_deps
- - depends on
+ - depends on
 START:dependencies
 IFNOT:is_last
 <a href="#%name%" title="%version%">%name%</a>,
@@ -337,75 +341,89 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
 .ruby-value   { color: #7fffd4; background: transparent; }
   RDOCCSS
-  def self.process_args(args)
-    options = {}
-    options[:port] = 8808
-    options[:gemdir] = Gem.dir
-    options[:daemon] = false
-    opts = OptionParser.new do |opts|
-      opts.on_tail("--help", "show this message") do
-        puts opts
-        exit
-      end
-      opts.on('-p', '--port=PORT', "Specify the port to listen on") do |port|
-        options[:port] = port
-      end
-      opts.on('-d', '--dir=GEMDIR',
-              "Specify the directory from which to serve Gems") do |gemdir|
-        options[:gemdir] = gemdir
-      end
-      opts.on(      '--daemon', "Run as a daemon") do |daemon|
-        options[:daemon] = daemon
-      end
-    end
-    opts.parse! args
-    options
-  end
-  def self.run(args = ARGV)
-    options = process_args args
+  def self.run(options)
     new(options[:gemdir], options[:port], options[:daemon]).run
   end
   def initialize(gemdir, port, daemon)
-    Socket.do_not_reverse_lookup=true
+    Socket.do_not_reverse_lookup = true
     @gemdir = gemdir
     @port = port
     @daemon = daemon
+    logger = WEBrick::Log.new nil, WEBrick::BasicLog::FATAL
+    @server = WEBrick::HTTPServer.new :DoNotListen => true, :Logger => logger
+    @spec_dir = File.join @gemdir, "specifications"
+    @source_index = Gem::SourceIndex.from_gems_in @spec_dir
+  end
+  def quick(req, res)
+    res['content-type'] = 'text/plain'
+    res['date'] = File.stat(@spec_dir).mtime
+    case req.request_uri.request_uri
+    when '/quick/index' then
+      res.body << @source_index.map { |name,_| name }.join("\n")
+    when '/quick/index.rz' then
+      index = @source_index.map { |name,_| name }.join("\n")
+      res.body << Zlib::Deflate.deflate(index)
+    when %r|^/quick/(.*)-([0-9.]+)\.gemspec(\.marshal)?\.rz$| then
+      specs = @source_index.search $1, $2
+      if specs.empty? then
+        res.status = 404
+      elsif specs.length > 1 then
+        res.status = 500
+      elsif $3 # marshal quickindex instead of YAML
+        res.body << Zlib::Deflate.deflate(Marshal.dump(specs.first))
+      else # deprecated YAML format
+        res.body << Zlib::Deflate.deflate(specs.first.to_yaml)
+      end
+    else
+      res.status = 404
+    end
   end
   def run
-    WEBrick::Daemon.start if @daemon
+    @server.listen nil, @port
+    say "Starting gem server on http://localhost:#{@port}/"
-    spec_dir = File.join @gemdir, "specifications"
+    WEBrick::Daemon.start if @daemon
-    s = WEBrick::HTTPServer.new :Port => @port
+    @server.mount_proc("/yaml") do |req, res|
+      res['content-type'] = 'text/plain'
+      res['date'] = File.stat(@spec_dir).mtime
+      if req.request_method == 'HEAD' then
+        res['content-length'] = @source_index.to_yaml.length
+      else
+        res.body << @source_index.to_yaml
+      end
+    end
-    s.mount_proc("/yaml") do |req, res|
+    @server.mount_proc("/Marshal") do |req, res|
       res['content-type'] = 'text/plain'
-      res['date'] = File.stat(spec_dir).mtime
-      res.body << Gem::SourceIndex.from_gems_in(spec_dir).to_yaml
+      res['date'] = File.stat(@spec_dir).mtime
+      if req.request_method == 'HEAD' then
+        res['content-length'] = Marshal.dump(@source_index).length
+      else
+        res.body << Marshal.dump(@source_index)
+      end
     end
-    s.mount_proc("/rdoc-style.css") do |req, res|
+    @server.mount_proc("/quick/", &method(:quick))
+    @server.mount_proc("/gem-server-rdoc-style.css") do |req, res|
       res['content-type'] = 'text/css'
-      res['date'] = File.stat(spec_dir).mtime
+      res['date'] = File.stat(@spec_dir).mtime
       res.body << RDOC_CSS
     end
-    s.mount_proc("/") do |req, res|
+    @server.mount_proc("/") do |req, res|
       specs = []
       total_file_count = 0
-      Gem::SourceIndex.from_gems_in(spec_dir).each do |path, spec|
+      @source_index.each do |path, spec|
         total_file_count += spec.files.size
         deps = spec.dependencies.collect { |dep|
           { "name"    => dep.name,
@@ -472,14 +490,14 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
     paths = { "/gems" => "/cache/", "/doc_root" => "/doc/" }
     paths.each do |mount_point, mount_dir|
-      s.mount(mount_point, WEBrick::HTTPServlet::FileHandler,
+      @server.mount(mount_point, WEBrick::HTTPServlet::FileHandler,
               File.join(@gemdir, mount_dir), true)
     end
-    trap("INT") { s.shutdown; exit! }
-    trap("TERM") { s.shutdown; exit! }
+    trap("INT") { @server.shutdown; exit! }
+    trap("TERM") { @server.shutdown; exit! }
-    s.start
+    @server.start
   end
 end

data/lib/rubygems/source_index.rb CHANGED

@@ -4,12 +4,11 @@
 # See LICENSE.txt for permissions.
 #++
-require 'rubygems/user_interaction'
-require 'rubygems/remote_fetcher'
-require 'rubygems/digest/sha2'
 require 'forwardable'
-require 'time'
+require 'rubygems'
+require 'rubygems/user_interaction'
+require 'rubygems/specification'
 module Gem
@@ -30,8 +29,6 @@ module Gem
     include Gem::UserInteraction
-    INCREMENTAL_THRESHHOLD = 50
     # Class Methods. -------------------------------------------------
     class << self
       include Gem::UserInteraction
@@ -89,7 +86,7 @@ module Gem
       def load_specification(file_name)
         begin
           spec_code = File.read(file_name).untaint
-          gemspec = eval(spec_code)
+          gemspec = eval spec_code, binding, file_name
           if gemspec.is_a?(Gem::Specification)
             gemspec.loaded_from = file_name
             return gemspec
@@ -134,18 +131,24 @@ module Gem
     # Returns a Hash of name => Specification of the latest versions of each
     # gem in this index.
     def latest_specs
-      thin = {}
+      result, latest = Hash.new { |h,k| h[k] = [] }, {}
-      each do |full_name, spec|
+      self.each do |_, spec| # SourceIndex is not a hash, so we're stuck with each
         name = spec.name
-        if thin.has_key? name then
-          thin[name] = spec if spec.version > thin[name].version
-        else
-          thin[name] = spec
+        curr_ver = spec.version
+        prev_ver = latest[name]
+        next unless prev_ver.nil? or curr_ver >= prev_ver
+        if prev_ver.nil? or curr_ver > prev_ver then
+          result[name].clear
+          latest[name] = curr_ver
         end
+        result[name] << spec
       end
-      thin
+      result.values.flatten
     end
     # Add a gem specification to the source index.
@@ -159,10 +162,7 @@ module Gem
     end
     # Iterate over the specifications in the source index.
-    #
-    # &block:: [yields gem.full_name, Gem::Specification]
-    #
-    def each(&block)
+    def each(&block) # :yields: gem.full_name, gem
       @gems.each(&block)
     end
@@ -174,18 +174,22 @@ module Gem
     # The signature for the source index.  Changes in the signature
     # indicate a change in the index.
     def index_signature
+      require 'rubygems/digest/sha2'
       Gem::SHA256.new.hexdigest(@gems.keys.sort.join(',')).to_s
     end
     # The signature for the given gem specification.
     def gem_signature(gem_full_name)
+      require 'rubygems/digest/sha2'
       Gem::SHA256.new.hexdigest(@gems[gem_full_name].to_yaml).to_s
     end
     def_delegators :@gems, :size, :length
     # Find a gem by an exact match on the short name.
-    def find_name(gem_name, version_requirement=Version::Requirement.new(">= 0"))
+    def find_name(gem_name, version_requirement = Gem::Requirement.default)
       search(/^#{gem_name}$/, version_requirement)
     end
@@ -195,22 +199,46 @@ module Gem
     #   [String] a partial for the (short) name of the gem, or
     #   [Regex] a pattern to match against the short name
     # version_requirement::
-    #   [String | default=Version::Requirement.new(">= 0")] version to
+    #   [String | default=Gem::Requirement.default] version to
     #   find
     # return::
     #   [Array] list of Gem::Specification objects in sorted (version)
     #   order.  Empty if not found.
     #
-    def search(gem_pattern, version_requirement=Version::Requirement.new(">= 0"))
-      gem_pattern = /#{ gem_pattern }/i if String === gem_pattern
-      version_requirement = Gem::Version::Requirement.create(version_requirement)
-      result = []
-      @gems.each do |full_spec_name, spec|
-        next unless spec.name =~ gem_pattern
-        result << spec if version_requirement.satisfied_by?(spec.version)
+    def search(gem_pattern, platform_only_or_version_req = false)
+      version_requirement = nil
+      only_platform = false
+      case gem_pattern
+      when Regexp then
+        version_requirement = platform_only_or_version_req ||
+                                Gem::Requirement.default
+      when Gem::Dependency then
+        only_platform = platform_only_or_version_req
+        version_requirement = gem_pattern.version_requirements
+        gem_pattern = gem_pattern.name.empty? ? // : /^#{gem_pattern.name}$/
+      else
+        version_requirement = platform_only_or_version_req ||
+                                Gem::Requirement.default
+        gem_pattern = /#{gem_pattern}/i
+      end
+      unless Gem::Requirement === version_requirement then
+        version_requirement = Gem::Requirement.create version_requirement
       end
-      result = result.sort
-      result
+      specs = @gems.values.select do |spec|
+        spec.name =~ gem_pattern and
+          version_requirement.satisfied_by? spec.version
+      end
+      if only_platform then
+        specs = specs.select do |spec|
+          Gem::Platform.match spec.platform
+        end
+      end
+      specs.sort_by { |s| s.sort_obj }
     end
     # Refresh the source index from the local file system.
@@ -224,15 +252,20 @@ module Gem
     # Returns an Array of Gem::Specifications that are not up to date.
     #
     def outdated
-      remotes = Gem::SourceInfoCache.search(//)
+      dep = Gem::Dependency.new '', Gem::Requirement.default
+      remotes = Gem::SourceInfoCache.search dep, true
       outdateds = []
-      latest_specs.each do |_, local|
+      latest_specs.each do |local|
         name = local.name
         remote = remotes.select  { |spec| spec.name == name }.
-                         sort_by { |spec| spec.version }.
+                         sort_by { |spec| spec.version.to_ints }.
                          last
         outdateds << name if remote and local.version < remote.version
       end
       outdateds
     end
@@ -243,58 +276,89 @@ module Gem
         gem_names = fetch_quick_index source_uri
         remove_extra gem_names
         missing_gems = find_missing gem_names
-        use_incremental = missing_gems.size <= INCREMENTAL_THRESHHOLD
+        return false if missing_gems.size.zero?
+        say "missing #{missing_gems.size} gems" if
+          missing_gems.size > 0 and Gem.configuration.really_verbose
+        use_incremental = missing_gems.size <= Gem.configuration.bulk_threshold
       rescue Gem::OperationNotSupportedError => ex
+        alert_error "Falling back to bulk fetch: #{ex.message}" if
+          Gem.configuration.really_verbose
         use_incremental = false
       end
       if use_incremental then
-        update_with_missing source_uri, missing_gems
+        update_with_missing(source_uri, missing_gems)
       else
-        new_index = fetch_bulk_index source_uri
-        @gems.replace new_index.gems
+        new_index = fetch_bulk_index(source_uri)
+        @gems.replace(new_index.gems)
       end
-      self
+      true
     end
     def ==(other) # :nodoc:
       self.class === other and @gems == other.gems
     end
+    def dump
+      Marshal.dump(self)
+    end
     protected
     attr_reader :gems
     private
-    # Convert the yamlized string spec into a real spec (actually, these are
-    # hashes of specs.).
-    def convert_specs(yaml_spec)
-      YAML.load(reduce_specs(yaml_spec)) or
-      raise "Didn't get a valid YAML document"
-    end
     def fetcher
+      require 'rubygems/remote_fetcher'
       Gem::RemoteFetcher.fetcher
     end
-    def fetch_bulk_index(source_uri)
-      say "Bulk updating Gem source index for: #{source_uri}"
+    def fetch_index_from(source_uri)
+      @fetch_error = nil
-      begin
-        yaml_spec = fetcher.fetch_path source_uri + '/yaml.Z'
-        yaml_spec = unzip yaml_spec
-      rescue
+      indexes = %W[
+        Marshal.#{Gem.marshal_version}.Z
+        Marshal.#{Gem.marshal_version}
+        yaml.Z
+        yaml
+      ]
+      indexes.each do |name|
+        spec_data = nil
         begin
-          yaml_spec = fetcher.fetch_path source_uri + '/yaml'
+          spec_data = fetcher.fetch_path("#{source_uri}/#{name}")
+          spec_data = unzip(spec_data) if name =~ /\.Z$/
+          if name =~ /Marshal/ then
+            return Marshal.load(spec_data)
+          else
+            return YAML.load(spec_data)
+          end
         rescue => e
-          raise Gem::RemoteSourceException,
-                "Error fetching remote gem cache: #{e}"
+          if Gem.configuration.really_verbose then
+            alert_error "Unable to fetch #{name}: #{e.message}"
+          end
+          @fetch_error = e
         end
       end
+      nil
+    end
-      convert_specs yaml_spec
+    def fetch_bulk_index(source_uri)
+      say "Bulk updating Gem source index for: #{source_uri}"
+      index = fetch_index_from(source_uri)
+      if index.nil? then
+        raise Gem::RemoteSourceException,
+              "Error fetching remote gem cache: #{@fetch_error}"
+      end
+      @fetch_error = nil
+      index
     end
     # Get the quick index needed for incremental updates.
@@ -313,26 +377,6 @@ module Gem
       }
     end
-    # This reduces the source spec in size so that YAML bugs with large data
-    # sets will be dodged.  Obviously this is a workaround, but it allows Gems
-    # to continue to work until the YAML bug is fixed.
-    def reduce_specs(yaml_spec)
-      result = ""
-      state = :copy
-      yaml_spec.each do |line|
-        if state == :copy && line =~ /^\s+files:\s*$/
-          state = :skip
-          result << line.sub(/$/, " []")
-        elsif state == :skip
-          if line !~ /^\s+-/
-            state = :copy
-          end
-        end
-        result << line if state == :copy
-      end
-      result
-    end
     def remove_extra(spec_names)
       dictionary = spec_names.inject({}) { |h, k| h[k] = true; h }
       each do |name, spec|
@@ -346,20 +390,47 @@ module Gem
       Zlib::Inflate.inflate(string)
     end
+    # Tries to fetch Marshal representation first, then YAML
+    def fetch_single_spec(source_uri, spec_name)
+      @fetch_error = nil
+      begin
+        marshal_uri = source_uri + "/quick/Marshal.#{Gem.marshal_version}/#{spec_name}.gemspec.rz"
+        zipped = fetcher.fetch_path marshal_uri
+        return Marshal.load(unzip(zipped))
+      rescue => ex
+        @fetch_error = ex
+        if Gem.configuration.really_verbose then
+          say "unable to fetch marshal gemspec #{marshal_uri}: #{ex.class} - #{ex}"
+        end
+      end
+      begin
+        yaml_uri = source_uri + "/quick/#{spec_name}.gemspec.rz"
+        zipped = fetcher.fetch_path yaml_uri
+        return YAML.load(unzip(zipped))
+      rescue => ex
+        @fetch_error = ex
+        if Gem.configuration.really_verbose then
+          say "unable to fetch YAML gemspec #{yaml_uri}: #{ex.class} - #{ex}"
+        end
+      end
+      nil
+    end
     # Update the cached source index with the missing names.
     def update_with_missing(source_uri, missing_names)
       progress = ui.progress_reporter(missing_names.size,
-        "Need to update #{missing_names.size} gems from #{source_uri}")
+        "Updating metadata for #{missing_names.size} gems from #{source_uri}")
       missing_names.each do |spec_name|
-        begin
-          spec_uri = source_uri + "/quick/#{spec_name}.gemspec.rz"
-          zipped_yaml = fetcher.fetch_path spec_uri
-          gemspec = YAML.load unzip(zipped_yaml)
+        gemspec = fetch_single_spec(source_uri, spec_name)
+        if gemspec.nil? then
+          ui.say "Failed to download spec #{spec_name} from #{source_uri}:\n" \
+                 "\t#{@fetch_error.message}"
+        else
           add_spec gemspec
           progress.updated spec_name
-        rescue RuntimeError => ex
-          ui.say "Failed to download spec for #{spec_name} from #{source_uri}"
         end
+        @fetch_error = nil
       end
       progress.done
       progress.count