Skip to content
Closed
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
16 changes: 9 additions & 7 deletions lib/rubygems/specification_policy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -125,23 +125,25 @@ def validate_dependencies # :nodoc:

seen[dep.type][dep.name] = dep

prerelease_dep = dep.requirements_list.any? do |req|
Gem::Requirement.new(req).prerelease?
dep_requirements = dep.requirement.requirements

prerelease_dep = dep_requirements.any? do |op, version|
version.prerelease? and op != '<'
end

warning_messages << "prerelease dependency on #{dep} is not recommended" if
prerelease_dep && !version.prerelease?

overly_strict = dep.requirement.requirements.length == 1 &&
dep.requirement.requirements.any? do |op, version|
overly_strict = dep_requirements.length == 1 &&
dep_requirements.any? do |op, version|
op == '~>' and
not version.prerelease? and
version.segments.length > 2 and
version.segments.first != 0
end

if overly_strict then
_, dep_version = dep.requirement.requirements.first
_, dep_version = dep_requirements.first

base = dep_version.segments.first 2
upper_bound = dep_version.segments.first(dep_version.segments.length - 1)
Expand All @@ -156,12 +158,12 @@ def validate_dependencies # :nodoc:
WARNING
end

open_ended = dep.requirement.requirements.all? do |op, version|
open_ended = dep_requirements.all? do |op, version|
not version.prerelease? and (op == '>' or op == '>=')
end

if open_ended then
op, dep_version = dep.requirement.requirements.first
op, dep_version = dep_requirements.first

base = dep_version.segments.first 2

Expand Down
1 change: 1 addition & 0 deletions test/rubygems/test_gem_specification.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2650,6 +2650,7 @@ def test_validate_dependencies
@a1.add_runtime_dependency 'l', '> 1.2.3'
@a1.add_runtime_dependency 'm', '~> 2.1.0'
@a1.add_runtime_dependency 'n', '~> 0.1.0'
@a1.add_runtime_dependency 'o', '< 1.0.x'

use_ui @ui do
@a1.validate
Expand Down