diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems.rb | 1 | ||||
| -rw-r--r-- | lib/rubygems/commands/build_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/rubygems_version.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_package.rb | 3 |
6 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Fri Dec 21 17:44:47 2007 Eric Hodel <drbrain@segment7.net> + + * lib/rubygems*: Update to RubyGems 1.0.1, r1581 + Fri Dec 21 17:32:49 2007 Koichi Sasada <ko1@atdot.net> * bootstraptest/pending.rb: renamed from featurebug.rb. @@ -160,6 +164,7 @@ Fri Dec 21 12:45:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * 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@ruby-lang.org> * file.c (Init_File): File.exists? revived. diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 72f735ce50..cc8066858c 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -73,6 +73,7 @@ module Gem ConfigMap = {} unless defined?(ConfigMap) require 'rbconfig' + RbConfig = Config unless defined? ::RbConfig ConfigMap.merge!( :BASERUBY => RbConfig::CONFIG["BASERUBY"], :EXEEXT => RbConfig::CONFIG["EXEEXT"], diff --git a/lib/rubygems/commands/build_command.rb b/lib/rubygems/commands/build_command.rb index c2e1abc92f..e1f0122c6c 100644 --- a/lib/rubygems/commands/build_command.rb +++ b/lib/rubygems/commands/build_command.rb @@ -47,7 +47,7 @@ class Gem::Commands::BuildCommand < Gem::Command 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 diff --git a/lib/rubygems/rubygems_version.rb b/lib/rubygems/rubygems_version.rb index 85e18d48a4..146e2cfee4 100644 --- a/lib/rubygems/rubygems_version.rb +++ b/lib/rubygems/rubygems_version.rb @@ -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 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index c5ed86a489..27f10e49b4 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -52,7 +52,7 @@ class TestGem < RubyGemTestCase 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 diff --git a/test/rubygems/test_package.rb b/test/rubygems/test_package.rb index 786400fe0c..641e3957d1 100644 --- a/test/rubygems/test_package.rb +++ b/test/rubygems/test_package.rb @@ -27,7 +27,8 @@ end 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 |