rubygems-update 1.3.6 → 1.3.7

data/lib/rubygems/source_index.rb

@@ -85,10 +85,10 @@ class Gem::SourceIndex
     def load_specification(file_name)
       return nil unless file_name and File.exist? file_name
 
-      spec_code = if RUBY_VERSION < '1.9' then
-                    File.read file_name
-                  else
+      spec_code = if defined? Encoding then
                     File.read file_name, :encoding => 'UTF-8'
+                  else
+                    File.read file_name
                   end.untaint
 
       begin
@@ -414,7 +414,7 @@ class Gem::SourceIndex
   end
 
   def ==(other) # :nodoc:
-    self.class === other and @gems == other.gems 
+    self.class === other and @gems == other.gems
   end
 
   def dump

data/lib/rubygems/source_info_cache.rb

@@ -285,17 +285,19 @@ class Gem::SourceInfoCache
     cache_data.map do |source_uri, sic_entry|
       next unless Gem.sources.include? source_uri
       # TODO - Remove this gunk after 2008/11
-      unless pattern.kind_of?(Gem::Dependency)
-        pattern = Gem::Dependency.new(pattern, Gem::Requirement.default) 
+      unless pattern.kind_of? Gem::Dependency then
+        pattern = Gem::Dependency.new pattern, Gem::Requirement.default
       end
       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, all = false)
     read_all_cache_data if all
 

data/lib/rubygems/spec_fetcher.rb

@@ -3,6 +3,7 @@ require 'fileutils'
 
 require 'rubygems/remote_fetcher'
 require 'rubygems/user_interaction'
+require 'rubygems/errors'
 
 ##
 # SpecFetcher handles metadata updates from remote gem repositories.
@@ -53,7 +54,7 @@ class Gem::SpecFetcher
   end
 
   ##
-  # Retuns the local directory to write +uri+ to.
+  # Returns the local directory to write +uri+ to.
 
   def cache_dir(uri)
     File.join @dir, "#{uri.host}%#{uri.port}", File.dirname(uri.path)
@@ -65,22 +66,28 @@ class Gem::SpecFetcher
   # false, all platforms are returned. If +prerelease+ is true,
   # prerelease versions are included.
 
-  def fetch(dependency, all = false, matching_platform = true, prerelease = false)
-    specs_and_sources = find_matching dependency, all, matching_platform, prerelease
+  def fetch_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
+    specs_and_sources, errors = find_matching_with_errors dependency, all, matching_platform, prerelease
 
-    specs_and_sources.map do |spec_tuple, source_uri|
+    ss = specs_and_sources.map do |spec_tuple, source_uri|
       [fetch_spec(spec_tuple, URI.parse(source_uri)), source_uri]
     end
 
+    return [ss, errors]
+
   rescue Gem::RemoteFetcher::FetchError => e
     raise unless warn_legacy e do
       require 'rubygems/source_info_cache'
 
-      return Gem::SourceInfoCache.search_with_source(dependency,
-                                                     matching_platform, all)
+      return [Gem::SourceInfoCache.search_with_source(dependency,
+                                                     matching_platform, all), nil]
     end
   end
 
+  def fetch(*args)
+    fetch_with_errors(*args).first
+  end
+
   def fetch_spec(spec, source_uri)
     spec = spec - [nil, 'ruby', '']
     spec_file_name = "#{spec.join '-'}.gemspec"
@@ -117,16 +124,27 @@ class Gem::SpecFetcher
   # matching released versions are returned.  If +matching_platform+
   # is false, gems for all platforms are returned.
 
-  def find_matching(dependency, all = false, matching_platform = true, prerelease = false)
+  def find_matching_with_errors(dependency, all = false, matching_platform = true, prerelease = false)
     found = {}
 
+    rejected_specs = {}
+
     list(all, prerelease).each do |source_uri, specs|
       found[source_uri] = specs.select do |spec_name, version, spec_platform|
-        dependency =~ Gem::Dependency.new(spec_name, version) and
-          (not matching_platform or Gem::Platform.match(spec_platform))
+        if dependency.match?(spec_name, version)
+          if matching_platform and !Gem::Platform.match(spec_platform)
+            pm = (rejected_specs[dependency] ||= Gem::PlatformMismatch.new(spec_name, version))
+            pm.add_platform spec_platform
+            false
+          else
+            true
+          end
+        end
       end
     end
 
+    errors = rejected_specs.values
+
     specs_and_sources = []
 
     found.each do |source_uri, specs|
@@ -134,7 +152,11 @@ class Gem::SpecFetcher
       specs_and_sources.push(*specs.map { |spec| [spec, uri_str] })
     end
 
-    specs_and_sources
+    [specs_and_sources, errors]
+  end
+
+  def find_matching(*args)
+    find_matching_with_errors(*args).first
   end
 
   ##
