diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gem_prelude.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems.rb | 2 | ||||
| -rw-r--r-- | test/rubygems/test_gem.rb | 2 | ||||
| -rw-r--r-- | version.h | 4 |
5 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Aug 17 07:38:43 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * gem_prelude.rb, lib/rubygems.rb (Gem.suffixes): include empty + suffix. [ruby-core:31730] + Mon Aug 16 22:16:12 2010 Tanaka Akira <akr@fsij.org> * ext/pathname/pathname.c (path_basename): unused variable removed. diff --git a/gem_prelude.rb b/gem_prelude.rb index 55fd9136dc..ffb3e9a63d 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -35,7 +35,7 @@ if defined?(Gem) then } def self.suffixes - ['.rb', ".#{RbConfig::CONFIG["DLEXT"]}"] + ['', '.rb', ".#{RbConfig::CONFIG["DLEXT"]}"] end def self.dir diff --git a/lib/rubygems.rb b/lib/rubygems.rb index e4360c616e..6c13f7bce2 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -902,7 +902,7 @@ module Gem # Suffixes for require-able paths. def self.suffixes - ['.rb', ".#{RbConfig::CONFIG["DLEXT"]}"] + ['', '.rb', ".#{RbConfig::CONFIG["DLEXT"]}"] end unless defined?(suffixes) ## diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index eacb11a290..91dbe226b5 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -291,6 +291,8 @@ class TestGem < RubyGemTestCase ] assert_equal expected, Gem.find_files('foo/discover') + bug3701 = '[ruby-core:31730]' + assert_equal expected, Gem.find_files('foo/**.rb'), bug3701 ensure assert_equal cwd, $LOAD_PATH.shift end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2010-08-16" +#define RUBY_RELEASE_DATE "2010-08-17" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |