rubygems-update 1.6.2 → 1.7.0

data/lib/rubygems/spec_fetcher.rb

@@ -251,13 +251,12 @@ class Gem::SpecFetcher
     loaded     = false
 
     if File.exist? local_file then
-      spec_dump = @fetcher.fetch_path spec_path, File.mtime(local_file)
+      spec_dump =
+        @fetcher.fetch_path(spec_path, File.mtime(local_file)) rescue nil
 
-      if spec_dump.nil? then
-        spec_dump = Gem.read_binary local_file
-      else
-        loaded = true
-      end
+      loaded = true if spec_dump
+
+      spec_dump ||= Gem.read_binary local_file
     else
       spec_dump = @fetcher.fetch_path spec_path
       loaded = true

data/lib/rubygems/specification.rb

@@ -7,6 +7,7 @@
 require 'rubygems/version'
 require 'rubygems/requirement'
 require 'rubygems/platform'
+require "rubygems/deprecate"
 
 # :stopdoc:
 class Date; end # for ruby_code if date.rb wasn't required
@@ -42,6 +43,17 @@ class Gem::Specification
   # The specification version applied to any new Specification instances
   # created.  This should be bumped whenever something in the spec format
   # changes.
+  #
+  # Specification Version History:
+  #
+  #   spec   ruby
+  #    ver    ver yyyy-mm-dd description
+  #     -1 <0.8.0            pre-spec-version-history
+  #      1  0.8.0 2004-08-01 Deprecated "test_suite_file" for "test_files"
+  #                          "test_file=x" is a shortcut for "test_files=[x]"
+  #      2  0.9.5 2007-10-01 Added "required_rubygems_version"
+  #                          Now forward-compatible with future versions
+  #      3  1.3.2 2009-01-03 Added Fixnum validation to specification_version
   #--
   # When updating this number, be sure to also update #to_ruby.
   #
@@ -49,82 +61,76 @@ class Gem::Specification
 
   CURRENT_SPECIFICATION_VERSION = 3
 
-  ##
-  # 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',
-    ],
-    3 => [
-       'Added Fixnum validation to the specification_version'
-    ]
-  }
-
   # :stopdoc:
-  MARSHAL_FIELDS = { -1 => 16, 1 => 16, 2 => 16, 3 => 17 }
 
-  now = Time.at(Time.now.to_i)
-  TODAY = now - ((now.to_i + now.gmt_offset) % 86400)
-  # :startdoc:
+  # version => # of fields
+  MARSHAL_FIELDS = { -1 => 16, 1 => 16, 2 => 16, 3 => 17 }
 
-  ##
-  # Optional block used to gather newly defined instances.
+  today = Time.now.utc
+  TODAY = Time.utc(today.year, today.month, today.day)
 
-  @@gather = nil
+  # :startdoc:
 
   ##
   # List of attribute names: [:name, :version, ...]
 
-  @@required_attributes = []
-
-  ##
-  # 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 = []
+  @@required_attributes = [:rubygems_version,
+                           :specification_version,
+                           :name,
+                           :version,
+                           :date,
+                           :summary,
+                           :require_paths]
 
   ##
   # Map of attribute names to default values.
 
-  @@default_value = {}
+  @@default_value = {
+    :authors                   => [],
+    :autorequire               => nil,
+    :bindir                    => "bin",
+    :cert_chain                => [],
+    :date                      => TODAY,
+    :dependencies              => [],
+    :description               => nil,
+    :email                     => nil,
+    :executables               => [],
+    :extensions                => [],
+    :extra_rdoc_files          => [],
+    :files                     => [],
+    :homepage                  => nil,
+    :licenses                  => [],
+    :name                      => nil,
+    :platform                  => Gem::Platform::RUBY,
+    :post_install_message      => nil,
+    :rdoc_options              => [],
+    :require_paths             => ["lib"],
+    :required_ruby_version     => Gem::Requirement.default,
+    :required_rubygems_version => Gem::Requirement.default,
+    :requirements              => [],
+    :rubyforge_project         => nil,
+    :rubygems_version          => Gem::VERSION,
+    :signing_key               => nil,
+    :specification_version     => CURRENT_SPECIFICATION_VERSION,
+    :summary                   => nil,
+    :test_files                => [],
+    :version                   => nil,
+  }
 
