Move fileExists to FileManagerClient

Author: finestructure

Sources/App/Commands/Analyze.swift

@@ -143,7 +143,7 @@ extension Analyze {
         @Dependency(\.fileManager) var fileManager
         let checkoutDir = fileManager.checkoutsDirectory()
         Current.logger().info("Checkout directory: \(checkoutDir)")
-        if !Current.fileManager.fileExists(atPath: checkoutDir) {
+        if !fileManager.fileExists(atPath: checkoutDir) {
             try await createCheckoutsDirectory(client: client, path: checkoutDir)
         }
 
@@ -267,11 +267,12 @@ extension Analyze {
     ///   - url: url to fetch from
     /// - Throws: Shell errors
     static func fetch(cacheDir: String, branch: String, url: String) async throws {
+        @Dependency(\.fileManager) var fileManager
         Current.logger().info("pulling \(url) in \(cacheDir)")
         // clean up stray lock files that might have remained from aborted commands
         for fileName in ["HEAD.lock", "index.lock"] {
             let filePath = cacheDir + "/.git/\(fileName)"
-            if Current.fileManager.fileExists(atPath: filePath) {
+            if fileManager.fileExists(atPath: filePath) {
                 Current.logger().info("Removing stale \(fileName) at path: \(filePath)")
                 try await Current.shell.run(command: .removeFile(from: filePath))
             }
@@ -296,7 +297,7 @@ extension Analyze {
         }
 
         do {
-            guard Current.fileManager.fileExists(atPath: cacheDir) else {
+            guard fileManager.fileExists(atPath: cacheDir) else {
                 try await clone(cacheDir: cacheDir, url: package.model.url)
                 return
             }
@@ -530,7 +531,8 @@ extension Analyze {
     /// - Throws: Shell errors or AppError.invalidRevision if there is no Package.swift file
     /// - Returns: `Manifest` data
     static func dumpPackage(at path: String) async throws -> Manifest {
-        guard Current.fileManager.fileExists(atPath: path + "/Package.swift") else {
+        @Dependency(\.fileManager) var fileManager
+        guard fileManager.fileExists(atPath: path + "/Package.swift") else {
             // It's important to check for Package.swift - otherwise `dump-package` will go
             // up the tree through parent directories to find one
             throw AppError.invalidRevision(nil, "no Package.swift")

Sources/App/Commands/ReAnalyzeVersions.swift

@@ -185,7 +185,7 @@ enum ReAnalyzeVersions {
                     try await dependencies.yield {
                         @Dependency(\.fileManager) var fileManager
                         guard let cacheDir = fileManager.cacheDirectoryPath(for: pkg.model) else { return }
-                        if !Current.fileManager.fileExists(atPath: cacheDir) || refreshCheckouts {
+                        if !fileManager.fileExists(atPath: cacheDir) || refreshCheckouts {
                             try await Analyze.refreshCheckout(package: pkg)
                         }
 

Sources/App/Core/AppEnvironment.swift

@@ -45,16 +45,13 @@ extension AppEnvironment {
 
 
 struct FileManager: Sendable {
-    var fileExists: @Sendable (String) -> Bool
     var removeItem: @Sendable (_ path: String) throws -> Void
     var workingDirectory: @Sendable () -> String
 
     // pass-through methods to preserve argument labels
-    func fileExists(atPath path: String) -> Bool { fileExists(path) }
     func removeItem(atPath path: String) throws { try removeItem(path) }
 
     static let live: Self = .init(
-        fileExists: { Foundation.FileManager.default.fileExists(atPath: $0) },
         removeItem: { try Foundation.FileManager.default.removeItem(atPath: $0) },
         workingDirectory: { DirectoryConfiguration.detect().workingDirectory }
     )

Sources/App/Core/Dependencies/FileManagerClient.swift

@@ -27,6 +27,7 @@ struct FileManagerClient {
     var contents: @Sendable (_ atPath: String) -> Data?
     var contentsOfDirectory: @Sendable (_ atPath: String) throws -> [String]
     var createDirectory: @Sendable (_ atPath: String, _ withIntermediateDirectories: Bool, _ attributes: [FileAttributeKey : Any]?) throws -> Void
+    var fileExists: @Sendable (_ atPath: String) -> Bool = { reportIssue("fileExists"); return Foundation.FileManager.default.fileExists(atPath: $0) }
 }
 
 
@@ -45,7 +46,8 @@ extension FileManagerClient: DependencyKey {
             checkoutsDirectory: { Environment.get("CHECKOUTS_DIR") ?? DirectoryConfiguration.detect().workingDirectory + "SPI-checkouts" },
             contents: { Foundation.FileManager.default.contents(atPath: $0) },
             contentsOfDirectory: { try Foundation.FileManager.default.contentsOfDirectory(atPath: $0) },
-            createDirectory: { try Foundation.FileManager.default.createDirectory(atPath: $0, withIntermediateDirectories: $1, attributes: $2) }
+            createDirectory: { try Foundation.FileManager.default.createDirectory(atPath: $0, withIntermediateDirectories: $1, attributes: $2) },
+            fileExists: { Foundation.FileManager.default.fileExists(atPath: $0) }
         )
     }
 }

Sources/App/Core/PackageContributors.swift

@@ -13,6 +13,8 @@
 // limitations under the License.
 
 import Foundation
+
+import Dependencies
 import ShellOut
 import Vapor
 
@@ -65,8 +67,8 @@ enum PackageContributors {
 
         /// Gets the git history in a string log
         private static func runShortlog(gitCacheDirectoryPath: String, packageID: UUID?) async throws -> String {
-
-            if Current.fileManager.fileExists(atPath: gitCacheDirectoryPath) == false {
+            @Dependency(\.fileManager) var fileManager
+            if fileManager.fileExists(atPath: gitCacheDirectoryPath) == false {
                 throw AppError.cacheDirectoryDoesNotExist(packageID, gitCacheDirectoryPath)
             }
 

Tests/AppTests/AnalyzeErrorTests.swift

@@ -204,15 +204,13 @@ final class AnalyzeErrorTests: AppTestCase {
     func test_analyze_dumpPackage_missing_manifest() async throws {
         try await withDependencies {
             $0.environment.loadSPIManifest = { _ in nil }
-        } operation: {
-            // setup
-            Current.fileManager.fileExists = { @Sendable path in
+            $0.fileManager.fileExists = { @Sendable path in
                 if path.hasSuffix("github.com-foo-1/Package.swift") {
                     return false
                 }
                 return true
             }
-            
+        } operation: {
             // MUT
             try await Analyze.analyze(client: app.client,
                                       database: app.db,