@@ -184,7 +206,7 @@ class Gem::SpecFetcher
     cache = { :latest => @latest_specs,
       :prerelease => @prerelease_specs,
       :all => @specs }[type]
-    
+
     Gem.sources.each do |source_uri|
       source_uri = URI.parse source_uri
 

data/lib/rubygems/specification.rb

@@ -504,8 +504,8 @@ class Gem::Specification
     gemspec = nil
     raise "NESTED Specification.load calls not allowed!" if @@gather
     @@gather = proc { |gs| gemspec = gs }
-    data = File.read(filename)
-    eval(data)
+    data = File.read filename
+    eval data, nil, filename
     gemspec
   ensure
     @@gather = nil
@@ -524,7 +524,7 @@ class Gem::Specification
   # Sets the rubygems_version to the current RubyGems version
 
   def mark_version
-    @rubygems_version = Gem::RubyGemsVersion
+    @rubygems_version = Gem::VERSION
   end
 
   ##
@@ -677,33 +677,43 @@ class Gem::Specification
     }
   end
 
-  def to_yaml(opts = {}) # :nodoc:
+  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
+               when nil, '' then
+                 'ruby'
+               when String then
+                 @original_platform
+               else
+                 @original_platform.to_s
+               end
+    coder.add 'platform', platform
+
+    attributes.each do |name|
+      coder.add name, instance_variable_get("@#{name}")
+    end
+  end
+
+  def to_yaml(opts = {}) # :nodoc:
+    return super if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
+
     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 = case @original_platform
-                   when nil, '' then
-                     'ruby'
-                   when String 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
+        encode_with map
       end
     end
   end
 
+  def init_with coder # :nodoc:
+    yaml_initialize coder.tag, coder.map
+  end
+
   def yaml_initialize(tag, vals) # :nodoc:
     vals.each do |ivar, val|
       instance_variable_set "@#{ivar}", val
@@ -759,7 +769,7 @@ class Gem::Specification
     result << "    s.specification_version = #{specification_version}"
     result << nil
 
-    result << "    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then"
+    result << "    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then"
 
     unless dependencies.empty? then
       dependencies.each do |dep|
@@ -804,9 +814,9 @@ class Gem::Specification
     extend Gem::UserInteraction
     normalize
 
-    if rubygems_version != Gem::RubyGemsVersion then
+    if rubygems_version != Gem::VERSION then
       raise Gem::InvalidSpecificationException,
-            "expected RubyGems version #{Gem::RubyGemsVersion}, was #{rubygems_version}"
+            "expected RubyGems version #{Gem::VERSION}, was #{rubygems_version}"
     end
 
     @@required_attributes.each do |symbol|
@@ -1052,7 +1062,7 @@ class Gem::Specification
   #
   # Do not set this, it is set automatically when the gem is packaged.
 
-  required_attribute :rubygems_version, Gem::RubyGemsVersion
+  required_attribute :rubygems_version, Gem::VERSION
 
   ##
   # :attr_accessor: specification_version
@@ -1481,14 +1491,12 @@ class Gem::Specification
   end
 
   overwrite_accessor :files do
-    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
+    # 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
-
 end
-

data/lib/rubygems/test_utilities.rb

@@ -11,9 +11,9 @@ require 'rubygems/remote_fetcher'
 #   @fetcher = Gem::FakeFetcher.new
 #   @fetcher.data['http://gems.example.com/yaml'] = source_index.to_yaml
 #   Gem::RemoteFetcher.fetcher = @fetcher
-#   
+#
 #   # invoke RubyGems code
-#   
+#
 #   paths = @fetcher.paths
 #   assert_equal 'http://gems.example.com/yaml', paths.shift
 #   assert paths.empty?, paths.join(', ')

data/lib/rubygems/validator.rb

@@ -10,12 +10,11 @@ require 'digest'
 require 'rubygems/format'
 require 'rubygems/installer'
 
-# Load test-unit 2.x if it's a gem
 begin
-   Gem.activate('test-unit')
+  gem 'test-unit'
 rescue Gem::LoadError
-   # Ignore - use the test-unit library that's part of the standard library
-end   
+  # Ignore - use the test-unit library that's part of the standard library
+end
 
 ##
 # Validator performs various gem file and gem database validation

data/lib/rubygems/version.rb

@@ -212,7 +212,7 @@ class Gem::Version
   end
 
   def hash # :nodoc:
-    segments.hash
+    @hash ||= segments.hash
   end
 
   def inspect # :nodoc:

data/test/gem_package_tar_test_case.rb

@@ -35,7 +35,7 @@ class TarTestCase < RubyGemTestCase
       linkname 100
       magic 6
       version 2
-      uname 32 
+      uname 32
       gname 32
       devmajor 8
       devminor 8
@@ -54,7 +54,7 @@ class TarTestCase < RubyGemTestCase
         next
       end
 
