diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-01 08:30:21 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-01 08:30:21 +0000 |
commit | cec4f5a9e02751404fd1408b6d81078f409b750d (patch) | |
tree | e0269284018921fa6a8c32dc007c819075d50cfd /lib/rubygems/request_set | |
parent | ffe920d674857087037327dc4075cd0c7e8e9fd1 (diff) | |
download | ruby-cec4f5a9e02751404fd1408b6d81078f409b750d.tar.gz |
* lib/rubygems: Update to RubyGems 2.4.2.
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request_set')
-rw-r--r-- | lib/rubygems/request_set/gem_dependency_api.rb | 9 | ||||
-rw-r--r-- | lib/rubygems/request_set/lockfile.rb | 8 |
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb index 24179dd1ed..9aad5ab5d3 100644 --- a/lib/rubygems/request_set/gem_dependency_api.rb +++ b/lib/rubygems/request_set/gem_dependency_api.rb @@ -596,8 +596,17 @@ Gem dependencies file #{@path} requires #{name} more than once. groups = gem_group spec.name, {} + self_dep = Gem::Dependency.new spec.name, spec.version + + add_dependencies groups, [self_dep] add_dependencies groups, spec.runtime_dependencies + @dependencies[spec.name] = '!' + + spec.dependencies.each do |dep| + @dependencies[dep.name] = dep.requirement + end + groups << development_group add_dependencies groups, spec.development_dependencies diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb index 2901dba871..918aa971e5 100644 --- a/lib/rubygems/request_set/lockfile.rb +++ b/lib/rubygems/request_set/lockfile.rb @@ -168,8 +168,12 @@ class Gem::RequestSet::Lockfile dest = File.expand_path(dest) base = File.expand_path(base) - if dest.index(base) == 0 - return dest[base.size+1..-1] + if dest.index(base) == 0 then + offset = dest[base.size+1..-1] + + return '.' unless offset + + offset else dest end |