diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-30 23:27:52 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-30 23:27:52 +0000 |
| commit | 73fc703f7cbb2e6dfd50897d26b37fe8e76064e3 () | |
| tree | 0296426c8ac01331f2d33dde54fd9f1e183ea974 /lib/rubygems/resolver | |
| parent | 6727297dfecddaef6b1166a7f442db2a22929c65 (diff) | |
* lib/rubygems: Update to RubyGems master 66e5c39. Notable changes:
Implement gem.deps.rb (Gemfile) .lock support Fixed `gem uninstall` for a relative directory in GEM_HOME. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/rubygems/resolver/best_set.rb | 10 | ||||
| -rw-r--r-- | lib/rubygems/resolver/git_set.rb | 23 | ||||
| -rw-r--r-- | lib/rubygems/resolver/index_set.rb | 24 | ||||
| -rw-r--r-- | lib/rubygems/resolver/lock_set.rb | 18 | ||||
| -rw-r--r-- | lib/rubygems/resolver/vendor_set.rb | 15 |
5 files changed, 89 insertions, 1 deletions
@@ -17,5 +17,15 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet end end end @@ -11,6 +11,12 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set ## # Contains repositories needing submodules attr_reader :need_submodules # :nodoc: @@ -30,6 +36,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set @git = ENV['git'] || 'git' @need_submodules = {} @repositories = {} @specs = {} end @@ -57,6 +64,7 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set @repositories.each do |name, (repository, reference)| source = Gem::Source::Git.new name, repository, reference source.specs.each do |spec| git_spec = Gem::Resolver::GitSpecification.new self, spec, source @@ -66,5 +74,20 @@ class Gem::Resolver::GitSet < Gem::Resolver::Set end end end @@ -46,5 +46,29 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set res end end @@ -9,7 +9,7 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set # Creates a new LockSet from the given +source+ def initialize source - @source = source @specs = [] end @@ -56,5 +56,21 @@ class Gem::Resolver::LockSet < Gem::Resolver::Set found.source.fetch_spec tuple end end @@ -64,5 +64,20 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set @specs.fetch key end end |