Skip to content

Fix pre-release version comparison across versions with different non-canonical segments #2727

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

Closed
greysteil wants to merge 2 commits into from
Closed

Fix pre-release version comparison across versions with different non-canonical segments #2727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7e3591
Test demonstrating pre-release version comparison is broken
greysteil Apr 14, 2019
5de1bc7
Always use canonical segments when comparing versions
greysteil Apr 14, 2019
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
4 changes: 3 additions & 1 deletion test/rubygems/test_gem_version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,14 @@ def test_release

def test_spaceship
assert_equal(0, v("1.0") <=> v("1.0.0"))
assert_equal(0, v("1.0.0.a") <=> v("1.0.a"))
assert_equal(1, v("1.0") <=> v("1.0.a"))
assert_equal(1, v("1.8.2") <=> v("0.0.0"))
assert_equal(1, v("1.8.2") <=> v("1.8.2.a"))
assert_equal(1, v("1.8.2.b") <=> v("1.8.2.a"))
assert_equal(-1, v("1.8.2.a") <=> v("1.8.2"))
assert_equal(-1, v("1.8.2.a") <=> v("1.8.2"))
assert_equal(1, v("1.8.2.a10") <=> v("1.8.2.a9"))
assert_equal(1, v("2.0.b") <=> v("2.0.0.a"))
assert_equal(0, v("") <=> v("0"))

assert_nil v("1.0") <=> "whatever"
Expand Down