rubygems-update 1.3.6 → 1.3.7

data/test/test_gem_indexer.rb

@@ -2,7 +2,7 @@ require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/indexer'
 
 unless ''.respond_to? :to_xs then
-  warn "Gem::Indexer tests are being skipped.  Install builder gem."
+  warn "Gem::Indexer tests are being skipped.  Install builder gem." if $VERBOSE
 end
 
 class TestGemIndexer < RubyGemTestCase
@@ -165,7 +165,7 @@ pl-1-i386-linux
     <title>ExampleForge gems</title>
     <link>http://example.com</link>
     <description>Recently released gems from http://example.com</description>
-    <generator>RubyGems v#{Gem::RubyGemsVersion}</generator>
+    <generator>RubyGems v#{Gem::VERSION}</generator>
     <docs>http://cyber.law.harvard.edu/rss/rss.html</docs>
     <item>
       <title>a-2</title>

data/test/test_gem_installer.rb

@@ -63,7 +63,7 @@ load Gem.bin_path('a', 'my_exec', version)
 #{Gem.ruby}: No such file or directory -- extconf.rb (LoadError)
     EOF
 
-    assert_match %r%#{Regexp.escape Gem.ruby} extconf.rb%,
+    assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
     assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
                  File.read(gem_make_out)

data/test/test_gem_package_tar_input.rb

@@ -41,7 +41,7 @@ class TestGemPackageTarInput < TarTestCase
       meta = @spec.to_yaml
 
       f.write tar_file_header("metadata", "", 0644, meta.size)
-      f.write meta + "\0" * (1024 - meta.size) 
+      f.write meta + "\0" * (1024 - meta.size)
       f.write "\0" * 1024
     end
 

data/test/test_gem_package_tar_writer.rb

@@ -39,7 +39,7 @@ class TestTarWriter < TarTestCase
   def test_add_file_simple_padding
     @tar_writer.add_file_simple 'x', 0, 100
 
-    assert_headers_equal tar_file_header('x', '', 0, 100), 
+    assert_headers_equal tar_file_header('x', '', 0, 100),
                          @io.string[0, 512]
 
     assert_equal "\0" * 512, @io.string[512, 512]
@@ -54,7 +54,7 @@ class TestTarWriter < TarTestCase
   end
 
   def test_add_file_simple_size
-    assert_raises Gem::Package::TarWriter::FileOverflow do 
+    assert_raises Gem::Package::TarWriter::FileOverflow do
       @tar_writer.add_file_simple("lib/foo/bar", 0, 10) do |io|
         io.write "1" * 11
       end
@@ -62,7 +62,7 @@ class TestTarWriter < TarTestCase
   end
 
   def test_add_file_unseekable
-    assert_raises Gem::Package::NonSeekableIO do 
+    assert_raises Gem::Package::NonSeekableIO do
       Gem::Package::TarWriter.new(Object.new).add_file 'x', 0
     end
   end

data/test/test_gem_platform.rb

@@ -30,6 +30,9 @@ class TestGemPlatform < RubyGemTestCase
       'hppa2.0w-hpux11.31'     => ['hppa2.0w',  'hpux',      '11'],
       'java'                   => [nil,         'java',      nil],
       'jruby'                  => [nil,         'java',      nil],
+      'universal-dotnet'       => ['universal', 'dotnet',    nil],
+      'universal-dotnet2.0'    => ['universal', 'dotnet',  '2.0'],
+      'universal-dotnet4.0'    => ['universal', 'dotnet',  '4.0'],
       'powerpc-aix5.3.0.0'     => ['powerpc',   'aix',       '5'],
       'powerpc-darwin7'        => ['powerpc',   'darwin',    '7'],
       'powerpc-darwin8'        => ['powerpc',   'darwin',    '8'],
@@ -227,6 +230,22 @@ class TestGemPlatform < RubyGemTestCase
     util_set_arch 'java'
     assert_match 'java',  Gem::Platform.local
     assert_match 'jruby', Gem::Platform.local