-  ##
-  # Names of all specification attributes
+  @@attributes = @@default_value.keys.sort_by { |s| s.to_s }
+  @@array_attributes = @@default_value.reject { |k,v| v != [] }.keys
+  @@nil_attributes, @@non_nil_attributes = @@default_value.keys.partition { |k|
+    @@default_value[k].nil?
+  }
 
   def self.attribute_names
-    @@attributes.map { |name, default| name }
-  end
-
-  ##
-  # Default values for specification attributes
-
-  def self.attribute_defaults
     @@attributes.dup
   end
 
   ##
   # The default value for specification attribute +name+
 
-  def self.default_value(name)
+  def default_value(name)
     @@default_value[name]
   end
 
@@ -150,114 +156,17 @@ class Gem::Specification
   end
 
   ##
-  # Specifies the +name+ and +default+ for a specification attribute, and
-  # creates a reader and writer method like Module#attr_accessor.
-  #
-  # The reader method returns the default if the value hasn't been set.
-
-  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)
-  end
-
-  ##
-  # 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] = []
-    code = %{
-      def #{name}
-        @#{name} ||= []
-      end
-      def #{name}=(value)
-        @#{name} = Array(value)
-      end
-    }
-
-    module_eval code, __FILE__, __LINE__ - 9
-  end
-
-  ##
-  # Same as attribute above, but also records this attribute as mandatory.
-
-  def self.required_attribute(*args)
-    @@required_attributes << args.first
-    attribute(*args)
-  end
-
-  ##
-  # Sometimes we don't want the world to use a setter method for a
-  # particular attribute.
-  #
-  # +read_only+ makes it private so we can still use it internally.
+  # Specification attributes that must be non-nil
 
-  def self.read_only(*names)
-    names.each do |name|
-      private "#{name}="
-    end
-  end
-
-  # Shortcut for creating several attributes at once (each with a default
-  # value of +nil+).
-
-  def self.attributes(*args)
-    args.each do |arg|
-      attribute(arg, nil)
-    end
-  end
-
-  ##
-  # Some attributes require special behaviour when they are accessed.  This
-  # allows for that.
-
-  def self.overwrite_accessor(name, &block)
-    remove_method name
-    define_method(name, &block)
-  end
-
-  ##
-  # Defines a _singular_ version of an existing _plural_ attribute (i.e. one
-  # whose value is expected to be an array).  This means just creating a
-  # helper method that takes a single value and appends it to the array.
-  # These are created for convenience, so that in a spec, one can write
-  #
-  #   s.require_path = 'mylib'
-  #
-  # instead of:
-  #
-  #   s.require_paths = ['mylib']
-  #
-  # That above convenience is available courtesy of:
-  #
-  #   attribute_alias_singular :require_path, :require_paths
-
-  def self.attribute_alias_singular(singular, plural)
-    define_method("#{singular}=") { |val|
-      send("#{plural}=", [val])
-    }
-    define_method("#{singular}") {
-      val = send("#{plural}")
-      val.nil? ? nil : val.first
-    }
+  def self.non_nil_attributes
+    @@non_nil_attributes.dup
   end
 
   ##
   # Dump only crucial instance variables.
   #--
   # MAINTAIN ORDER!
+  # (down with the man)
 
   def _dump(limit)
     Marshal.dump [
@@ -265,7 +174,7 @@ class Gem::Specification
       @specification_version,
       @name,
       @version,
-      (Time === @date ? @date : (require 'time'; Time.parse(@date.to_s))),
+      date,
       @summary,
       @required_ruby_version,
       @required_rubygems_version,
@@ -276,7 +185,7 @@ class Gem::Specification
       @authors,
       @description,
       @homepage,
-      @has_rdoc,
+      true, # has_rdoc
       @new_platform,
       @licenses
     ]
@@ -333,7 +242,6 @@ class Gem::Specification
   # List of dependencies that will automatically be activated at runtime.
 
   def runtime_dependencies
-    # TODO: fix #type to return :runtime if nil
     dependencies.select { |d| d.type == :runtime }
   end
 
@@ -345,12 +253,10 @@ class Gem::Specification
   end
 
   def test_suite_file # :nodoc:
-    warn 'test_suite_file deprecated, use test_files'
     test_files.first
   end
 
   def test_suite_file=(val) # :nodoc:
-    warn 'test_suite_file= deprecated, use test_files='
     @test_files = [] unless defined? @test_files
     @test_files << val
   end
