Skip to content

Restore transitiveness of version comparison #2651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Apr 15, 2019
Merged

Restore transitiveness of version comparison #2651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions lib/rubygems/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,8 +344,8 @@ def <=>(other)
return unless Gem::Version === other
return 0 if @version == other._version || canonical_segments == other.canonical_segments

lhsegments = _segments
rhsegments = other._segments
lhsegments = canonical_segments
rhsegments = other.canonical_segments

lhsize = lhsegments.size
rhsize = rhsegments.size
Expand Down
6 changes: 6 additions & 0 deletions test/rubygems/test_gem_requirement.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,12 @@ def test_satisfied_by_eh_good
assert_satisfied_by "3.0.rc2", "< 3.0.1"

assert_satisfied_by "3.0.rc2", "> 0"

assert_satisfied_by "5.0.0.rc2", "~> 5.a"
refute_satisfied_by "5.0.0.rc2", "~> 5.x"

assert_satisfied_by "5.0.0", "~> 5.a"
assert_satisfied_by "5.0.0", "~> 5.x"
end

def test_illformed_requirements
Expand Down
7 changes: 7 additions & 0 deletions test/rubygems/test_gem_version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ def test_spaceship
assert_equal(1, v("1.8.2.a10") <=> v("1.8.2.a9"))
assert_equal(0, v("") <=> v("0"))

assert_equal(0, v("0.beta.1") <=> v("0.0.beta.1"))
assert_equal(-1, v("0.0.beta") <=> v("0.0.beta.1"))
assert_equal(-1, v("0.0.beta") <=> v("0.beta.1"))

assert_equal(-1, v("5.a") <=> v("5.0.0.rc2"))
assert_equal(1, v("5.x") <=> v("5.0.0.rc2"))

assert_nil v("1.0") <=> "whatever"
end

Expand Down