summaryrefslogtreecommitdiff
path: root/lib/bundler/installer.rb
diff options
context:
space:
mode:
authorAndy Delcambre <adelcambre@engineyard.com>2010-03-17 10:33:31 -0700
committerAndy Delcambre <adelcambre@engineyard.com>2010-03-25 11:13:18 -0700
commit8853c6b1db27793f4d5b7b7fc8ed65fb1877a3b6 (patch)
treeffc1b25f58f2e9fa043ac9cd729d7376c792db8f /lib/bundler/installer.rb
parent774d950b9f20047e4aa18dfc643ceb22947ad36d (diff)
downloadbundler-8853c6b1db27793f4d5b7b7fc8ed65fb1877a3b6.tar.gz
s/actual_dependencies/resolved_dependencies/
Diffstat (limited to 'lib/bundler/installer.rb')
-rw-r--r--lib/bundler/installer.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index b3d62c2265..527c44ad8e 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -7,7 +7,7 @@ module Bundler
end
def run(options)
- if actual_dependencies.empty?
+ if resolved_dependencies.empty?
Bundler.ui.warn "The Gemfile specifies no dependencies"
return
end
@@ -44,8 +44,8 @@ module Bundler
@definition.dependencies
end
- def actual_dependencies
- @definition.actual_dependencies
+ def resolved_dependencies
+ @definition.resolved_dependencies
end
private
@@ -56,12 +56,12 @@ module Bundler
def resolve_locally
# Return unless all the dependencies have = version requirements
- return if actual_dependencies.any? { |d| ambiguous?(d) }
+ return if resolved_dependencies.any? { |d| ambiguous?(d) }
specs = super
# Simple logic for now. Can improve later.
- specs.length == actual_dependencies.length && specs
+ specs.length == resolved_dependencies.length && specs
rescue GemNotFound, PathError => e
nil
end