rubygems-update 1.7.2 → 1.8.0

data/.autotest

@@ -1,5 +1,8 @@
 # -*- ruby -*-
 
+ENV['GEM_HOME'] = "tmp/isolate/ruby-1.8"
+Gem.refresh
+
 require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
@@ -25,7 +28,8 @@ Autotest.add_hook :initialize do |at|
     at.files_matching %r%^test/rubygems/test_(.*)\.rb$%
   end
 
-  at.find_directories = ARGV unless ARGV.empty?
+  args = ARGV.reject { |a| a =~ /^-/ }
+  at.find_directories = args unless args.empty?
 end
 
 class Autotest

data/History.txt

@@ -1,12 +1,109 @@
-=== 1.7.2 / 2011-04-05
-
-* 1 Bug Fix:
+=== 1.8.0 / 2011-04-34
+
+This release focused on properly encapsulating functionality.  Most of this
+work focused on moving functionality out of Gem::SourceIndex and
+Gem::GemPathSearcher into Gem::Specification where it belongs.
+
+After installing RubyGems 1.8.0 you will see deprecations when loading your
+exsting gems.  Run `gem pristine --all --no-extensions` to regenerate your
+gem specifications safely.
+
+Currently RubyGems does not save the build arguments used to build gems with
+extensions.  You will need to run `gem pristine gem_with_extension --
+--build-arg` to regenerate a gem with an extension where it requires special
+build arguments.
+
+* 24(+) Deprecations (WOOT!):
+
+  * DependencyList.from_source_index deprecated the source_index argument.
+  * Deprecated Dependency.new(/regex/).
+  * Deprecated Gem.searcher.
+  * Deprecated Gem.source_index and Gem.available?
+  * Deprecated Gem: activate_dep, activate_spec, activate,
+    report_activate_error, and required_location.
+  * Deprecated Gem::all_partials
+  * Deprecated Gem::cache_dir
+  * Deprecated Gem::cache_gem
+  * Deprecated Gem::default_system_source_cache_dir
+  * Deprecated Gem::default_user_source_cache_dir
+  * Deprecated Platform#empty?
+  * Deprecated Specification.cache_gem
+  * Deprecated Specification.installation_path
+  * Deprecated Specification.loaded, loaded?, and loaded=
+  * Deprecated all of Gem::SourceIndex.
+  * Deprecated all of Gem::GemPathSearcher.
+  * Deprecated Gem::Specification#default_executable.
+
+* 2 major enhancements:
+
+  * Gem::SourceIndex functionality has been moved to Gem::Specification.
+    Gem::SourceIndex is completely disconnected from Gem::Specification
+  * Refactored GemPathSearcher entirely out. RIPMF
+
+* 41 minor enhancements:
+
+  * Added CommandManager#unregister_command
+  * Added Dependency#matching_specs + to_specs.
+  * Added Dependency#to_spec
+  * Added Gem.pre_reset_hook/s and post_reset_hook/s.
+  * Added GemCommand.reset to reinitialize the singleton
+  * Added Specification#activate.
+  * Added Specification#activated, activated=, and activated?
+  * Added Specification#base_dir.
+  * Added Specification#bin_dir and bin_file.
+  * Added Specification#cache_dir and cache_file. Aliased cache_gem.
+  * Added Specification#doc_dir and ri_dir.
+  * Added Specification#find(name_or_dep, *requirements).
+  * Added Specification#gem_dir and gems_dir.
+  * Added Specification#spec_dir and spec_file.
+  * Added Specification.add_spec, add_specs, and remove_spec.
+  * Added Specification.all=. If you use this, we will light you on fire.
+  * Added Specification.all_names.
+  * Added Specification.dirs and dirs=. dirs= resets.
+  * Added Specification.find_all_by_name(name, *reqs)
+  * Added Specification.latest_specs. SO TINY!
+  * Added TestCase#all_spec_names to help clean up tests
+  * Added TestCase#assert_path_exists and refute_path_exists. Will move to
+    minitest.
+  * Gem.sources no longer tries to load sources gem. Only uses default_sources.
+  * Installer no longer accepts a source_index option.
+  * More low-level integration.
+  * Removed Gem::FileOperations since it is a dummy class
+  * Removed a comment because I am dumb
+  * Removed pkgs/sources/lib/sources.rb
+  * Revamped indexer to mostly not use SourceIndex (legacy index requires it).
+  * Rewrote our last functional test suite to be happy and fast
+  * RubyGems is now under the Ruby License or the MIT license
+  * Specification#== now only checks name, version, and platform.
+  * Specification#authors= now forcefully flattens contents (bad rspec! no
+    cookie!)
+  * Specification#eql? checks all fields.
+  * Specification#installation_path no longer raises if it hasn't been
+    activated.
+  * Specification#validate now ensures that authors is not empty.
+  * TestCase.util_setup_spec_fetcher no longer returns a SourceIndex.
+  * Uninstaller no longer passes around SourceIndex instances
   * Warn on loading bad spec array values (ntlm-http gem has nil in its cert
     chain)
