rubygems-update 0.9.4 → 0.9.5

data/lib/rubygems/source_info_cache.rb

@@ -1,9 +1,8 @@
 require 'fileutils'
+
 require 'rubygems'
-require 'rubygems/remote_fetcher'
 require 'rubygems/source_info_cache_entry'
-
-require 'sources'
+require 'rubygems/user_interaction'
 
 # SourceInfoCache stores a copy of the gem index for each gem source.
 #
@@ -38,7 +37,7 @@ class Gem::SourceInfoCache
   def self.cache
     return @cache if @cache
     @cache = new
-    @cache.refresh
+    @cache.refresh if Gem.configuration.update_sources
     @cache
   end
 
@@ -47,8 +46,14 @@ class Gem::SourceInfoCache
   end
 
   # Search all source indexes for +pattern+.
-  def self.search(pattern)
-    cache.search(pattern)
+  def self.search(pattern, platform_only = false)
+    cache.search pattern, platform_only
+  end
+
+  # Search all source indexes for +pattern+.  Only returns gems matching
+  # Gem.platforms when +only_platform+ is true.  See #search_with_source.
+  def self.search_with_source(pattern, only_platform = false)
+    cache.search_with_source(pattern, only_platform)
   end
 
   def initialize # :nodoc:
@@ -60,31 +65,50 @@ class Gem::SourceInfoCache
   # The most recent cache data.
   def cache_data
     return @cache_data if @cache_data
-    @dirty = false
     cache_file # HACK writable check
-    # Marshal loads 30-40% faster from a String, and 2MB on 20061116 is small
+
     begin
+      # Marshal loads 30-40% faster from a String, and 2MB on 20061116 is small
       data = File.open cache_file, 'rb' do |fp| fp.read end
       @cache_data = Marshal.load data
+
       @cache_data.each do |url, sice|
-        next unless Hash === sice
-        @dirty = true
-        if sice.key? 'cache' and sice.key? 'size' and
-           Gem::SourceIndex === sice['cache'] and Numeric === sice['size'] then
-          new_sice = Gem::SourceInfoCacheEntry.new sice['cache'], sice['size']
+        next unless sice.is_a?(Hash)
+        update
+        cache = sice['cache']
+        size  = sice['size']
+        if cache.is_a?(Gem::SourceIndex) and size.is_a?(Numeric) then
+          new_sice = Gem::SourceInfoCacheEntry.new cache, size
           @cache_data[url] = new_sice
         else # irreperable, force refetch.
-          sice = Gem::SourceInfoCacheEntry.new Gem::SourceIndex.new, 0
-          sice.refresh url # HACK may be unnecessary, see ::cache and #refresh
-          @cache_data[url] = sice
+          reset_cache_for(url)
         end
       end
       @cache_data
-    rescue
-      {}
+    rescue => e
+      if Gem.configuration.really_verbose then
+        say "Exception during cache_data handling: #{ex.class} - #{ex}"
+        say "Cache file was: #{cache_file}"
+        say "\t#{e.backtrace.join "\n\t"}"
+      end
+      reset_cache_data
     end
   end
 
+  def reset_cache_for(url)
+    say "Reseting cache for #{url}" if Gem.configuration.really_verbose
+
+    sice = Gem::SourceInfoCacheEntry.new Gem::SourceIndex.new, 0
+    sice.refresh url # HACK may be unnecessary, see ::cache and #refresh
+
+    @cache_data[url] = sice
+    @cache_data
+  end
+
+  def reset_cache_data
+    @cache_data = {}
+  end
+
   # The name of the cache file to be read
   def cache_file
     return @cache_file if @cache_file
@@ -108,17 +132,36 @@ class Gem::SourceInfoCache
         cache_data[source_uri] = cache_entry
       end
 
-      cache_entry.refresh source_uri
+      update if cache_entry.refresh source_uri
     end
-    update
+
     flush
   end
 
   # Searches all source indexes for +pattern+.