@@ -416,16 +322,31 @@ class Gem::Specification
 
   def initialize name = nil, version = nil
     @new_platform = nil
-    assign_defaults
     @loaded = false
     @loaded_from = nil
+    @original_platform = nil
+
+    @@nil_attributes.each do |key|
+      instance_variable_set "@#{key}", nil
+    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
+
+      instance_variable_set "@#{key}", value
+    end
+
+    # HACK
+    instance_variable_set :@new_platform, Gem::Platform::RUBY
 
     self.name = name if name
     self.version = version if version
 
     yield self if block_given?
-
-    @@gather.call(self) if @@gather
   end
 
   ##
@@ -434,38 +355,22 @@ class Gem::Specification
   def initialize_copy(other_spec)
     other_ivars = other_spec.instance_variables
     other_ivars = other_ivars.map { |ivar| ivar.intern } if # for 1.9
-      other_ivars.any? { |ivar| String === ivar }
+      String === other_ivars.first
 
     self.class.array_attributes.each do |name|
       name = :"@#{name}"
       next unless other_ivars.include? name
-      instance_variable_set name, other_spec.instance_variable_get(name).dup
-    end
-  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.
+      begin
+        instance_variable_set name, other_spec.instance_variable_get(name).dup
+      rescue TypeError
+        e = Gem::FormatException.new \
+          "#{full_name} has an invalid value for #{name}"
 
-  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
+        e.file_path = loaded_from
+        raise e
+      end
     end
-
-    # HACK
-    instance_variable_set :@new_platform, Gem::Platform::RUBY
   end
 
   ##
@@ -628,7 +533,7 @@ class Gem::Specification
   #   spec.file_name # => "example-1.0.gem"
 
   def file_name
-    full_name + '.gem'
+    "#{full_name}.gem"
   end
 
   ##
@@ -663,7 +568,7 @@ class Gem::Specification
   #   spec.spec_name # => "example-1.0.gemspec"
 
   def spec_name
-    full_name + '.gemspec'
+    "#{full_name}.gemspec"
   end
 
   def <=>(other) # :nodoc:
@@ -708,9 +613,6 @@ class Gem::Specification
   def encode_with coder # :nodoc:
     mark_version
 
-    attributes = @@attributes.map { |name,| name.to_s }.sort
-    attributes = attributes - %w[name version platform]
-
     coder.add 'name', @name
     coder.add 'version', @version
     platform = case @original_platform
@@ -723,11 +625,24 @@ class Gem::Specification
                end
     coder.add 'platform', platform
 
+    attributes = @@attributes.map(&:to_s) - %w[name version platform]
     attributes.each do |name|
       coder.add name, instance_variable_get("@#{name}")
     end
   end
 
+  ##
+  # Creates a duplicate spec without large blobs that aren't used at runtime.
+
+  def for_cache
+    spec = dup
+
+    spec.files = nil
+    spec.test_files = nil
+
+    spec
+  end
+
   def to_yaml(opts = {}) # :nodoc:
     if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
       super.gsub(/ !!null \n/, " \n")
@@ -780,14 +695,13 @@ class Gem::Specification
       :required_rubygems_version,
       :specification_version,
       :version,
+      :has_rdoc,
     ]
 
-    attributes = @@attributes.sort_by { |attr_name,| attr_name.to_s }
-
-    attributes.each do |attr_name, default|
+    @@attributes.each do |attr_name|
       next if handled.include? attr_name
       current_value = self.send(attr_name)
-      if current_value != default or
+      if current_value != default_value(attr_name) or
          self.class.required_attribute? attr_name then
         result << "  s.#{attr_name} = #{ruby_code current_value}"
       end
@@ -829,12 +743,7 @@ class Gem::Specification
   end
 
   def to_ruby_for_cache
-    s = dup
-    # remove large blobs that aren't used at runtime:
-    s.files = nil
-    s.extra_rdoc_files = nil
-    s.rdoc_options = nil
-    s.to_ruby
+    for_cache.to_ruby
   end
 
   ##
@@ -844,12 +753,21 @@ class Gem::Specification
   # Raises InvalidSpecificationException if the spec does not pass the
   # checks..
 
-  def validate
+  def validate packaging = true
     require 'rubygems/user_interaction'
     extend Gem::UserInteraction
     normalize
 
-    if rubygems_version != Gem::VERSION then
+    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
@@ -883,7 +801,7 @@ class Gem::Specification
       !File.file? file
     end
 
-    unless non_files.empty? then
+    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"
@@ -901,10 +819,14 @@ class Gem::Specification
             "invalid platform #{platform.inspect}, see Gem::Platform"
     end
 
-    unless Array === authors and
-           authors.all? { |author| String === author } then
-      raise Gem::InvalidSpecificationException,
-            'authors must be Array of Strings'
+    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|
@@ -914,26 +836,24 @@ class Gem::Specification
       end
     }
 
-    # reject FIXME and TODO
+    # reject lazy developers:
 
-    unless authors.grep(/FIXME|TODO/).empty? then
-      raise Gem::InvalidSpecificationException,
-            '"FIXME" or "TODO" is not an author'
+    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(/FIXME|TODO/).empty? then
-      raise Gem::InvalidSpecificationException,
-            '"FIXME" or "TODO" is not an email address'
+    unless Array(email).grep(/FI XME|TO DO/x).empty? then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not an email"
     end
 
-    if description =~ /FIXME|TODO/ then
-      raise Gem::InvalidSpecificationException,
-            '"FIXME" or "TODO" is not a description'
+    if description =~ /FI XME|TO DO/x then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not a description"
     end
 
-    if summary =~ /FIXME|TODO/ then
-      raise Gem::InvalidSpecificationException,
-            '"FIXME" or "TODO" is not a summary'
+    if summary =~ /FI XME|TO DO/x then
+      raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
     end
 
     if homepage and not homepage.empty? and
@@ -949,10 +869,11 @@ class Gem::Specification
       alert_warning "no #{attribute} specified" if value.nil? or value.empty?
     end
 
-    if summary and not summary.empty? and description == summary then
+    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|
@@ -1010,11 +931,10 @@ class Gem::Specification
     q.group 2, 'Gem::Specification.new do |s|', 'end' do
       q.breakable
 
-      attributes = @@attributes.sort_by { |attr_name,| attr_name.to_s }
-
-      attributes.each do |attr_name, default|
+      # REFACTOR: each_attr - use in to_yaml as well
+      @@attributes.each do |attr_name|
         current_value = self.send attr_name
-        if current_value != default or
+        if current_value != default_value(attr_name) or
            self.class.required_attribute? attr_name then
 
           q.text "s.#{attr_name} = "
@@ -1091,49 +1011,30 @@ class Gem::Specification
   # :section: Required gemspec attributes
 
   ##
-  # :attr_accessor: rubygems_version
-  #
   # The version of RubyGems used to create this gem.
   #
   # Do not set this, it is set automatically when the gem is packaged.
 
-  required_attribute :rubygems_version, Gem::VERSION
+  attr_accessor :rubygems_version
 
   ##
-  # :attr_accessor: specification_version
-  #
   # The Gem::Specification version of this gemspec.
   #
   # Do not set this, it is set automatically when the gem is packaged.
 
-  required_attribute :specification_version, CURRENT_SPECIFICATION_VERSION
+  attr_accessor :specification_version
 
   ##
-  # :attr_accessor: name
-  #
   # This gem's name
 
-  required_attribute :name
+  attr_accessor :name
 
   ##
-  # :attr_accessor: version
-  #
   # This gem's version
 
-  required_attribute :version
+  attr_reader :version
 
   ##
-  # :attr_accessor: date
-  #
-  # The date this gem was created
-  #
-  # Do not set this, it is set automatically when the gem is packaged.
-
-  required_attribute :date, TODAY
-
-  ##
-  # :attr_accessor: summary
-  #
   # A short summary of this gem's description.  Displayed in `gem list -d`.
   #
   # The description should be more detailed than the summary.  For example,
@@ -1141,22 +1042,18 @@ class Gem::Specification
   #
   # As of RubyGems 1.3.2 newlines are no longer stripped.
 
-  required_attribute :summary
+  attr_reader :summary
 
   ##
-  # :attr_accessor: require_paths
-  #
   # Paths in the gem to add to $LOAD_PATH when this gem is activated.
   #
   # The default 'lib' is typically sufficient.
 
-  required_attribute :require_paths, ['lib']
+  attr_accessor :require_paths
 
   # :section: Optional gemspec attributes
 
   ##
-  # :attr_accessor: email
-  #
   # A contact email for this gem
   #
   # If you are providing multiple authors and multiple emails they should be
