diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | lib/rubygems/specification.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/syck_hack.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_ext_builder.rb | 8 |
4 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Fri Dec 20 07:07:35 2013 Eric Hodel <drbrain@segment7.net> + + * lib/rubygems: Update to RubyGems master 03d6ae7. Changes include: + + * Fixed typos. + + * Relaxed Gem.ruby test for ruby packagers that do not use `ruby`. + + * test/rubygems: ditto. + Thu Dec 19 14:03:04 2013 Koichi Sasada <ko1@atdot.net> * gc.c (heap_get_freeobj): improve hot path performance. diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb index e4539d4cad..59d71d378b 100644 --- a/lib/rubygems/specification.rb +++ b/lib/rubygems/specification.rb @@ -1275,7 +1275,7 @@ class Gem::Specification < Gem::BasicSpecification ## # Activate all unambiguously resolved runtime dependencies of this - # spec. Add any ambigous dependencies to the unresolved list to be + # spec. Add any ambiguous dependencies to the unresolved list to be # resolved later, as needed. def activate_dependencies diff --git a/lib/rubygems/syck_hack.rb b/lib/rubygems/syck_hack.rb index 1229fe7c7a..92179abb53 100644 --- a/lib/rubygems/syck_hack.rb +++ b/lib/rubygems/syck_hack.rb @@ -12,7 +12,7 @@ module YAML # :nodoc: # In newer 1.9.2, there is a Syck toplevel constant instead of it - # being underneith YAML. If so, reference it back under YAML as + # being underneath YAML. If so, reference it back under YAML as # well. if defined? ::Syck # for tests that change YAML::ENGINE diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 3b9cb0ac4e..adb4ee4d0e 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -228,10 +228,16 @@ install: assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%, File.read(gem_make_out) - assert_match %r%#{Regexp.escape Gem.ruby}: No such file%, + assert_match /: No such file/, File.read(gem_make_out) refute_path_exists @spec.gem_build_complete_path + + skip "Gem.ruby is not the name of the binary being run in the end" \ + unless File.read(gem_make_out).include? "#{Regexp.escape Gem.ruby}:" + + assert_match %r%#{Regexp.escape Gem.ruby}: No such file%, + File.read(gem_make_out) end def test_build_extensions_unsupported |