Skip to content

Commit

Permalink
bundle install resolves all current dependencies Fixes rubygems#3981
Browse files Browse the repository at this point in the history
  • Loading branch information
asutoshpalai committed Mar 11, 2016
1 parent 4114f81 commit 9890ea1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 6 additions & 0 deletions lib/bundler/definition.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/bundler/installer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9890ea1

Please sign in to comment.