diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rubygems.rb | 24 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 24 deletions
@@ -1,3 +1,8 @@ +Wed Dec 30 14:13:06 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rubygems.rb: Kernel#gem is already defined, and workaround + for home directory and custom_require are no longer needed. + Tue Dec 29 16:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org> * numeric.c (Init_Numeric): Add Float::INFINITY and Float::NAN. diff --git a/lib/rubygems.rb b/lib/rubygems.rb index 06ea950c64..8ae4243e68 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -35,6 +35,8 @@ module Gem end module Kernel + # defined in gem_prelude.rb + undef gem ## # Use Kernel#gem to activate a specific version of +gem_name+. @@ -534,26 +536,8 @@ module Gem ## # Finds the user's home directory. - #-- - # Some comments from the ruby-talk list regarding finding the home - # directory: - # - # I have HOME, USERPROFILE and HOMEDRIVE + HOMEPATH. Ruby seems - # to be depending on HOME in those code samples. I propose that - # it should fallback to USERPROFILE and HOMEDRIVE + HOMEPATH (at - # least on Win32). def self.find_home - unless RUBY_VERSION > '1.9' then - ['HOME', 'USERPROFILE'].each do |homekey| - return ENV[homekey] if ENV[homekey] - end - - if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then - return "#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}" - end - end - File.expand_path "~" rescue if File::ALT_SEPARATOR then @@ -1104,10 +1088,6 @@ end require 'rubygems/config_file' -if RUBY_VERSION < '1.9' then - require 'rubygems/custom_require' -end - Gem.clear_paths plugins = Gem.find_files 'rubygems_plugin' @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-12-29" +#define RUBY_RELEASE_DATE "2009-12-30" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 29 +#define RUBY_RELEASE_DAY 30 #include "ruby/version.h" |