-  def search(pattern)
-    cache_data.map do |source, sic_entry|
-      sic_entry.source_index.search pattern
-    end.flatten
+  def search(pattern, platform_only = false)
+    cache_data.map do |source_uri, sic_entry|
+      next unless Gem.sources.include? source_uri
+      sic_entry.source_index.search pattern, platform_only
+    end.flatten.compact
+  end
+
+  # Searches all source indexes for +pattern+.  If +only_platform+ is true,
+  # only gems matching Gem.platforms will be selected.  Returns an Array of
+  # pairs containing the Gem::Specification found and the source_uri it was
+  # found at.
+  def search_with_source(pattern, only_platform = false)
+    results = []
+
+    cache_data.map do |source_uri, sic_entry|
+      next unless Gem.sources.include? source_uri
+
+      sic_entry.source_index.search(pattern, only_platform).each do |spec|
+        results << [spec, source_uri]
+      end
+    end
+
+    results
   end
 
   # Mark the cache as updated (i.e. dirty).
@@ -155,12 +198,12 @@ class Gem::SourceInfoCache
   end
 
   # Set the source info cache data directly.  This is mainly used for unit
-  # testing when we don't want to read a file system for to grab the cached
-  # source index information.  The +hash+ should map a source URL into a 
-  # SourceIndexCacheEntry.
+  # testing when we don't want to read a file system to grab the cached source
+  # index information.  The +hash+ should map a source URL into a
+  # SourceInfoCacheEntry.
   def set_cache_data(hash)
     @cache_data = hash
-    @dirty = false
+    update
   end
 
   private
@@ -171,7 +214,7 @@ class Gem::SourceInfoCache
     return fn if File.writable?(fn)
     return nil if File.exist?(fn)
     dir = File.dirname(fn)
-    if ! File.exist? dir
+    unless File.exist? dir then
       begin
         FileUtils.mkdir_p(dir)
       rescue RuntimeError
@@ -179,7 +222,7 @@ class Gem::SourceInfoCache
       end
     end
     if File.writable?(dir)
-      FileUtils.touch fn
+      File.open(fn, "wb") { |f| f << Marshal.dump({}) }
       return fn
     end
     nil

data/lib/rubygems/source_info_cache_entry.rb

@@ -21,10 +21,19 @@ class Gem::SourceInfoCacheEntry
   end
 
   def refresh(source_uri)
-    remote_size = Gem::RemoteFetcher.fetcher.fetch_size source_uri + '/yaml'
-    return if @size == remote_size # HACK bad check, local cache not YAML
-    @source_index.update source_uri
+    begin
+      marshal_uri = URI.join source_uri.to_s, "Marshal.#{Gem.marshal_version}"
+      remote_size = Gem::RemoteFetcher.fetcher.fetch_size marshal_uri
+    rescue Gem::RemoteSourceException
+      yaml_uri = URI.join source_uri.to_s, 'yaml'
+      remote_size = Gem::RemoteFetcher.fetcher.fetch_size yaml_uri
+    end
+
+    return false if @size == remote_size # TODO Use index_signature instead of size?
+    updated = @source_index.update source_uri
     @size = remote_size
+
+    updated
   end
 
   def ==(other) # :nodoc:

data/lib/rubygems/specification.rb

@@ -7,36 +7,22 @@
 require 'time'
 require 'rubygems'
 require 'rubygems/version'
+require 'rubygems/platform'
 
-class Time # :nodoc:
-  def self.today
-    Time.parse Time.now.strftime("%Y-%m-%d")
-  end
-end
+# :stopdoc:
+# Time::today has been deprecated in 0.9.5 and will be removed.
+def Time.today
+  t = Time.now
+  t - ((t.to_i + t.gmt_offset) % 86400)
+end unless defined? Time.today
+# :startdoc:
 
 module Gem
-  
-  # == Gem::Platform
-  #
-  # Available list of platforms for targeting Gem installations.
-  # Platform::RUBY is the default platform (pure Ruby Gem).
-  #
-  module Platform
-    RUBY = 'ruby'
-    WIN32 = 'mswin32'
-    LINUX_586 = 'i586-linux'
-    DARWIN = 'powerpc-darwin'
-    CURRENT = 'current'
-  end
-  
-  # Potentially raised when a specification is validated.
-  class InvalidSpecificationException < Gem::Exception; end
-  class EndOfYAMLException < Gem::Exception; end
 
   # == Gem::Specification
   #