@@ -1166,117 +1063,67 @@ class Gem::Specification
   #
   # Gives a hash of author name to email address.
 
-  attribute :email
+  attr_accessor :email
 
   ##
-  # :attr_accessor: homepage
-  #
   # The URL of this gem's home page
 
-  attribute :homepage
+  attr_accessor :homepage
 
   ##
-  # :attr_accessor: rubyforge_project
-  #
   # The rubyforge project this gem lives under.  i.e. RubyGems'
   # rubyforge_project is "rubygems".
 
-  attribute :rubyforge_project
+  attr_accessor :rubyforge_project
 
   ##
-  # :attr_accessor: description
-  #
   # A long description of this gem
 
-  attribute :description
+  attr_reader :description
 
   ##
-  # :attr_accessor: autorequire
-  #
   # Autorequire was used by old RubyGems to automatically require a file.
   # It no longer is supported.
 
-  attribute :autorequire
+  attr_accessor :autorequire
 
   ##
-  # :attr_accessor: default_executable
-  #
   # The default executable for this gem.
-  #
-  # This is not used.
 
-  attribute :default_executable
+  attr_writer :default_executable
 
   ##
-  # :attr_accessor: bindir
-  #
   # The path in the gem for executable scripts
 
-  attribute :bindir, 'bin'
+  attr_accessor :bindir
 
   ##
-  # :attr_accessor: has_rdoc
-  #
-  # Deprecated and ignored, defaults to true.
-  #
-  # Formerly used to indicate this gem was RDoc-capable.
-
-  attribute :has_rdoc, true
-
-  ##
-  # True if this gem supports RDoc
-
-  alias :has_rdoc? :has_rdoc
-
-  ##
-  # :attr_accessor: required_ruby_version
-  #
   # The version of ruby required by this gem
 
-  attribute :required_ruby_version, Gem::Requirement.default
+  attr_reader :required_ruby_version
 
   ##
-  # :attr_accessor: required_rubygems_version
-  #
   # The RubyGems version required by this gem
 
-  attribute :required_rubygems_version, Gem::Requirement.default
+  attr_reader :required_rubygems_version
 
   ##
-  # :attr_accessor: platform
-  #
-  # The platform this gem runs on.  See Gem::Platform for details.
-  #
-  # Setting this to any value other than Gem::Platform::RUBY or
-  # Gem::Platform::CURRENT is probably wrong.
-
-  attribute :platform, Gem::Platform::RUBY
-
-  ##
-  # :attr_accessor: signing_key
-  #
   # The key used to sign this gem.  See Gem::Security for details.
 
-  attribute :signing_key, nil
+  attr_accessor :signing_key
 
   ##
-  # :attr_accessor: cert_chain
-  #
   # The certificate chain used to sign this gem.  See Gem::Security for
   # details.
 
-  attribute :cert_chain, []
+  attr_accessor :cert_chain
 
   ##
-  # :attr_accessor: post_install_message
-  #
   # A message that gets displayed after the gem is installed
 
-  attribute :post_install_message, nil
+  attr_accessor :post_install_message
 
   ##
-  # :attr_accessor: authors
-  #
   # The list of author names who wrote this gem.
   #
   # If you are providing multiple authors and multiple emails they should be
@@ -1286,19 +1133,27 @@ class Gem::Specification
   #
   # Gives a hash of author name to email address.
 
-  array_attribute :authors
+  def authors
+    @authors ||= []
+  end
+
+  def authors=(value)
+    @authors = Array(value)
+  end
 
   ##
-  # :attr_accessor: licenses
-  #
   # The license(s) for the library.  Each license must be a short name, no
   # more than 64 characters.
 
-  array_attribute :licenses
+  def licenses
+    @licenses ||= []
+  end
+
+  def licenses=(value)
+    @licenses = Array(value)
+  end
 
   ##
-  # :attr_accessor: files
-  #
   # Files included in this gem.  You cannot append to this accessor, you must
   # assign to it.
   #
@@ -1307,117 +1162,210 @@ class Gem::Specification
   # Directories are automatically stripped from this list when building a gem,
   # other non-files cause an error.
 
-  array_attribute :files
+  def files
+    @files ||= []
+  end
+
+  def files=(value)
+    @files = Array(value)
+  end
 
   ##