-      assert_equal expected[offset, length], actual[offset, length], 
+      assert_equal expected[offset, length], actual[offset, length],
                    "Field #{name} of the tar header differs."
 
       offset += length

data/test/gemutilities.rb

@@ -8,18 +8,17 @@ else
   require 'rubygems'
 end
 require 'fileutils'
-begin
-  gem 'minitest', '>= 1.3.1'
-  require 'minitest/unit'
-rescue Gem::LoadError
-  warn "Install minitest gem >= 1.3.1"
-  raise
-end
+require 'minitest/autorun'
 require 'tmpdir'
 require 'uri'
 require 'rubygems/package'
 require 'rubygems/test_utilities'
 require 'pp'
+require 'yaml'
+begin
+  YAML::ENGINE.yamler = 'psych'
+rescue LoadError
+end if YAML.const_defined? :ENGINE
 
 begin
   gem 'rdoc'
@@ -71,6 +70,13 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
 
     Gem.ensure_gem_subdirectories @gemhome
 
+    @orig_ruby = if ruby = ENV['RUBY'] then
+                   Gem.class_eval { ruby, @ruby = @ruby, ruby }
+                   ruby
+                 end
+
+    Gem.ensure_gem_subdirectories @gemhome
+
     @orig_ENV_HOME = ENV['HOME']
     ENV['HOME'] = @userhome
     Gem.instance_variable_set :@user_home, nil
@@ -147,6 +153,8 @@ class RubyGemTestCase < MiniTest::Unit::TestCase
 
     Gem.clear_paths
 
+    Gem.class_eval { @ruby = ruby } if ruby = @orig_ruby
+
     if @orig_ENV_HOME then
       ENV['HOME'] = @orig_ENV_HOME
     else
@@ -578,5 +586,3 @@ Also, a list:
 
 end
 
-MiniTest::Unit.autorun
-

data/test/insure_session.rb

@@ -15,7 +15,7 @@ def install_session
     puts
     puts "with the appropriate admin privileges."
     puts "*****************************************************************"
-    puts 
+    puts
     exit
   end
   gem 'session'

data/test/plugin/exception/rubygems_plugin.rb

@@ -0,0 +1,2 @@
+TestGem::TEST_PLUGIN_EXCEPTION = :loaded
+raise Exception.new('boom')

data/test/plugin/load/rubygems_plugin.rb

@@ -0,0 +1 @@
+TestGem::TEST_PLUGIN_LOAD = :loaded

data/test/plugin/standarderror/rubygems_plugin.rb

@@ -0,0 +1,2 @@
+TestGem::TEST_PLUGIN_STANDARDERROR = :loaded
+raise StandardError.new('boom')

data/test/rubygems/commands/crash_command.rb

@@ -0,0 +1,5 @@
+class Gem::Commands::CrashCommand < Gem::Command
+
+  raise "crash"
+
+end

data/test/rubygems_plugin.rb

@@ -1,5 +1,10 @@
 require 'rubygems/command_manager'
 
+##
+# This is an example of exactly what NOT to do.
+#
+# DO NOT include code like this in your rubygems_plugin.rb
+
 class Gem::Commands::InterruptCommand < Gem::Command
 
   def initialize

data/test/simple_gem.rb

@@ -1,8 +1,8 @@
 SIMPLE_GEM = <<-GEMDATA
-        MD5SUM = "e3701f9db765a2358aef94c40ded71c8"
+        MD5SUM = "b12a4d48febeb2289c539c2574c4b6f8"
         if $0 == __FILE__
           require 'optparse'
-        
+
           options = {}
           ARGV.options do |opts|
             opts.on_tail("--help", "show this message") {puts opts; exit}
@@ -13,45 +13,45 @@ SIMPLE_GEM = <<-GEMDATA
           end
 
           require 'rubygems'
-          @directory = options[:directory] || Gem.dir  
+          @directory = options[:directory] || Gem.dir
           @force = options[:force]
-  
-          gem = Gem::Installer.new(__FILE__).install(@force, @directory)      
+
+          gem = Gem::Installer.new(__FILE__).install(@force, @directory)
           if options[:gen_rdoc]
             Gem::DocManager.new(gem).generate_rdoc
           end
 end
 
 __END__
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 rubygems_version: "1.0"
 name: testing
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
   version: 1.2.3
 date: 2004-03-18 22:01:52.859121 -05:00
-platform: 
+platform:
 summary: This exercise the gem testing stuff.
-require_paths: 
+require_paths:
   - lib
-files: 
+files:
   - lib/foo.rb
   - lib/test
   - lib/test.rb
   - lib/test/wow.rb
 autorequire: test
 test_suite_file: foo
-requirements: 
+requirements:
   - a computer processor
---- 
-- 
+---
+-
   size: 109
   mode: 420
   path: lib/foo.rb
-- 
+-
   size: 0
   mode: 420
   path: lib/test.rb
-- 
+-
   size: 15
   mode: 420
   path: lib/test/wow.rb