Merge pull request #3641 from SwiftPackageIndex/issue-3469-dependency-transition-24

Issue 3469 dependency transition 24

Author: finestructure

Sources/App/Commands/Analyze.swift

@@ -398,7 +398,7 @@ extension Analyze {
             throw AppError.analysisError(package.model.id, "Package must have default branch")
         }
 
-        guard try await Current.git.hasBranch(defaultBranch, cacheDir) else {
+        guard try await git.hasBranch(defaultBranch, at: cacheDir) else {
             throw AppError.analysisError(package.model.id, "Default branch '\(defaultBranch)' does not exist in checkout")
         }
 
@@ -407,7 +407,7 @@ extension Analyze {
         let references = [defaultBranch] + tags
         return try await references
             .mapAsync { ref in
-                let revInfo = try await Current.git.revisionInfo(ref, cacheDir)
+                let revInfo = try await git.revisionInfo(ref, at: cacheDir)
                 let url = package.model.versionUrl(for: ref)
                 return try Version(package: package.model,
                                    commit: revInfo.commit,

Sources/App/Core/AppEnvironment.swift

@@ -23,7 +23,6 @@ import FoundationNetworking
 
 
 struct AppEnvironment: Sendable {
-    var git: Git
     var logger: @Sendable () -> Logger
     var setLogger: @Sendable (Logger) -> Void
     var shell: Shell
@@ -34,7 +33,6 @@ extension AppEnvironment {
     nonisolated(unsafe) static var logger: Logger!
 
     static let live = AppEnvironment(
-        git: .live,
         logger: { logger },
         setLogger: { logger in Self.logger = logger },
         shell: .live
@@ -43,19 +41,6 @@ extension AppEnvironment {
 
 
 
-struct Git: Sendable {
-    var hasBranch: @Sendable (Reference, String) async throws -> Bool
-    var revisionInfo: @Sendable (Reference, String) async throws -> RevisionInfo
-    var shortlog: @Sendable (String) async throws -> String
-
-    static let live: Self = .init(
-        hasBranch: { ref, path in try await hasBranch(ref, at: path) },
-        revisionInfo: { ref, path in try await revisionInfo(ref, at: path) },
-        shortlog: { path in try await shortlog(at: path) }
-    )
-}
-
-
 struct Shell: Sendable {
     var run: @Sendable (ShellOutCommand, String) async throws -> String
 

Sources/App/Core/Dependencies/GitClient.swift

@@ -24,7 +24,10 @@ struct GitClient {
     var commitCount: @Sendable (_ at: String) async throws -> Int
     var firstCommitDate: @Sendable (_ at: String) async throws -> Date
     var getTags: @Sendable (_ at: String) async throws -> [Reference]
+    var hasBranch: @Sendable (Reference, _ at: String) async throws -> Bool
     var lastCommitDate: @Sendable (_ at: String) async throws -> Date
+    var revisionInfo: @Sendable (Reference, _ at: String) async throws -> Git.RevisionInfo
+    var shortlog: @Sendable (_ at: String) async throws -> String
 }
 
 
@@ -34,7 +37,10 @@ extension GitClient: DependencyKey {
             commitCount: { path in try await Git.commitCount(at: path) },
             firstCommitDate: { path in try await Git.firstCommitDate(at: path) },
             getTags: { path in try await Git.getTags(at: path) },
-            lastCommitDate: { path in try await Git.lastCommitDate(at: path) }
+            hasBranch: { ref, path in try await Git.hasBranch(ref, at: path) },
+            lastCommitDate: { path in try await Git.lastCommitDate(at: path) },
+            revisionInfo: { ref, path in try await Git.revisionInfo(ref, at: path) },
+            shortlog: { path in try await Git.shortlog(at: path) }
         )
     }
 }

Sources/App/Core/Git.swift

@@ -17,18 +17,18 @@ import SemanticVersion
 import ShellOut
 
 
-enum GitError: LocalizedError {
-    case invalidInteger
-    case invalidTimestamp
-    case invalidRevisionInfo(String)
-}
+enum Git {
 
-extension Git {
+    enum Error: LocalizedError {
+        case invalidInteger
+        case invalidTimestamp
+        case invalidRevisionInfo(String)
+    }
 
     static func commitCount(at path: String) async throws -> Int {
         let res = try await Current.shell.run(command: .gitCommitCount, at: path)
         guard let count = Int(res) else {
-            throw GitError.invalidInteger
+            throw Error.invalidInteger
         }
         return count
     }
@@ -39,7 +39,7 @@ extension Git {
                 .trimming { $0 == Character("\"") }
         )
         guard let timestamp = TimeInterval(res) else {
-            throw GitError.invalidTimestamp
+            throw Error.invalidTimestamp
         }
         return Date(timeIntervalSince1970: timestamp)
     }
@@ -50,7 +50,7 @@ extension Git {
                 .trimming { $0 == Character("\"") }
         )
         guard let timestamp = TimeInterval(res) else {
-            throw GitError.invalidTimestamp
+            throw Error.invalidTimestamp
         }
         return Date(timeIntervalSince1970: timestamp)
     }
@@ -83,10 +83,10 @@ extension Git {
         let parts = res.components(separatedBy: separator)
         guard parts.count == 2 else {
             Current.logger().warning(#"Git.invalidRevisionInfo: \#(res) for '\#(ShellOutCommand.gitRevisionInfo(reference: reference, separator: separator))' at: \#(path)"#)
-            throw GitError.invalidRevisionInfo(res)
+            throw Error.invalidRevisionInfo(res)
         }
         let hash = parts[0]
-        guard let timestamp = TimeInterval(parts[1]) else { throw GitError.invalidTimestamp }
+        guard let timestamp = TimeInterval(parts[1]) else { throw Error.invalidTimestamp }
         let date = Date(timeIntervalSince1970: timestamp)
         return .init(commit: hash, date: date)
     }
@@ -99,4 +99,5 @@ extension Git {
         let commit: CommitHash
         let date: Date
     }
+
 }

Sources/App/Core/PackageContributors.swift

@@ -68,13 +68,15 @@ enum PackageContributors {
         /// Gets the git history in a string log
         private static func runShortlog(gitCacheDirectoryPath: String, packageID: UUID?) async throws -> String {
             @Dependency(\.fileManager) var fileManager
+            @Dependency(\.git) var git
+
             if fileManager.fileExists(atPath: gitCacheDirectoryPath) == false {
                 throw AppError.cacheDirectoryDoesNotExist(packageID, gitCacheDirectoryPath)
             }
 
             // attempt to shortlog
             do {
-                return try await Current.git.shortlog(gitCacheDirectoryPath)
+                return try await git.shortlog(gitCacheDirectoryPath)
             } catch {
                 throw AppError.shellCommandFailed("gitShortlog",
                                                   gitCacheDirectoryPath,

Tests/AppTests/AnalyzeErrorTests.swift

@@ -73,22 +73,6 @@ final class AnalyzeErrorTests: AppTestCase {
             Repository(package: pkgs[1], defaultBranch: "main", name: "2", owner: "foo"),
         ].save(on: app.db)
 
-        Current.git.hasBranch = { @Sendable _, _ in true }
-        Current.git.revisionInfo = { @Sendable ref, checkoutDir in
-            if checkoutDir.hasSuffix("foo-1") { return .init(commit: "commit \(ref)", date: .t1) }
-            if checkoutDir.hasSuffix("foo-2") { return .init(commit: "commit \(ref)", date: .t1) }
-            throw SetupError()
-        }
-        Current.git.shortlog = { @Sendable _ in
-            """
-            1000\tPerson 1
-             871\tPerson 2
-             703\tPerson 3
-             360\tPerson 4
-             108\tPerson 5
-            """
-        }
-
         Current.shell.run = Self.defaultShellRun
     }
 
@@ -103,7 +87,22 @@ final class AnalyzeErrorTests: AppTestCase {
                 if checkoutDir.hasSuffix("foo-2") { return [.tag(1, 2, 3)] }
                 throw SetupError()
             }
+            $0.git.hasBranch = { @Sendable _, _ in true }
             $0.git.lastCommitDate = { @Sendable _ in .t1 }
+            $0.git.revisionInfo = { @Sendable ref, checkoutDir in
+                if checkoutDir.hasSuffix("foo-1") { return .init(commit: "commit \(ref)", date: .t1) }
+                if checkoutDir.hasSuffix("foo-2") { return .init(commit: "commit \(ref)", date: .t1) }
+                throw SetupError()
+            }
+            $0.git.shortlog = { @Sendable _ in
+                """
+                1000\tPerson 1
+                 871\tPerson 2
+                 703\tPerson 3
+                 360\tPerson 4
+                 108\tPerson 5
+                """
+            }
             $0.httpClient.mastodonPost = { @Sendable [socialPosts = self.socialPosts] message in
                 socialPosts.withValue { $0.append(message) }
             }