+  * `gem pristine` now accepts --no-executables to skip restoring gems with
+    extensions.
+  * `gem pristine` can now restore multiple gems.
+
+* 6 bug fixes:
+
+  * DependencyInstaller passed around a source_index instance but used
+    Gem.source_index.
+  * Fixed Platform#== and #hash so instances may be used as hash keys.
+  * Fixed broken Specification#original_platform. It should never be nil.
+  * Gem::Text#format_text now strips trailing whitespace
+  * Normalize LOAD_PATH with File.expand_path
+  * `gem build` errors should exit 1.
+  * `gem pristine` can now restore non-latest gems where the cached gem was
+    removed.
 
 === 1.7.1 / 2011-03-32
 
-* 1 Bug Fix:
+* 1 bug fix:
   * Fixed missing file in Manifest.txt.  (Also a bug in hoe was fixed where
     `rake check_manifest` showing a diff would not exit with an error.)
 

data/LICENSE.txt

@@ -1,53 +1,58 @@
 RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
 Weirich and others.  You can redistribute it and/or modify it under
-either the terms of the GPL (see the GPL.txt file), or the conditions
-below:
+either the terms of the MIT license (see the file MIT.txt), or the
+conditions below:
 
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
 
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
 
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
 
-       b) use the modified software only within your corporation or
-          organization.
+   b. use the modified software only within your corporation or
+      organization.
 
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
+   c. give non-standard executables non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
+3. You may distribute the software in object code or executable
+   form, provided that you do at least ONE of the following:
 
-       a) distribute the executables and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
+   a. distribute the executables and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
 
-       b) accompany the distribution with the machine-readable source of
-	  the software.
+   b. accompany the distribution with the machine-readable source of
+      the software.
 
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
+   c. give non-standard executables non-standard names, with
+      instructions on where to get the original software distribution.
 
-       d) make other distribution arrangements with the author.
+   d. make other distribution arrangements with the author.
 
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).  But some files in the distribution
+   are not written by the author, so that they are not under these terms.
 
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
+   For the list of those files and their copying conditions, see the
+   file LEGAL.
+
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.
 
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.

data/MIT.txt

@@ -0,0 +1,20 @@
+Copyright (c) Chad Fowler, Rich Kilmer, Jim Weirich and others.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest.txt

@@ -1,8 +1,8 @@
 .autotest
 .document
-GPL.txt
 History.txt
 LICENSE.txt
+MIT.txt
 Manifest.txt
 README.rdoc
 Rakefile
@@ -84,6 +84,7 @@ lib/rubygems/package/tar_reader/entry.rb
 lib/rubygems/package/tar_test_case.rb
 lib/rubygems/package/tar_writer.rb
 lib/rubygems/package_task.rb
+lib/rubygems/path_support.rb
 lib/rubygems/platform.rb
 lib/rubygems/remote_fetcher.rb
 lib/rubygems/require_paths_builder.rb
@@ -102,8 +103,6 @@ lib/rubygems/validator.rb
 lib/rubygems/version.rb
 lib/rubygems/version_option.rb
 lib/ubygems.rb
-pkgs/sources/lib/sources.rb
-pkgs/sources/sources.gemspec
 setup.rb
 test/rubygems/bogussources.rb
 test/rubygems/data/gem-private_key.pem
@@ -111,7 +110,6 @@ test/rubygems/data/gem-public_cert.pem
 test/rubygems/fake_certlib/openssl.rb
 test/rubygems/fix_openssl_warnings.rb
 test/rubygems/foo/discover.rb
-test/rubygems/functional.rb
 test/rubygems/insure_session.rb
 test/rubygems/plugin/exception/rubygems_plugin.rb
 test/rubygems/plugin/load/rubygems_plugin.rb
@@ -130,11 +128,13 @@ test/rubygems/test_gem_command_manager.rb
 test/rubygems/test_gem_commands_build_command.rb
 test/rubygems/test_gem_commands_cert_command.rb
 test/rubygems/test_gem_commands_check_command.rb
+test/rubygems/test_gem_commands_cleanup_command.rb
 test/rubygems/test_gem_commands_contents_command.rb
 test/rubygems/test_gem_commands_dependency_command.rb
 test/rubygems/test_gem_commands_environment_command.rb
 test/rubygems/test_gem_commands_fetch_command.rb
 test/rubygems/test_gem_commands_generate_index_command.rb
