Add internal archiverFactory to RegistryManager for DI

Author: mattt

Sources/PackageRegistry/RegistryManager.swift

@@ -29,6 +29,10 @@ public enum RegistryError: Error {
 }
 
 public final class RegistryManager {
+    internal static var archiverFactory: (FileSystem) -> Archiver = { fileSystem in
+        return ZipArchiver(fileSystem: fileSystem)
+    }
+
     internal static var clientFactory: () -> HTTPClientProtocol = {
         var configuration = HTTPClientConfiguration()
         configuration.followRedirects = false
@@ -169,7 +173,7 @@ public final class RegistryManager {
         for version: Version,
         of package: PackageReference,
         into fileSystem: FileSystem,
-        at path: AbsolutePath,
+        at destinationPath: AbsolutePath,
         expectedChecksum: ByteString? = nil,
         completion: @escaping (Result<Void, Error>) -> Void
     ) {
@@ -184,12 +188,14 @@ public final class RegistryManager {
             method: .get,
             url: url,
             headers: [
-                "Accept": "application/vnd.swift.registry.v1+zip"
+                "Accept": "application/vnd.swift.registry.v1+zip",
             ]
         )
 
+        let client = Self.clientFactory()
         client.execute(request) { result in
-            completion(result.tryMap { response in
+            switch result {
+            case .success(let response):
                 if response.statusCode == 200,
                    response.headers.get("Content-Version").first == "1",
                    response.headers.get("Content-Type").first?.hasPrefix("application/zip") == true,
@@ -210,24 +216,26 @@ public final class RegistryManager {
                             )
                         }
 
-                        let archivePath = path.withExtension("zip")
+                        let archivePath = destinationPath.withExtension("zip")
                         try fileSystem.writeFileContents(archivePath, bytes: contents)
 
-                        try fileSystem.createDirectory(path, recursive: true)
+                        try fileSystem.createDirectory(destinationPath, recursive: true)
 
-                        let archiver = ZipArchiver(fileSystem: fileSystem)
-                        archiver.extract(from: archivePath, to: path) { result in
-                            try? fileSystem.removeFileTree(archivePath)
+                        let archiver = Self.archiverFactory(fileSystem)
+                        archiver.extract(from: archivePath, to: destinationPath) { result in
                             completion(result)
+                            try? fileSystem.removeFileTree(archivePath)
                         }
                     } catch {
-                        try? fileSystem.removeFileTree(path)
-                        throw error
+                        try? fileSystem.removeFileTree(destinationPath)
+                        completion(.failure(error))
                     }
                 } else {
-                    throw RegistryError.invalidResponse
+                    completion(.failure(RegistryError.invalidResponse))
                 }
-            })
+            case .failure(let error):
+                completion(.failure(error))
+            }
         }
     }
 }

Tests/PackageRegistryTests/RegistryManagerTests.swift

@@ -27,6 +27,10 @@ final class RegistryManagerTests: XCTestCase {
     override func setUp() {
         PackageModel._useLegacyIdentities = false
 
+        RegistryManager.archiverFactory = { _ in
+            return MockArchiver()
+        }
+
         RegistryManager.clientFactory = {
             let configuration = URLSessionConfiguration.default
             configuration.protocolClasses = [MockPackageRegistryURLProtocol.self] + (configuration.protocolClasses ?? [])