Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.
Swift cache-cleanercleanerclideveloper-toolsdisk-cleanupdisk-spaceduplicate-finderhomebrewliquid-glassmac-cleanermacosmacos-appmacos-golden-gatemacos-tahoemacos-tweaksswiftswiftuiterminal-themesuninstalluninstaller
Let Homebrew's reports go once other packages are installed
Țugui Dragoșfbc720e6e613
diff --git a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swiftindex 271a4f2c..bec9f6f1 100644--- a/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift+++ b/Packages/PeelCore/Sources/PeelCore/Homebrew/Homebrew.swift@@ -112,6 +112,18 @@ public struct HomebrewPackage: Sendable, Hashable, Identifiable {}}+extension [HomebrewPackage] {+ /// Whether `other` has the same packages installed, at the same versions, whatever else Homebrew now says of+ /// them, such as a newer version it offers.+ public func installsTheSame(as other: [HomebrewPackage]) -> Bool {+ installed == other.installed+ }++ private var installed: [String: String?] {+ Dictionary(map { ($0.id, $0.installedVersion) }, uniquingKeysWith: { first, _ in first })+ }+}+public struct HomebrewInstallation: Sendable, Hashable {public let version: Stringpublic let prefix: URLdiff --git a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swiftindex 93ee20c8..1fe38c03 100644--- a/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift+++ b/Packages/PeelCore/Tests/PeelCoreTests/HomebrewTests.swift@@ -546,6 +546,20 @@ struct HomebrewTests {#expect(vulnerabilities.map(\.fix) == [.versions(["0.12.8"]), .commits, .notListed])}+ @Test func tellsWhenTheInstalledPackagesChanged() {+ let openssl = HomebrewPackage(name: "openssl@3", kind: .formula, installedVersion: "3.6.3")+ let offered = HomebrewPackage(+ name: "openssl@3", kind: .formula, installedVersion: "3.6.3", latestVersion: "3.6.4", isOutdated: true+ )+ let upgraded = HomebrewPackage(name: "openssl@3", kind: .formula, installedVersion: "3.6.4")+ let curl = HomebrewPackage(name: "curl", kind: .formula, installedVersion: "8.17.0")++ #expect([openssl, curl].installsTheSame(as: [curl, offered]))+ #expect(![openssl].installsTheSame(as: [upgraded]))+ #expect(![openssl].installsTheSame(as: [openssl, curl]))+ #expect(![openssl, curl].installsTheSame(as: [curl]))+ }+@Test func listsIdentifiersInTheOrderOfTheirNumbers() throws {let json = """{"findings": [{"formula": "libssh2", "version": "1.11.1", "vulnerabilities": [diff --git a/Peel/Model/HomebrewLibrary.swift b/Peel/Model/HomebrewLibrary.swiftindex 0aa264f5..8f7e7931 100644--- a/Peel/Model/HomebrewLibrary.swift+++ b/Peel/Model/HomebrewLibrary.swift@@ -58,8 +58,9 @@ final class HomebrewLibrary {/// at launch and on every change in an Applications folder, which would be Peel contacting the network on/// its own. So nothing is asked.private(set) var needsDefinitions = false- /// The findings of the last health check. Nil until one runs, and cleared by any command that changes- /// Homebrew, since they would then describe it as it was.+ /// The findings of the last health check. Nil until one runs, and cleared, with the vulnerability report, by+ /// any command that changes Homebrew and by a reading that finds other packages installed, since they would+ /// then describe it as it was.private(set) var findings: [HomebrewFinding]?private(set) var advisories: HomebrewVulnerabilityReport?/// Casks describing installed apps that Homebrew didn't install, read from its local definitions.@@ -151,6 +152,9 @@ final class HomebrewLibrary {// the page is visited.switch installed {case .success(let list):+ if let packages, !packages.installsTheSame(as: list) {+ (findings, advisories) = (nil, nil)+ }packages = listhasAnswered = truecouldNotRead = nil