+test/rubygems/test_gem_commands_help_command.rb
 test/rubygems/test_gem_commands_install_command.rb
 test/rubygems/test_gem_commands_list_command.rb
 test/rubygems/test_gem_commands_lock_command.rb
@@ -174,6 +174,7 @@ test/rubygems/test_gem_package_tar_reader.rb
 test/rubygems/test_gem_package_tar_reader_entry.rb
 test/rubygems/test_gem_package_tar_writer.rb
 test/rubygems/test_gem_package_task.rb
+test/rubygems/test_gem_path_support.rb
 test/rubygems/test_gem_platform.rb
 test/rubygems/test_gem_remote_fetcher.rb
 test/rubygems/test_gem_requirement.rb

data/Rakefile

@@ -18,6 +18,7 @@ Hoe::RUBY_FLAGS << " --disable-gems" if RUBY_VERSION > "1.9"
 
 Hoe.plugin :minitest
 Hoe.plugin :git
+Hoe.plugin :isolate
 
 hoe = Hoe.spec 'rubygems-update' do
   self.rubyforge_name = 'rubygems'
@@ -45,6 +46,9 @@ hoe = Hoe.spec 'rubygems-update' do
   extra_dev_deps << ['builder', '~> 2.1']
   extra_dev_deps << ['hoe-seattlerb', '~> 1.2']
   extra_dev_deps << ['session', '~> 2.4']
+  extra_dev_deps << ['rdoc', '~> 3.0']
+  extra_dev_deps << ['rcov', '~> 0.9.0']
+  extra_dev_deps << ['ZenTest', '~> 4.5']
 
   self.extra_rdoc_files = Dir["*.rdoc"]
 
@@ -73,16 +77,10 @@ task :rake_sucks do
   end
 end
 
-desc "Run just the functional tests"
-Rake::TestTask.new(:test_functional) do |t|
-  t.test_files = FileList['test/functional*.rb']
-  t.warning = true
-end
-
 # --------------------------------------------------------------------
 # Creating a release
 
-task :prerelease => [:clobber, :check_manifest, :test, :test_functional]
+task :prerelease => [:clobber, :check_manifest, :test]
 
 task :postrelease => :publish_docs
 
@@ -167,6 +165,7 @@ task "rcov:for", [:test] do |task, args|
 
   rflags  = []
   rflags << "-i" << "lib/rubygems"
+  rflags << "--no-color" << "--save coverage.info" << "-T" << "--no-html"
 
   ruby "#{flags.join ' '} #{rcov} #{rflags.join ' '} #{args[:test]}"
 end

data/lib/rubygems.rb

@@ -27,6 +27,7 @@ end
 
 require 'rubygems/defaults'
 require "rubygems/dependency_list"
+require 'rubygems/path_support'
 require 'rbconfig'
 require "rubygems/deprecate"
 
@@ -119,8 +120,7 @@ require "rubygems/deprecate"
 # -The RubyGems Team
 
 module Gem
-
-  VERSION = '1.7.2'
+  VERSION = '1.8.0'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -156,11 +156,6 @@ module Gem
     end
   end
 
-  ##
-  # Default directories in a gem repository
-
-  DIRECTORIES = %w[cache doc gems specifications] unless defined?(DIRECTORIES)
-
   RubyGemsPackageVersion = VERSION
 
   RUBYGEMS_DIR = File.dirname File.expand_path(__FILE__)
@@ -186,13 +181,15 @@ module Gem
   @loaded_specs = {}
   @platforms = []
   @ruby = nil
-  @sources = []
+  @sources = nil
 
   @post_build_hooks     ||= []
   @post_install_hooks   ||= []
   @post_uninstall_hooks ||= []
   @pre_uninstall_hooks  ||= []
   @pre_install_hooks    ||= []
+  @pre_reset_hooks      ||= []
+  @post_reset_hooks     ||= []
 
   ##
   # Try to activate a gem containing +path+. Returns true if
@@ -200,17 +197,18 @@ module Gem
   # activated. Returns false if it can't find the path in a gem.
 
   def self.try_activate path
+    # TODO: deprecate when 1.9.3 comes out.
     # finds the _latest_ version... regardless of loaded specs and their deps
 
     # TODO: use find_all and bork if ambiguous
 
-    spec = Gem.searcher.find path
+    spec = Gem::Specification.find_by_path path
     return false unless spec
 
     begin
-      Gem.activate spec.name, "= #{spec.version}"
+      spec.activate
     rescue Gem::LoadError # this could fail due to gem dep collisions, go lax
-      Gem.activate spec.name
+      Gem::Specification.find_by_name(spec.name).activate
     end
 
     return true
