Added --delete-app flag to xcodes uninstall

This is equivalent to the `--delete-xip` flag that was added to `xcodes install` on the previous commit.

Author: juanjonol

Sources/XcodesKit/XcodeInstaller.swift

@@ -595,7 +595,7 @@ public final class XcodeInstaller {
         }
     }
 
-    public func uninstallXcode(_ versionString: String, directory: Path) -> Promise<Void> {
+    public func uninstallXcode(_ versionString: String, directory: Path, deleteApp: Bool) -> Promise<Void> {
         return firstly { () -> Promise<InstalledXcode> in
             guard let version = Version(xcodeVersion: versionString) else {
                 Current.logging.log(Error.invalidVersion(versionString).legibleLocalizedDescription)
@@ -609,11 +609,17 @@ public final class XcodeInstaller {
 
             return Promise.value(installedXcode)
         }
-        .map { ($0, try Current.files.trashItem(at: $0.path.url)) }
-        .then { (installedXcode, trashURL) -> Promise<(InstalledXcode, URL)> in
+        .map { installedXcode -> (InstalledXcode, URL?) in
+            if deleteApp {
+                try Current.files.removeItem(at: installedXcode.path.url)
+                return (installedXcode, nil)
+            }
+            return (installedXcode, try Current.files.trashItem(at: installedXcode.path.url))
+        }
+        .then { (installedXcode, trashURL) -> Promise<(InstalledXcode, URL?)> in
             // If we just uninstalled the selected Xcode, try to select the latest installed version so things don't accidentally break
             Current.shell.xcodeSelectPrintPath()
-                .then { output -> Promise<(InstalledXcode, URL)> in
+                .then { output -> Promise<(InstalledXcode, URL?)> in
                     if output.out.hasPrefix(installedXcode.path.string),
                        let latestInstalledXcode = Current.files.installedXcodes(directory).sorted(by: { $0.version < $1.version }).last {
                         return selectXcodeAtPath(latestInstalledXcode.path.string)
@@ -628,7 +634,12 @@ public final class XcodeInstaller {
                 }
         }
         .done { (installedXcode, trashURL) in
-            Current.logging.log("Xcode \(installedXcode.version.appleDescription) moved to Trash: \(trashURL.path)".green)
+            if let trashURL = trashURL {
+                Current.logging.log("Xcode \(installedXcode.version.appleDescription) moved to Trash: \(trashURL.path)".green)
+            }
+            else {
+                Current.logging.log("Xcode \(installedXcode.version.appleDescription) deleted".green)
+            }
             Current.shell.exit(0)
         }
     }

Sources/xcodes/main.swift

@@ -351,6 +351,9 @@ struct Xcodes: ParsableCommand {
                   completion: .custom { _ in Current.files.installedXcodes(getDirectory(possibleDirectory: nil)).sorted { $0.version < $1.version }.map { $0.version.appleDescription } })
         var version: [String] = []
 
+        @Flag(help: "Completely delete Xcode, instead of moving it to the user's Trash.")
+        var deleteApp: Bool = false
+        
         @OptionGroup
         var globalDirectory: GlobalDirectoryOption
 
@@ -362,7 +365,7 @@ struct Xcodes: ParsableCommand {
 
             let directory = getDirectory(possibleDirectory: globalDirectory.directory)
 
-            installer.uninstallXcode(version.joined(separator: " "), directory: directory)
+            installer.uninstallXcode(version.joined(separator: " "), directory: directory, deleteApp: deleteApp)
                 .done { Uninstall.exit() }
                 .catch { error in Uninstall.exit(withLegibleError: error) }
 

Tests/XcodesKitTests/XcodesKitTests.swift

@@ -778,7 +778,7 @@ final class XcodesKitTests: XCTestCase {
             return Promise.value((status: 0, out: "", err: ""))
         }
 
-        installer.uninstallXcode("0.0.0", directory: Path.root.join("Applications"))
+        installer.uninstallXcode("0.0.0", directory: Path.root.join("Applications"), deleteApp: false)
             .ensure {
                 XCTAssertEqual(selectedPaths, ["/Applications/Xcode-2.0.1.app"])
                 XCTAssertEqual(trashedItemAtURL, installedXcodes[0].path.url)
@@ -823,7 +823,7 @@ final class XcodesKitTests: XCTestCase {
             return URL(fileURLWithPath: "\(NSHomeDirectory())/.Trash/\(itemURL.lastPathComponent)")
         }
 
-        installer.uninstallXcode("999", directory: Path.root.join("Applications"))
+        installer.uninstallXcode("999", directory: Path.root.join("Applications"), deleteApp: false)
             .ensure {
                 XCTAssertEqual(trashedItemAtURL, installedXcodes[0].path.url)
             }