-  # :attr_accessor: test_files
-  #
   # Test files included in this gem.  You cannot append to this accessor, you
   # must assign to it.
 
-  array_attribute :test_files
+  def test_files
+    @test_files ||= []
+  end
+
+  def test_files=(value)
+    @test_files = Array(value)
+  end
 
   ##
-  # :attr_accessor: rdoc_options
-  #
   # An ARGV style array of options to RDoc
 
-  array_attribute :rdoc_options
+  def rdoc_options
+    @rdoc_options ||= []
+  end
+
+  def rdoc_options=(value)
+    # TODO: warn about setting instead of pushing
+    @rdoc_options = Array(value)
+  end
 
   ##
-  # :attr_accessor: extra_rdoc_files
-  #
   # Extra files to add to RDoc such as README or doc/examples.txt
 
-  array_attribute :extra_rdoc_files
+  def extra_rdoc_files
+    @extra_rdoc_files ||= []
+  end
+
+  def extra_rdoc_files=(value)
+    # TODO: warn about setting instead of pushing
+    @extra_rdoc_files = Array(value)
+  end
 
   ##
-  # :attr_accessor: executables
-  #
   # Executables included in the gem.
 
-  array_attribute :executables
+  def executables
+    @executables ||= []
+  end
+
+  def executables=(value)
+    # TODO: warn about setting instead of pushing
+    @executables = Array(value)
+  end
 
   ##
-  # :attr_accessor: extensions
-  #
   # Extensions to build when installing the gem.  See
   # Gem::Installer#build_extensions for valid values.
 
-  array_attribute :extensions
+  def extensions
+    @extensions ||= []
+  end
+
+  def extensions=(value)
+    # TODO: warn about setting instead of pushing
+    @extensions = Array(value)
+  end
 
   ##
-  # :attr_accessor: requirements
-  #
   # An array or things required by this gem.  Not used by anything
   # presently.
 
-  array_attribute :requirements
+  def requirements
+    @requirements ||= []
+  end
+
+  def requirements=(value)
+    # TODO: warn about setting instead of pushing
+    @requirements = Array(value)
+  end
 
   ##
-  # :attr_reader: dependencies
-  #
   # A list of Gem::Dependency objects this gem depends on.
   #
   # Use #add_dependency or #add_development_dependency to add dependencies to
   # a gem.
 
-  array_attribute :dependencies
-
-  read_only :dependencies
+  def dependencies
+    @dependencies ||= []
+  end
 
   # :section: Aliased gemspec attributes
 
   ##
   # Singular accessor for #executables
 
-  attribute_alias_singular :executable, :executables
+  def executable
+    val = executables and val.first
+  end
+
+  ##
+  # Singular accessor for #executables
+
+  def executable=o
+    self.executables = [o]
+  end
+
+  ##
+  # Singular accessor for #authors
+
+  def author
+    val = authors and val.first
+  end
 
   ##
   # Singular accessor for #authors
 
-  attribute_alias_singular :author, :authors
+  def author=o
+    self.authors = [o]
+  end
+
+  ##
+  # Singular accessor for #licenses
+
+  def license
+    val = licenses and val.first
+  end
 
   ##
   # Singular accessor for #licenses
 
-  attribute_alias_singular :license, :licenses
+  def license=o
+    self.licenses = [o]
+  end
 
   ##
   # Singular accessor for #require_paths
 
-  attribute_alias_singular :require_path, :require_paths
+  def require_path
+    val = require_paths and val.first
+  end
+
+  ##
+  # Singular accessor for #require_paths
+
+  def require_path=o
+    self.require_paths = [o]
+  end
 
   ##
   # Singular accessor for #test_files
 
-  attribute_alias_singular :test_file, :test_files
+  def test_file
+    val = test_files and val.first
+  end
 
   ##
-  # has_rdoc is now ignored
+  # Singular accessor for #test_files
+
+  def test_file=o
+    self.test_files = [o]
+  end
+
+  ##
+  # Deprecated and ignored, defaults to true.
+  #
+  # Formerly used to indicate this gem was RDoc-capable.
 
-  overwrite_accessor :has_rdoc do
+  def has_rdoc
     true
   end
 
   ##
-  # has_rdoc is now ignored
+  # Deprecated and ignored.
+  #
+  # Formerly used to indicate this gem was RDoc-capable.
 
-  overwrite_accessor :has_rdoc= do |value|
+  def has_rdoc= v
     @has_rdoc = true
   end
 