+      
+    util_set_arch 'universal-dotnet2.0'
+    assert_match 'universal-dotnet',     Gem::Platform.local
+    assert_match 'universal-dotnet-2.0', Gem::Platform.local
+    refute_match 'universal-dotnet-4.0', Gem::Platform.local
+    assert_match 'dotnet',               Gem::Platform.local
+    assert_match 'dotnet-2.0',           Gem::Platform.local
+    refute_match 'dotnet-4.0',           Gem::Platform.local
+    
+    util_set_arch 'universal-dotnet4.0'
+    assert_match 'universal-dotnet',      Gem::Platform.local
+    refute_match 'universal-dotnet-2.0',  Gem::Platform.local  
+    assert_match 'universal-dotnet-4.0',  Gem::Platform.local
+    assert_match 'dotnet',                Gem::Platform.local
+    refute_match 'dotnet-2.0',            Gem::Platform.local  
+    assert_match 'dotnet-4.0',            Gem::Platform.local
 
     util_set_arch 'powerpc-darwin'
     assert_match 'powerpc-darwin', Gem::Platform.local

data/test/test_gem_server.rb

@@ -20,6 +20,17 @@ class TestGemServer < RubyGemTestCase
     @res = WEBrick::HTTPResponse.new :HTTPVersion => '1.0'
   end
 
+  def test_spec_dirs
+    s = Gem::Server.new Gem.dir, process_based_port, false
+
+    assert_equal [File.join(Gem.dir, 'specifications')], s.spec_dirs
+
+    s = Gem::Server.new [Gem.dir, Gem.dir], process_based_port, false
+
+    assert_equal [File.join(Gem.dir, 'specifications'),
+                  File.join(Gem.dir, 'specifications')], s.spec_dirs
+  end
+
   def test_Marshal
     data = StringIO.new "GET /Marshal.#{Gem.marshal_version} HTTP/1.0\r\n\r\n"
     @req.parse data

data/test/test_gem_source_index.rb

@@ -85,7 +85,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else
@@ -334,7 +334,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
   end
 
   def test_refresh_bang
-    a1_spec = File.join @gemhome, "specifications", @a1.spec_name 
+    a1_spec = File.join @gemhome, "specifications", @a1.spec_name
 
     FileUtils.mv a1_spec, @tempdir
 

data/test/test_gem_spec_fetcher.rb

@@ -115,6 +115,21 @@ class TestGemSpecFetcher < RubyGemTestCase
     assert_equal [[@pl1.full_name, @gem_repo]], spec_names
   end
 
+  def test_fetch_with_errors_mismatched_platform
+    util_set_arch 'hrpa-989'
+
+    @fetcher.data["#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@pl1.original_name}.gemspec.rz"] =
+      util_zip(Marshal.dump(@pl1))
+
+    dep = Gem::Dependency.new 'pl', 1
+    specs_and_sources, errors = @sf.fetch_with_errors dep
+
+    assert_equal 0, specs_and_sources.size
+    assert_equal 1, errors.size
+
+    assert_equal "i386-linux", errors[0].platforms.first
+  end
+
   def test_fetch_spec
     spec_uri = "#{@gem_repo}#{Gem::MARSHAL_SPEC_DIR}#{@a1.spec_name}"
     @fetcher.data["#{spec_uri}.rz"] = util_zip(Marshal.dump(@a1))
@@ -220,6 +235,33 @@ class TestGemSpecFetcher < RubyGemTestCase
     assert_equal [], specs
   end
 
+  def test_find_matching_with_errors_matched_platform
+    util_set_arch 'i386-linux'
+
+    dep = Gem::Dependency.new 'pl', 1
+    specs, errors = @sf.find_matching_with_errors dep
+
+    expected = [
+      [['pl', Gem::Version.new(1), 'i386-linux'], @gem_repo],
+    ]
+
+    assert_equal expected, specs
+    assert_equal 0, errors.size
+  end
+
+  def test_find_matching_with_errors_invalid_platform
+    util_set_arch 'hrpa-899'
+
+    dep = Gem::Dependency.new 'pl', 1
+    specs, errors = @sf.find_matching_with_errors dep
+
+    assert_equal 0, specs.size
+
+    assert_equal 1, errors.size
+
+    assert_equal "i386-linux", errors[0].platforms.first
+  end
+
   def test_find_all_platforms
     util_set_arch 'i386-freebsd6'
 

data/test/test_gem_specification.rb

@@ -473,6 +473,31 @@ end
     assert_equal expected, @a1.files.sort
   end
 
