Skip to content

Commit 54cee0a

Browse files
committed
Address Tom's feedback
1 parent c85b5bf commit 54cee0a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

Sources/PackageRegistry/RegistryManager.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ public final class RegistryManager {
4040

4141
private let configuration: RegistryConfiguration
4242
private let identityResolver: IdentityResolver
43-
private let archiverFactory: (FileSystem) -> Archiver
43+
private let archiverProvider: (FileSystem) -> Archiver
4444
private let httpClient: HTTPClient
4545
private let authorizationProvider: HTTPClientAuthorizationProvider?
4646

4747
public init(configuration: RegistryConfiguration,
4848
identityResolver: IdentityResolver,
49-
customArchiverFactory: ((FileSystem) -> Archiver)? = nil,
49+
customArchiverProvider: ((FileSystem) -> Archiver)? = nil,
5050
customHTTPClient: HTTPClient? = nil,
5151
authorizationProvider: HTTPClientAuthorizationProvider? = nil)
5252
{
5353
self.configuration = configuration
5454
self.identityResolver = identityResolver
55-
self.archiverFactory = customArchiverFactory ?? { fileSystem in SourceArchiver(fileSystem: fileSystem) }
55+
self.archiverProvider = customArchiverProvider ?? { fileSystem in SourceArchiver(fileSystem: fileSystem) }
5656
self.httpClient = customHTTPClient ?? HTTPClient()
5757
self.authorizationProvider = authorizationProvider
5858
}
@@ -337,7 +337,7 @@ public final class RegistryManager {
337337
let archivePath = destinationPath.withExtension("zip")
338338
try fileSystem.writeFileContents(archivePath, bytes: contents)
339339

340-
let archiver = self.archiverFactory(fileSystem)
340+
let archiver = self.archiverProvider(fileSystem)
341341
// TODO: Bail if archive contains relative paths or overlapping files
342342
archiver.extract(from: archivePath, to: destinationPath) { result in
343343
completion(result)
@@ -420,7 +420,7 @@ public final class RegistryManager {
420420
}
421421
}
422422

423-
public extension RegistryManager {
423+
private extension RegistryManager {
424424
enum APIVersion: String {
425425
case v1 = "1"
426426
}

Tests/PackageRegistryTests/RegistryManagerTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ final class RegistryManagerTests: XCTestCase {
7272
let registryManager = RegistryManager(
7373
configuration: configuration,
7474
identityResolver: DefaultIdentityResolver(),
75-
customArchiverFactory: { _ in MockArchiver() },
75+
customArchiverProvider: { _ in MockArchiver() },
7676
customHTTPClient: httpClient
7777
)
7878

@@ -131,7 +131,7 @@ final class RegistryManagerTests: XCTestCase {
131131
let registryManager = RegistryManager(
132132
configuration: configuration,
133133
identityResolver: DefaultIdentityResolver(),
134-
customArchiverFactory: { _ in MockArchiver() },
134+
customArchiverProvider: { _ in MockArchiver() },
135135
customHTTPClient: httpClient
136136
)
137137

@@ -286,7 +286,7 @@ final class RegistryManagerTests: XCTestCase {
286286
let registryManager = RegistryManager(
287287
configuration: configuration,
288288
identityResolver: DefaultIdentityResolver(),
289-
customArchiverFactory: { _ in MockArchiver() },
289+
customArchiverProvider: { _ in MockArchiver() },
290290
customHTTPClient: httpClient
291291
)
292292

@@ -337,7 +337,7 @@ final class RegistryManagerTests: XCTestCase {
337337
let registryManager = RegistryManager(
338338
configuration: configuration,
339339
identityResolver: DefaultIdentityResolver(),
340-
customArchiverFactory: { _ in MockArchiver() },
340+
customArchiverProvider: { _ in MockArchiver() },
341341
customHTTPClient: httpClient
342342
)
343343

@@ -431,7 +431,7 @@ final class RegistryManagerTests: XCTestCase {
431431
let registryManager = RegistryManager(
432432
configuration: configuration,
433433
identityResolver: DefaultIdentityResolver(),
434-
customArchiverFactory: { _ in MockArchiver() },
434+
customArchiverProvider: { _ in MockArchiver() },
435435
customHTTPClient: httpClient
436436
)
437437

@@ -496,7 +496,7 @@ final class RegistryManagerTests: XCTestCase {
496496
let registryManager = RegistryManager(
497497
configuration: configuration,
498498
identityResolver: DefaultIdentityResolver(),
499-
customArchiverFactory: { _ in MockArchiver() },
499+
customArchiverProvider: { _ in MockArchiver() },
500500
customHTTPClient: httpClient
501501
)
502502

0 commit comments

Comments
 (0)