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: Update to RubyGems master af60443. Changes include:

Browse source 
* Improved speed of `gem install --ignore-dependencies`.

  * Open read-write for exclusive flock.  [ruby-trunk - Bug #9257]

  * Remove specification before install to prevent infinite loop.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2013-12-19 03:05:37 +00:00
parent 4cd675ea9e
commit f8bcd57cb7
5 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Thu Dec 19 12:05:17 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems master af60443. Changes include:
* Improved speed of `gem install --ignore-dependencies`.
* Open read-write for exclusive flock. [ruby-trunk - Bug #9257]
* Remove specification before install to prevent infinite loop.
Thu Dec 19 11:23:49 2013 Aman Gupta <ruby@tmm1.net>
* vm_insnhelper.c (vm_call_iseq_setup_normal): simple for loop

2
lib/rubygems.rb
View file

@ -764,7 +764,7 @@ module Gem
# Safely read a file in binary mode on all platforms.
def self.read_binary(path)
File.open path, binary_mode do |f|
open path, 'rb+' do |f|
f.flock(File::LOCK_EX)
f.read
end

32
lib/rubygems/commands/install_command.rb
View file

@ -200,25 +200,31 @@ to write the specification by hand. For example:
req = Gem::Requirement.create(version)
inst = Gem::DependencyInstaller.new options
if options[:ignore_dependencies]
inst = Gem::Installer.new name, options
inst.install
@installed_specs.push(inst.spec)
else
inst = Gem::DependencyInstaller.new options
if options[:explain]
request_set = inst.resolve_dependencies name, req
if options[:explain]
request_set = inst.resolve_dependencies name, req
puts "Gems to install:"
puts "Gems to install:"
request_set.specs.map { |s| s.full_name }.sort.each do |s|
puts " #{s}"
request_set.specs.map { |s| s.full_name }.sort.each do |s|
puts " #{s}"
end
return
else
inst.install name, req
end
return
else
inst.install name, req
@installed_specs.push(*inst.installed_gems)
show_install_errors inst.errors
end
@installed_specs.push(*inst.installed_gems)
show_install_errors inst.errors
end
def install_gems # :nodoc:

2
lib/rubygems/installer.rb
View file

@ -212,6 +212,8 @@ class Gem::Installer
def install
pre_install_checks
FileUtils.rm_f File.join gem_home, 'specifications', @spec.spec_name
run_pre_install_hooks
# Completely remove any previous gem files

4
test/rubygems/test_gem_installer.rb
View file

@ -645,9 +645,11 @@ gem 'other', version
cache_file = File.join @gemhome, 'cache', @spec.file_name
stub_exe = File.join @gemhome, 'bin', 'executable'
rakefile = File.join gemdir, 'ext', 'a', 'Rakefile'
spec_file = File.join @gemhome, 'specifications', @spec.spec_name
Gem.pre_install do |installer|
refute_path_exists cache_file, 'cache file must not exist yet'
refute_path_exists spec_file, 'spec file must not exist yet'
true
end
@ -655,11 +657,13 @@ gem 'other', version
assert_path_exists gemdir, 'gem install dir must exist'
assert_path_exists rakefile, 'gem executable must exist'
refute_path_exists stub_exe, 'gem executable must not exist'
refute_path_exists spec_file, 'spec file must not exist yet'
true
end
Gem.post_install do |installer|
assert_path_exists cache_file, 'cache file must exist'
assert_path_exists spec_file, 'spec file must exist'
end
@newspec = nil