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.

Say a tool is installed though Peel won't run the brew under it

Țugui Dragoșd6a1277bc6f6
diff --git a/Peel/Model/TerminalToolLibrary.swift b/Peel/Model/TerminalToolLibrary.swift
index 1ea27d49..99d4b59a 100644
--- a/Peel/Model/TerminalToolLibrary.swift
+++ b/Peel/Model/TerminalToolLibrary.swift
@@ -30,10 +30,11 @@ final class TerminalToolLibrary {
func refresh() async {
let prefix = Homebrew.executableURL?.deletingLastPathComponent().deletingLastPathComponent()
- let installed = prefix.map { prefix in TerminalTool.allCases.filter { $0.isInstalled(prefix: prefix) } } ?? []
+ let unrunnable = HomebrewChoice().unrunnable()
+ let refused = Homebrew.refusedInAUsualPlace()
state = State(
- prefix: prefix, installed: Set(installed), unrunnable: HomebrewChoice().unrunnable(),
- refused: Homebrew.refusedInAUsualPlace()
+ prefix: prefix, installed: Self.installed(prefix: prefix, refused: refused, unrunnable: unrunnable),
+ unrunnable: unrunnable, refused: refused
)
guard let prefix else { return }
if case .notAsked = asked {
@@ -46,6 +47,16 @@ final class TerminalToolLibrary {
await askingHomebrew?.value
}
+ /// What is on the disk under the `brew` Peel runs, or under one it won't run, which it never asks: that a tool is
+ /// installed is only a look at a folder.
+ static func installed(
+ prefix: URL?, refused: HomebrewChoice.Unrunnable?, unrunnable: HomebrewChoice.Unrunnable?
+ ) -> Set<TerminalTool> {
+ let brew = (refused ?? unrunnable)?.brew
+ guard let folder = prefix ?? brew?.deletingLastPathComponent().deletingLastPathComponent() else { return [] }
+ return Set(TerminalTool.allCases.filter { $0.isInstalled(prefix: folder) })
+ }
+
func availability(of tool: TerminalTool) -> TerminalTool.Availability? {
Self.availability(of: tool, in: asked)
}
diff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swift
index cb0adcf5..7417d424 100644
--- a/PeelTests/TerminalLibrariesTests.swift
+++ b/PeelTests/TerminalLibrariesTests.swift
@@ -1,6 +1,6 @@
import Foundation
@testable import Peel
-import PeelCore
+@testable import PeelCore
import Testing
private final class FakeTerminalSettings: TerminalSettingsStoring {
@@ -214,6 +214,23 @@ struct TerminalLibrariesTests {
#expect(!library.wasRefused)
}
+ @Test func aToolIsInstalledThoughPeelWontRunTheBrewThatInstalledIt() throws {
+ let home = try madeUpHome()
+ defer { try? FileManager.default.removeItem(at: home) }
+ let prefix = home.appending(path: "homebrew", directoryHint: .isDirectory)
+ let tool = try #require(TerminalTool.allCases.first)
+ let formula = try #require(tool.formulae.first)
+ try FileManager.default.createDirectory(
+ at: prefix.appending(path: "opt/\(formula)", directoryHint: .isDirectory), withIntermediateDirectories: true
+ )
+ let refused = HomebrewChoice.Unrunnable(brew: prefix.appending(path: "bin/brew"), refusal: .ownedByAnotherAccount)
+
+ #expect(TerminalToolLibrary.installed(prefix: nil, refused: refused, unrunnable: nil).contains(tool))
+ #expect(TerminalToolLibrary.installed(prefix: nil, refused: nil, unrunnable: refused).contains(tool))
+ #expect(TerminalToolLibrary.installed(prefix: prefix, refused: nil, unrunnable: nil).contains(tool))
+ #expect(TerminalToolLibrary.installed(prefix: nil, refused: nil, unrunnable: nil).isEmpty)
+ }
+
@Test func aToolsAvailabilityIsNotKnownWhileHomebrewIsAsked() {
let fzf = HomebrewPackage(name: "fzf", kind: .formula)
let catalog = TerminalToolLibrary.Catalog(known: ["fzf"], packages: [fzf])