@@ -233,111 +231,18 @@ module Gem
   # Gem::Requirement and Gem::Version documentation.
 
   def self.activate(dep, *requirements)
-    activate_dep dep, *requirements
-  end
-
-  def self.activate_dep dep, *requirements
-    requirements = Gem::Requirement.default if requirements.empty?
-    dep = Gem::Dependency.new(dep, requirements) unless Gem::Dependency === dep
-
-    matches = Gem.source_index.search dep, true
-    report_activate_error(dep) if matches.empty?
-
-    existing_spec = @loaded_specs[dep.name]
+    raise ArgumentError, "Deprecated use of Gem.activate(dep)" if
+      Gem::Dependency === dep
 
-    # TODO: move this to Dependency
-    if existing_spec then
-      # This gem is already loaded.  If the currently loaded gem is not in the
-      # list of candidate gems, then we have a version conflict.
-
-      # TODO: unless dep.matches_spec? existing_spec then
-      unless matches.any? { |spec| spec.version == existing_spec.version } then
-        msg = "can't activate #{dep}, "
-        msg << "already activated #{existing_spec.full_name}"
-
-        e = Gem::LoadError.new msg
-        e.name = dep.name
-        e.requirement = dep.requirement
-
-        raise e
-      end
-
-      return false
-    end
-
-    # TODO: this + spec.conflicts hint that activation is still dumb
-    spec = matches.last
-
-    activate_spec spec
+    Gem::Specification.find_by_name(dep, *requirements).activate
   end
 
-  def self.activate_spec spec
-    existing_spec = @loaded_specs[spec.name]
-
-    # TODO: move this to Specification
-    if existing_spec then
-      if spec.version != existing_spec.version then
-        # This gem is already loaded.  If the currently loaded gem is not in the
-        # list of candidate gems, then we have a version conflict.
-
-        msg = "can't activate #{dep}, "
-        msg << "already activated #{existing_spec.full_name}"
-
-        e = Gem::LoadError.new msg
-        e.name = dep.name
-        e.requirement = dep.requirement
-
-        raise e
-      end
-
-      return false
-    end
-
-    conf = spec.conflicts
-
-    unless conf.empty? then
-      why = conf.map { |act,con|
-        "#{act.full_name} conflicts with #{con.join(", ")}"
-      }.join ", "
-
-      # TODO: improve message by saying who activated `con`
-
-      raise LoadError, "Unable to activate #{spec.full_name}, because #{why}"
-    end
-
-    spec.loaded = true
-    @loaded_specs[spec.name]  = spec
-
-    spec.runtime_dependencies.each do |spec_dep|
-      next if Gem.loaded_specs.include? spec_dep.name
-      specs = Gem.source_index.search spec_dep, true
-
-      if specs.size == 1 then
-        self.activate spec_dep
-      else
-        name = spec_dep.name
-        unresolved_deps[name] = unresolved_deps[name].merge spec_dep
-      end
-    end
-
-    unresolved_deps.delete spec.name
-
-    require_paths = spec.require_paths.map do |path|
-      File.join spec.full_gem_path, path
-    end
-
-    # gem directories must come after -I and ENV['RUBYLIB']
-    insert_index = load_path_insert_index
-
-    if insert_index then
-      # gem directories must come after -I and ENV['RUBYLIB']
-      $LOAD_PATH.insert(insert_index, *require_paths)
-    else
-      # we are probably testing in core, -I and RUBYLIB don't apply
-      $LOAD_PATH.unshift(*require_paths)
-    end
+  def self.activate_dep dep, *requirements # :nodoc:
+    dep.to_spec.activate
+  end
 
-    return true
+  def self.activate_spec spec # :nodoc:
+    spec.activate
   end
 
   def self.unresolved_deps
@@ -353,7 +258,7 @@ module Gem
 
     Gem.path.each do |gemdir|
       each_load_path all_partials(gemdir) do |load_path|
-        result << load_path
+        result << gemdir.add(load_path).expand_path
       end
     end
 
@@ -364,7 +269,7 @@ module Gem
   # Return all the partial paths in +gemdir+.
 
   def self.all_partials(gemdir)
-    Dir[File.join(gemdir, 'gems/*')]
+    Dir[File.join(gemdir, "gems/*")]
   end
 
   private_class_method :all_partials
@@ -372,15 +277,14 @@ module Gem
   ##
   # See if a given gem is available.
 
-  def self.available?(gem, *requirements)
+  def self.available?(dep, *requirements)
     requirements = Gem::Requirement.default if requirements.empty?
 
-    unless gem.respond_to?(:name) and
-           gem.respond_to?(:requirement) then
-      gem = Gem::Dependency.new gem, requirements
+    unless dep.respond_to?(:name) and dep.respond_to?(:requirement) then
+      dep = Gem::Dependency.new dep, requirements
     end
 
-    !Gem.source_index.search(gem).empty?
+    not dep.matching_specs(true).empty?
   end
 
   ##
@@ -390,32 +294,29 @@ module Gem
   # you to specify specific gem versions.
 
   def self.bin_path(name, exec_name = nil, *requirements)
+    # TODO: fails test_self_bin_path_bin_file_gone_in_latest
+    # Gem::Specification.find_by_name(name, *requirements).bin_file exec_name
+
     raise ArgumentError, "you must supply exec_name" unless exec_name
 
     requirements = Gem::Requirement.default if
       requirements.empty?
-    specs = Gem.source_index.find_name(name, requirements)
+
+    specs = Gem::Dependency.new(name, requirements).matching_specs(true)
 
     raise Gem::GemNotFoundException,
           "can't find gem #{name} (#{requirements})" if specs.empty?
 
-    specs = specs.find_all do |spec|
-      spec.executables.include?(exec_name)
-    end if exec_name
+    specs = specs.find_all { |spec|
+      spec.executables.include? exec_name
+    } if exec_name
 
     unless spec = specs.last
       msg = "can't find gem #{name} (#{requirements}) with executable #{exec_name}"
       raise Gem::GemNotFoundException, msg
     end
 
-    exec_name ||= spec.default_executable
-
-    unless exec_name
-      msg = "no default executable for #{spec.full_name} and none given"
-      raise Gem::Exception, msg
-    end
-
-    File.join(spec.full_gem_path, spec.bindir, exec_name)
+    spec.bin_file exec_name
   end
 
   ##
@@ -429,8 +330,9 @@ module Gem
   # The path where gem executables are to be installed.
 
   def self.bindir(install_dir=Gem.dir)
-    return File.join(install_dir, 'bin') unless
-      install_dir.to_s == Gem.default_dir
+    # TODO: move to Gem::Dirs
+    return File.join install_dir, 'bin' unless
+      install_dir.to_s == Gem.default_dir.to_s
     Gem.default_bindir
   end
 
@@ -440,20 +342,18 @@ module Gem
   # mainly used by the unit tests to provide test isolation.
 
   def self.clear_paths
-    @gem_home = nil
-    @gem_path = nil
-    @user_home = nil
-
     @@source_index = nil
-
-    @searcher = nil
+    @paths         = nil
+    @user_home     = nil
+    @searcher      = nil
+    Gem::Specification.reset
   end
 
   ##
   # The path to standard location of the user's .gemrc file.
 
   def self.config_file
-    File.join Gem.user_home, '.gemrc'
+    @config_file ||= File.join Gem.user_home, '.gemrc'
   end
 
   ##
@@ -476,9 +376,10 @@ module Gem
   # package is not available as a gem, return nil.
 
   def self.datadir(gem_name)
+# TODO: deprecate
     spec = @loaded_specs[gem_name]
     return nil if spec.nil?
-    File.join(spec.full_gem_path, 'data', gem_name)
+    File.join spec.full_gem_path, "data", gem_name
   end
 
   ##
@@ -489,13 +390,29 @@ module Gem
     Zlib::Deflate.deflate data
   end
 
+  def self.paths
+    @paths ||= Gem::PathSupport.new
+  end
+
+  def self.paths=(env)
+    clear_paths
+    @paths = Gem::PathSupport.new env
+    Gem::Specification.dirs = @paths.path # FIX: home is at end
+  end
+
   ##
   # The path where gems are to be installed.
+  #--
+  # FIXME deprecate these once everything else has been done -ebh
 
   def self.dir
-    @gem_home ||= nil
-    set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
-    @gem_home
+    # TODO: raise "no"
+    paths.home
+  end
+
+  def self.path
+    # TODO: raise "no"
+    paths.path
   end
 
   ##
@@ -504,33 +421,35 @@ module Gem
 
   def self.each_load_path(partials)
     partials.each do |gp|
-      base = File.basename(gp)
-      specfn = File.join(dir, "specifications", base + ".gemspec")
-      if File.exist?(specfn)
-        spec = eval(File.read(specfn))
+      base = gp.basename
+      specfn = dir.specifications.add(base + ".gemspec")
+      if specfn.exist?
+        spec = eval(specfn.read)
         spec.require_paths.each do |rp|
-          yield(File.join(gp, rp))
+          yield(gp.add(rp))
         end
       else
-        filename = File.join(gp, 'lib')
-        yield(filename) if File.exist?(filename)
+        filename = dir.add(gp, 'lib')
+        yield(filename) if filename.exist?
       end
     end
   end
 
   private_class_method :each_load_path
 
+
   ##
   # Quietly ensure the named Gem directory contains all the proper
   # subdirectories.  If we can't create a directory due to a permission
   # problem, then we will silently continue.
 
-  def self.ensure_gem_subdirectories(gemdir)
+  def self.ensure_gem_subdirectories dir = Gem.dir
     require 'fileutils'
 
-    Gem::DIRECTORIES.each do |filename|
-      fn = File.join gemdir, filename
-      FileUtils.mkdir_p fn rescue nil unless File.exist? fn
+    %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
   end
 
@@ -555,11 +474,9 @@ module Gem
       }.flatten.select { |file| File.file? file.untaint }
     end
 
-    specs = searcher.find_all glob
-
-    specs.each do |spec|
-      files.concat searcher.matching_files(spec, glob)
-    end
+    files.concat Gem::Specification.map { |spec|
+      spec.matches_for_glob("#{glob}#{Gem.suffix_pattern}")
+    }.flatten
 
     # $LOAD_PATH might contain duplicate entries or reference
     # the spec dirs directly, so we prune.
@@ -579,25 +496,30 @@ module Gem
   #   it should fallback to USERPROFILE and HOMEDRIVE + HOMEPATH (at
   #   least on Win32).
   #++
+  #--
+  #
+  # FIXME move to pathsupport
+  #
+  #++
 
   def self.find_home
-    unless RUBY_VERSION > '1.9' then
-      ['HOME', 'USERPROFILE'].each do |homekey|
-        return File.expand_path(ENV[homekey]) if ENV[homekey]
+    windows = File::ALT_SEPARATOR
+    if not windows or RUBY_VERSION >= '1.9' then
+      File.expand_path "~"
+    else
+      ['HOME', 'USERPROFILE'].each do |key|
+        return File.expand_path ENV[key] if ENV[key]
       end
 
       if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
-        return File.expand_path("#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}")
+        File.expand_path "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}"
       end
     end
-
-    File.expand_path "~"
   rescue
-    if File::ALT_SEPARATOR then
-      drive = ENV['HOMEDRIVE'] || ENV['SystemDrive']
-      File.join(drive.to_s, '/')
+    if windows then
+      File.expand_path File.join(ENV['HOMEDRIVE'] || ENV['SystemDrive'], '/')
     else
-      "/"
+      File.expand_path "/"
     end
   end
 
@@ -663,7 +585,7 @@ module Gem
 
     Gem.path.each do |gemdir|
       each_load_path(latest_partials(gemdir)) do |load_path|
-        result << load_path
+        result << gemdir.add(load_path).expand_path
       end
     end
 
@@ -676,8 +598,9 @@ module Gem
   def self.latest_partials(gemdir)
     latest = {}
     all_partials(gemdir).each do |gp|
-      base = File.basename(gp)
-      if base =~ /(.*)-((\d+\.)*\d+)/ then
+      base = gp.basename
+
+      if base.to_s =~ /(.*)-((\d+\.)*\d+)/ then
         name, version = $1, $2
         ver = Gem::Version.new(version)
         if latest[name].nil? || ver > latest[name][0]
@@ -742,25 +665,6 @@ module Gem
     "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
   end
 
-  ##
-  # Array of paths to search for Gems.
-
-  def self.path
-    @gem_path ||= nil
-
-    unless @gem_path then
-      paths = [ENV['GEM_PATH'] || default_path]
-
-      if defined?(APPLE_GEM_HOME) and not ENV['GEM_PATH'] then
-        paths << APPLE_GEM_HOME
-      end
-
-      set_paths paths.compact.join(File::PATH_SEPARATOR)
-    end
-
-    @gem_path
-  end
-
   ##
   # Get the appropriate cache path.
   #
@@ -769,7 +673,7 @@ module Gem
   #
 
   def self.cache_dir(custom_dir=false)
-    File.join(custom_dir ? custom_dir : Gem.dir, 'cache')
+    File.join(custom_dir || Gem.dir, "cache")
   end
 
   ##
@@ -779,7 +683,7 @@ module Gem
   # nil/false (default) for Gem.dir.
 
   def self.cache_gem(filename, user_dir=false)
-    File.join(cache_dir(user_dir), filename)
+    cache_dir(user_dir).add(filename)
   end
 
   ##
@@ -819,6 +723,14 @@ module Gem
     @post_install_hooks << hook
   end
 
+  ##
+  # Adds a hook that will get run after Gem::Specification.reset is
+  # run.
+
+  def self.post_reset(&hook)
+    @post_reset_hooks << hook
+  end
+
   ##
   # Adds a post-uninstall hook that will be passed a Gem::Uninstaller instance
   # and the spec that was uninstalled when Gem::Uninstaller#uninstall is