-  # The Specification class contains the metadata for a Gem.  Typically defined in a
-  # .gemspec file or a Rakefile, and looks like this:
+  # The Specification class contains the metadata for a Gem.  Typically
+  # defined in a .gemspec file or a Rakefile, and looks like this:
   #
   #   spec = Gem::Specification.new do |s|
   #     s.name = 'rfoo'
@@ -45,31 +31,46 @@ module Gem
   #     ...
   #   end
   #
-  # There are many <em>gemspec attributes</em>, and the best place to learn about them in
-  # the "Gemspec Reference" linked from the RubyGems wiki.
+  # There are many <em>gemspec attributes</em>, and the best place to learn
+  # about them in the "Gemspec Reference" linked from the RubyGems wiki.
   #
   class Specification
 
+    # Allows deinstallation of gems with legacy platforms.
+    attr_accessor :original_platform # :nodoc:
+
     # ------------------------- Specification version contstants.
 
-    # The the version number of a specification that does not specify one (i.e. RubyGems 0.7
-    # or earlier).
+    # The the version number of a specification that does not specify one
+    # (i.e. RubyGems 0.7 or earlier).
     NONEXISTENT_SPECIFICATION_VERSION = -1
 
-    # The specification version applied to any new Specification instances created.  This
-    # should be bumped whenever something in the spec format changes.
-    CURRENT_SPECIFICATION_VERSION = 1
+    # The specification version applied to any new Specification instances
+    # created.  This should be bumped whenever something in the spec format
+    # changes.
+    CURRENT_SPECIFICATION_VERSION = 2
 
-    # An informal list of changes to the specification.  The highest-valued key should be
-    # equal to the CURRENT_SPECIFICATION_VERSION.
+    # An informal list of changes to the specification.  The highest-valued
+    # key should be equal to the CURRENT_SPECIFICATION_VERSION.
     SPECIFICATION_VERSION_HISTORY = {
       -1 => ['(RubyGems versions up to and including 0.7 did not have versioned specifications)'],
       1  => [
         'Deprecated "test_suite_file" in favor of the new, but equivalent, "test_files"',
         '"test_file=x" is a shortcut for "test_files=[x]"'
-      ]
+      ],
+      2  => [
+        'Added "required_rubygems_version"',
+        'Now forward-compatible with future versions',
+      ],
     }
 
+    # :stopdoc:
+    MARSHAL_FIELDS = { -1 => 16, 1 => 16, 2 => 16 }
+
+    now = Time.at(Time.now.to_i)
+    TODAY = now - ((now.to_i + now.gmt_offset) % 86400)
+    # :startdoc:
+
     # ------------------------- Class variables.
 
     # List of Specification instances.
@@ -84,6 +85,9 @@ module Gem
     # List of _all_ attributes and default values: [[:name, nil], [:bindir, 'bin'], ...]
     @@attributes = []
 
+    @@nil_attributes = []
+    @@non_nil_attributes = [:@original_platform]
+
     # List of array attributes
     @@array_attributes = []
 
@@ -139,6 +143,13 @@ module Gem
     # values. 
     #
     def self.attribute(name, default=nil)
+      ivar_name = "@#{name}".intern
+      if default.nil? then
+        @@nil_attributes << ivar_name
+      else
+        @@non_nil_attributes << [ivar_name, default]
+      end
+
       @@attributes << [name, default]
       @@default_value[name] = default
       attr_accessor(name)
@@ -147,17 +158,21 @@ module Gem
     # Same as :attribute, but ensures that values assigned to the
     # attribute are array values by applying :to_a to the value.
     def self.array_attribute(name)
+      @@non_nil_attributes << ["@#{name}".intern, []]
+
       @@array_attributes << name
       @@attributes << [name, []]
       @@default_value[name] = []
-      module_eval %{
+      code = %{
         def #{name}
           @#{name} ||= []
         end
         def #{name}=(value)
-          @#{name} = value.to_a
+          @#{name} = Array(value)
         end
       }
+
+      module_eval code, __FILE__, __LINE__ - 9
     end
 
     # Same as attribute above, but also records this attribute as mandatory.
@@ -215,6 +230,69 @@ module Gem
       }
     end
 
