kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/rubygems.rb: Kernel#gem is already defined, and workaround

Browse source 
for home directory and custom_require are no longer needed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-12-30 05:13:09 +00:00
parent 7ed0640ffb
commit 45b750149a
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Dec 29 16:03:33 2009 NARUSE, Yui <naruse@ruby-lang.org>
* numeric.c (Init_Numeric): Add Float::INFINITY and Float::NAN. * numeric.c (Init_Numeric): Add Float::INFINITY and Float::NAN.

24
lib/rubygems.rb
View file

@ -35,6 +35,8 @@ module Gem
end end
module Kernel module Kernel
# defined in gem_prelude.rb
undef gem
## ##
# Use Kernel#gem to activate a specific version of +gem_name+. # Use Kernel#gem to activate a specific version of +gem_name+.
@ -534,26 +536,8 @@ module Gem
## ##
# Finds the user's home directory. # 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 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 "~" File.expand_path "~"
rescue rescue
if File::ALT_SEPARATOR then if File::ALT_SEPARATOR then
@ -1104,10 +1088,6 @@ end
require 'rubygems/config_file' require 'rubygems/config_file'
if RUBY_VERSION < '1.9' then
require 'rubygems/custom_require'
end
Gem.clear_paths Gem.clear_paths
plugins = Gem.find_files 'rubygems_plugin' plugins = Gem.find_files 'rubygems_plugin'

4
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #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_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 12 #define RUBY_RELEASE_MONTH 12
#define RUBY_RELEASE_DAY 29 #define RUBY_RELEASE_DAY 30
#include "ruby/version.h" #include "ruby/version.h"