@@ -837,6 +749,14 @@ module Gem
     @pre_install_hooks << hook
   end
 
+  ##
+  # Adds a hook that will get run before Gem::Specification.reset is
+  # run.
+
+  def self.pre_reset(&hook)
+    @pre_reset_hooks << hook
+  end
+
   ##
   # Adds a pre-uninstall hook that will be passed an Gem::Uninstaller instance
   # and the spec that will be uninstalled when Gem::Uninstaller#uninstall is
@@ -873,10 +793,10 @@ module Gem
     raise ArgumentError, "gem #{gem_name} is not activated" if gem.nil?
     raise ArgumentError, "gem #{over_name} is not activated" if over.nil?
 
-    last_gem_path = File.join gem.full_gem_path, gem.require_paths.last
+    last_gem_path = Gem::Path.path(gem.full_gem_path).add(gem.require_paths.last)
 
     over_paths = over.require_paths.map do |path|
-      File.join over.full_gem_path, path
+      Gem::Path.path(over.full_gem_path).add(path).to_s
     end
 
     over_paths.each do |path|
@@ -892,8 +812,8 @@ module Gem
   # Refresh source_index from disk and clear searcher.
 
   def self.refresh
-    source_index.refresh!
-
+    Gem::Specification.reset
+    @source_index = nil
     @searcher = nil
   end
 
@@ -910,7 +830,7 @@ module Gem
   # any version by the requested name.
 
   def self.report_activate_error(gem)
-    matches = Gem.source_index.find_name(gem.name)
+    matches = Gem::Specification.find_by_name(gem.name)
 
     if matches.empty? then
       error = Gem::LoadError.new(
@@ -941,8 +861,8 @@ module Gem
 
     spec = matches.last
     spec.require_paths.each do |path|
-      result = File.join spec.full_gem_path, path, libfile
-      return result if File.exist? result
+      result = Gem::Path.path(spec.full_gem_path).add(path, libfile)
+      return result if result.exist?
     end
 
     nil
@@ -954,11 +874,9 @@ module Gem
   def self.ruby
     if @ruby.nil? then
       @ruby = File.join(ConfigMap[:bindir],
-                        ConfigMap[:ruby_install_name])
-      @ruby << ConfigMap[:EXEEXT]
+                        "#{ConfigMap[:ruby_install_name]}#{ConfigMap[:EXEEXT]}")
 
-      # escape string in case path to ruby executable contain spaces.
-      @ruby.sub!(/.*\s.*/m, '"\&"')
+      @ruby = "\"#{@ruby}\"" if @ruby =~ /\s/
     end
 
     @ruby
@@ -1010,45 +928,13 @@ module Gem
     @searcher ||= Gem::GemPathSearcher.new
   end
 
-  ##
-  # Set the Gem home directory (as reported by Gem.dir).
-
-  def self.set_home(home)
-    home = home.gsub File::ALT_SEPARATOR, File::SEPARATOR if File::ALT_SEPARATOR
-    @gem_home = home
-  end
-
-  private_class_method :set_home
-
-  ##
-  # Set the Gem search path (as reported by Gem.path).
-
-  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!
-  end
-
-  private_class_method :set_paths
-
   ##
   # Returns the Gem::SourceIndex of specifications that are in the Gem.path
 
   def self.source_index
-    @@source_index ||= SourceIndex.new Gem::SourceIndex.installed_spec_directories
+    @@source_index ||= Deprecate.skip_during do
+      SourceIndex.new Gem::Specification.dirs
+    end
   end
 
   ##
@@ -1057,23 +943,14 @@ module Gem
   # default_sources if it is not installed.
 
   def self.sources
-    if @sources.empty? then
-      begin
-        gem 'sources', '> 0.0.1'
-        require 'sources'
-      rescue LoadError
-        @sources = default_sources
-      end
-    end
-
-    @sources
+    @sources ||= default_sources
   end
 
   ##
   # Need to be able to set the sources without calling
   # Gem.sources.replace since that would cause an infinite loop.
 
-  def self.sources=(new_sources)
+  def self.sources= new_sources
     @sources = new_sources
   end
 
@@ -1135,9 +1012,8 @@ module Gem
   # by the unit tests to provide environment isolation.
 
   def self.use_paths(home, paths=[])
-    clear_paths
-    set_home(home) if home
-    set_paths(paths.join(File::PATH_SEPARATOR)) if paths
+    self.paths = { "GEM_HOME" => home, "GEM_PATH" => paths }
+    # TODO: self.paths = home, paths
   end
 
   ##
@@ -1221,6 +1097,11 @@ module Gem
 
     attr_reader :post_install_hooks
 
+    ##
+    # The list of hooks to be run after Gem::Specification.reset is run.
+
+    attr_reader :post_reset_hooks
+
     ##
     # The list of hooks to be run before Gem::Uninstall#uninstall does any
     # work
@@ -1232,11 +1113,15 @@ module Gem
 
     attr_reader :pre_install_hooks
 
+    ##
+    # The list of hooks to be run before Gem::Specification.reset is run.
+
+    attr_reader :pre_reset_hooks
+
     ##
     # The list of hooks to be run after Gem::Uninstall#uninstall is finished
 
     attr_reader :pre_uninstall_hooks
-
   end
 
   def self.cache # :nodoc:
@@ -1248,27 +1133,17 @@ module Gem
 
   MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
 
-  autoload :Version, 'rubygems/version'
-  autoload :Requirement, 'rubygems/requirement'
-  autoload :Dependency, 'rubygems/dependency'
+  autoload :Version,         'rubygems/version'
+  autoload :Requirement,     'rubygems/requirement'
+  autoload :Dependency,      'rubygems/dependency'
   autoload :GemPathSearcher, 'rubygems/gem_path_searcher'
-  autoload :SpecFetcher, 'rubygems/spec_fetcher'
-  autoload :Specification, 'rubygems/specification'
-  autoload :Cache, 'rubygems/source_index'
-  autoload :SourceIndex, 'rubygems/source_index'
-  autoload :Platform, 'rubygems/platform'
-  autoload :Builder, 'rubygems/builder'
-  autoload :ConfigFile, 'rubygems/config_file'
-
-  class << self
-    extend Deprecate
-    # Can't do this one until I add Specification#activate
-    # deprecate :activate,          "Specification#activate", 2011, 10
-    deprecate :all_load_paths,    :none,                    2011, 10
-    deprecate :latest_load_paths, :none,                    2011, 10
-    deprecate :promote_load_path, :none,                    2011, 10
-    deprecate :cache,             "Gem::source_index",      2011, 8
-  end
+  autoload :SpecFetcher,     'rubygems/spec_fetcher'
+  autoload :Specification,   'rubygems/specification'
+  autoload :Cache,           'rubygems/source_index'
+  autoload :SourceIndex,     'rubygems/source_index'
+  autoload :Platform,        'rubygems/platform'
+  autoload :Builder,         'rubygems/builder'
+  autoload :ConfigFile,      'rubygems/config_file'
 end
 
 module Kernel
@@ -1304,7 +1179,8 @@ module Kernel
   def gem(gem_name, *requirements) # :doc:
     skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
     raise Gem::LoadError, "skipping #{gem_name}" if skip_list.include? gem_name
-    Gem.activate(gem_name, *requirements)
+    spec = Gem::Dependency.new(gem_name, *requirements).to_spec
+    spec.activate if spec
   end
 
   private :gem
@@ -1325,8 +1201,7 @@ def RbConfig.datadir(package_name)
 
   require 'rbconfig/datadir'
 
-  Gem.datadir(package_name) ||
-    File.join(Gem::ConfigMap[:datadir], package_name)
+  Gem.datadir(package_name) || File.join(Gem::ConfigMap[:datadir], package_name)
 end
 
 require 'rubygems/exceptions'
@@ -1359,3 +1234,25 @@ require 'rubygems/custom_require'
 
 Gem.clear_paths
 
+module Gem
+  class << self
+    extend Deprecate
+    deprecate :activate_dep,          "Specification#activate", 2011,  6
+    deprecate :activate_spec,         "Specification#activate", 2011,  6
+    deprecate :cache,                 "Gem::source_index",      2011,  8
+    deprecate :activate,              "Specification#activate", 2011, 10
+    deprecate :all_load_paths,        :none,                    2011, 10
+    deprecate :all_partials,          :none,                    2011, 10
+    deprecate :latest_load_paths,     :none,                    2011, 10
+    deprecate :promote_load_path,     :none,                    2011, 10
+    deprecate :available?,       "Specification::find_by_name", 2011, 11
+    deprecate :cache_dir,           "Specification#cache_dir",  2011, 11
+    deprecate :cache_gem,           "Specification#cache_file", 2011, 11
+    deprecate :default_system_source_cache_dir, :none,          2011, 11
+    deprecate :default_user_source_cache_dir,   :none,          2011, 11
+    deprecate :report_activate_error, :none,                    2011, 11
+    deprecate :required_location,     :none,                    2011, 11
+    deprecate :searcher,              "Specification",          2011, 11
+    deprecate :source_index,          "Specification",          2011, 11
+  end
+end