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.

Don't call an app up to date when Homebrew can't upgrade its cask

Țugui Dragoșf60d91a360f3
diff --git a/Packages/PeelCore/Sources/PeelCore/Updates/UpdateChecker.swift b/Packages/PeelCore/Sources/PeelCore/Updates/UpdateChecker.swift
index 949efbb7..731c5917 100644
--- a/Packages/PeelCore/Sources/PeelCore/Updates/UpdateChecker.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Updates/UpdateChecker.swift
@@ -159,10 +159,11 @@ public struct UpdateChecker: Sendable {
}
/// The status Homebrew reports at `now` for `cask`, known to be the app's at `appVersion`, or nil when it can't
- /// tell (`whyHomebrewCannotTell(about:at:)`).
+ /// tell (`whyHomebrewCannotTell(about:at:)`), or when the app is behind and Homebrew can't upgrade it.
static func homebrewStatus(of cask: HomebrewPackage, appVersion: String?, at now: Date) -> UpdateStatus? {
- if cask.waitsForAnUpgrade, let latest = cask.latestVersion, !isAlready(appVersion, at: latest) {
- return .updateAvailable(version: latest, source: .homebrew, releaseNotes: cask.homepage)
+ if cask.isOutdated, let latest = cask.latestVersion, !isAlready(appVersion, at: latest) {
+ return cask.waitsForAnUpgrade
+ ? .updateAvailable(version: latest, source: .homebrew, releaseNotes: cask.homepage) : nil
}
return whyHomebrewCannotTell(about: cask, at: now) == nil ? .upToDate : nil
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
index 1d8041f0..d41f34ed 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/UpdateTests.swift
@@ -697,6 +697,27 @@ struct UpdateSourceTests {
#expect(status("2.0.0") == update, "versions of other lengths compare as Homebrew's don't")
}
+ @Test func anAppWhoseCaskHomebrewCanNotUpgradeGetsNoAnswerFromHomebrew() throws {
+ let directory = try TemporaryDirectory()
+ let checked = Date(timeIntervalSince1970: 1_792_315_250)
+ // Installed from a package whose receipts are gone, so Homebrew counts what the cask installed as gone.
+ let cask = HomebrewPackage(
+ name: "example", kind: .cask, installedVersion: "1.0", latestVersion: "2.0", isOutdated: true,
+ quitIdentifiers: ["com.example.app"], packageIdentifiers: ["org.example.pkg"]
+ ).kept(inCaskroom: try directory.directory("Caskroom"))
+ .checkingWhatItInstalled(receipts: try directory.directory("receipts"))
+ .noting(lastUpdateCheck: checked)
+ let app = InstalledApp(
+ url: try directory.directory("Applications/Example.app"), bundleIdentifier: "com.example.app",
+ name: "Example", version: "1.0"
+ )
+
+ let status = UpdateChecker(clock: { checked + 60 }).homebrewStatus(for: app, casks: [cask])
+
+ #expect(cask.isMissingWhatItInstalled && !cask.waitsForAnUpgrade)
+ #expect(status == nil, "Homebrew can't upgrade it, and the app isn't up to date")
+ }
+
/// `firefox`, `firefox@beta`, and `firefox@esr` all install `Firefox.app`. With `firefox@esr` installed, the
/// base cask, which Homebrew only knows of, matches the app too and sorts first, but has no installed
/// version. The installed cask is the one to ask, or the waiting update is missed.