Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

select a pre-release if it's specified in the Gemfile #6570

Merged
merged 1 commit into from
Jun 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions lib/bundler/resolver.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,6 @@ def name_for_locking_dependency_source

def requirement_satisfied_by?(requirement, activated, spec)
return false unless requirement.matches_spec?(spec) || spec.source.is_a?(Source::Gemspec)
if spec.version.prerelease? && !requirement.prerelease? && search_for(requirement).any? {|sg| !sg.version.prerelease? }
vertex = activated.vertex_named(spec.name)
return false if vertex.requirements.none?(&:prerelease?)
end
spec.activate_platform!(requirement.__platform) if !@platforms || @platforms.include?(requirement.__platform)
true
end
Expand Down
7 changes: 7 additions & 0 deletions spec/resolver/basic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,13 @@
should_resolve_as %w[need-pre-1.0.0 activesupport-3.0.0.beta1]
end

it "selects a pre-release if it's specified in the Gemfile" do
dep "activesupport", "= 3.0.0.beta"
dep "actionpack"

should_resolve_as %w[activesupport-3.0.0.beta actionpack-3.0.0.beta rack-1.1 rack-mount-0.6]
end

it "raises an exception if a child dependency is not resolved" do
@index = a_unresovable_child_index
dep "chef_app_error"
Expand Down