drbrain	2007-12-21 17:45:07 +0900 (Fri, 21 Dec 2007)

  New Revision: 14424

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/commands/build_command.rb
    trunk/lib/rubygems/rubygems_version.rb
    trunk/lib/rubygems.rb
    trunk/test/rubygems/test_gem.rb
    trunk/test/rubygems/test_package.rb

  Log:
    Update to RubyGems 1.0.1, r1581

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rubygems/test_gem.rb?r1=14424&r2=14423
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rubygems/commands/build_command.rb?r1=14424&r2=14423
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14424&r2=14423
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rubygems/test_package.rb?r1=14424&r2=14423
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rubygems.rb?r1=14424&r2=14423
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rubygems/rubygems_version.rb?r1=14424&r2=14423

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14423)
+++ ChangeLog	(revision 14424)
@@ -1,3 +1,7 @@
+Fri Dec 21 17:44:47 2007  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems*:  Update to RubyGems 1.0.1, r1581
+
 Fri Dec 21 17:32:49 2007  Koichi Sasada  <ko1@a...>
 
 	* bootstraptest/pending.rb: renamed from featurebug.rb.
@@ -160,6 +164,7 @@
 	* string.c (rb_str_chomp_bang): avoid unnecessary loop using
 	  ONIGENC_LEFT_ADJUST_CHAR_HEAD().
 
+>>>>>>> .r14423
 Fri Dec 21 12:32:08 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* file.c (Init_File): File.exists? revived.
Index: lib/rubygems/commands/build_command.rb
===================================================================
--- lib/rubygems/commands/build_command.rb	(revision 14423)
+++ lib/rubygems/commands/build_command.rb	(revision 14424)
@@ -47,7 +47,7 @@
 
   def yaml?(filename)
     line = open(filename) { |f| line = f.gets }
-    result = line =~ %r{^--- *!ruby/object:Gem::Specification}
+    result = line =~ %r{!ruby/object:Gem::Specification}
     result
   end
 end
Index: lib/rubygems/rubygems_version.rb
===================================================================
--- lib/rubygems/rubygems_version.rb	(revision 14423)
+++ lib/rubygems/rubygems_version.rb	(revision 14424)
@@ -2,5 +2,5 @@
 # This file is auto-generated by build scripts.
 # See:  rake update_version
 module Gem
-  RubyGemsVersion = '1.0.0'
+  RubyGemsVersion = '1.0.1'
 end
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 14423)
+++ lib/rubygems.rb	(revision 14424)
@@ -73,6 +73,7 @@
 
   ConfigMap = {} unless defined?(ConfigMap)
   require 'rbconfig'
+  RbConfig = Config unless defined? ::RbConfig
   ConfigMap.merge!(
       :BASERUBY => RbConfig::CONFIG["BASERUBY"],
       :EXEEXT => RbConfig::CONFIG["EXEEXT"],
Index: test/rubygems/test_package.rb
===================================================================
--- test/rubygems/test_package.rb	(revision 14423)
+++ test/rubygems/test_package.rb	(revision 14424)
@@ -27,7 +27,8 @@
 
 class TarTestCase < Test::Unit::TestCase
 
-  undef_method :default_test
+  undef_method :default_test if instance_methods.include? 'default_test' or
+                                instance_methods.include? :default_test
 
   def assert_headers_equal(h1, h2)
     fields = %w[name 100 mode 8 uid 8 gid 8 size 12 mtime 12 checksum 8
Index: test/rubygems/test_gem.rb
===================================================================
--- test/rubygems/test_gem.rb	(revision 14423)
+++ test/rubygems/test_gem.rb	(revision 14424)
@@ -52,7 +52,7 @@
     assert_equal nil, Gem.instance_variable_get(:@gem_home)
     assert_equal nil, Gem.instance_variable_get(:@gem_path)
     assert_not_equal searcher, Gem.searcher
-    assert_not_equal source_index, Gem.source_index
+    assert_not_equal source_index.object_id, Gem.source_index.object_id
   end
 
   def test_self_configuration

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml