Skip to content

Fix pre-release sorting #1

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
merged 1 commit into from
Sep 1, 2020
Merged

Fix pre-release sorting #1

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
11 changes: 8 additions & 3 deletions Sources/SemanticVersion/SemanticVersion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,14 @@ extension SemanticVersion: Comparable {
if lhs.major != rhs.major { return lhs.major < rhs.major }
if lhs.minor != rhs.minor { return lhs.minor < rhs.minor }
if lhs.patch != rhs.patch { return lhs.patch < rhs.patch }
// Not entirely sure how much sense it makes to compare the pre and build values
// but it's probably better than just ignoring them
if lhs.preRelease != rhs.preRelease { return lhs.preRelease < rhs.preRelease }
if lhs.preRelease != rhs.preRelease {
// Ensure stable versions sort after their betas ...
if lhs.isStable { return false }
if rhs.isStable { return true }
// ... otherwise sort by preRelease
return lhs.preRelease < rhs.preRelease
}
// ... and build
return lhs.build < rhs.build
}
}
Expand Down
10 changes: 10 additions & 0 deletions Tests/SemanticVersionTests/SemanticVersionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ final class SemanticVersionTests: XCTestCase {
XCTAssertEqual(SemanticVersion("1.2.3-rc"), SemanticVersion(1, 2, 3, "rc"))
XCTAssertEqual(SemanticVersion("v1.2.3-beta1"), SemanticVersion(1, 2, 3, "beta1"))
XCTAssertEqual(SemanticVersion("v1.2.3-beta1+build5"), SemanticVersion(1, 2, 3, "beta1", "build5"))
XCTAssertEqual(SemanticVersion("1.2.3-beta-foo"), SemanticVersion(1, 2, 3, "beta-foo"))
XCTAssertEqual(SemanticVersion("1.2.3-beta-foo+build-42"), SemanticVersion(1, 2, 3, "beta-foo", "build-42"))
XCTAssertEqual(SemanticVersion(""), nil)
XCTAssertEqual(SemanticVersion("1"), nil)
XCTAssertEqual(SemanticVersion("1.2"), nil)
Expand All @@ -109,6 +111,14 @@ final class SemanticVersionTests: XCTestCase {
XCTAssert(SemanticVersion(1, 0, 0) < SemanticVersion(1, 0, 1))
XCTAssert(SemanticVersion(1, 0, 0, "a") < SemanticVersion(1, 0, 0, "b"))
XCTAssert(SemanticVersion(1, 0, 0, "a", "a") < SemanticVersion(1, 0, 0, "a", "b"))

// ensure betas come before releases
XCTAssert(SemanticVersion(1, 0, 0, "b1") < SemanticVersion(1, 0, 0))
XCTAssertFalse(SemanticVersion(1, 0, 0, "b1") > SemanticVersion(1, 0, 0))
// but only if major/minor/patch are the same
XCTAssert(SemanticVersion(1, 0, 0) < SemanticVersion(1, 0, 1, "b1"))
// once the patch bumps up to the beta level again, it sorts higher
XCTAssert(SemanticVersion(1, 0, 1) > SemanticVersion(1, 0, 1, "b1"))
}

func test_isStable() throws {
Expand Down