+  def test_files_append
+    @a1.files            = %w(files bin/common)
+    @a1.test_files       = %w(test_files bin/common)
+    @a1.executables      = %w(executables common)
+    @a1.extra_rdoc_files = %w(extra_rdoc_files bin/common)
+    @a1.extensions       = %w(extensions bin/common)
+
+    expected = %w[
+      bin/common
+      bin/executables
+      extensions
+      extra_rdoc_files
+      files
+      test_files
+    ]
+    assert_equal expected, @a1.files.sort
+
+    @a1.files << "generated_file.c"
+
+    expected << "generated_file.c"
+    expected.sort!
+
+    assert_equal expected, @a1.files.sort
+  end
+
   def test_files_duplicate
     @a2.files = %w[a b c d b]
     @a2.extra_rdoc_files = %w[x y z x]
@@ -549,7 +574,7 @@ end
       'i386-mswin32_80'   => 'a-1-x86-mswin32-80',
       'i386-mingw32'      => 'a-1-x86-mingw32'
     }
-    
+
     test_cases.each do |arch, expected|
       util_set_arch arch
       @a1.platform = 'current'
@@ -748,14 +773,14 @@ Gem::Specification.new do |s|
   s.files = [\"lib/code.rb\"]
   s.homepage = %q{http://example.com}
   s.require_paths = [\"lib\"]
-  s.rubygems_version = %q{#{Gem::RubyGemsVersion}}
+  s.rubygems_version = %q{#{Gem::VERSION}}
   s.summary = %q{this is a summary}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<b>, [\"= 1\"])
     else
       s.add_dependency(%q<b>, [\"= 1\"])
@@ -802,7 +827,7 @@ Gem::Specification.new do |s|
   s.require_paths = [\"lib\"]
   s.requirements = [\"A working computer\"]
   s.rubyforge_project = %q{example}
-  s.rubygems_version = %q{#{Gem::RubyGemsVersion}}
+  s.rubygems_version = %q{#{Gem::VERSION}}
   s.summary = %q{this is a summary}
   s.test_files = [\"test/suite.rb\"]
 
@@ -810,7 +835,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [\"> 0.4\"])
       s.add_runtime_dependency(%q<jabber4r>, [\"> 0.0.0\"])
       s.add_runtime_dependency(%q<pqa>, [\"> 0.4\", \"<= 0.6\"])
@@ -883,7 +908,7 @@ end
 
     yaml_str = @a1.to_yaml
 
-    same_spec = YAML.load(yaml_str)
+    same_spec = YAML.load yaml_str
 
     assert_equal Gem::Platform.new('powerpc-darwin7'), same_spec.platform
     assert_equal 'powerpc-darwin7.9.0', same_spec.original_platform
@@ -1173,7 +1198,7 @@ end
       @a1.validate
     end
 
-    assert_equal "expected RubyGems version #{Gem::RubyGemsVersion}, was 3",
+    assert_equal "expected RubyGems version #{Gem::VERSION}, was 3",
                  e.message
   end
 
@@ -1228,6 +1253,20 @@ end
     assert_equal Gem::Version.new('1'), @a1.version
   end
 
+  def test_load_errors_contain_filename
+    specfile = Tempfile.new(self.class.name.downcase)
+    specfile.write "raise 'boom'"
+    specfile.close
+    begin
+      Gem::Specification.load(specfile.path)
+    rescue => e
+      name_rexp = Regexp.new(Regexp.escape(specfile.path))
+      assert e.backtrace.grep(name_rexp).any?
+    end
+  ensure
+    specfile.delete
+  end
+
   def util_setup_validate
     Dir.chdir @tempdir do
       FileUtils.mkdir_p File.join('ext', 'a')

data/util/{gem_prelude.rb.template → gem_prelude.rb}

@@ -1,6 +1,5 @@
 # depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
 # vim: filetype=ruby
-# WARN
 
 # NOTICE: Ruby is during initialization here.
 # * Encoding.default_external does not reflects -E.
@@ -16,7 +15,7 @@ if defined?(Gem) then
     def gem(gem_name, *version_requirements)
       Gem.push_gem_version_on_load_path(gem_name, *version_requirements)
     end
-
+    private :gem
   end
 
   module Gem
@@ -43,7 +42,7 @@ if defined?(Gem) then
     def self.path
       @gem_path ||= nil
       unless @gem_path
-        paths = [ENV['GEM_PATH']]
+        paths = [ENV['GEM_PATH'] || default_path]
         paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
         set_paths(paths.compact.join(File::PATH_SEPARATOR))
       end
@@ -67,7 +66,8 @@ if defined?(Gem) then
     end
 
     def self.set_home(home)
-      home = home.gsub File::ALT_SEPARATOR, File::SEPARATOR if File::ALT_SEPARATOR
+      home = home.dup.force_encoding(Encoding.find('filesystem'))
+      home.gsub!(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR
       @gem_home = home
     end
 
@@ -88,9 +88,24 @@ if defined?(Gem) then
       end
 
       @gem_path.uniq!
+      @gem_path.map!{|x|x.force_encoding(Encoding.find('filesystem'))}
+    end
+
+    def self.user_home
+      @user_home ||= File.expand_path("~").force_encoding(Encoding.find('filesystem'))
+    rescue
+      if File::ALT_SEPARATOR then
+        "C:/"
+      else
+        "/"
+      end
     end
 
-    # INCLUDE rubygems/defaults
+    # begin rubygems/defaults
+    # NOTE: this require will be replaced with in-place eval before compilation.
+    require 'lib/rubygems/defaults.rb'
+    # end rubygems/defaults
+
 
     ##
     # Methods before this line will be removed when QuickLoader is replaced
@@ -130,18 +145,42 @@ if defined?(Gem) then
           Gem::GEM_PRELUDE_METHODS.each do |method_name|
             undef_method method_name
           end
+          undef_method :const_missing
+          undef_method :method_missing
         end
 
         Kernel.module_eval do
           undef_method :gem if method_defined? :gem
         end
 
-        $".delete File.join(Gem::ConfigMap[:rubylibprefix],
-                            Gem::ConfigMap[:ruby_version], 'rubygems.rb')
-
+        $".delete path_to_full_rubygems_library
+        $".each do |path|
+          if /#{Regexp.escape File::SEPARATOR}rubygems\.rb\z/ =~ path
+            raise LoadError, "another rubygems is already loaded from #{path}"
+          end
+        end
         require 'rubygems'
       end
 
+      def self.fake_rubygems_as_loaded
+        path = path_to_full_rubygems_library
+        $" << path unless $".include?(path)
+      end
+
+      def self.path_to_full_rubygems_library
+        installed_path = File.join(Gem::ConfigMap[:rubylibprefix], Gem::ConfigMap[:ruby_version])
+        if $:.include?(installed_path)
+          return File.join(installed_path, 'rubygems.rb')
+        else # e.g., on test-all
+          $:.each do |dir|
+            if File.exist?( path = File.join(dir, 'rubygems.rb') )
+              return path
+            end
+          end
+          raise LoadError, 'rubygems.rb'
+        end
+      end
+
       GemPaths = {}
       GemVersions = {}
 
@@ -194,19 +233,11 @@ if defined?(Gem) then
             Dir.entries(gems_directory).each do |gem_directory_name|
               next if gem_directory_name == "." || gem_directory_name == ".."
 
-              dash = gem_directory_name.rindex("-")
-              next if dash.nil?
-
-              gem_name = gem_directory_name[0...dash]
+              next unless gem_name = gem_directory_name[/(.*)-(.*)/, 1]
+              new_version = integers_for($2)
               current_version = GemVersions[gem_name]
-              new_version = integers_for(gem_directory_name[dash+1..-1])
-
-              if current_version then
-                if (current_version <=> new_version) == -1 then
-                  GemVersions[gem_name] = new_version
-                  GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
-                end
-              else
+
+              if !current_version or (current_version <=> new_version) < 0 then
                 GemVersions[gem_name] = new_version
                 GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
               end
@@ -236,7 +267,7 @@ if defined?(Gem) then
           require_paths.first.instance_variable_set(:@gem_prelude_index, true)
         end
         # gem directories must come after -I and ENV['RUBYLIB']
-        $:[$:.index(ConfigMap[:sitelibdir]),0] = require_paths
+        $:[$:.index{|e|e.instance_variable_defined?(:@gem_prelude_index)}||-1,0] = require_paths
       end
 
       def const_missing(constant)
@@ -262,8 +293,7 @@ if defined?(Gem) then
 
   begin
     Gem.push_all_highest_version_gems_on_load_path
-    $" << File.join(Gem::ConfigMap[:rubylibprefix],
-                    Gem::ConfigMap[:ruby_version], "rubygems.rb")
+    Gem::QuickLoader.fake_rubygems_as_loaded
   rescue Exception => e
     puts "Error loading gem paths on load path in gem_prelude"
     puts e