-  overwrite_accessor :version= do |version|
+  alias :has_rdoc? :has_rdoc
+
+  def version= version
     @version = Gem::Version.create(version)
     self.required_rubygems_version = '> 1.3.1' if @version.prerelease?
     return @version
   end
 
-  overwrite_accessor :platform do
+  ##
+  # The platform this gem runs on.  See Gem::Platform for details.
+
+  def platform
     @new_platform
   end
 
-  overwrite_accessor :platform= do |platform|
+  ##
+  # The platform this gem runs on.  See Gem::Platform for details.
+  #
+  # Setting this to any value other than Gem::Platform::RUBY or
+  # Gem::Platform::CURRENT is probably wrong.
+
+  def platform= platform
     if @original_platform.nil? or
        @original_platform == Gem::Platform::RUBY then
       @original_platform = platform
@@ -1449,68 +1397,82 @@ class Gem::Specification
     @new_platform
   end
 
-  overwrite_accessor :required_ruby_version= do |value|
+  ##
+  # The version of ruby required by this gem
+
+  def required_ruby_version= value
     @required_ruby_version = Gem::Requirement.create(value)
   end
 
-  overwrite_accessor :required_rubygems_version= do |value|
+  ##
+  # The RubyGems version required by this gem
+
+  def required_rubygems_version= value
     @required_rubygems_version = Gem::Requirement.create(value)
   end
 
-  overwrite_accessor :date= do |date|
+  ##
+  # The date this gem was created
+  #
+  # Do not set this, it is set automatically when the gem is packaged.
+
+  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.
-    case date
-    when String then
-      @date = if /\A(\d{4})-(\d{2})-(\d{2})\Z/ =~ date then
-                Time.local($1.to_i, $2.to_i, $3.to_i)
+    @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
-                require 'time'
-                Time.parse date
+                raise(Gem::InvalidSpecificationException,
+                      "invalid date format in specification: #{date.inspect}")
               end
-    when Time then
-      @date = Time.local(date.year, date.month, date.day)
-    when Date then
-      @date = Time.local(date.year, date.month, date.day)
-    else
-      @date = TODAY
-    end
+            when Time, Date then
+              Time.utc(date.year, date.month, date.day)
+            else
+              TODAY
+            end
   end
 
-  overwrite_accessor :date do
-    self.date = nil if @date.nil?  # HACK Sets the default value for date
-    @date
+  ##
+  # The date this gem was created. Lazily defaults to TODAY.
+
+  def date
+    @date ||= TODAY
   end
 
-  overwrite_accessor :summary= do |str|
-    @summary = if str then
-                 str.strip.
-                 gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').
-                 gsub(/\n[ \t]*/, " ")
-               end
+  ##
+  # A short summary of this gem's description.
+
+  def summary= str
+    @summary = str.to_s.strip.
+      gsub(/(\w-)\n[ \t]*(\w)/, '\1\2').gsub(/\n[ \t]*/, " ") # so. weird.
   end
 
-  overwrite_accessor :description= do |str|
+  ##
+  # A long description of this gem
+
+  def description= str
     @description = str.to_s
   end
 
-  overwrite_accessor :default_executable do
-    begin
-      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
-    rescue
-      nil
+  ##
+  # The default executable for this gem.
+
+  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
 
-  overwrite_accessor :test_files do
+  undef_method :test_files
+  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
     # YAML.
@@ -1525,7 +1487,8 @@ class Gem::Specification
     end
   end
 
-  overwrite_accessor :files do
+  undef_method :files
+  def files
     # DO NOT CHANGE TO ||= ! This is not a normal accessor. (yes, it sucks)
     @files = [@files,
               @test_files,
@@ -1562,4 +1525,14 @@ class Gem::Specification
   def dependent_specs
     runtime_dependencies.map { |dep| Gem.source_index.search dep, true }.flatten
   end
+
+  extend Deprecate
+
+  deprecate :test_suite_file,     :test_file,  2011, 10
+  deprecate :test_suite_file=,    :test_file=, 2011, 10
+  deprecate :has_rdoc,            :none,       2011, 10
+  deprecate :has_rdoc?,           :none,       2011, 10
+  deprecate :has_rdoc=,           :none,       2011, 10
+  deprecate :default_executable,  :none,       2011, 10
+  deprecate :default_executable=, :none,       2011, 10
 end