+    # Dump only crucial instance variables.
+    #
+    # MAINTAIN ORDER!
+    def _dump(limit) # :nodoc:
+      Marshal.dump [
+        @rubygems_version,
+        @specification_version,
+        @name,
+        @version,
+        (Time === @date ? @date : Time.parse(@date.to_s)),
+        @summary,
+        @required_ruby_version,
+        @required_rubygems_version,
+        @original_platform,
+        @dependencies,
+        @rubyforge_project,
+        @email,
+        @authors,
+        @description,
+        @homepage,
+        @has_rdoc,
+        @new_platform,
+      ]
+    end
+
+    # Load custom marshal format, re-initializing defaults as needed
+    def self._load(str)
+      array = Marshal.load str
+
+      spec = Gem::Specification.new
+      spec.instance_variable_set :@specification_version, array[1]
+
+      current_version = CURRENT_SPECIFICATION_VERSION
+
+      field_count = MARSHAL_FIELDS[spec.specification_version]
+
+      if field_count.nil? or 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 :@loaded,                    false
+
+      spec
+    end
+
     def warn_deprecated(old, new)
       # How (if at all) to implement this?  We only want to warn when
       # a gem is being built, I should think.
@@ -226,23 +304,23 @@ module Gem
     required_attribute :specification_version, CURRENT_SPECIFICATION_VERSION
     required_attribute :name
     required_attribute :version
-    required_attribute :date
+    required_attribute :date, TODAY
     required_attribute :summary
     required_attribute :require_paths, ['lib']
-    
-    read_only :specification_version
 
     # OPTIONAL gemspec attributes ------------------------------------
     
     attributes :email, :homepage, :rubyforge_project, :description
     attributes :autorequire, :default_executable
-    attribute :bindir,                'bin'
-    attribute :has_rdoc,               false
-    attribute :required_ruby_version,  Gem::Version::Requirement.default
-    attribute :platform,               Gem::Platform::RUBY
+
+    attribute :bindir,                     'bin'
+    attribute :has_rdoc,                   false
+    attribute :required_ruby_version,      Gem::Requirement.default
+    attribute :required_rubygems_version,  Gem::Requirement.default
+    attribute :platform,                   Gem::Platform::RUBY
 
     attribute :signing_key,            nil
-    attribute :cert_chain,             nil
+    attribute :cert_chain,             []
     attribute :post_install_message,   nil
 
     array_attribute :authors
@@ -251,6 +329,10 @@ module Gem
     array_attribute :rdoc_options
     array_attribute :extra_rdoc_files
     array_attribute :executables
+
+    # Array of extensions to build.  See Gem::Installer#build_extensions for
+    # valid values.
+
     array_attribute :extensions
     array_attribute :requirements
     array_attribute :dependencies
@@ -276,10 +358,13 @@ module Gem
       @test_files = [] unless defined? @test_files
       @test_files << val
     end
- 
-    # RUNTIME attributes (not persisted) -----------------------------
-    
+
+    # true when this gemspec has been loaded from a specifications directory.
+    # This attribute is not persisted.
+
     attr_writer :loaded
+
+    # Path this gemspec was loaded from.  This attribute is not persisted.
     attr_accessor :loaded_from
 
     # Special accessor behaviours (overwriting default) --------------
@@ -288,21 +373,53 @@ module Gem
       @version = Version.create(version)
     end
 
+    overwrite_accessor :platform do
+      @new_platform
+    end
+
     overwrite_accessor :platform= do |platform|
-      # Checks the provided platform for the special value
-      # Platform::CURRENT and changes it to be binary specific to the
-      # current platform (i386-mswin32, etc). 
-      @platform = (platform == Platform::CURRENT ? RUBY_PLATFORM : platform)
+      if @original_platform.nil? or
+         @original_platform == Gem::Platform::RUBY then
+        @original_platform = platform
+      end
+
+      case platform
+      when Gem::Platform::CURRENT then
+        @new_platform = Gem::Platform.local
+
+      when Gem::Platform then
+        @new_platform = platform
+
+      # legacy constants
+      when nil, Gem::Platform::RUBY then
+        @new_platform = Gem::Platform::RUBY
+      when Gem::Platform::WIN32 then
+        @new_platform = Gem::Platform::MSWIN32
+      when Gem::Platform::LINUX_586 then
+        @new_platform = Gem::Platform::X86_LINUX
+      when Gem::Platform::DARWIN then
+        @new_platform = Gem::Platform::PPC_DARWIN
+      else
+        @new_platform = platform
+      end
+
+      @platform = @new_platform.to_s
+
+      @new_platform
     end
 
     overwrite_accessor :required_ruby_version= do |value|
-      @required_ruby_version = Version::Requirement.create(value)
+      @required_ruby_version = Gem::Requirement.create(value)
+    end
+
+    overwrite_accessor :required_rubygems_version= do |value|
+      @required_rubygems_version = Gem::Requirement.create(value)
     end
 
     overwrite_accessor :date= do |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. 
+      # way to do it.
       case date
       when String then
         @date = Time.parse date
@@ -311,7 +428,7 @@ module Gem
       when Date then
         @date = Time.parse date.to_s
       else
-        @date = Time.today
+        @date = TODAY
       end
     end
 
@@ -339,9 +456,9 @@ module Gem
     overwrite_accessor :default_executable do
       begin
         if defined? @default_executable and @default_executable
-          result = @default_executable 
+          result = @default_executable
         elsif @executables and @executables.size == 1
-          result = @executables.first
+          result = Array(@executables).first
         else
           result = nil
         end
@@ -357,7 +474,7 @@ module Gem
       end
 
       if defined? @bindir and @bindir then
-        @executables.map {|e| File.join(@bindir, e) }
+        Array(@executables).map {|e| File.join(@bindir, e) }
       else
         @executables
       end
@@ -367,12 +484,21 @@ module Gem
 
     overwrite_accessor :files do
       result = []
-      result |= as_array(@files) if defined?(@files)
-      result |= as_array(@test_files) if defined?(@test_files)
-      result |= as_array(add_bindir(@executables) || [])
-      result |= as_array(@extra_rdoc_files) if defined?(@extra_rdoc_files)
-      result |= as_array(@extensions) if defined?(@extensions)
-      result
+      result.push(*@files) if defined?(@files)
+      result.push(*@test_files) if defined?(@test_files)
+      result.push(*(add_bindir(@executables)))
+      result.push(*@extra_rdoc_files) if defined?(@extra_rdoc_files)
+      result.push(*@extensions) if defined?(@extensions)
+      result.uniq.compact
+    end
+
+    # Files in the Gem under one of the require_paths
+    def lib_files
+      @files.select do |file|
+        require_paths.any? do |path|
+          file.index(path) == 0
+        end
+      end
     end
 
     overwrite_accessor :test_files do
@@ -404,24 +530,39 @@ module Gem
     # Specification.list), and yields itself for further initialization.
     #
     def initialize
-      # Each attribute has a default value (possibly nil).  Here, we
-      # initialize all attributes to their default value.  This is
-      # done through the accessor methods, so special behaviours will
-      # be honored.  Furthermore, we take a _copy_ of the default so
-      # each specification instance has its own empty arrays, etc.
-      @@attributes.each do |name, default|
-        if RUBY_VERSION >= "1.9" then
-          self.funcall "#{name}=", copy_of(default)
-        else
-          self.send "#{name}=", copy_of(default)
-        end
-      end
+      @new_platform = nil
+      assign_defaults
       @loaded = false
       @@list << self
+
       yield self if block_given?
+
       @@gather.call(self) if @@gather
     end
 
+    # Each attribute has a default value (possibly nil).  Here, we
+    # initialize all attributes to their default value.  This is
+    # done through the accessor methods, so special behaviours will
+    # be honored.  Furthermore, we take a _copy_ of the default so
+    # each specification instance has its own empty arrays, etc.
+    def assign_defaults
+      @@nil_attributes.each do |name|
+        instance_variable_set name, nil
+      end
+
+      @@non_nil_attributes.each do |name, default|
+        value = case default
+                when Time, Numeric, Symbol, true, false, nil then default
+                else default.dup
+                end
+
+        instance_variable_set name, value
+      end
+
+      # HACK
+      instance_variable_set :@new_platform, Gem::Platform::RUBY
+    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
@@ -429,24 +570,29 @@ module Gem
     #
     # 'input' can be anything that YAML.load() accepts: String or IO. 
     #
-    def Specification.from_yaml(input)
-      input = normalize_yaml_input(input)
-      spec = YAML.load(input)
-      if(spec && spec.class == FalseClass) then
+    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 Specification === spec
+
+      unless Gem::Specification === spec then
         raise Gem::Exception, "YAML data doesn't evaluate to gem specification"
       end
