aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/installer.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-19 15:51:21 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-03-19 15:51:21 -0700
commit067b23fbb1dcace50226e2b0d08cb14d5e5bcd39 (patch)
treed23b717b60dfad3549b9bdae5515b2bee85835f9 /lib/bundler/installer.rb
parent5a8e2ea5a4f9911c556c0f039455a0376f767740 (diff)
downloadbundler-067b23fbb1dcace50226e2b0d08cb14d5e5bcd39.tar.gz
Move more stuff upstream into Environment
Diffstat (limited to 'lib/bundler/installer.rb')
-rw-r--r--lib/bundler/installer.rb13
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index b92e3628..28a8e7ba 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -48,10 +48,6 @@ module Bundler
@definition.actual_dependencies
end
- def specs
- @specs ||= resolve_locally || resolve_remotely
- end
-
private
def sources
@@ -62,14 +58,7 @@ module Bundler
# Return unless all the dependencies have = version requirements
return if actual_dependencies.any? { |d| ambiguous?(d) }
- source_requirements = {}
- actual_dependencies.each do |dep|
- next unless dep.source && dep.source.respond_to?(:local_specs)
- source_requirements[dep.name] = dep.source.local_specs
- end
-
- # Run a resolve against the locally available gems
- specs = Resolver.resolve(actual_dependencies, index, source_requirements)
+ specs = super
# Simple logic for now. Can improve later.
specs.length == actual_dependencies.length && specs