rubygems-update 1.7.2 → 1.8.0

data/lib/rubygems/source_index.rb

@@ -73,16 +73,13 @@ class Gem::SourceIndex
 
   def self.load_specification(file_name)
     Deprecate.skip_during do
-      Gem::Specification.load file_name
+      Gem::Specification.load Gem::Path.new(file_name)
     end
   end
 
   ##
   # Constructs a source index instance from the provided specifications, which
   # is a Hash of gem full names and Gem::Specifications.
-  #--
-  # TODO merge @gems and @prerelease_gems and provide a separate method
-  # #prerelease_gems
 
   def initialize specs_or_dirs = []
     @gems = {}
@@ -90,8 +87,9 @@ class Gem::SourceIndex
 
     case specs_or_dirs
     when Hash then
-      warn "NOTE: SourceIndex.new(hash) is deprecated; From #{caller.first}."
-      specs_or_dirs.each{ |full_name, spec| add_spec spec }
+      specs_or_dirs.each do |full_name, spec|
+        add_spec spec
+      end
     when Array, String then
       self.spec_dirs = Array(specs_or_dirs)
       refresh!
@@ -102,15 +100,15 @@ class Gem::SourceIndex
   end
 
   def all_gems
-    @gems
+    gems
   end
 
   def prerelease_gems
-    @gems.reject{ |name, gem| !gem.version.prerelease? }
+    @gems.reject { |name, gem| !gem.version.prerelease? }
   end
 
   def released_gems
-    @gems.reject{ |name, gem| gem.version.prerelease? }
+    @gems.reject { |name, gem| gem.version.prerelease? }
   end
 
   ##
@@ -120,7 +118,7 @@ class Gem::SourceIndex
     @gems.clear
 
     spec_dirs.reverse_each do |spec_dir|
-      spec_files = Dir.glob File.join(spec_dir, '*.gemspec')
+      spec_files = Dir[File.join(spec_dir, "*.gemspec")]
 
       spec_files.each do |spec_file|
         gemspec = Deprecate.skip_during do
@@ -165,8 +163,6 @@ class Gem::SourceIndex
       result[name] << spec
     end
 
-    # TODO: why is this a hash while @gems is an array? Seems like
-    # structural similarity would be good.
     result.values.flatten
   end
 
@@ -252,7 +248,10 @@ class Gem::SourceIndex
 
   def find_name(gem_name, requirement = Gem::Requirement.default)
     dep = Gem::Dependency.new gem_name, requirement
-    search dep
+
+    Deprecate.skip_during do
+      search dep
+    end
   end
 
   ##
@@ -264,9 +263,9 @@ class Gem::SourceIndex
   # +gem_pattern+, and a Gem::Requirement for +platform_only+.  This
   # behavior is deprecated and will be removed.
 
-  def search(gem_pattern, platform_only = false)
+  def search(gem_pattern, platform_or_requirement = false)
     requirement = nil
-    only_platform = false
+    only_platform = false # FIX: WTF is this?!?
 
     # TODO - Remove support and warning for legacy arguments after 2008/11
     unless Gem::Dependency === gem_pattern
@@ -275,9 +274,9 @@ class Gem::SourceIndex
 
     case gem_pattern
     when Regexp then
-      requirement = platform_only || Gem::Requirement.default
+      requirement = platform_or_requirement || Gem::Requirement.default
     when Gem::Dependency then
-      only_platform = platform_only
+      only_platform = platform_or_requirement
       requirement = gem_pattern.requirement
 
       gem_pattern = if Regexp === gem_pattern.name then
@@ -288,7 +287,7 @@ class Gem::SourceIndex
                       /^#{Regexp.escape gem_pattern.name}$/
                     end
     else
-      requirement = platform_only || Gem::Requirement.default
+      requirement = platform_or_requirement || Gem::Requirement.default
       gem_pattern = /#{gem_pattern}/i
     end
 
@@ -349,16 +348,6 @@ class Gem::SourceIndex
   def dump
     Marshal.dump(self)
   end
-
-  extend Deprecate
-  deprecate :all_gems, :none,  2011, 10
-
-  class << self
-    extend Deprecate
-    deprecate :from_installed_gems,        :none, 2011, 10
-    deprecate :from_gems_in,               :none, 2011, 10
-    deprecate :load_specification,         :none, 2011, 10
-  end
 end
 
 # :stopdoc:
@@ -371,5 +360,45 @@ module Gem
   Cache = SourceIndex
 
 end
-# :startdoc:
 
+class Gem::SourceIndex
+  extend Deprecate
+
+  deprecate :all_gems,         :none,                        2011, 10
+
+  deprecate :==,               :none,                        2011, 11 # noisy
+  deprecate :add_specs,        :none,                        2011, 11 # noisy
+  deprecate :each,             :none,                        2011, 11
+  deprecate :gems,             :none,                        2011, 11
+  deprecate :load_gems_in,     :none,                        2011, 11
+  deprecate :refresh!,         :none,                        2011, 11
+  deprecate :spec_dirs=,       "Specification.dirs=",        2011, 11 # noisy
+  deprecate :add_spec,         "Specification.add_spec",     2011, 11
+  deprecate :find_name,        "Specification.find_by_name", 2011, 11
+  deprecate :gem_signature,    :none,                        2011, 11
+  deprecate :index_signature,  :none,                        2011, 11
+  deprecate :initialize,       :none,                        2011, 11
+  deprecate :latest_specs,     "Specification.latest_specs", 2011, 11
+  deprecate :length,           "Specification.all.length",   2011, 11
+  deprecate :outdated,         :none,                        2011, 11
+  deprecate :prerelease_gems,  :none,                        2011, 11
+  deprecate :prerelease_specs, :none,                        2011, 11
+  deprecate :released_gems,    :none,                        2011, 11
+  deprecate :released_specs,   :none,                        2011, 11
+  deprecate :remove_spec,      "Specification.remove_spec",  2011, 11
+  deprecate :search,           :none,                        2011, 11
+  deprecate :size,             "Specification.all.size",     2011, 11
+  deprecate :spec_dirs,        "Specification.dirs",         2011, 11
+  deprecate :specification,    "Specification.find",         2011, 11
+
+  class << self
+    extend Deprecate
+
+    deprecate :from_gems_in,               :none,                2011, 10
+    deprecate :from_installed_gems,        :none,                2011, 10
+    deprecate :installed_spec_directories, "Specification.dirs", 2011, 11
+    deprecate :load_specification,         :none,                2011, 10
+  end
+end
+
+# :startdoc:

data/lib/rubygems/spec_fetcher.rb

@@ -85,6 +85,7 @@ class Gem::SpecFetcher
                         all               = false,
                         matching_platform = true,
                         prerelease        = false)
