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.

A Brewfile is never written from a Homebrew that did not answer

Țugui Dragoș7e726b59187b
diff --git a/Localization/Peel/Localizable.xcstrings b/Localization/Peel/Localizable.xcstrings
index f99cea7e..c7c2b8af 100644
--- a/Localization/Peel/Localizable.xcstrings
+++ b/Localization/Peel/Localizable.xcstrings
@@ -40327,6 +40327,112 @@
}
}
},
+ "Homebrew didn’t answer, so Peel has nothing to write a Brewfile from. Open Homebrew in Peel to see why." : {
+ "localizations" : {
+ "cs" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew neodpověděl, takže Peel nemá z čeho vytvořit Brewfile. Otevřete v Peelu stránku Homebrew a uvidíte proč."
+ }
+ },
+ "de" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew hat nicht geantwortet, daher fehlt Peel die Grundlage für ein Brewfile. Öffne die Seite „Homebrew“ in Peel, um zu sehen, warum."
+ }
+ },
+ "es" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew no ha respondido, así que Peel no tiene nada con lo que escribir un Brewfile. Abre Homebrew en Peel para ver por qué."
+ }
+ },
+ "fr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew n’a pas répondu : Peel n’a donc rien à écrire dans un Brewfile. Ouvrez la page Homebrew dans Peel pour savoir pourquoi."
+ }
+ },
+ "it" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew non ha risposto, quindi Peel non ha nulla da cui scrivere un Brewfile. Apri la pagina Homebrew in Peel per vedere perché."
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrewが応答しなかったため、PeelにはBrewfileを作成する元になる情報がありません。理由を確認するには、PeelでHomebrewを開いてください。"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew가 응답하지 않아 Peel이 Brewfile을 작성할 내용이 없습니다. Peel에서 Homebrew 페이지를 열어 이유를 확인하십시오."
+ }
+ },
+ "nl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew reageerde niet, dus Peel heeft niets om een Brewfile op te baseren. Open de pagina 'Homebrew' in Peel om te zien waarom."
+ }
+ },
+ "pl" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew nie odpowiedział, więc Peel nie ma z czego utworzyć pliku Brewfile. Otwórz stronę Homebrew w Peel, aby zobaczyć, dlaczego."
+ }
+ },
+ "pt" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "O Homebrew não respondeu, então o Peel não tem nada para escrever em um Brewfile. Abra a página Homebrew no Peel para ver o motivo."
+ }
+ },
+ "ro" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew nu a răspuns, așa că Peel nu are din ce să scrie un Brewfile. Deschideți pagina Homebrew în Peel pentru a vedea de ce."
+ }
+ },
+ "ru" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew не ответил, поэтому у Peel нет данных для Brewfile. Откройте страницу Homebrew в Peel, чтобы узнать причину."
+ }
+ },
+ "sv" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew svarade inte, så Peel har inget underlag att skriva en Brewfile utifrån. Öppna sidan Homebrew i Peel för att se varför."
+ }
+ },
+ "tr" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew yanıt vermedi, bu yüzden Peel’in bir Brewfile yazacağı hiçbir şey yok. Nedenini görmek için Peel’de Homebrew’u açın."
+ }
+ },
+ "uk" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew не відповів, тож Peel немає з чого записати Brewfile. Відкрийте сторінку «Homebrew» у Peel, щоб побачити, чому."
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew没有回应,因此Peel没有内容可写入Brewfile。在Peel中打开Homebrew页面即可查看原因。"
+ }
+ },
+ "zh-Hant" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Homebrew沒有回應,因此Peel沒有可用來寫入Brewfile的內容。請在Peel中打開「Homebrew」頁面查看原因。"
+ }
+ }
+ }
+ },
"Homebrew didn’t say what is installed" : {
"localizations" : {
"cs" : {
diff --git a/Packages/PeelCore/Sources/PeelCore/Apps/Inventory.swift b/Packages/PeelCore/Sources/PeelCore/Apps/Inventory.swift
index 1657f24d..980d9faa 100644
--- a/Packages/PeelCore/Sources/PeelCore/Apps/Inventory.swift
+++ b/Packages/PeelCore/Sources/PeelCore/Apps/Inventory.swift
@@ -43,30 +43,37 @@ public struct Inventory: Sendable {
case brewfile
}
+ /// A Brewfile asked for while Homebrew did not answer: an empty one would read as a Mac with nothing to install.
+ public struct HomebrewDidNotAnswer: Error {}
+
public let entries: [InventoryEntry]
/// What Homebrew says was installed on request, which is what a Brewfile has to reproduce.
public let formulae: [String]
public let casks: [String]
/// The packages among them, by full name, that come from a tap outside Homebrew's own and are trusted.
public var trusted: Set<String> = []
+ /// False when Homebrew did not answer, so what it installed is not known.
+ public var knowsHomebrew = true
- /// `origins` looks up where downloaded apps came from. The app and `peel` pass `DownloadOrigins.onThisMac`.
- /// `trust` is what this Mac trusts, which only a Brewfile needs (`Homebrew.trust()`).
+ /// `casks` is what Homebrew installed, nil when it did not answer. `origins` looks up where downloaded apps
+ /// came from. The app and `peel` pass `DownloadOrigins.onThisMac`. `trust` is what this Mac trusts, which only
+ /// a Brewfile needs (`Homebrew.trust()`).
public static func build(
apps: [InstalledApp],
- casks: [HomebrewPackage] = [],
+ casks: [HomebrewPackage]? = [],
origins: DownloadOrigins? = nil,
trust: HomebrewTrust = HomebrewTrust()
) -> Inventory {
let entries = apps
.sorted { $0.name.localizedStandardCompare($1.name) == .orderedAscending }
- .map { app in entry(for: app, casks: casks, origins: origins) }
- let requested = casks.filter(\.isInstalledOnRequest)
+ .map { app in entry(for: app, casks: casks ?? [], origins: origins) }
+ let requested = (casks ?? []).filter(\.isInstalledOnRequest)
return Inventory(
entries: entries,
formulae: requested.filter { $0.kind == .formula }.map(\.fullName).sorted(),
casks: requested.filter { $0.kind == .cask }.map(\.fullName).sorted(),
- trusted: Set(requested.filter(trust.trusts).map(\.fullName))
+ trusted: Set(requested.filter(trust.trusts).map(\.fullName)),
+ knowsHomebrew: casks != nil
)
}
@@ -114,7 +121,7 @@ public struct Inventory: Sendable {
case .json: try json()
case .csv: csv()
case .text: text()
- case .brewfile: brewfile()
+ case .brewfile: try brewfile()
}
}
@@ -167,7 +174,8 @@ public struct Inventory: Sendable {
/// Lists only what Homebrew can install again, taken from what Homebrew says is installed. Each package is
/// written under its full name, so Homebrew adds a third-party package's tap by itself, and one this Mac
/// trusts says so, as `brew bundle dump` writes it.
- private func brewfile() -> String {
+ private func brewfile() throws -> String {
+ guard knowsHomebrew else { throw HomebrewDidNotAnswer() }
func line(_ kind: String, _ name: String) -> String {
"\(kind) \"\(name)\"" + (trusted.contains(name) ? ", trusted: true" : "")
}
diff --git a/Packages/PeelCore/Tests/PeelCoreTests/InventoryTests.swift b/Packages/PeelCore/Tests/PeelCoreTests/InventoryTests.swift
index e4bc3413..260ca9b6 100644
--- a/Packages/PeelCore/Tests/PeelCoreTests/InventoryTests.swift
+++ b/Packages/PeelCore/Tests/PeelCoreTests/InventoryTests.swift
@@ -121,6 +121,14 @@ struct InventoryTests {
#expect(!brewfile.contains("Sparkly"))
}
+ @Test func writesNoBrewfileWhenHomebrewDidNotAnswer() throws {
+ let unread = Inventory.build(apps: [], casks: nil)
+
+ #expect(throws: Inventory.HomebrewDidNotAnswer.self) { try unread.written(as: .brewfile) }
+ #expect(try unread.written(as: .text) == "\n")
+ #expect(try Inventory.build(apps: [], casks: []).written(as: .brewfile) == "")
+ }
+
@Test func writesTheDayWhereTheReaderIs() throws {
let halfPastOneInBucharest = try Date("2026-09-18T22:30:00Z", strategy: .iso8601)
let bucharest = try #require(TimeZone(identifier: "Europe/Bucharest"))
diff --git a/Peel/Model/HomebrewLibrary.swift b/Peel/Model/HomebrewLibrary.swift
index 7a0a75b3..0c1d8872 100644
--- a/Peel/Model/HomebrewLibrary.swift
+++ b/Peel/Model/HomebrewLibrary.swift
@@ -98,6 +98,13 @@ final class HomebrewLibrary {
var selection: HomebrewPackage.ID?
var result: CommandResult?
+ private(set) var hasAnswered = false
+
+ /// What Homebrew says is installed, or nil when it did not answer and nothing is known.
+ var answeredPackages: [HomebrewPackage]? {
+ hasAnswered ? packages : nil
+ }
+
var selectedPackage: HomebrewPackage? {
packages?.first { $0.id == selection }
}
@@ -132,6 +139,7 @@ final class HomebrewLibrary {
guard let reading = await scanRun.run({ await self.read(includingReclaimable: includingReclaimable) }) else { return }
guard let (found, installed, preview, overridden) = reading else {
needsDefinitions = true
+ hasAnswered = false
packages = packages ?? []
return
}
@@ -140,9 +148,11 @@ final class HomebrewLibrary {
switch installed {
case .success(let list):
packages = list
+ hasAnswered = true
couldNotRead = nil
case .failure(let error):
packages = packages ?? []
+ hasAnswered = false
couldNotRead = error.output
}
self.installation = found
diff --git a/Peel/Model/InventoryExport.swift b/Peel/Model/InventoryExport.swift
index d09cec9a..65cb65b1 100644
--- a/Peel/Model/InventoryExport.swift
+++ b/Peel/Model/InventoryExport.swift
@@ -8,12 +8,14 @@ enum InventoryExport {
/// Asks the user where to save the inventory, then writes it there. Returns nil when the file was written
/// or the user canceled, and the error message otherwise.
@MainActor
- static func run(format: Inventory.Format, apps: [InstalledApp], casks: [HomebrewPackage]) async -> String? {
+ static func run(format: Inventory.Format, apps: [InstalledApp], casks: [HomebrewPackage]?) async -> String? {
let contents: String
// Only a Brewfile says what this Mac trusts, and asking takes a call to `brew`.
let trust = format == .brewfile ? await Homebrew.trust() : HomebrewTrust()
do {
contents = try Inventory.build(apps: apps, casks: casks, origins: .onThisMac, trust: trust).written(as: format)
+ } catch is Inventory.HomebrewDidNotAnswer {
+ return String(localized: "Homebrew didn’t answer, so Peel has nothing to write a Brewfile from. Open Homebrew in Peel to see why.")
} catch {
return error.localizedDescription
}
diff --git a/Peel/Navigation/PeelCommands.swift b/Peel/Navigation/PeelCommands.swift
index d72d46d6..2c26f3e2 100644
--- a/Peel/Navigation/PeelCommands.swift
+++ b/Peel/Navigation/PeelCommands.swift
@@ -154,7 +154,10 @@ struct PeelCommands: Commands {
extension PeelCommands {
private func export(as format: Inventory.Format) {
Task {
- guard let failure = await InventoryExport.run(format: format, apps: library.apps, casks: homebrew.packages ?? []) else { return }
+ let failure = await InventoryExport.run(
+ format: format, apps: library.apps, casks: homebrew.answeredPackages
+ )
+ guard let failure else { return }
let alert = NSAlert()
alert.messageText = String(localized: "The list couldn’t be saved.")
alert.informativeText = failure
diff --git a/Peel/Views/AppList.swift b/Peel/Views/AppList.swift
index 9a21a7fe..64136b71 100644
--- a/Peel/Views/AppList.swift
+++ b/Peel/Views/AppList.swift
@@ -151,7 +151,11 @@ private struct ExportMenu: View {
// whole menu waits for that list, because without it every cask app's source would read "Unknown".
ForEach(Inventory.Format.allCases.filter { $0 != .brewfile || homebrew.isInstalled }, id: \.self) { format in
Button(String(localized: format.title)) {
- Task { failure = await InventoryExport.run(format: format, apps: library.apps, casks: homebrew.packages ?? []) }
+ Task {
+ failure = await InventoryExport.run(
+ format: format, apps: library.apps, casks: homebrew.answeredPackages
+ )
+ }
}
}
} label: {