Skip to content

Allow version with less than three components #9

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

Open
OmarPedraza wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow version with less than three components #9

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
16 changes: 9 additions & 7 deletions Sources/Version.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@
// SOFTWARE.

func versionComponentFromCharacters(_ characters: Substring) -> UInt? {
var component: UInt? = nil
var component: UInt?
if characters.count > 0 {
if let firstCharacter = characters.first, firstCharacter != "0" || characters.count == 1 {
component = UInt(String(characters))
}
component = UInt(characters)
}

return component
Expand Down Expand Up @@ -53,12 +51,16 @@ public struct Version {

let versionEndIndex = prereleaseStartIndex ?? buildMetadataStartIndex ?? string.endIndex
let versionCharacters = string.prefix(upTo: versionEndIndex)
var versionComponents = versionCharacters.split(separator: ".", maxSplits: 2, omittingEmptySubsequences: false).compactMap(versionComponentFromCharacters)

guard versionComponents.count == 3 else {
guard versionCharacters.count > 0, versionCharacters.last != "." else {
// If a negative number is present in version components, version characters will be empty or will finish with a dot
return nil
}

var versionComponents = versionCharacters.split(separator: ".", maxSplits: 2, omittingEmptySubsequences: false).compactMap(versionComponentFromCharacters)
while versionComponents.count < 3 {
versionComponents.append(0)
}

var prerelease: DotSeparatedValues?
if let prereleaseStartIndex = prereleaseStartIndex {
let prereleaseEndIndex = buildMetadataStartIndex ?? string.endIndex
Expand Down
19 changes: 16 additions & 3 deletions Tests/LXSemVerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,24 @@ class VersionTests: XCTestCase {
XCTAssertEqual(UInt("1")!, 1)

XCTAssertNotNil(Version(string: "1.0.0"))
XCTAssertNil(Version(string: "01.0.0"))
XCTAssertNotNil(Version(string: "01.0.0"))
XCTAssertEqual(Version(string: "1.0.0"), Version(string: "01.0.0"))

XCTAssertNotNil(Version(string: "1.5.0"))
XCTAssertNil(Version(string: "1.05.0"))
XCTAssertNotNil(Version(string: "1.05.0"))
XCTAssertEqual(Version(string: "1.5.0"), Version(string: "1.05.0"))

XCTAssertNotNil(Version(string: "0.1.7"))
XCTAssertNil(Version(string: "0.1.007"))
XCTAssertNotNil(Version(string: "0.1.007"))
XCTAssertEqual(Version(string: "0.1.7"), Version(string: "0.1.007"))

XCTAssertNil(Version(string: ""))

XCTAssertNotNil(Version(string: "1.29"))
XCTAssertEqual(Version(string: "1.29"), Version(string: "1.29.0"))

XCTAssertNotNil(Version(string: "1"))
XCTAssertEqual(Version(string: "1"), Version(string: "1.0.0"))

XCTAssertNotNil(Version(string: "1.1.1"))
XCTAssertNil(Version(string: "-1.1.1"))
Expand Down