Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Read a blank build number as no build

Țugui Dragoș4ec35d951f14
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift b/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift
index 3c324e82..03549760 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/AppInspector.swift
@@ -104,7 +104,7 @@ public enum AppInspector {
name: displayName(of: url, identifier: bundleIdentifier),
bundleName: info["CFBundleName"] as? String,
version: statedVersion(in: info),
- buildVersion: info["CFBundleVersion"] as? String,
+ buildVersion: stated(info["CFBundleVersion"]),
teamIdentifier: signing.teamIdentifier,
developer: signing.developer,
applicationGroups: signing.applicationGroups,
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift
index 59804bb6..84048a28 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/AppInspectorTests.swift
@@ -339,6 +339,7 @@ struct AppInspectorTests {
try plist(["CFBundleIdentifier": "org.example.spaces", "CFBundleShortVersionString": " ", "CFBundleVersion": "12"], at: "Spaces.app/Contents/Info.plist", in: directory)
#expect(try #require(AppInspector.inspect(directory.url.appending(path: "Blank.app"))).version == nil)
+ #expect(try #require(AppInspector.inspect(directory.url.appending(path: "Blank.app"))).buildVersion == nil)
#expect(try #require(AppInspector.inspect(directory.url.appending(path: "Spaces.app"))).version == "12")
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift
index 741a9b29..36c1d9c9 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateCheckerTests.swift
@@ -182,6 +182,20 @@ private final class DroppedProtocol: URLProtocol, @unchecked Sendable {
#expect(await checker.status(for: sparkleApp()) == .upToDate)
}
+ @Test func aBlankBuildLeavesTheComparisonToTheVersions() async throws {
+ reply("feed.example.com", appcast("<item><enclosure url=\"https://feed.example.com/a.zip\" sparkle:version=\"101\" sparkle:shortVersionString=\"1.0\" /></item>"))
+ let directory = try TemporaryDirectory()
+ let info = [
+ "CFBundleIdentifier": "org.example.editor", "CFBundleShortVersionString": "1.0", "CFBundleVersion": " ",
+ "SUFeedURL": "https://feed.example.com/appcast.xml",
+ ]
+ try PropertyListSerialization.data(fromPropertyList: info, format: .xml, options: 0)
+ .write(to: directory.file("Editor.app/Contents/Info.plist"))
+ let app = try #require(AppInspector.inspect(directory.url.appending(path: "Editor.app")))
+
+ #expect(await checker.status(for: app) == .upToDate)
+ }
+
@Test func asksNothingAboutAnAppFromSetapp() async throws {
reply("feed.example.com", appcast("<item><enclosure url=\"https://feed.example.com/a.zip\" sparkle:version=\"200\" sparkle:shortVersionString=\"2.0\" /></item>"))
func inspected(_ identifier: String, in directory: borrowing TemporaryDirectory) throws -> InstalledApp {