summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsutosh Palai <asupalai@gmail.com>2016-03-11 14:31:18 -0500
committerAsutosh Palai <asupalai@gmail.com>2016-03-11 14:31:18 -0500
commit9890ea14abb8db0f224264debae08259c3f09c7e (patch)
tree46d62bc63f7872e0db98cdc2b77fbebc450c55cf
parent4114f81b3148c9c106e8c164acd7f6c990cdb1ce (diff)
downloadbundler-9890ea14abb8db0f224264debae08259c3f09c7e.tar.gz
bundle install resolves all current dependencies Fixes #3981
-rw-r--r--lib/bundler/definition.rb6
-rw-r--r--lib/bundler/installer.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 3dcac64191..0ee27b3ae7 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -167,6 +167,12 @@ module Bundler
missing
end
+ def missing_dependencies
+ missing = []
+ resolve.materialize(current_dependencies, missing)
+ missing
+ end
+
def requested_specs
@requested_specs ||= begin
groups = requested_groups
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 509b7b0cba..fcf68928e4 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -185,7 +185,7 @@ module Bundler
local = Bundler.ui.silence do
begin
tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)
- true unless tmpdef.new_platform? || tmpdef.missing_specs.any?
+ true unless tmpdef.new_platform? || tmpdef.missing_dependencies.any?
rescue BundlerError
end
end