-      unless spec.instance_variables.include? '@specification_version' and
+
+      unless (spec.instance_variables.include? '@specification_version' or
+              spec.instance_variables.include? :@specification_version) and
              spec.instance_variable_get :@specification_version
         spec.instance_variable_set :@specification_version, 
-          NONEXISTENT_SPECIFICATION_VERSION
+                                   NONEXISTENT_SPECIFICATION_VERSION
       end
+
       spec
     end 
 
-    def Specification.load(filename)
+    def self.load(filename)
       gemspec = nil
       fail "NESTED Specification.load calls not allowed!" if @@gather
       @@gather = proc { |gs| gemspec = gs }
@@ -458,7 +604,7 @@ module Gem
     end
 
     # Make sure the yaml specification is properly formatted with dashes.
-    def Specification.normalize_yaml_input(input)
+    def self.normalize_yaml_input(input)
       result = input.respond_to?(:read) ? input.read : input
       result = "--- " + result unless result =~ /^--- /
       result
@@ -472,19 +618,34 @@ module Gem
       @rubygems_version = RubyGemsVersion
     end
 
+    # Ignore unknown attributes if the 
+    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
+
     # Adds a dependency to this Gem.  For example,
     #
     #   spec.add_dependency('jabber4r', '> 0.1', '<= 0.5')
     #
     # gem:: [String or Gem::Dependency] The Gem name/dependency.
-    # requirements:: [default="> 0.0.0"] The version requirements.   
+    # requirements:: [default=">= 0"] The version requirements.
     #
     def add_dependency(gem, *requirements)
-      requirements = ['> 0.0.0'] if requirements.empty?
-      requirements.flatten!
+      requirements = if requirements.empty? then
+                       Gem::Requirement.default
+                     else
+                       requirements.flatten
+                     end
+
       unless gem.respond_to?(:name) && gem.respond_to?(:version_requirements)
         gem = Dependency.new(gem, requirements)
       end
+
       dependencies << gem
     end
     
@@ -493,19 +654,32 @@ module Gem
     # default Ruby platform).
     #
     def full_name
-      if platform == Gem::Platform::RUBY || platform.nil?
+      if platform == Gem::Platform::RUBY or platform.nil? then
         "#{@name}-#{@version}"
       else
         "#{@name}-#{@version}-#{platform}"
-      end 
+      end
     end
-    
+
+    # Returns the full name (name-version) of this gemspec using the original
+    # platform.
+    #
+    def original_name # :nodoc:
+      if platform == Gem::Platform::RUBY or platform.nil? then
+        "#{@name}-#{@version}"
+      else
+        "#{@name}-#{@version}-#{@original_platform}"
+      end
+    end
+
     # The full path to the gem (install path + full name).
     #
     # return:: [String] the full gem path
     #
     def full_gem_path
-      File.join(installation_path, "gems", full_name)
+      path = File.join installation_path, 'gems', full_name
+      return path if File.directory? path
+      File.join installation_path, 'gems', original_name
     end
     
     # The default (generated) file name of the gem.
@@ -532,17 +706,20 @@ module Gem
       return @name == dependency.name && 
         dependency.version_requirements.satisfied_by?(@version)
     end
-    
+
     # Comparison methods ---------------------------------------------
-    
-    # Compare specs (name then version).
-    def <=>(other)
-      [@name, @version] <=> [other.name, other.version]
+
+    def sort_obj
+      [@name, @version.to_ints, @new_platform == Gem::Platform::RUBY ? -1 : 1]
+    end
+
+    def <=>(other) # :nodoc:
+      sort_obj <=> other.sort_obj
     end
 
     # Tests specs for equality (across all attributes).
     def ==(other) # :nodoc:
-      other.kind_of?(self.class) && same_attributes?(other)
+      self.class === other && same_attributes?(other)
     end
 
     alias eql? == # :nodoc:
@@ -561,39 +738,94 @@ module Gem
         hash_code + n
       }
     end
-    
+
     # Export methods (YAML and Ruby code) ----------------------------
-    
-    # Returns an array of attribute names to be used when generating a
-    # YAML representation of this object.  If an attribute still has
-    # its default value, it is omitted.
-    def to_yaml_properties
+
+    def to_yaml(opts = {}) # :nodoc:
       mark_version
