Merge pull request #307 from rzulkoski/parseXcodeVersionBetaFormat

MattKiazyk · web-flow · commit 7340c9b769d9 · 2024-02-16T09:38:43.000-06:00
Support parsing `.xcode-version` beta format
diff --git a/Sources/XcodesKit/Version+Xcode.swift b/Sources/XcodesKit/Version+Xcode.swift
@@ -43,6 +43,8 @@ public extension Version {
 
                     optionalPrereleaseIdentifiers[lastIndex] = "\(lastItem)-seed"
                 }
+            } else if type == "b" {
+                optionalPrereleaseIdentifiers.append("beta")
             } else {
                 optionalPrereleaseIdentifiers.append(type)
             }
diff --git a/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift b/Tests/XcodesKitTests/Models+FirstWithVersionTests.swift
@@ -91,6 +91,10 @@ final class ModelsFirstWithVersionTests: XCTestCase {
             installedXcodes.first(withVersion: Version(xcodeVersion: "1.2.3 Beta 2")!),
             InstalledXcode(path: Path("/Applications/Xcode-1.2.3-beta.2.app")!, version: Version(xcodeVersion: "1.2.3 Beta 2")!)
         )
+        XCTAssertEqual(
+            installedXcodes.first(withVersion: Version(xcodeVersion: "1.2.3b2")!),
+            InstalledXcode(path: Path("/Applications/Xcode-1.2.3-beta.2.app")!, version: Version(xcodeVersion: "1.2.3 Beta 2")!)
+        )
         
         // With build metadata
         XCTAssertEqual(

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ public extension Version {`
`43`	`43`
`44`	`44`	`optionalPrereleaseIdentifiers[lastIndex] = "\(lastItem)-seed"`
`45`	`45`	`}`
	`46`	`+ } else if type == "b" {`
	`47`	`+ optionalPrereleaseIdentifiers.append("beta")`
`46`	`48`	`} else {`
`47`	`49`	`optionalPrereleaseIdentifiers.append(type)`
`48`	`50`	`}`