Quiet the macOS installer messages behind the verbose flag

Provide more verbose untarring messages in Linux behind the verbose flag

Author: cmcgee1024

Sources/LinuxPlatform/Linux.swift

@@ -350,7 +350,7 @@ public struct Linux: Platform {
         }
     }
 
-    public func install(from tmpFile: URL, version: ToolchainVersion) throws {
+    public func install(from tmpFile: URL, version: ToolchainVersion, verbose: Bool) throws {
         guard tmpFile.fileExists() else {
             throw Error(message: "\(tmpFile) doesn't exist")
         }
@@ -371,7 +371,14 @@ public struct Linux: Platform {
             let relativePath = name.drop { c in c != "/" }.dropFirst()
 
             // prepend /path/to/swiftlyHomeDir/toolchains/<toolchain> to each file name
-            return toolchainDir.appendingPathComponent(String(relativePath))
+            let destination = toolchainDir.appendingPathComponent(String(relativePath))
+
+            if verbose {
+                SwiftlyCore.print("\(destination.path)")
+            }
+
+            // prepend /path/to/swiftlyHomeDir/toolchains/<toolchain> to each file name
+            return destination
         }
     }
 

Sources/MacOSPlatform/MacOS.swift

@@ -49,7 +49,7 @@ public struct MacOS: Platform {
         nil
     }
 
-    public func install(from tmpFile: URL, version: ToolchainVersion) throws {
+    public func install(from tmpFile: URL, version: ToolchainVersion, verbose: Bool) throws {
         guard tmpFile.fileExists() else {
             throw Error(message: "\(tmpFile) doesn't exist")
         }
@@ -60,23 +60,26 @@ public struct MacOS: Platform {
 
         if SwiftlyCore.mockedHomeDir == nil {
             SwiftlyCore.print("Installing package in user home directory...")
-            try runProgram("installer", "-pkg", tmpFile.path, "-target", "CurrentUserHomeDirectory")
+            try runProgram("installer", "-verbose", "-pkg", tmpFile.path, "-target", "CurrentUserHomeDirectory", quiet: !verbose)
         } else {
             // In the case of a mock for testing purposes we won't use the installer, perferring a manual process because
             //  the installer will not install to an arbitrary path, only a volume or user home directory.
+            SwiftlyCore.print("Expanding pkg...")
             let tmpDir = self.getTempFilePath()
             let toolchainDir = self.swiftlyToolchainsDir.appendingPathComponent("\(version.identifier).xctoolchain", isDirectory: true)
             if !toolchainDir.fileExists() {
                 try FileManager.default.createDirectory(at: toolchainDir, withIntermediateDirectories: false)
             }
-            try runProgram("pkgutil", "--expand", tmpFile.path, tmpDir.path)
+            try runProgram("pkgutil", "--verbose", "--expand", tmpFile.path, tmpDir.path)
             // There's a slight difference in the location of the special Payload file between official swift packages
             // and the ones that are mocked here in the test framework.
             var payload = tmpDir.appendingPathComponent("Payload")
             if !payload.fileExists() {
                 payload = tmpDir.appendingPathComponent("\(version.identifier)-osx-package.pkg/Payload")
             }
-            try runProgram("tar", "-C", toolchainDir.path, "-xf", payload.path)
+
+            SwiftlyCore.print("Untarring pkg Payload...")
+            try runProgram("tar", "-C", toolchainDir.path, "-xvf", payload.path, quiet: !verbose)
         }
     }
 

Sources/Swiftly/Install.swift

@@ -227,7 +227,7 @@ struct Install: SwiftlyCommand {
             )
         }
 
-        try Swiftly.currentPlatform.install(from: tmpFile, version: version)
+        try Swiftly.currentPlatform.install(from: tmpFile, version: version, verbose: verbose)
 
         config.installedToolchains.insert(version)
 

Sources/SwiftlyCore/Platform.swift

@@ -65,7 +65,7 @@ public protocol Platform {
 
     /// Installs a toolchain from a file on disk pointed to by the given URL.
     /// After this completes, a user can “use” the toolchain.
-    func install(from: URL, version: ToolchainVersion) throws
+    func install(from: URL, version: ToolchainVersion, verbose: Bool) throws
 
     /// Extract swiftly from the provided downloaded archive and install
     /// ourselves from that.

Tests/SwiftlyTests/PlatformTests.swift

@@ -22,23 +22,23 @@ final class PlatformTests: SwiftlyTests {
             // GIVEN: a toolchain has been downloaded
             var (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.7.1")
             // WHEN: the platform installs the toolchain
-            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version)
+            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version, verbose: true)
             // THEN: the toolchain is extracted in the toolchains directory
             var toolchains = try FileManager.default.contentsOfDirectory(at: Swiftly.currentPlatform.swiftlyToolchainsDir, includingPropertiesForKeys: nil)
             XCTAssertEqual(1, toolchains.count)
 
             // GIVEN: a second toolchain has been downloaded
             (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.8.0")
             // WHEN: the platform installs the toolchain
-            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version)
+            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version, verbose: true)
             // THEN: the toolchain is added to the toolchains directory
             toolchains = try FileManager.default.contentsOfDirectory(at: Swiftly.currentPlatform.swiftlyToolchainsDir, includingPropertiesForKeys: nil)
             XCTAssertEqual(2, toolchains.count)
 
             // GIVEN: an identical toolchain has been downloaded
             (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.8.0")
             // WHEN: the platform installs the toolchain
-            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version)
+            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version, verbose: true)
             // THEN: the toolchains directory remains the same
             toolchains = try FileManager.default.contentsOfDirectory(at: Swiftly.currentPlatform.swiftlyToolchainsDir, includingPropertiesForKeys: nil)
             XCTAssertEqual(2, toolchains.count)
@@ -49,9 +49,9 @@ final class PlatformTests: SwiftlyTests {
         try await self.rollbackLocalChanges {
             // GIVEN: toolchains have been downloaded, and installed
             var (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.8.0")
-            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version)
+            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version, verbose: true)
             (mockedToolchainFile, version) = try await self.mockToolchainDownload(version: "5.6.3")
-            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version)
+            try Swiftly.currentPlatform.install(from: mockedToolchainFile, version: version, verbose: true)
             // WHEN: one of the toolchains is uninstalled
             try Swiftly.currentPlatform.uninstall(version)
             // THEN: there is only one remaining toolchain installed