-      @@attributes.map { |name, default| "@#{name}" }
+
+      attributes = @@attributes.map { |name,| name.to_s }.sort
+      attributes = attributes - %w[name version platform]
+
+      yaml = YAML.quick_emit object_id, opts do |out|
+        out.map taguri, to_yaml_style do |map|
+          map.add 'name', @name
+          map.add 'version', @version
+          platform = if String === @original_platform then
+                       @original_platform
+                     else
+                       @original_platform.to_s
+                     end
+          map.add 'platform', platform
+
+          attributes.each do |name|
+            map.add name, instance_variable_get("@#{name}")
+          end
+        end
+      end
+    end
+
+    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
 
-    # 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 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 = "Gem::Specification.new do |s|\n"
-      @@attributes.each do |name, default|
-        # TODO better implementation of next line (read_only_attribute? ... something like that)
-        next if name == :dependencies or name == :specification_version
+      result = []
+      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
+      result << ""
+      result << "  s.specification_version = #{specification_version} if s.respond_to? :specification_version="
+      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,
+      ]
+
+      attributes = @@attributes.sort_by { |name,| name.to_s }
+
+      attributes.each do |name, default|
+        next if handled.include? name
         current_value = self.send(name)
-        result << "  s.#{name} = #{ruby_code(current_value)}\n" unless current_value == default
+        if current_value != default or self.class.required_attribute? name then
+          result << "  s.#{name} = #{ruby_code current_value}"
+        end
       end
+
+      result << "" unless dependencies.empty?
+
       dependencies.each do |dep|
         version_reqs_param = dep.requirements_list.inspect
-        result << "  s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})\n"
+        result << "  s.add_dependency(%q<#{dep.name}>, #{version_reqs_param})"
       end
-      result << "end\n"
+
+      result << "end"
+      result << ""
+
+      result.join "\n"
     end
 
     # Validation and normalization methods ---------------------------
-    
+
     # Checks that the specification contains all required fields, and
     # does a very basic sanity check.
     #
@@ -601,19 +833,32 @@ module Gem
     # the checks..
     def validate
       normalize
-      if rubygems_version != RubyGemsVersion
-        raise InvalidSpecificationException.new(%[
-          Expected RubyGems Version #{RubyGemsVersion}, was #{rubygems_version}
-        ].strip)
+
+      if rubygems_version != RubyGemsVersion then
+        raise Gem::InvalidSpecificationException,
+              "expected RubyGems version #{RubyGemsVersion}, was #{rubygems_version}"
       end
+
       @@required_attributes.each do |symbol|
-        unless self.send(symbol)
-          raise InvalidSpecificationException.new("Missing value for attribute #{symbol}")
+        unless self.send symbol then
+          raise Gem::InvalidSpecificationException,
+                "missing value for attribute #{symbol}"
         end
       end 
-      if require_paths.empty?
-        raise InvalidSpecificationException.new("Gem spec needs to have at least one require_path")
+
+      if require_paths.empty? then
+        raise Gem::InvalidSpecificationException,
+              "specification must have at least one require_path"
+      end
+
+      case platform
+      when Gem::Platform, Platform::RUBY then # ok
+      else
+        raise Gem::InvalidSpecificationException,
+              "invalid platform #{platform.inspect}, see Gem::Platform"
       end
+
+      true
     end
 
     # Normalize the list of files so that:
@@ -671,31 +916,19 @@ module Gem
       end
     end
 
-    # Duplicate an object unless it's an immediate value.
-    def copy_of(obj)
-      case obj
-      when Numeric, Symbol, true, false, nil then obj
-      else obj.dup
-      end
-    end
-
-    def as_array(items)
-      items.to_ary
-    rescue NoMethodError => ex
-      [items]
-    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.inspect
-      when Gem::Version     then obj.to_s.inspect
-      when Date, Time       then '%q{' + obj.strftime('%Y-%m-%d') + '}'
-      when Numeric          then obj.inspect
-      when true, false, nil then obj.inspect
-      when Gem::Version::Requirement  then "Gem::Version::Requirement.new(#{obj.to_s.inspect})"
+      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 Exception, "ruby_code case not handled: #{obj.class}"
       end
     end