From ff17ee0d310751f5f5c90226c36caffe484843fd Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 8 Aug 2009 10:56:38 +0000 Subject: merges r24328 from trunk into ruby_1_9_1. -- * gem_prelude.rb (Gem.path): uses Gem.default_path as a default value so that ruby finds gems in ~/.gem/. (Gem.user_home): reduced version of lib/rubygems.rb's. Gem.default_path needs it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ gem_prelude.rb | 14 ++++++++++++-- version.h | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a73ec590b..ff81c415d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Jul 30 23:04:32 2009 Yuki Sonoda (Yugui) + + * gem_prelude.rb (Gem.path): uses Gem.default_path as a default value + so that ruby finds gems in ~/.gem/. + (Gem.user_home): reduced version of lib/rubygems.rb's. + Gem.default_path needs it. + Thu Jul 30 21:39:42 2009 Yusuke Endoh * compile.c (iseq_compile_each): fix stack consistency error. diff --git a/gem_prelude.rb b/gem_prelude.rb index 4eb0e4e304..b5da35e186 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -42,7 +42,7 @@ if defined?(Gem) then def self.path @gem_path ||= nil unless @gem_path - paths = [ENV['GEM_PATH']] + paths = [ENV['GEM_PATH'] || default_path] paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME set_paths(paths.compact.join(File::PATH_SEPARATOR)) end @@ -84,7 +84,17 @@ if defined?(Gem) then def self.ensure_gem_subdirectories(path) end - + def self.user_home + @user_home ||= File.expand_path("~") + rescue + if File::ALT_SEPARATOR then + "C:/" + else + "/" + end + end + + @post_install_hooks ||= [] @post_uninstall_hooks ||= [] @pre_uninstall_hooks ||= [] diff --git a/version.h b/version.h index f32d823c79..02ddd40be6 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 257 +#define RUBY_PATCHLEVEL 258 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3