Move createDirectory to FileManagerClient

Author: finestructure

Sources/App/Commands/Analyze.swift

@@ -236,9 +236,10 @@ extension Analyze {
                                          path: String) async throws {
         Current.logger().info("Creating checkouts directory at path: \(path)")
         do {
-            try Current.fileManager.createDirectory(atPath: path,
-                                                    withIntermediateDirectories: false,
-                                                    attributes: nil)
+            @Dependency(\.fileManager) var fileManager
+            try fileManager.createDirectory(atPath: path,
+                                            withIntermediateDirectories: false,
+                                            attributes: nil)
         } catch {
             let error = AppError.genericError(nil, "Failed to create checkouts directory: \(error.localizedDescription)")
             Current.logger().report(error: error)

Sources/App/Core/AppEnvironment.swift

@@ -45,22 +45,15 @@ extension AppEnvironment {
 
 
 struct FileManager: Sendable {
-    var createDirectory: @Sendable (String, Bool, [FileAttributeKey : Any]?) throws -> Void
     var fileExists: @Sendable (String) -> Bool
     var removeItem: @Sendable (_ path: String) throws -> Void
     var workingDirectory: @Sendable () -> String
 
     // pass-through methods to preserve argument labels
-    func createDirectory(atPath path: String,
-                         withIntermediateDirectories createIntermediates: Bool,
-                         attributes: [FileAttributeKey : Any]?) throws {
-        try createDirectory(path, createIntermediates, attributes)
-    }
     func fileExists(atPath path: String) -> Bool { fileExists(path) }
     func removeItem(atPath path: String) throws { try removeItem(path) }
 
     static let live: Self = .init(
-        createDirectory: { try Foundation.FileManager.default.createDirectory(atPath: $0, withIntermediateDirectories: $1, attributes: $2) },
         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

@@ -26,6 +26,7 @@ struct FileManagerClient {
     var checkoutsDirectory: @Sendable () -> String = { reportIssue("checkoutsDirectory"); return "SPI-checkouts" }
     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
 }
 
 
@@ -43,7 +44,8 @@ extension FileManagerClient: DependencyKey {
             attributesOfItem: { try Foundation.FileManager.default.attributesOfItem(atPath: $0) },
             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) }
+            contentsOfDirectory: { try Foundation.FileManager.default.contentsOfDirectory(atPath: $0) },
+            createDirectory: { try Foundation.FileManager.default.createDirectory(atPath: $0, withIntermediateDirectories: $1, attributes: $2) }
         )
     }
 }

Tests/AppTests/AnalyzerTests.swift

@@ -33,6 +33,7 @@ class AnalyzerTests: AppTestCase {
         // End-to-end test, where we mock at the shell command level (i.e. we
         // don't mock the git commands themselves to ensure we're running the
         // expected shell commands for the happy path.)
+        let checkoutDir = QueueIsolated<String?>(nil)
         try await withDependencies {
             $0.date.now = .now
             $0.environment.allowSocialPosts = { true }
@@ -43,6 +44,7 @@ class AnalyzerTests: AppTestCase {
                     return nil
                 }
             }
+            $0.fileManager.createDirectory = { @Sendable path, _, _ in checkoutDir.setValue(path) }
             $0.httpClient.mastodonPost = { @Sendable _ in }
         } operation: {
             // setup
@@ -62,7 +64,6 @@ class AnalyzerTests: AppTestCase {
                                  owner: "foo",
                                  stars: 100).save(on: app.db)
 
-            let checkoutDir = QueueIsolated<String?>(nil)
             let commands = QueueIsolated<[Command]>([])
             let firstDirCloned = QueueIsolated(false)
             Current.fileManager.fileExists = { @Sendable path in
@@ -75,7 +76,6 @@ class AnalyzerTests: AppTestCase {
                 if path.hasSuffix("Package.resolved") { return true }
                 return false
             }
-            Current.fileManager.createDirectory = { @Sendable path, _, _ in checkoutDir.setValue(path) }
             Current.git = .live
             Current.shell.run = { @Sendable cmd, path in
                 let trimmedPath = path.replacingOccurrences(of: checkoutDir.value!, with: ".")
@@ -409,26 +409,26 @@ class AnalyzerTests: AppTestCase {
 
     func test_continue_on_exception() async throws {
         // Test to ensure exceptions don't interrupt processing
+        let checkoutDir: NIOLockedValueBox<String?> = .init(nil)
         try await withDependencies {
             $0.date.now = .now
             $0.environment.allowSocialPosts = { true }
             $0.environment.loadSPIManifest = { _ in nil }
+            $0.fileManager.createDirectory = { @Sendable path, _, _ in checkoutDir.withLockedValue { $0 = path } }
         } operation: {
             // setup
             let urls = ["https://github.com/foo/1", "https://github.com/foo/2"]
             let pkgs = try await savePackages(on: app.db, urls.asURLs, processingStage: .ingestion)
             for p in pkgs {
                 try await Repository(package: p, defaultBranch: "main").save(on: app.db)
             }
-            let checkoutDir: NIOLockedValueBox<String?> = .init(nil)
 
             Current.fileManager.fileExists = { @Sendable path in
                 if let outDir = checkoutDir.withLockedValue({ $0 }), path == "\(outDir)/github.com-foo-1" { return true }
                 if let outDir = checkoutDir.withLockedValue({ $0 }), path == "\(outDir)/github.com-foo-2" { return true }
                 if path.hasSuffix("Package.swift") { return true }
                 return false
             }
-            Current.fileManager.createDirectory = { @Sendable path, _, _ in checkoutDir.withLockedValue { $0 = path } }
 
             Current.git = .live
 

Tests/AppTests/Mocks/AppFileManager+mock.swift

@@ -21,7 +21,6 @@ extension App.FileManager {
     static let mock = Self.mock(fileExists: true)
     static func mock(fileExists: Bool) -> Self {
         .init(
-            createDirectory: { _, _, _ in },
             fileExists: { path in fileExists },
             removeItem: { _ in },
             workingDirectory: { DirectoryConfiguration.detect().workingDirectory }