From 9890ea14abb8db0f224264debae08259c3f09c7e Mon Sep 17 00:00:00 2001 From: Asutosh Palai Date: Fri, 11 Mar 2016 14:31:18 -0500 Subject: [PATCH] bundle install resolves all current dependencies Fixes #3981 --- lib/bundler/definition.rb | 6 ++++++ lib/bundler/installer.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 3dcac64191a..0ee27b3ae77 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -167,6 +167,12 @@ def missing_specs 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 509b7b0cbaa..fcf68928e41 100644 --- a/lib/bundler/installer.rb +++ b/lib/bundler/installer.rb @@ -185,7 +185,7 @@ def resolve_if_need(options) 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