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/config_file.rb: Add missing require for

Browse source 
user_interaction.rb

* lib/rubygems/dependency_installer.rb:  Minor refactor for clarity.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2013-02-08 01:15:54 +00:00
parent 978c0f0f04
commit 8bb45796c8
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Feb 8 10:11:09 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems/config_file.rb: Add missing require for
user_interaction.rb
* lib/rubygems/dependency_installer.rb: Minor refactor for clarity.
Fri Feb 8 09:35:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Feb 8 09:35:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (MakeMakefile#configuration): set all ruby names. * lib/mkmf.rb (MakeMakefile#configuration): set all ruby names.

2
lib/rubygems/config_file.rb
View file

@ -4,6 +4,8 @@
# See LICENSE.txt for permissions. # See LICENSE.txt for permissions.
#++ #++
require 'rubygems/user_interaction'
## ##
# Gem::ConfigFile RubyGems options and gem command options from gemrc. # Gem::ConfigFile RubyGems options and gem command options from gemrc.
# #

13
lib/rubygems/dependency_installer.rb
View file

@ -57,13 +57,13 @@ class Gem::DependencyInstaller
# :build_args:: See Gem::Installer::new # :build_args:: See Gem::Installer::new
def initialize(options = {}) def initialize(options = {})
if options[:install_dir] then @install_dir = options[:install_dir] || Gem.dir
@gem_home = options[:install_dir]
# HACK shouldn't change the global settings if options[:install_dir] then
Gem::Specification.dirs = @gem_home # HACK shouldn't change the global settings, needed for -i behavior
Gem.ensure_gem_subdirectories @gem_home # maybe move to the install command? See also github #442
options[:install_dir] = @gem_home # FIX: because we suck and reuse below Gem::Specification.dirs = @install_dir
Gem.ensure_gem_subdirectories @install_dir
end end
options = DEFAULT_OPTIONS.merge options options = DEFAULT_OPTIONS.merge options
@ -91,7 +91,6 @@ class Gem::DependencyInstaller
@installed_gems = [] @installed_gems = []
@toplevel_specs = nil @toplevel_specs = nil
@install_dir = options[:install_dir] || Gem.dir
@cache_dir = options[:cache_dir] || @install_dir @cache_dir = options[:cache_dir] || @install_dir
# Set with any errors that SpecFetcher finds while search through # Set with any errors that SpecFetcher finds while search through