+
     specs_and_sources, errors = find_matching_with_errors(dependency,
                                                           all,
                                                           matching_platform,
@@ -138,7 +139,10 @@ class Gem::SpecFetcher
   # matching released versions are returned.  If +matching_platform+
   # is false, gems for all platforms are returned.
 
-  def find_matching_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
+  def find_matching_with_errors(dependency,
+                                all               = false,
+                                matching_platform = true,
+                                prerelease        = false)
     found = {}
 
     rejected_specs = {}

data/lib/rubygems/specification.rb

@@ -28,11 +28,6 @@ class Date; end # for ruby_code if date.rb wasn't required
 
 class Gem::Specification
 
-  ##
-  # Allows deinstallation of gems with legacy platforms.
-
-  attr_accessor :original_platform # :nodoc:
-
   ##
   # The the version number of a specification that does not specify one
   # (i.e. RubyGems 0.7 or earlier).
@@ -88,7 +83,7 @@ class Gem::Specification
   @@default_value = {
     :authors                   => [],
     :autorequire               => nil,
-    :bindir                    => "bin",
+    :bindir                    => 'bin',
     :cert_chain                => [],
     :date                      => TODAY,
     :dependencies              => [],
@@ -104,7 +99,7 @@ class Gem::Specification
     :platform                  => Gem::Platform::RUBY,
     :post_install_message      => nil,
     :rdoc_options              => [],
-    :require_paths             => ["lib"],
+    :require_paths             => ['lib'],
     :required_ruby_version     => Gem::Requirement.default,
     :required_rubygems_version => Gem::Requirement.default,
     :requirements              => [],
@@ -123,279 +118,374 @@ class Gem::Specification
     @@default_value[k].nil?
   }
 
-  def self.attribute_names
-    @@attributes.dup
-  end
+  ######################################################################
+  # :section: Required gemspec attributes
 
   ##
-  # The default value for specification attribute +name+
+  # This gem's name
 
-  def default_value(name)
-    @@default_value[name]
-  end
+  attr_accessor :name
 
   ##
-  # Required specification attributes
+  # This gem's version
 
-  def self.required_attributes
-    @@required_attributes.dup
-  end
+  attr_reader :version
 
   ##
-  # Is +name+ a required attribute?
+  # Paths in the gem to add to $LOAD_PATH when this gem is activated.
+  #
+  # The default ['lib'] is typically sufficient.
 
-  def self.required_attribute?(name)
-    @@required_attributes.include? name.to_sym
-  end
+  attr_accessor :require_paths
 
   ##
-  # Specification attributes that are arrays (appendable and so-forth)
+  # The version of RubyGems used to create this gem.
+  #
+  # Do not set this, it is set automatically when the gem is packaged.
 
-  def self.array_attributes
-    @@array_attributes.dup
-  end
+  attr_accessor :rubygems_version
 
   ##
-  # Specification attributes that must be non-nil
+  # The Gem::Specification version of this gemspec.
+  #
+  # Do not set this, it is set automatically when the gem is packaged.
 
-  def self.non_nil_attributes
-    @@non_nil_attributes.dup
-  end
+  attr_accessor :specification_version
 
   ##
-  # Dump only crucial instance variables.
-  #--
-  # MAINTAIN ORDER!
-  # (down with the man)
+  # A short summary of this gem's description.  Displayed in `gem list -d`.
+  #
+  # The description should be more detailed than the summary.  For example,
+  # you might wish to copy the entire README into the description.
 
-  def _dump(limit)
-    Marshal.dump [
-      @rubygems_version,
-      @specification_version,
-      @name,
-      @version,
-      date,
-      @summary,
-      @required_ruby_version,
-      @required_rubygems_version,
-      @original_platform,
-      @dependencies,
-      @rubyforge_project,
-      @email,
-      @authors,
-      @description,
-      @homepage,
-      true, # has_rdoc
-      @new_platform,
-      @licenses
-    ]
-  end
+  attr_reader :summary
+
+  ######################################################################
+  # :section: Optional gemspec attributes
 
   ##
-  # Load custom marshal format, re-initializing defaults as needed
+  # Autorequire was used by old RubyGems to automatically require a file.
+  #
+  # Deprecated: It is neither supported nor functional.
 
-  def self._load(str)
-    array = Marshal.load str
+  attr_accessor :autorequire
 
-    spec = Gem::Specification.new
-    spec.instance_variable_set :@specification_version, array[1]
+  ##
+  # The path in the gem for executable scripts.  Usually 'bin'
 
-    current_version = CURRENT_SPECIFICATION_VERSION
+  attr_accessor :bindir
 
-    field_count = if spec.specification_version > current_version then
-                    spec.instance_variable_set :@specification_version,
-                                               current_version
-                    MARSHAL_FIELDS[current_version]
-                  else
-                    MARSHAL_FIELDS[spec.specification_version]
-                  end
+  ##
+  # The certificate chain used to sign this gem.  See Gem::Security for
+  # details.
 
-    if array.size < field_count then
-      raise TypeError, "invalid Gem::Specification format #{array.inspect}"
-    end
+  attr_accessor :cert_chain
 
-    spec.instance_variable_set :@rubygems_version,          array[0]
-    # spec version
-    spec.instance_variable_set :@name,                      array[2]
-    spec.instance_variable_set :@version,                   array[3]
-    spec.instance_variable_set :@date,                      array[4]
-    spec.instance_variable_set :@summary,                   array[5]
-    spec.instance_variable_set :@required_ruby_version,     array[6]
-    spec.instance_variable_set :@required_rubygems_version, array[7]
-    spec.instance_variable_set :@original_platform,         array[8]
-    spec.instance_variable_set :@dependencies,              array[9]
-    spec.instance_variable_set :@rubyforge_project,         array[10]
-    spec.instance_variable_set :@email,                     array[11]
-    spec.instance_variable_set :@authors,                   array[12]
-    spec.instance_variable_set :@description,               array[13]
-    spec.instance_variable_set :@homepage,                  array[14]
-    spec.instance_variable_set :@has_rdoc,                  array[15]
-    spec.instance_variable_set :@new_platform,              array[16]
-    spec.instance_variable_set :@platform,                  array[16].to_s
-    spec.instance_variable_set :@license,                   array[17]
-    spec.instance_variable_set :@loaded,                    false
+  ##
+  # A long description of this gem
 
-    spec
-  end
+  attr_reader :description
 
   ##
-  # List of dependencies that will automatically be activated at runtime.
+  # Sets the default executable for this gem.
+  #
+  # Deprecated: You must now specify the executable name to  Gem.bin_path.
 
-  def runtime_dependencies
-    dependencies.select { |d| d.type == :runtime }
-  end
+  attr_writer :default_executable
 
   ##
-  # List of dependencies that are used for development
+  # A contact email for this gem
+  #
+  # If you are providing multiple authors and multiple emails they should be
+  # in the same order such that:
+  #
+  #   Hash[*spec.authors.zip(spec.emails).flatten]
+  #
+  # Gives a hash of author name to email address.
 
-  def development_dependencies
-    dependencies.select { |d| d.type == :development }
-  end
+  attr_accessor :email
 
-  def test_suite_file # :nodoc:
-    test_files.first
-  end
+  ##
+  # The URL of this gem's home page
 
-  def test_suite_file=(val) # :nodoc:
-    @test_files = [] unless defined? @test_files
-    @test_files << val
-  end
+  attr_accessor :homepage
 
   ##
-  # true when this gemspec has been loaded from a specifications directory.
-  # This attribute is not persisted.
+  # True when this gemspec has been activated. This attribute is not persisted.
 
   attr_accessor :loaded
 
-  ##
-  # Path this gemspec was loaded from.  This attribute is not persisted.
-
-  attr_accessor :loaded_from
+  alias :loaded? :loaded
 
   ##
-  # Returns an array with bindir attached to each executable in the
-  # executables list
+  # True when this gemspec has been activated. This attribute is not persisted.
 
-  def add_bindir(executables)
-    return nil if executables.nil?
+  attr_accessor :activated
 
-    if @bindir then
-      Array(executables).map { |e| File.join(@bindir, e) }
-    else
-      executables
-    end
-  rescue
-    return nil
-  end
+  alias :activated? :activated
 
   ##
-  # Files in the Gem under one of the require_paths
+  # Path this gemspec was loaded from.  This attribute is not persisted.
 
-  def lib_files
-    @files.select do |file|
-      require_paths.any? do |path|
-        file.index(path) == 0
-      end
-    end
-  end
+  attr_reader :loaded_from
 
   ##
-  # True if this gem was loaded from disk
+  # Allows deinstallation of gems with legacy platforms.
 
-  alias :loaded? :loaded
+  attr_writer :original_platform # :nodoc:
 
   ##
-  # True if this gem has files in test_files
+  # A message that gets displayed after the gem is installed
 
-  def has_unit_tests?
-    not test_files.empty?
-  end
+  attr_accessor :post_install_message
 
-  # :stopdoc:
-  alias has_test_suite? has_unit_tests?
-  # :startdoc:
+  ##
+  # The version of ruby required by this gem
+
+  attr_reader :required_ruby_version
 
   ##
-  # Specification constructor.  Assigns the default values to the
-  # attributes and yields itself for further
-  # initialization. Optionally takes +name+ and +version+.
+  # The RubyGems version required by this gem
 
-  def initialize name = nil, version = nil
-    @new_platform = nil
-    @loaded = false
-    @loaded_from = nil
-    @original_platform = nil
+  attr_reader :required_rubygems_version
 
-    @@nil_attributes.each do |key|
-      instance_variable_set "@#{key}", nil
-    end
+  ##
+  # The rubyforge project this gem lives under.  i.e. RubyGems'
+  # rubyforge_project is "rubygems".
 
-    @@non_nil_attributes.each do |key|
-      default = default_value(key)
-      value = case default
-              when Time, Numeric, Symbol, true, false, nil then default
-              else default.dup
-              end
+  attr_accessor :rubyforge_project
 
-      instance_variable_set "@#{key}", value
-    end
+  ##
+  # The key used to sign this gem.  See Gem::Security for details.
 
-    # HACK
-    instance_variable_set :@new_platform, Gem::Platform::RUBY
+  attr_accessor :signing_key
 
-    self.name = name if name
-    self.version = version if version
+  def self._all # :nodoc:
+    unless defined?(@@all) && @@all then
+      @@all = self.dirs.reverse.map { |dir|
+        Dir[File.join(dir, "*.gemspec")].map { |path|
+          Gem::Specification.load path
+        }
+      }.flatten
+      _resort!
+    end
+    @@all
+  end
 
-    yield self if block_given?
+  def self._resort! # :nodoc:
+    @@all.sort! { |a, b|
+      names = a.name <=> b.name
+      next names if names.nonzero?
+      b.version <=> a.version
+    }
   end
 
   ##
-  # Duplicates array_attributes from +other_spec+ so state isn't shared.
+  # Adds +spec+ to the known specifications, keeping the collection
+  # properly sorted.
 
-  def initialize_copy(other_spec)
-    other_ivars = other_spec.instance_variables
-    other_ivars = other_ivars.map { |ivar| ivar.intern } if # for 1.9
-      String === other_ivars.first
+  def self.add_spec spec
+    # TODO: find all extraneous adds
+    # puts
+    # p :add_spec => [spec.full_name, caller.reject { |s| s =~ /minitest/ }]
 
-    self.class.array_attributes.each do |name|
-      name = :"@#{name}"
-      next unless other_ivars.include? name
+    # TODO: flush the rest of the crap from the tests
+    # raise "no dupes #{spec.full_name} in #{all_names.inspect}" if
+    #   _all.include? spec
 
-      begin
-        val = other_spec.instance_variable_get(name)
-        if val then
-          instance_variable_set name, val.dup
-        else
-          warn "WARNING: #{full_name} has an invalid nil value for #{name}"
-        end
-      rescue TypeError
-        e = Gem::FormatException.new \
-          "#{full_name} has an invalid value for #{name}"
+    raise "nil spec!" unless spec # TODO: remove once we're happy with tests
 
-        e.file_path = loaded_from
-        raise e
-      end
-    end
+    return if _all.include? spec
+
+    _all << spec
+    _resort!
   end
 
   ##
-  # Special loader for YAML files.  When a Specification object is loaded
-  # from a YAML file, it bypasses the normal Ruby object initialization
-  # routine (#initialize).  This method makes up for that and deals with
-  # gems of different ages.
-  #
-  # 'input' can be anything that YAML.load() accepts: String or IO.
+  # Adds multiple specs to the known specifications.
 
-  def self.from_yaml(input)
-    input = normalize_yaml_input input
-    spec = YAML.load input
+  def self.add_specs *specs
+    raise "nil spec!" if specs.any?(&:nil?) # TODO: remove once we're happy
 
-    if spec && spec.class == FalseClass then
-      raise Gem::EndOfYAMLException
-    end
+    # TODO: this is much more efficient, but we need the extra checks for now
+    # _all.concat specs
+    # _resort!
 
-    unless Gem::Specification === spec then
-      raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
+    specs.each do |spec| # TODO: slow
+      add_spec spec
+    end
+  end
+
+  ##
+  # Returns all specifications. This method is discouraged from use.
+  # You probably want to use one of the Enumerable methods instead.
+
+  def self.all
+    warn "NOTE: Specification.all called from #{caller.first}" unless
+      Deprecate.skip
+    _all
+  end
+
+  ##
+  # Sets the known specs to +specs+. Not guaranteed to work for you in
+  # the future. Use at your own risk. Caveat emptor. Doomy doom doom.
+  # Etc etc.
+  #
+  #--
+  # Makes +specs+ the known specs
+  # Listen, time is a river
+  # Winter comes, code breaks
+  #
+  # -- wilsonb
+
+  def self.all= specs
+    @@all = specs
+  end
+
+  ##
+  # Return full names of all specs in sorted order.
+
+  def self.all_names
+    self._all.map(&:full_name)
+  end
+
+  ##
+  # Return the list of all array-oriented instance variables.
+  #--
+  # Not sure why we need to use so much stupid reflection in here...
+
+  def self.array_attributes
+    @@array_attributes.dup
+  end
+
+  ##
+  # Return the list of all instance variables.
+  #--
+  # Not sure why we need to use so much stupid reflection in here...
+
+  def self.attribute_names
+    @@attributes.dup
+  end
+
+  ##
+  # Return the directories that Specification uses to find specs.
+
+  def self.dirs
+    @@dirs ||= Gem.path.collect { |dir|
+      File.join dir, "specifications"
+    }
+  end
+
+  ##
+  # Set the directories that Specification uses to find specs. Setting
+  # this resets the list of known specs.
+
+  def self.dirs= dirs
+    # TODO: find extra calls to dir=
+    # warn "NOTE: dirs= called from #{caller.first} for #{dirs.inspect}"
+
+    self.reset
+
+    # ugh
+    @@dirs = Array(dirs).map { |dir| File.join dir, "specifications" }
+  end
+
+  extend Enumerable
+
+  ##
+  # Enumerate every known spec.  See ::dirs= and ::add_spec to set the list of
+  # specs.
+
+  def self.each
+    return enum_for(:each) unless block_given?
+
+    self._all.each do |x|
+      yield x
+    end
+  end
+
+  ##
+  # Returns every spec that matches +name+ and optional +requirements+.
+
+  def self.find_all_by_name name, *requirements
+    requirements = Gem::Requirement.default if requirements.empty?
+
+    # TODO: maybe try: find_all { |s| spec === dep }
+
+    Gem::Dependency.new(name, *requirements).matching_specs
+  end
+
+  ##
+  # Find the best specification matching a +name+ and +requirements+. Raises
+  # if the dependency doesn't resolve to a valid specification.
+
+  def self.find_by_name name, *requirements
+    requirements = Gem::Requirement.default if requirements.empty?
+
+    # TODO: maybe try: find { |s| spec === dep }
+
+    Gem::Dependency.new(name, *requirements).to_spec
+  end
+
+  ##
+  # Return the best specification that contains the file matching +path+.
+
+  def self.find_by_path path
+    self.find { |spec|
+      spec.contains_requirable_file? path
+    }
+  end
+
+  ##
+  # Return currently unresolved specs that contain the file matching +path+.
+
+  def self.find_in_unresolved path
+    # TODO: do we need these?? Kill it
+    specs = Gem.unresolved_deps.values.map { |dep| dep.to_specs }.flatten
+
+    specs.find_all { |spec| spec.contains_requirable_file? path }
+  end
+
+  ##
+  # Search through all unresolved deps and sub-dependencies and return
+  # specs that contain the file matching +path+.
+
+  def self.find_in_unresolved_tree path
+    specs = Gem.unresolved_deps.values.map { |dep| dep.to_specs }.flatten
+
+    specs.reverse_each do |spec|
+      trails = []
+      spec.traverse do |from_spec, dep, to_spec, trail|
+        next unless to_spec.conflicts.empty?
+        trails << trail if to_spec.contains_requirable_file? path
+      end
+
+      next if trails.empty?
+
+      return trails.map(&:reverse).sort.first.reverse
+    end
+
+    []
+  end
+
+  ##
+  # Special loader for YAML files.  When a Specification object is loaded
+  # from a YAML file, it bypasses the normal Ruby object initialization
+  # routine (#initialize).  This method makes up for that and deals with
+  # gems of different ages.
+  #
+  # +input+ can be anything that YAML.load() accepts: String or IO.
+
+  def self.from_yaml(input)
+    input = normalize_yaml_input input
+    spec = YAML.load input
+
+    if spec && spec.class == FalseClass then
+      raise Gem::EndOfYAMLException
+    end
+
+    unless Gem::Specification === spec then
+      raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
     end
 
     unless (spec.instance_variables.include? '@specification_version' or
@@ -408,6 +498,27 @@ class Gem::Specification
     spec
   end
 
+  ##
+  # Return the latest specs, optionally including prerelease specs if
+  # +prerelease+ is true.
+
+  def self.latest_specs prerelease = false
+    result = Hash.new { |h,k| h[k] = {} }
+    native = {}
+
+    Gem::Specification._all.reverse_each do |spec|
+      next if spec.version.prerelease? unless prerelease
+
+      native[spec.name] = spec.version if spec.platform == Gem::Platform::RUBY
+      result[spec.name][spec.platform] = spec
+    end
+
+    result.map(&:last).map(&:values).flatten.reject { |spec|
+      minimum = native[spec.name]
+      minimum && spec.version < minimum
+    }
+  end
+
   ##
   # Loads Ruby format gemspec from +file+.
 
@@ -428,7 +539,7 @@ class Gem::Specification
       spec = eval code, binding, file
 
       if Gem::Specification === spec
-        spec.loaded_from = file
+        spec.loaded_from = file.to_s
         return spec
       end
 
@@ -442,6 +553,13 @@ class Gem::Specification
     nil
   end
 
+  ##
+  # Specification attributes that must be non-nil
+
+  def self.non_nil_attributes
+    @@non_nil_attributes.dup
+  end
+
   ##
   # Make sure the YAML specification is properly formatted with dashes
 
@@ -452,458 +570,430 @@ class Gem::Specification
   end
 
   ##
-  # Sets the rubygems_version to the current RubyGems version
+  # Removes +spec+ from the known specs.
 
-  def mark_version
-    @rubygems_version = Gem::VERSION
+  def self.remove_spec spec
+    # TODO: beat on the tests
+    raise "wtf: #{spec.full_name} not in #{all_names.inspect}" unless
+      _all.include? spec
+    _all.delete spec
   end
 
   ##
-  # Ignore unknown attributes while loading
+  # Is +name+ a required attribute?
 
-  def method_missing(sym, *a, &b) # :nodoc:
-    if @specification_version > CURRENT_SPECIFICATION_VERSION and
-      sym.to_s =~ /=$/ then
-      warn "ignoring #{sym} loading #{full_name}" if $DEBUG
-    else
-      super
-    end
+  def self.required_attribute?(name)
+    @@required_attributes.include? name.to_sym
   end
 
   ##
-  # Adds a development dependency named +gem+ with +requirements+ to this
-  # Gem.  For example:
-  #
-  #   spec.add_development_dependency 'jabber4r', '> 0.1', '<= 0.5'
-  #
-  # Development dependencies aren't installed by default and aren't
-  # activated when a gem is required.
+  # Required specification attributes
 
-  def add_development_dependency(gem, *requirements)
-    add_dependency_with_type(gem, :development, *requirements)
+  def self.required_attributes
+    @@required_attributes.dup
   end
 
   ##
-  # Adds a runtime dependency named +gem+ with +requirements+ to this Gem.
-  # For example:
-  #
-  #   spec.add_runtime_dependency 'jabber4r', '> 0.1', '<= 0.5'
+  # Reset the list of known specs, running pre and post reset hooks
+  # registered in Gem.
 
-  def add_runtime_dependency(gem, *requirements)
-    add_dependency_with_type(gem, :runtime, *requirements)
+  def self.reset
+    @@dirs = nil
+    # from = caller.first(10).reject { |s| s =~ /minitest/ }
+    # warn ""
+    # warn "NOTE: Specification.reset from #{from.inspect}"
+    Gem.pre_reset_hooks.each  { |hook| hook.call }
+    @@all = nil
+    Gem.post_reset_hooks.each { |hook| hook.call }
   end
 
   ##
-  # Adds a runtime dependency
+  # Load custom marshal format, re-initializing defaults as needed
 
-  alias add_dependency add_runtime_dependency
+  def self._load(str)
+    array = Marshal.load str
 
-  ##
-  # Returns the full name (name-version) of this Gem.  Platform information
-  # is included (name-version-platform) if it is specified and not the
-  # default Ruby platform.
+    spec = Gem::Specification.new
+    spec.instance_variable_set :@specification_version, array[1]
 
-  def full_name
-    if platform == Gem::Platform::RUBY or platform.nil? then
-      "#{@name}-#{@version}"
-    else
-      "#{@name}-#{@version}-#{platform}"
-    end
-  end
+    current_version = CURRENT_SPECIFICATION_VERSION
 
-  ##
-  # Returns the full name (name-version) of this gemspec using the original
-  # platform.  For use with legacy gems.
+    field_count = if spec.specification_version > current_version then
+                    spec.instance_variable_set :@specification_version,
+                                               current_version
+                    MARSHAL_FIELDS[current_version]
+                  else
+                    MARSHAL_FIELDS[spec.specification_version]
+                  end
 
-  def original_name # :nodoc:
-    if platform == Gem::Platform::RUBY or platform.nil? then
-      "#{@name}-#{@version}"
-    else
-      "#{@name}-#{@version}-#{@original_platform}"
+    if array.size < field_count then
+      raise TypeError, "invalid Gem::Specification format #{array.inspect}"
     end
+
+    spec.instance_variable_set :@rubygems_version,          array[0]
+    # spec version
+    spec.instance_variable_set :@name,                      array[2]
+    spec.instance_variable_set :@version,                   array[3]
+    spec.instance_variable_set :@date,                      array[4]
+    spec.instance_variable_set :@summary,                   array[5]
+    spec.instance_variable_set :@required_ruby_version,     array[6]
+    spec.instance_variable_set :@required_rubygems_version, array[7]
+    spec.instance_variable_set :@original_platform,         array[8]
+    spec.instance_variable_set :@dependencies,              array[9]
+    spec.instance_variable_set :@rubyforge_project,         array[10]
+    spec.instance_variable_set :@email,                     array[11]
+    spec.instance_variable_set :@authors,                   array[12]
+    spec.instance_variable_set :@description,               array[13]
+    spec.instance_variable_set :@homepage,                  array[14]
+    spec.instance_variable_set :@has_rdoc,                  array[15]
+    spec.instance_variable_set :@new_platform,              array[16]
+    spec.instance_variable_set :@platform,                  array[16].to_s
+    spec.instance_variable_set :@license,                   array[17]
+    spec.instance_variable_set :@loaded,                    false
+
+    spec
   end
 
-  ##
-  # The full path to the gem (install path + full name).
+  def <=>(other) # :nodoc:
+    sort_obj <=> other.sort_obj
+  end
 
-  def full_gem_path
-    path = File.join installation_path, 'gems', full_name
-    return path if File.directory? path
-    File.join installation_path, 'gems', original_name
+  def == other # :nodoc:
+    self.class === other &&
+      name == other.name &&
+      version == other.version &&
+      platform == other.platform
   end
 
   ##
-  # The default (generated) file name of the gem.  See also #spec_name.
-  #
-  #   spec.file_name # => "example-1.0.gem"
+  # Dump only crucial instance variables.
+  #--
+  # MAINTAIN ORDER!
+  # (down with the man)
 
-  def file_name
-    "#{full_name}.gem"
+  def _dump(limit)
+    Marshal.dump [
+      @rubygems_version,
+      @specification_version,
+      @name,
+      @version,
+      date,
+      @summary,
+      @required_ruby_version,
+      @required_rubygems_version,
+      @original_platform,
+      @dependencies,
+      @rubyforge_project,
+      @email,
+      @authors,
+      @description,
+      @homepage,
+      true, # has_rdoc
+      @new_platform,
+      @licenses
+    ]
   end
 
   ##
-  # The directory that this gem was installed into.
+  # Activate this spec, registering it as a loaded spec and adding
+  # it's lib paths to $LOAD_PATH. Returns true if the spec was
+  # activated, false if it was previously activated. Freaks out if
+  # there are conflicts upon activation.
 
-  def installation_path
-    unless @loaded_from then
-      raise Gem::Exception, "spec #{full_name} is not from an installed gem"
-    end
+  def activate
+    raise_if_conflicts
 
-    File.expand_path File.dirname(File.dirname(@loaded_from))
-  end
+    return false if Gem.loaded_specs[self.name]
 
-  ##
-  # Checks if this specification meets the requirement of +dependency+.
+    activate_dependencies
+    add_self_to_load_path
 
-  def satisfies_requirement?(dependency)
-    return @name == dependency.name &&
-      dependency.requirement.satisfied_by?(@version)
+    Gem.loaded_specs[self.name] = self
+    self.activated = true
+
+    return true
   end
 
   ##
-  # Returns an object you can use to sort specifications in #sort_by.
+  # Activate all unambiguously resolved runtime dependencies of this
+  # spec. Add any ambigous dependencies to the unresolved list to be
+  # resolved later, as needed.
 
-  def sort_obj
-    [@name, @version, @new_platform == Gem::Platform::RUBY ? -1 : 1]
+  def activate_dependencies
+    self.runtime_dependencies.each do |spec_dep|
+      # TODO: check for conflicts! not just name!
+      next if Gem.loaded_specs.include? spec_dep.name
+      specs = spec_dep.to_specs
+
+      if specs.size == 1 then
+        specs.first.activate
+      else
+        name = spec_dep.name
+        Gem.unresolved_deps[name] = Gem.unresolved_deps[name].merge spec_dep
+      end
+    end
+
+    Gem.unresolved_deps.delete self.name
   end
 
   ##
-  # The default name of the gemspec.  See also #file_name
-  #
-  #   spec.spec_name # => "example-1.0.gemspec"
+  # Returns an array with bindir attached to each executable in the
+  # +executables+ list
 
-  def spec_name
-    "#{full_name}.gemspec"
-  end
+  def add_bindir(executables)
+    return nil if executables.nil?
 
-  def <=>(other) # :nodoc:
-    sort_obj <=> other.sort_obj
+    if @bindir then
+      Array(executables).map { |e| File.join(@bindir, e) }
+    else
+      executables
+    end
+  rescue
+    return nil
   end
 
   ##
-  # Tests specs for equality (across all attributes).
+  # Adds a dependency on gem +dependency+ with type +type+ that requires
+  # +requirements+.  Valid types are currently <tt>:runtime</tt> and
+  # <tt>:development</tt>.
 
-  def ==(other) # :nodoc:
-    self.class === other && same_attributes?(other)
+  def add_dependency_with_type(dependency, type, *requirements)
+    requirements = if requirements.empty? then
+                     Gem::Requirement.default
+                   else
+                     requirements.flatten
+                   end
+
+    unless dependency.respond_to?(:name) &&
+      dependency.respond_to?(:version_requirements)
+
+      dependency = Gem::Dependency.new(dependency, requirements, type)
+    end
+
+    dependencies << dependency
   end
 
-  alias eql? == # :nodoc:
+  private :add_dependency_with_type
 
   ##
-  # A macro to yield cached gem path
+  # Adds a development dependency named +gem+ with +requirements+ to this
+  # Gem.  For example:
+  #
+  #   spec.add_development_dependency 'example', '~> 1.1', '>= 1.1.4'
   #
-  def cache_gem
-    cache_name = File.join(Gem.dir, 'cache', file_name)
-    return File.exist?(cache_name) ? cache_name : nil
+  # Development dependencies aren't installed by default and aren't
+  # activated when a gem is required.
+
+  def add_development_dependency(gem, *requirements)
+    add_dependency_with_type(gem, :development, *requirements)
   end
 
   ##
-  # True if this gem has the same attributes as +other+.
+  # Adds a runtime dependency named +gem+ with +requirements+ to this Gem.
+  # For example:
+  #
+  #   spec.add_runtime_dependency 'example', '~> 1.1', '>= 1.1.4'
 
-  def same_attributes?(other)
-    @@attributes.each do |name, default|
-      return false unless self.send(name) == other.send(name)
-    end
-    true
+  def add_runtime_dependency(gem, *requirements)
+    add_dependency_with_type(gem, :runtime, *requirements)
   end
 
-  private :same_attributes?
+  alias add_dependency add_runtime_dependency
 
-  def hash # :nodoc:
-    @@attributes.inject(0) { |hash_code, (name, _)|
-      hash_code ^ self.send(name).hash
-    }
-  end
+  ##
+  # Adds this spec's require paths to LOAD_PATH, in the proper location.
 
-  def encode_with coder # :nodoc:
-    mark_version
+  def add_self_to_load_path
+    paths = require_paths.map do |path|
+      File.join full_gem_path, path
+    end
 
-    coder.add 'name', @name
-    coder.add 'version', @version
-    platform = case @original_platform
-               when nil, '' then
-                 'ruby'
-               when String then
-                 @original_platform
-               else
-                 @original_platform.to_s
-               end
-    coder.add 'platform', platform
+    # gem directories must come after -I and ENV['RUBYLIB']
+    insert_index = Gem.load_path_insert_index
 
-    attributes = @@attributes.map(&:to_s) - %w[name version platform]
-    attributes.each do |name|
-      coder.add name, instance_variable_get("@#{name}")
+    if insert_index then
+      # gem directories must come after -I and ENV['RUBYLIB']
+      $LOAD_PATH.insert(insert_index, *paths)
+    else
+      # we are probably testing in core, -I and RUBYLIB don't apply
+      $LOAD_PATH.unshift(*paths)
     end
   end
 
   ##
-  # Creates a duplicate spec without large blobs that aren't used at runtime.
+  # Singular reader for #authors
 
-  def for_cache
-    spec = dup
+  def author
+    val = authors and val.first
+  end
 
-    spec.files = nil
-    spec.test_files = nil
+  ##
+  # Singular writer for #authors
 
-    spec
+  def author= o
+    self.authors = [o]
   end
 
-  def to_yaml(opts = {}) # :nodoc:
-    if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
-      super.gsub(/ !!null \n/, " \n")
-    else
-      YAML.quick_emit object_id, opts do |out|
-        out.map taguri, to_yaml_style do |map|
-          encode_with map
-        end
-      end
-    end
+  ##
+  # The list of author names who wrote this gem.
+  #
+  # If you are providing multiple authors and multiple emails they should be
+  # in the same order such that:
+  #
+  #   Hash[*spec.authors.zip(spec.emails).flatten]
+  #
+  # Gives a hash of author name to email address.
+
+  def authors
+    @authors ||= []
   end
 
-  def init_with coder # :nodoc:
-    yaml_initialize coder.tag, coder.map
+  ##
+  # Sets the list of authors, ensuring it is an array.
+
+  def authors= value
+    @authors = Array(value).flatten.grep(String)
   end
 
-  def yaml_initialize(tag, vals) # :nodoc:
-    vals.each do |ivar, val|
-      instance_variable_set "@#{ivar}", val
-    end
+  ##
+  # Returns the full path to the base gem directory.
+  #
+  # eg: /usr/local/lib/ruby/gems/1.8
 
-    @original_platform = @platform # for backwards compatibility
-    self.platform = Gem::Platform.new @platform
+  def base_dir
+    return Gem.dir unless loaded_from
+    @base_dir ||= File.dirname File.dirname loaded_from
   end
 
   ##
-  # Returns a Ruby code representation of this specification, such that it
-  # can be eval'ed and reconstruct the same specification later.  Attributes
-  # that still have their default values are omitted.
+  # Returns the full path to installed gem's bin directory.
+  #
+  # NOTE: do not confuse this with +bindir+, which is just 'bin', not
+  # a full path.
 
-  def to_ruby
-    mark_version
-    result = []
-    result << "# -*- encoding: utf-8 -*-"
-    result << nil
-    result << "Gem::Specification.new do |s|"
+  def bin_dir
+    @bin_dir ||= File.join gem_dir, bindir # TODO: this is unfortunate
+  end
 
-    result << "  s.name = #{ruby_code name}"
-    result << "  s.version = #{ruby_code version}"
-    unless platform.nil? or platform == Gem::Platform::RUBY then
-      result << "  s.platform = #{ruby_code original_platform}"
-    end
-    result << ""
-    result << "  s.required_rubygems_version = #{ruby_code required_rubygems_version} if s.respond_to? :required_rubygems_version="
+  ##
+  # Returns the full path to an executable named +name+ in this gem.
 
-    handled = [
-      :dependencies,
-      :name,
-      :platform,
-      :required_rubygems_version,
-      :specification_version,
-      :version,
-      :has_rdoc,
-    ]
+  def bin_file name
+    File.join bin_dir, name
+  end
 
-    @@attributes.each do |attr_name|
-      next if handled.include? attr_name
-      current_value = self.send(attr_name)
-      if current_value != default_value(attr_name) or
-         self.class.required_attribute? attr_name then
-        result << "  s.#{attr_name} = #{ruby_code current_value}"
-      end
-    end
+  ##
+  # Returns the full path to the cache directory containing this
+  # spec's cached gem.
 
-    result << nil
-    result << "  if s.respond_to? :specification_version then"
-    result << "    s.specification_version = #{specification_version}"
-    result << nil
+  def cache_dir
+    @cache_dir ||= File.join base_dir, "cache"
+  end
 
-    result << "    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then"
+  ##
+  # Returns the full path to the cached gem for this spec.
 
-    dependencies.each do |dep|
-      req = dep.requirements_list.inspect
-      dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
-      result << "      s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{req})"
-    end
+  def cache_file
+    @cache_file ||= File.join cache_dir, "#{full_name}.gem"
+  end
 
-    result << "    else"
+  alias :cache_gem :cache_file
 
-    dependencies.each do |dep|
-      version_reqs_param = dep.requirements_list.inspect
-      result << "      s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
+  ##
+  # Return any possible conflicts against the currently loaded specs.
+
+  def conflicts
+    conflicts = {}
+    Gem.loaded_specs.values.each do |spec|
+      bad = self.runtime_dependencies.find_all { |dep|
+        spec.name == dep.name and not spec.satisfies_requirement? dep
+      }
+
+      conflicts[spec] = bad unless bad.empty?
     end
+    conflicts
+  end
 
-    result << '    end'
+  ##
+  # Return true if this spec can require +file+.
 
-    result << "  else"
-      dependencies.each do |dep|
-        version_reqs_param = dep.requirements_list.inspect
-        result << "    s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
-      end
-    result << "  end"
+  def contains_requirable_file? file
+    root = full_gem_path
 
-    result << "end"
-    result << nil
+    require_paths.each do |lib|
+      base = "#{root}/#{lib}/#{file}"
+      Gem.suffixes.each do |suf|
+        path = "#{base}#{suf}"
+        return true if File.file? path
+      end
+    end
 
-    result.join "\n"
+    return false
   end
 
-  def to_ruby_for_cache
-    for_cache.to_ruby
+  ##
+  # The date this gem was created. Lazily defaults to TODAY.
+
+  def date
+    @date ||= TODAY
   end
 
   ##
-  # Checks that the specification contains all required fields, and does a
-  # very basic sanity check.
+  # The date this gem was created
   #
-  # Raises InvalidSpecificationException if the spec does not pass the
-  # checks..
+  # Do not set this, it is set automatically when the gem is packaged.
 
-  def validate packaging = true
-    require 'rubygems/user_interaction'
-    extend Gem::UserInteraction
-    normalize
+  def date= date
+    # We want to end up with a Time object with one-day resolution.
+    # This is the cleanest, most-readable, faster-than-using-Date
+    # way to do it.
+    @date = case date
+            when String then
+              if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
+                Time.utc($1.to_i, $2.to_i, $3.to_i)
+              else
+                raise(Gem::InvalidSpecificationException,
+                      "invalid date format in specification: #{date.inspect}")
+              end
+            when Time, Date then
+              Time.utc(date.year, date.month, date.day)
+            else
+              TODAY
+            end
+  end
 
-    nil_attributes = self.class.non_nil_attributes.find_all do |name|
-      instance_variable_get("@#{name}").nil?
-    end
+  ##
+  # The default executable for this gem.
+  #
+  # Deprecated: The name of the gem is assumed to be the name of the
+  # executable now.  See Gem.bin_path.
 
-    unless nil_attributes.empty? then
-      raise Gem::InvalidSpecificationException,
-        "#{nil_attributes.join ', '} must not be nil"
+  def default_executable
+    if defined?(@default_executable) and @default_executable
+      result = @default_executable
+    elsif @executables and @executables.size == 1
+      result = Array(@executables).first
+    else
+      result = nil
     end
+    result
+  end
 
-    if packaging and rubygems_version != Gem::VERSION then
-      raise Gem::InvalidSpecificationException,
-            "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
-    end
+  ##
+  # The default value for specification attribute +name+
 
-    @@required_attributes.each do |symbol|
-      unless self.send symbol then
-        raise Gem::InvalidSpecificationException,
-              "missing value for attribute #{symbol}"
-      end
-    end
-
-    unless String === name then
-      raise Gem::InvalidSpecificationException,
-            "invalid value for attribute name: \"#{name.inspect}\""
-    end
-
-    if require_paths.empty? then
-      raise Gem::InvalidSpecificationException,
-            'specification must have at least one require_path'
-    end
-
-    @files.delete_if            do |file| File.directory? file end
-    @test_files.delete_if       do |file| File.directory? file end
-    @executables.delete_if      do |file|
-      File.directory? File.join(bindir, file)
-    end
-    @extra_rdoc_files.delete_if do |file| File.directory? file end
-    @extensions.delete_if       do |file| File.directory? file end
-
-    non_files = files.select do |file|
-      !File.file? file
-    end
-
-    unless not packaging or non_files.empty? then
-      non_files = non_files.map { |file| file.inspect }
-      raise Gem::InvalidSpecificationException,
-            "[#{non_files.join ", "}] are not files"
-    end
-
-    unless specification_version.is_a?(Fixnum)
-      raise Gem::InvalidSpecificationException,
-            'specification_version must be a Fixnum (did you mean version?)'
-    end
-
-    case platform
-    when Gem::Platform, Gem::Platform::RUBY then # ok
-    else
-      raise Gem::InvalidSpecificationException,
-            "invalid platform #{platform.inspect}, see Gem::Platform"
-    end
-
-    self.class.array_attributes.each do |symbol|
-      val = self.send symbol
-      klass = symbol == :dependencies ? Gem::Dependency : String
-
-      unless Array === val and val.all? { |x| klass === x } then
-        raise(Gem::InvalidSpecificationException,
-              "#{symbol} must be an Array of #{klass} instances")
-      end
-    end
-
-    licenses.each { |license|
-      if license.length > 64
-        raise Gem::InvalidSpecificationException,
-          "each license must be 64 characters or less"
-      end
-    }
-
-    # reject lazy developers:
-
-    lazy = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, '')
-
-    unless authors.grep(/FI XME|TO DO/x).empty? then
-      raise Gem::InvalidSpecificationException, "#{lazy} is not an author"
-    end
-
-    unless Array(email).grep(/FI XME|TO DO/x).empty? then
-      raise Gem::InvalidSpecificationException, "#{lazy} is not an email"
-    end
-
-    if description =~ /FI XME|TO DO/x then
-      raise Gem::InvalidSpecificationException, "#{lazy} is not a description"
-    end
-
-    if summary =~ /FI XME|TO DO/x then
-      raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
-    end
-
-    if homepage and not homepage.empty? and
-       homepage !~ /\A[a-z][a-z\d+.-]*:/i then
-      raise Gem::InvalidSpecificationException,
-            "\"#{homepage}\" is not a URI"
-    end
-
-    # Warnings
-
-    %w[author description email homepage summary].each do |attribute|
-      value = self.send attribute
-      alert_warning "no #{attribute} specified" if value.nil? or value.empty?
-    end
-
-    if description == summary then
-      alert_warning 'description and summary are identical'
-    end
-
-    # TODO: raise at some given date
-    alert_warning "deprecated autorequire specified" if autorequire
-
-    executables.each do |executable|
-      executable_path = File.join bindir, executable
-      shebang = File.read(executable_path, 2) == '#!'
-
-      alert_warning "#{executable_path} is missing #! line" unless shebang
-    end
-
-    true
+  def default_value name
+    @@default_value[name]
   end
 
   ##
-  # Normalize the list of files so that:
-  # * All file lists have redundancies removed.
-  # * Files referenced in the extra_rdoc_files are included in the package
-  #   file list.
+  # A list of Gem::Dependency objects this gem depends on.
+  #
+  # Use #add_dependency or #add_development_dependency to add dependencies to
+  # a gem.
 
-  def normalize
-    if defined?(@extra_rdoc_files) and @extra_rdoc_files then
-      @extra_rdoc_files.uniq!
-      @files ||= []
-      @files.concat(@extra_rdoc_files)
-    end
-    @files.uniq! if @files
+  def dependencies
+    @dependencies ||= []
   end
 
   ##
@@ -914,379 +1004,372 @@ class Gem::Specification
 
   def dependent_gems
     out = []
-    Gem.source_index.each do |name,gem|
-      gem.dependencies.each do |dep|
+    Gem::Specification.each do |spec|
+      spec.dependencies.each do |dep|
         if self.satisfies_requirement?(dep) then
           sats = []
           find_all_satisfiers(dep) do |sat|
             sats << sat
           end
-          out << [gem, dep, sats]
+          out << [spec, dep, sats]
         end
       end
     end
     out
   end
 
-  def to_s # :nodoc:
-    "#<Gem::Specification name=#{@name} version=#{@version}>"
-  end
-
-  def pretty_print(q) # :nodoc:
-    q.group 2, 'Gem::Specification.new do |s|', 'end' do
-      q.breakable
+  ##
+  # Returns all specs that matches this spec's runtime dependencies.
 
-      # REFACTOR: each_attr - use in to_yaml as well
-      @@attributes.each do |attr_name|
-        current_value = self.send attr_name
-        if current_value != default_value(attr_name) or
-           self.class.required_attribute? attr_name then
+  def dependent_specs
+    runtime_dependencies.map { |dep| dep.to_specs }.flatten
+  end
 
-          q.text "s.#{attr_name} = "
+  ##
+  # A long description of this gem
 
-          if attr_name == :date then
-            current_value = current_value.utc
+  def description= str
+    @description = str.to_s
+  end
 
-            q.text "Time.utc(#{current_value.year}, #{current_value.month}, #{current_value.day})"
-          else
-            q.pp current_value
-          end
+  ##
+  # List of dependencies that are used for development
 
-          q.breakable
-        end
-      end
-    end
+  def development_dependencies
+    dependencies.select { |d| d.type == :development }
   end
 
   ##
-  # Adds a dependency on gem +dependency+ with type +type+ that requires
-  # +requirements+.  Valid types are currently <tt>:runtime</tt> and
-  # <tt>:development</tt>.
+  # Returns the full path to this spec's documentation directory.
 
-  def add_dependency_with_type(dependency, type, *requirements)
-    requirements = if requirements.empty? then
-                     Gem::Requirement.default
-                   else
-                     requirements.flatten
-                   end
+  def doc_dir
+    @doc_dir ||= File.join base_dir, 'doc', full_name
+  end
 
-    unless dependency.respond_to?(:name) &&
-      dependency.respond_to?(:version_requirements)
+  def encode_with coder # :nodoc:
+    mark_version
 
-      dependency = Gem::Dependency.new(dependency, requirements, type)
-    end
+    coder.add 'name', @name
+    coder.add 'version', @version
+    platform = case @original_platform
+               when nil, '' then
+                 'ruby'
+               when String then
+                 @original_platform
+               else
+                 @original_platform.to_s
+               end
+    coder.add 'platform', platform
 
-    dependencies << dependency
+    attributes = @@attributes.map(&:to_s) - %w[name version platform]
+    attributes.each do |name|
+      coder.add name, instance_variable_get("@#{name}")
+    end
   end
 
-  private :add_dependency_with_type
+  def eql? other # :nodoc:
+    self.class === other && same_attributes?(other)
+  end
 
   ##
-  # Finds all gems that satisfy +dep+
+  # Singular accessor for #executables
 
-  def find_all_satisfiers(dep)
-    Gem.source_index.each do |_, gem|
-      yield gem if gem.satisfies_requirement? dep
-    end
+  def executable
+    val = executables and val.first
   end
 
-  private :find_all_satisfiers
-
   ##
-  # Return a string containing a Ruby code representation of the given
-  # object.
+  # Singular accessor for #executables
 
-  def ruby_code(obj)
-    case obj
-    when String            then '%q{' + obj + '}'
-    when Array             then obj.inspect
-    when Gem::Version      then obj.to_s.inspect
-    when Date              then '%q{' + obj.strftime('%Y-%m-%d') + '}'
-    when Time              then '%q{' + obj.strftime('%Y-%m-%d') + '}'
-    when Numeric           then obj.inspect
-    when true, false, nil  then obj.inspect
-    when Gem::Platform     then "Gem::Platform.new(#{obj.to_a.inspect})"
-    when Gem::Requirement  then "Gem::Requirement.new(#{obj.to_s.inspect})"
-    else raise Gem::Exception, "ruby_code case not handled: #{obj.class}"
-    end
+  def executable=o
+    self.executables = [o]
   end
 
-  private :ruby_code
+  ##
+  # Executables included in the gem.
 
-  # :section: Required gemspec attributes
+  def executables
+    @executables ||= []
+  end
 
   ##
-  # The version of RubyGems used to create this gem.
-  #
-  # Do not set this, it is set automatically when the gem is packaged.
+  # Sets executables to +value+, ensuring it is an array. Don't
+  # use this, push onto the array instead.
 
-  attr_accessor :rubygems_version
+  def executables= value
+    # TODO: warn about setting instead of pushing
+    @executables = Array(value)
+  end
 
   ##
-  # The Gem::Specification version of this gemspec.
-  #
-  # Do not set this, it is set automatically when the gem is packaged.
+  # Extensions to build when installing the gem.  See
+  # Gem::Installer#build_extensions for valid values.
 
-  attr_accessor :specification_version
+  def extensions
+    @extensions ||= []
+  end
 
   ##
-  # This gem's name
+  # Sets extensions to +extensions+, ensuring it is an array. Don't
+  # use this, push onto the array instead.
 
-  attr_accessor :name
+  def extensions= extensions
+    # TODO: warn about setting instead of pushing
+    @extensions = Array extensions
+  end
 
   ##
-  # This gem's version
+  # Extra files to add to RDoc such as README or doc/examples.txt
 
-  attr_reader :version
+  def extra_rdoc_files
+    @extra_rdoc_files ||= []
+  end
 
   ##
-  # A short summary of this gem's description.  Displayed in `gem list -d`.
-  #
-  # The description should be more detailed than the summary.  For example,
-  # you might wish to copy the entire README into the description.
-  #
-  # As of RubyGems 1.3.2 newlines are no longer stripped.
+  # Sets extra_rdoc_files to +files+, ensuring it is an array. Don't
+  # use this, push onto the array instead.
 
-  attr_reader :summary
+  def extra_rdoc_files= files
+    # TODO: warn about setting instead of pushing
+    @extra_rdoc_files = Array files
+  end
 
   ##
-  # Paths in the gem to add to $LOAD_PATH when this gem is activated.
+  # The default (generated) file name of the gem.  See also #spec_name.
   #
-  # The default 'lib' is typically sufficient.
+  #   spec.file_name # => "example-1.0.gem"
 
-  attr_accessor :require_paths
-
-  # :section: Optional gemspec attributes
+  def file_name
+    "#{full_name}.gem"
+  end
 
   ##
-  # A contact email for this gem
-  #
-  # If you are providing multiple authors and multiple emails they should be
-  # in the same order such that:
+  # Files included in this gem.  You cannot append to this accessor, you must
+  # assign to it.
   #
-  #   Hash[*spec.authors.zip(spec.emails).flatten]
+  # Only add files you can require to this list, not directories, etc.
   #
-  # Gives a hash of author name to email address.
-
-  attr_accessor :email
-
-  ##
-  # The URL of this gem's home page
-
-  attr_accessor :homepage
-
-  ##
-  # The rubyforge project this gem lives under.  i.e. RubyGems'
-  # rubyforge_project is "rubygems".
+  # Directories are automatically stripped from this list when building a gem,
+  # other non-files cause an error.
 
-  attr_accessor :rubyforge_project
+  def files
+    # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
+    @files = [@files,
+              @test_files,
+              add_bindir(@executables),
+              @extra_rdoc_files,
+              @extensions,
+             ].flatten.uniq.compact
+  end
 
   ##
-  # A long description of this gem
+  # Sets files to +files+, ensuring it is an array.
 
-  attr_reader :description
+  def files= files
+    @files = Array files
+  end
 
   ##
-  # Autorequire was used by old RubyGems to automatically require a file.
-  # It no longer is supported.
-
-  attr_accessor :autorequire
+  # Finds all gems that satisfy +dep+
 
-  ##
-  # The default executable for this gem.
+  def find_all_satisfiers dep
+    Gem::Specification.each do |spec|
+      yield spec if spec.satisfies_requirement? dep
+    end
+  end
 
-  attr_writer :default_executable
+  private :find_all_satisfiers
 
   ##
-  # The path in the gem for executable scripts
+  # Creates a duplicate spec without large blobs that aren't used at runtime.
 
-  attr_accessor :bindir
+  def for_cache
+    spec = dup
 
-  ##
-  # The version of ruby required by this gem
+    spec.files = nil
+    spec.test_files = nil
 
-  attr_reader :required_ruby_version
+    spec
+  end
 
   ##
-  # The RubyGems version required by this gem
-
-  attr_reader :required_rubygems_version
+  # The full path to the gem (install path + full name).
 
-  ##
-  # The key used to sign this gem.  See Gem::Security for details.
+  def full_gem_path
+    # TODO: try to get rid of this... or the awkward
+    # TODO: also, shouldn't it default to full_name if it hasn't been written?
+    return @full_gem_path if defined?(@full_gem_path) && @full_gem_path
 
-  attr_accessor :signing_key
+    @full_gem_path = File.expand_path File.join(gems_dir, full_name)
 
-  ##
-  # The certificate chain used to sign this gem.  See Gem::Security for
-  # details.
+    return @full_gem_path if File.directory? @full_gem_path
 
-  attr_accessor :cert_chain
+    @full_gem_path = File.expand_path File.join(gems_dir, original_name)
+  end
 
   ##
-  # A message that gets displayed after the gem is installed
+  # Returns the full name (name-version) of this Gem.  Platform information
+  # is included (name-version-platform) if it is specified and not the
+  # default Ruby platform.
 
-  attr_accessor :post_install_message
+  def full_name
+    if platform == Gem::Platform::RUBY or platform.nil? then
+      "#{@name}-#{@version}"
+    else
+      "#{@name}-#{@version}-#{platform}"
+    end
+  end
 
   ##
-  # The list of author names who wrote this gem.
-  #
-  # If you are providing multiple authors and multiple emails they should be
-  # in the same order such that:
-  #
-  #   Hash[*spec.authors.zip(spec.emails).flatten]
-  #
-  # Gives a hash of author name to email address.
-
-  def authors
-    @authors ||= []
-  end
+  # Returns the full path to this spec's gem directory.
+  # eg: /usr/local/lib/ruby/1.8/gems/mygem-1.0
 
-  def authors=(value)
-    @authors = Array(value)
+  def gem_dir
+    @gem_dir ||= File.expand_path File.join(gems_dir, full_name)
   end
 
   ##
-  # The license(s) for the library.  Each license must be a short name, no
-  # more than 64 characters.
+  # Returns the full path to the gems directory containing this spec's
+  # gem directory. eg: /usr/local/lib/ruby/1.8/gems
 
-  def licenses
-    @licenses ||= []
-  end
-
-  def licenses=(value)
-    @licenses = Array(value)
+  def gems_dir
+    # TODO: this logic seems terribly broken, but tests fail if just base_dir
+    @gems_dir ||= File.join(loaded_from && base_dir || Gem.dir, "gems")
   end
 
   ##
-  # Files included in this gem.  You cannot append to this accessor, you must
-  # assign to it.
-  #
-  # Only add files you can require to this list, not directories, etc.
+  # Deprecated and ignored, defaults to true.
   #
-  # Directories are automatically stripped from this list when building a gem,
-  # other non-files cause an error.
-
-  def files
-    @files ||= []
-  end
+  # Formerly used to indicate this gem was RDoc-capable.
 
-  def files=(value)
-    @files = Array(value)
+  def has_rdoc
+    true
   end
 
   ##
-  # Test files included in this gem.  You cannot append to this accessor, you
-  # must assign to it.
+  # Deprecated and ignored.
+  #
+  # Formerly used to indicate this gem was RDoc-capable.
 
-  def test_files
-    @test_files ||= []
+  def has_rdoc= ignored
+    @has_rdoc = true
   end
 
-  def test_files=(value)
-    @test_files = Array(value)
-  end
+  alias :has_rdoc? :has_rdoc
 
   ##
-  # An ARGV style array of options to RDoc
-
-  def rdoc_options
-    @rdoc_options ||= []
-  end
+  # True if this gem has files in test_files
 
-  def rdoc_options=(value)
-    # TODO: warn about setting instead of pushing
-    @rdoc_options = Array(value)
+  def has_unit_tests?
+    not test_files.empty?
   end
 
-  ##
-  # Extra files to add to RDoc such as README or doc/examples.txt
+  # :stopdoc:
+  alias has_test_suite? has_unit_tests?
+  # :startdoc:
 
-  def extra_rdoc_files
-    @extra_rdoc_files ||= []
+  def hash # :nodoc:
+    @@attributes.inject(0) { |hash_code, (name, _)|
+      hash_code ^ self.send(name).hash
+    }
   end
 
-  def extra_rdoc_files=(value)
-    # TODO: warn about setting instead of pushing
-    @extra_rdoc_files = Array(value)
+  def init_with coder # :nodoc:
+    yaml_initialize coder.tag, coder.map
   end
 
   ##
-  # Executables included in the gem.
-
-  def executables
-    @executables ||= []
-  end
+  # Specification constructor. Assigns the default values to the attributes
+  # and yields itself for further initialization.  Optionally takes +name+ and
+  # +version+.
 
-  def executables=(value)
-    # TODO: warn about setting instead of pushing
-    @executables = Array(value)
-  end
+  def initialize name = nil, version = nil
+    @loaded = false
+    @loaded_from = nil
+    @original_platform = nil
 
-  ##
-  # Extensions to build when installing the gem.  See
-  # Gem::Installer#build_extensions for valid values.
+    @@nil_attributes.each do |key|
+      instance_variable_set "@#{key}", nil
+    end
 
-  def extensions
-    @extensions ||= []
-  end
+    @@non_nil_attributes.each do |key|
+      default = default_value(key)
+      value = case default
+              when Time, Numeric, Symbol, true, false, nil then default
+              else default.dup
+              end
 
-  def extensions=(value)
-    # TODO: warn about setting instead of pushing
-    @extensions = Array(value)
-  end
+      instance_variable_set "@#{key}", value
+    end
 
-  ##
-  # An array or things required by this gem.  Not used by anything
-  # presently.
+    @new_platform = Gem::Platform::RUBY
 
-  def requirements
-    @requirements ||= []
-  end
+    self.name = name if name
+    self.version = version if version
 
-  def requirements=(value)
-    # TODO: warn about setting instead of pushing
-    @requirements = Array(value)
+    yield self if block_given?
   end
 
   ##
-  # A list of Gem::Dependency objects this gem depends on.
-  #
-  # Use #add_dependency or #add_development_dependency to add dependencies to
-  # a gem.
+  # Duplicates array_attributes from +other_spec+ so state isn't shared.
 
-  def dependencies
-    @dependencies ||= []
-  end
+  def initialize_copy other_spec
+    other_ivars = other_spec.instance_variables
+    other_ivars = other_ivars.map { |ivar| ivar.intern } if # for 1.9
+      String === other_ivars.first
 
-  # :section: Aliased gemspec attributes
+    self.class.array_attributes.each do |name|
+      name = :"@#{name}"
+      next unless other_ivars.include? name
 
-  ##
-  # Singular accessor for #executables
+      begin
+        val = other_spec.instance_variable_get(name)
+        if val then
+          instance_variable_set name, val.dup
+        else
+          warn "WARNING: #{full_name} has an invalid nil value for #{name}"
+        end
+      rescue TypeError
+        e = Gem::FormatException.new \
+          "#{full_name} has an invalid value for #{name}"
 
-  def executable
-    val = executables and val.first
+        e.file_path = loaded_from
+        raise e
+      end
+    end
   end
 
   ##
-  # Singular accessor for #executables
+  # The directory that this gem was installed into.
+  # TODO: rename - horrible. this is the base_dir for a gem path
 
-  def executable=o
-    self.executables = [o]
+  def installation_path
+    loaded_from && base_dir
   end
 
   ##
-  # Singular accessor for #authors
+  # Returns a string usable in Dir.glob to match all requirable paths
+  # for this spec.
 
-  def author
-    val = authors and val.first
+  def lib_dirs_glob
+    dirs = if self.require_paths.size > 1 then
+             "{#{self.require_paths.join(',')}}"
+           else
+             self.require_paths.first
+           end
+
+    "#{self.full_gem_path}/#{dirs}"
   end
 
   ##
-  # Singular accessor for #authors
+  # Files in the Gem under one of the require_paths
 
-  def author=o
-    self.authors = [o]
+  def lib_files
+    @files.select do |file|
+      require_paths.any? do |path|
+        file.index(path) == 0
+      end
+    end
   end
 
   ##
@@ -1304,64 +1387,101 @@ class Gem::Specification
   end
 
   ##
-  # Singular accessor for #require_paths
+  # The license(s) for the library.  Each license must be a short name, no
+  # more than 64 characters.
 
-  def require_path
-    val = require_paths and val.first
+  def licenses
+    @licenses ||= []
   end
 
   ##
-  # Singular accessor for #require_paths
+  # Set licenses to +licenses+, ensuring it is an array.
 
-  def require_path=o
-    self.require_paths = [o]
+  def licenses= licenses
+    @licenses = Array licenses
   end
 
   ##
-  # Singular accessor for #test_files
+  # Set the location a Specification was loaded from. +obj+ is converted
+  # to a String.
 
-  def test_file
-    val = test_files and val.first
+  def loaded_from= path
+    @loaded_from = path.to_s
   end
 
   ##
-  # Singular accessor for #test_files
+  # Sets the rubygems_version to the current RubyGems version.
 
-  def test_file=o
-    self.test_files = [o]
+  def mark_version
+    @rubygems_version = Gem::VERSION
   end
 
   ##
-  # Deprecated and ignored, defaults to true.
-  #
-  # Formerly used to indicate this gem was RDoc-capable.
+  # Return all files in this gem that match for +glob+.
 
-  def has_rdoc
-    true
+  def matches_for_glob glob # TODO: rename?
+    # TODO: do we need these?? Kill it
+    glob = File.join(self.lib_dirs_glob, glob)
+
+    Dir[glob].map { |f| f.untaint } # FIX our tests are brokey, run w/ SAFE=1
   end
 
   ##
-  # Deprecated and ignored.
-  #
-  # Formerly used to indicate this gem was RDoc-capable.
+  # Warn about unknown attributes while loading a spec.
 
-  def has_rdoc= v
-    @has_rdoc = true
+  def method_missing(sym, *a, &b) # :nodoc:
+    if @specification_version > CURRENT_SPECIFICATION_VERSION and
+      sym.to_s =~ /=$/ then
+      warn "ignoring #{sym} loading #{full_name}" if $DEBUG
+    else
+      super
+    end
   end
 
-  alias :has_rdoc? :has_rdoc
+  ##
+  # Normalize the list of files so that:
+  # * All file lists have redundancies removed.
+  # * Files referenced in the extra_rdoc_files are included in the package
+  #   file list.
 
-  def version= version
-    @version = Gem::Version.create(version)
-    self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
-    return @version
+  def normalize
+    if defined?(@extra_rdoc_files) and @extra_rdoc_files then
+      @extra_rdoc_files.uniq!
+      @files ||= []
+      @files.concat(@extra_rdoc_files)
+    end
+
+    @files            = @files.uniq if @files
+    @extensions       = @extensions.uniq if @extensions
+    @test_files       = @test_files.uniq if @test_files
+    @executables      = @executables.uniq if @executables
+    @extra_rdoc_files = @extra_rdoc_files.uniq if @extra_rdoc_files
+  end
+
+  ##
+  # Returns the full name (name-version) of this gemspec using the original
+  # platform.  For use with legacy gems.
+
+  def original_name # :nodoc:
+    if platform == Gem::Platform::RUBY or platform.nil? then
+      "#{@name}-#{@version}"
+    else
+      "#{@name}-#{@version}-#{@original_platform}"
+    end
+  end
+
+  ##
+  # Cruft. Use +platform+.
+
+  def original_platform # :nodoc:
+    @original_platform ||= platform
   end
 
   ##
   # The platform this gem runs on.  See Gem::Platform for details.
 
   def platform
-    @new_platform
+    @new_platform ||= Gem::Platform::RUBY
   end
 
   ##
@@ -1402,49 +1522,208 @@ class Gem::Specification
     @new_platform
   end
 
+  def pretty_print(q) # :nodoc:
+    q.group 2, 'Gem::Specification.new do |s|', 'end' do
+      q.breakable
+
+      # REFACTOR: each_attr - use in to_yaml as well
+      @@attributes.each do |attr_name|
+        current_value = self.send attr_name
+        if current_value != default_value(attr_name) or
+           self.class.required_attribute? attr_name then
+
+          q.text "s.#{attr_name} = "
+
+          if attr_name == :date then
+            current_value = current_value.utc
+
+            q.text "Time.utc(#{current_value.year}, #{current_value.month}, #{current_value.day})"
+          else
+            q.pp current_value
+          end
+
+          q.breakable
+        end
+      end
+    end
+  end
+
+  ##
+  # Check the spec for possible conflicts and freak out if there are any.
+
+  def raise_if_conflicts
+    other = Gem.loaded_specs[self.name]
+
+    if other and self.version != other.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 #{full_name}, already activated #{other.full_name}"
+
+      e = Gem::LoadError.new msg
+      e.name = self.name
+      # TODO: e.requirement = dep.requirement
+
+      raise e
+    end
+
+    conf = self.conflicts
+
+    unless conf.empty? then
+      y = conf.map { |act,con|
+        "#{act.full_name} conflicts with #{con.join(", ")}"
+      }.join ", "
+
+      # TODO: improve message by saying who activated `con`
+
+      raise Gem::LoadError, "Unable to activate #{self.full_name}, because #{y}"
+    end
+  end
+
+  ##
+  # An ARGV style array of options to RDoc
+
+  def rdoc_options
+    @rdoc_options ||= []
+  end
+
+  ##
+  # Sets rdoc_options to +value+, ensuring it is an array. Don't
+  # use this, push onto the array instead.
+
+  def rdoc_options= options
+    # TODO: warn about setting instead of pushing
+    @rdoc_options = Array options
+  end
+
+  ##
+  # Singular accessor for #require_paths
+
+  def require_path
+    val = require_paths and val.first
+  end
+
+  ##
+  # Singular accessor for #require_paths
+
+  def require_path= path
+    self.require_paths = [path]
+  end
+
   ##
   # The version of ruby required by this gem
 
-  def required_ruby_version= value
-    @required_ruby_version = Gem::Requirement.create(value)
+  def required_ruby_version= req
+    @required_ruby_version = Gem::Requirement.create req
   end
 
   ##
   # The RubyGems version required by this gem
 
-  def required_rubygems_version= value
-    @required_rubygems_version = Gem::Requirement.create(value)
+  def required_rubygems_version= req
+    @required_rubygems_version = Gem::Requirement.create req
   end
 
   ##
-  # The date this gem was created
-  #
-  # Do not set this, it is set automatically when the gem is packaged.
+  # An array or things required by this gem.  Not used by anything
+  # presently.
 
-  def date= date
-    # We want to end up with a Time object with one-day resolution.
-    # This is the cleanest, most-readable, faster-than-using-Date
-    # way to do it.
-    @date = case date
-            when String then
-              if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
-                Time.utc($1.to_i, $2.to_i, $3.to_i)
-              else
-                raise(Gem::InvalidSpecificationException,
-                      "invalid date format in specification: #{date.inspect}")
-              end
-            when Time, Date then
-              Time.utc(date.year, date.month, date.day)
-            else
-              TODAY
-            end
+  def requirements
+    @requirements ||= []
   end
 
   ##
-  # The date this gem was created. Lazily defaults to TODAY.
+  # Set requirements to +req+, ensuring it is an array. Don't
+  # use this, push onto the array instead.
 
-  def date
-    @date ||= TODAY
+  def requirements= req
+    # TODO: warn about setting instead of pushing
+    @requirements = Array req
+  end
+
+  ##
+  # Returns the full path to this spec's ri directory.
+
+  def ri_dir
+    @ri_dir ||= File.join base_dir, 'ri', full_name
+  end
+
+  ##
+  # Return a string containing a Ruby code representation of the given
+  # object.
+
+  def ruby_code(obj)
+    case obj
+    when String            then '%q{' + obj + '}'
+    when Array             then '[' + obj.map { |x| ruby_code x }.join(", ") + ']'
+    when Gem::Version      then obj.to_s.inspect
+    when Date              then '%q{' + obj.strftime('%Y-%m-%d') + '}'
+    when Time              then '%q{' + obj.strftime('%Y-%m-%d') + '}'
+    when Numeric           then obj.inspect
+    when true, false, nil  then obj.inspect
+    when Gem::Platform     then "Gem::Platform.new(#{obj.to_a.inspect})"
+    when Gem::Requirement  then "Gem::Requirement.new(#{obj.to_s.inspect})"
+    else raise Gem::Exception, "ruby_code case not handled: #{obj.class}"
+    end
+  end
+
+  private :ruby_code
+
+  ##
+  # List of dependencies that will automatically be activated at runtime.
+
+  def runtime_dependencies
+    dependencies.select { |d| d.type == :runtime }
+  end
+
+  ##
+  # True if this gem has the same attributes as +other+.
+
+  def same_attributes? spec
+    @@attributes.all? { |name, default| self.send(name) == spec.send(name) }
+  end
+
+  private :same_attributes?
+
+  ##
+  # Checks if this specification meets the requirement of +dependency+.
+
+  def satisfies_requirement? dependency
+    return @name == dependency.name &&
+      dependency.requirement.satisfied_by?(@version)
+  end
+
+  ##
+  # Returns an object you can use to sort specifications in #sort_by.
+
+  def sort_obj
+    # TODO: this is horrible. Deprecate it.
+    [@name, @version, @new_platform == Gem::Platform::RUBY ? -1 : 1]
+  end
+
+  ##
+  # Returns the full path to the directory containing this spec's
+  # gemspec file. eg: /usr/local/lib/ruby/gems/1.8/specifications
+
+  def spec_dir
+    @spec_dir ||= File.join base_dir, "specifications"
+  end
+
+  ##
+  # Returns the full path to this spec's gemspec file.
+  # eg: /usr/local/lib/ruby/gems/1.8/specifications/mygem-1.0.gemspec
+
+  def spec_file
+    @spec_file ||= File.join spec_dir, "#{full_name}.gemspec"
+  end
+
+  ##
+  # The default name of the gemspec.  See also #file_name
+  #
+  #   spec.spec_name # => "example-1.0.gemspec"
+
+  def spec_name
+    "#{full_name}.gemspec"
   end
 
   ##
@@ -1456,27 +1735,23 @@ class Gem::Specification
   end
 
   ##
-  # A long description of this gem
+  # Singular accessor for #test_files
 
-  def description= str
-    @description = str.to_s
+  def test_file
+    val = test_files and val.first
   end
 
   ##
-  # The default executable for this gem.
+  # Singular accessor for #test_files
 
-  def default_executable
-    if defined?(@default_executable) and @default_executable
-      result = @default_executable
-    elsif @executables and @executables.size == 1
-      result = Array(@executables).first
-    else
-      result = nil
-    end
-    result
+  def test_file= file
+    self.test_files = [file]
   end
 
-  undef_method :test_files
+  ##
+  # Test files included in this gem.  You cannot append to this accessor, you
+  # must assign to it.
+
   def test_files
     # Handle the possibility that we have @test_suite_file but not
     # @test_files.  This will happen when an old gem is loaded via
@@ -1492,43 +1767,305 @@ class Gem::Specification
     end
   end
 
-  undef_method :files
-  def files
-    # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
-    @files = [@files,
-              @test_files,
-              add_bindir(@executables),
-              @extra_rdoc_files,
-              @extensions,
-             ].flatten.uniq.compact
+  ##
+  # Set test_files to +files+, ensuring it is an array.
+
+  def test_files= files
+    @test_files = Array files
   end
 
-  def conflicts
-    conflicts = {}
-    Gem.loaded_specs.values.each do |spec|
-      bad = self.runtime_dependencies.find_all { |dep|
-        spec.name == dep.name and not spec.satisfies_requirement? dep
-      }
+  def test_suite_file # :nodoc:
+    # TODO: deprecate
+    test_files.first
+  end
 
-      conflicts[spec] = bad unless bad.empty?
+  def test_suite_file= file # :nodoc:
+    # TODO: deprecate
+    @test_files = [] unless defined? @test_files
+    @test_files << file
+  end
+
+  ##
+  # Returns a Ruby code representation of this specification, such that it can
+  # be eval'ed and reconstruct the same specification later.  Attributes that
+  # still have their default values are omitted.
+
+  def to_ruby
+    mark_version
+    result = []
+    result << "# -*- encoding: utf-8 -*-"
+    result << nil
+    result << "Gem::Specification.new do |s|"
+
+    result << "  s.name = #{ruby_code name}"
+    result << "  s.version = #{ruby_code version}"
+    unless platform.nil? or platform == Gem::Platform::RUBY then
+      result << "  s.platform = #{ruby_code original_platform}"
     end
-    conflicts
+    result << ""
+    result << "  s.required_rubygems_version = #{ruby_code required_rubygems_version} if s.respond_to? :required_rubygems_version="
+
+    handled = [
+      :dependencies,
+      :name,
+      :platform,
+      :required_rubygems_version,
+      :specification_version,
+      :version,
+      :has_rdoc,
+      :default_executable,
+    ]
+
+    @@attributes.each do |attr_name|
+      next if handled.include? attr_name
+      current_value = self.send(attr_name)
+      if current_value != default_value(attr_name) or
+         self.class.required_attribute? attr_name then
+        result << "  s.#{attr_name} = #{ruby_code current_value}"
+      end
+    end
+
+    result << nil
+    result << "  if s.respond_to? :specification_version then"
+    result << "    s.specification_version = #{specification_version}"
+    result << nil
+
+    result << "    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then"
+
+    dependencies.each do |dep|
+      req = dep.requirements_list.inspect
+      dep.instance_variable_set :@type, :runtime if dep.type.nil? # HACK
+      result << "      s.add_#{dep.type}_dependency(%q<#{dep.name}>, #{req})"
+    end
+
+    result << "    else"
+
+    dependencies.each do |dep|
+      version_reqs_param = dep.requirements_list.inspect
+      result << "      s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
+    end
+
+    result << '    end'
+
+    result << "  else"
+      dependencies.each do |dep|
+        version_reqs_param = dep.requirements_list.inspect
+        result << "    s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
+      end
+    result << "  end"
+
+    result << "end"
+    result << nil
+
+    result.join "\n"
   end
 
-  def traverse trail = [], &b
+  ##
+  # Returns a Ruby lighter-weight code representation of this specification,
+  # used for indexing only.
+  #
+  # See #to_ruby.
+
+  def to_ruby_for_cache
+    for_cache.to_ruby
+  end
+
+  def to_s # :nodoc:
+    "#<Gem::Specification name=#{@name} version=#{@version}>"
+  end
+
+  def to_yaml(opts = {}) # :nodoc:
+    if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
+      super.gsub(/ !!null \n/, " \n")
+    else
+      YAML.quick_emit object_id, opts do |out|
+        out.map taguri, to_yaml_style do |map|
+          encode_with map
+        end
+      end
+    end
+  end
+
+  ##
+  # Recursively walk dependencies of this spec, executing the +block+ for each
+  # hop.
+
+  def traverse trail = [], &block
     trail = trail + [self]
     runtime_dependencies.each do |dep|
-      dep_specs = Gem.source_index.search dep, true
-      dep_specs.each do |dep_spec|
-        b[self, dep, dep_spec, trail + [dep_spec]]
-        dep_spec.traverse(trail, &b) unless
+      dep.to_specs.each do |dep_spec|
+        block[self, dep, dep_spec, trail + [dep_spec]]
+        dep_spec.traverse(trail, &block) unless
           trail.map(&:name).include? dep_spec.name
       end
     end
   end
 
-  def dependent_specs
-    runtime_dependencies.map { |dep| Gem.source_index.search dep, true }.flatten
+  ##
+  # Checks that the specification contains all required fields, and does a
+  # very basic sanity check.
+  #
+  # Raises InvalidSpecificationException if the spec does not pass the
+  # checks..
+
+  def validate packaging = true
+    require 'rubygems/user_interaction'
+    extend Gem::UserInteraction
+    normalize
+
+    nil_attributes = self.class.non_nil_attributes.find_all do |name|
+      instance_variable_get("@#{name}").nil?
+    end
+
+    unless nil_attributes.empty? then
+      raise Gem::InvalidSpecificationException,
+        "#{nil_attributes.join ', '} must not be nil"
+    end
+
+    if packaging and rubygems_version != Gem::VERSION then
+      raise Gem::InvalidSpecificationException,
+            "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
+    end
+
+    @@required_attributes.each do |symbol|
+      unless self.send symbol then
+        raise Gem::InvalidSpecificationException,
+              "missing value for attribute #{symbol}"
+      end
+    end
+
+    unless String === name then
+      raise Gem::InvalidSpecificationException,
+            "invalid value for attribute name: \"#{name.inspect}\""
+    end
+
+    if require_paths.empty? then
+      raise Gem::InvalidSpecificationException,
+            'specification must have at least one require_path'
+    end
+
+    @files.delete_if            { |x| File.directory?(x) }
+    @test_files.delete_if       { |x| File.directory?(x) }
+    @executables.delete_if      { |x| File.directory?(File.join(@bindir, x)) }
+    @extra_rdoc_files.delete_if { |x| File.directory?(x) }
+    @extensions.delete_if       { |x| File.directory?(x) }
+
+    non_files = files.reject { |x| File.file?(x) }
+
+    unless not packaging or non_files.empty? then
+      raise Gem::InvalidSpecificationException,
+            "[\"#{non_files.join "\", \""}\"] are not files"
+    end
+
+    unless specification_version.is_a?(Fixnum)
+      raise Gem::InvalidSpecificationException,
+            'specification_version must be a Fixnum (did you mean version?)'
+    end
+
+    case platform
+    when Gem::Platform, Gem::Platform::RUBY then # ok
+    else
+      raise Gem::InvalidSpecificationException,
+            "invalid platform #{platform.inspect}, see Gem::Platform"
+    end
+
+    self.class.array_attributes.each do |field|
+      val = self.send field
+      klass = case field
+              when :dependencies
+                Gem::Dependency
+              else
+                String
+              end
+
+      unless Array === val and val.all? { |x| x.kind_of?(klass) } then
+        raise(Gem::InvalidSpecificationException,
+              "#{field} must be an Array of #{klass}")
+      end
+    end
+
+    [:authors].each do |field|
+      val = self.send field
+      raise Gem::InvalidSpecificationException, "#{field} may not be empty" if
+        val.empty?
+    end
+
+    licenses.each { |license|
+      if license.length > 64
+        raise Gem::InvalidSpecificationException,
+          "each license must be 64 characters or less"
+      end
+    }
+
+    # reject lazy developers:
+
+    lazy = '"FIxxxXME" or "TOxxxDO"'.gsub(/xxx/, '')
+
+    unless authors.grep(/FI XME|TO DO/x).empty? then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not an author"
+    end
+
+    unless Array(email).grep(/FI XME|TO DO/x).empty? then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not an email"
+    end
+
+    if description =~ /FI XME|TO DO/x then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not a description"
+    end
+
+    if summary =~ /FI XME|TO DO/x then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
+    end
+
+    if homepage and not homepage.empty? and
+       homepage !~ /\A[a-z][a-z\d+.-]*:/i then
+      raise Gem::InvalidSpecificationException,
+            "\"#{homepage}\" is not a URI"
+    end
+
+    # Warnings
+
+    %w[author description email homepage summary].each do |attribute|
+      value = self.send attribute
+      alert_warning "no #{attribute} specified" if value.nil? or value.empty?
+    end
+
+    if description == summary then
+      alert_warning 'description and summary are identical'
+    end
+
+    # TODO: raise at some given date
+    alert_warning "deprecated autorequire specified" if autorequire
+
+    executables.each do |executable|
+      executable_path = File.join(bindir, executable)
+      shebang = File.read(executable_path, 2) == '#!'
+
+      alert_warning "#{executable_path} is missing #! line" unless shebang
+    end
+
+    true
+  end
+
+  ##
+  # Set the version to +version+, potentially also setting
+  # required_rubygems_version if +version+ indicates it is a
+  # prerelease.
+
+  def version= version
+    @version = Gem::Version.create(version)
+    self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
+    return @version
+  end
+
+  # FIX: have this handle the platform/new_platform/original_platform bullshit
+  def yaml_initialize(tag, vals) # :nodoc:
+    vals.each do |ivar, val|
+      instance_variable_set "@#{ivar}", val
+    end
+
+    @original_platform = @platform # for backwards compatibility
+    self.platform = Gem::Platform.new @platform
   end
 
   extend Deprecate
@@ -1540,4 +2077,12 @@ class Gem::Specification
   deprecate :has_rdoc=,           :none,       2011, 10
   deprecate :default_executable,  :none,       2011, 10
   deprecate :default_executable=, :none,       2011, 10
+  deprecate :loaded,              :activated,  2011, 10
+  deprecate :loaded?,             :activated?, 2011, 10
+  deprecate :loaded=,             :activated=, 2011, 10
+  deprecate :installation_path,   :base_dir,   2011, 10
+  deprecate :cache_gem,           :cache_file, 2011, 10
+  # deprecate :spec_name,           :spec_file,  2011, 10
+  # deprecate :file_name,           :cache_file, 2011, 10
+  # deprecate :full_gem_path,     :cache_file, 2011, 10
 end