Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2024-11-24 20:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve errors.

Browse source 
Partial #313

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
This commit is contained in:
Ross Goldberg 2024-10-23 14:11:52 -04:00
parent 06ee9608be
commit 53c64b1758
No known key found for this signature in database
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sources/mas/Commands/Uninstall.swift
View file

@ -44,7 +44,7 @@ extension Mas {
try appLibrary.uninstallApp(app: installedApp) try appLibrary.uninstallApp(app: installedApp)
} }
} catch { } catch {
throw MASError.uninstallFailed throw error as? MASError ?? MASError.uninstallFailed(error: error as NSError)
} }
} }
} }

3
Sources/mas/Controllers/MasAppLibrary.swift
View file

@ -51,8 +51,7 @@ class MasAppLibrary: AppLibrary {
printInfo("App moved to trash: \(path)") printInfo("App moved to trash: \(path)")
} }
} catch { } catch {
printError("Unable to move app to trash.") throw MASError.uninstallFailed(error: error as NSError)
throw MASError.uninstallFailed
} }
} }
} }

7
Sources/mas/Errors/MASError.swift
View file

@ -28,7 +28,7 @@ enum MASError: Error, Equatable {
case noVendorWebsite case noVendorWebsite
case notInstalled(appID: AppID) case notInstalled(appID: AppID)
case uninstallFailed case uninstallFailed(error: NSError?)
case macOSUserMustBeRoot case macOSUserMustBeRoot
case noData case noData
@ -83,7 +83,10 @@ extension MASError: CustomStringConvertible {
return "App does not have a vendor website" return "App does not have a vendor website"
case .notInstalled(let appID): case .notInstalled(let appID):
return "No apps installed with app ID \(appID)" return "No apps installed with app ID \(appID)"
case .uninstallFailed: case .uninstallFailed(let error):
if let error {
return "Uninstall failed: \(error.localizedDescription)"
}
return "Uninstall failed" return "Uninstall failed"
case .macOSUserMustBeRoot: case .macOSUserMustBeRoot:
return "Apps installed from the Mac App Store require root permission to remove." return "Apps installed from the Mac App Store require root permission to remove."

2
Tests/masTests/Commands/UninstallSpec.swift
View file

@ -78,7 +78,7 @@ public class UninstallSpec: QuickSpec {
expect { expect {
try uninstall.run(appLibrary: mockLibrary) try uninstall.run(appLibrary: mockLibrary)
} }
.to(throwError(MASError.uninstallFailed)) .to(throwError(MASError.uninstallFailed(error: nil)))
} }
} }
} }

2
Tests/masTests/Controllers/AppLibraryMock.swift
View file

@ -20,7 +20,7 @@ class AppLibraryMock: AppLibrary {
// Special case for testing where we pretend the trash command failed // Special case for testing where we pretend the trash command failed
if app.bundlePath == "/dev/null" { if app.bundlePath == "/dev/null" {
throw MASError.uninstallFailed throw MASError.uninstallFailed(error: nil)
} }
// Success is the default, watch out for false positives! // Success is the default, watch out for false positives!

2
Tests/masTests/Errors/MASErrorTestCase.swift
View file

@ -114,7 +114,7 @@ class MASErrorTestCase: XCTestCase {
} }
func testUninstallFailed() { func testUninstallFailed() {
error = .uninstallFailed error = .uninstallFailed(error: nil)
XCTAssertEqual(error.description, "Uninstall failed") XCTAssertEqual(error.description, "Uninstall failed")
} }