Merge pull request #3638 from SwiftPackageIndex/issue-3469-dependency-transition-23

Issue 3469 dependency transition 23

Author: finestructure

Sources/App/Commands/Analyze.swift

@@ -326,17 +326,19 @@ extension Analyze {
     ///   - package: `Package` to update
     /// - Returns: result future
     static func updateRepository(on database: Database, package: Joined<Package, Repository>) async throws {
+        @Dependency(\.fileManager) var fileManager
+        @Dependency(\.git) var git
+
         guard let repo = package.repository else {
             throw AppError.genericError(package.model.id, "updateRepository: no repository")
         }
-        @Dependency(\.fileManager) var fileManager
         guard let gitDirectory = fileManager.cacheDirectoryPath(for: package.model) else {
             throw AppError.invalidPackageCachePath(package.model.id, package.model.url)
         }
 
-        repo.commitCount = (try? await Current.git.commitCount(gitDirectory)) ?? 0
-        repo.firstCommitDate = try? await Current.git.firstCommitDate(gitDirectory)
-        repo.lastCommitDate = try? await Current.git.lastCommitDate(gitDirectory)
+        repo.commitCount = (try? await git.commitCount(at: gitDirectory)) ?? 0
+        repo.firstCommitDate = try? await git.firstCommitDate(at: gitDirectory)
+        repo.lastCommitDate = try? await git.lastCommitDate(at: gitDirectory)
         repo.authors = try? await PackageContributors.extract(gitCacheDirectoryPath: gitDirectory, packageID: package.model.id)
 
         try await repo.update(on: database)
@@ -384,6 +386,8 @@ extension Analyze {
     static func getIncomingVersions(client: Client,
                                     package: Joined<Package, Repository>) async throws -> [Version] {
         @Dependency(\.fileManager) var fileManager
+        @Dependency(\.git) var git
+        
         guard let cacheDir = fileManager.cacheDirectoryPath(for: package.model) else {
             throw AppError.invalidPackageCachePath(package.model.id, package.model.url)
         }
@@ -398,7 +402,7 @@ extension Analyze {
             throw AppError.analysisError(package.model.id, "Default branch '\(defaultBranch)' does not exist in checkout")
         }
 
-        let tags = try await Current.git.getTags(cacheDir)
+        let tags = try await git.getTags(at: cacheDir)
 
         let references = [defaultBranch] + tags
         return try await references

Sources/App/Core/AppEnvironment.swift

@@ -44,19 +44,11 @@ extension AppEnvironment {
 
 
 struct Git: Sendable {
-    var commitCount: @Sendable (String) async throws -> Int
-    var firstCommitDate: @Sendable (String) async throws -> Date
-    var lastCommitDate: @Sendable (String) async throws -> Date
-    var getTags: @Sendable (String) async throws -> [Reference]
     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(
-        commitCount: { path in try await commitCount(at: path) },
-        firstCommitDate: { path in try await firstCommitDate(at: path) },
-        lastCommitDate: { path in try await lastCommitDate(at: path) },
-        getTags: { path in try await getTags(at: path) },
         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) }

Sources/App/Core/Dependencies/GitClient.swift

@@ -0,0 +1,53 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import Foundation
+
+import Dependencies
+import DependenciesMacros
+import IssueReporting
+
+
+@DependencyClient
+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 lastCommitDate: @Sendable (_ at: String) async throws -> Date
+}
+
+
+extension GitClient: DependencyKey {
+    static var liveValue: Self {
+        .init(
+            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) }
+        )
+    }
+}
+
+
+extension GitClient: TestDependencyKey {
+    static var testValue: Self { .init() }
+}
+
+
+extension DependencyValues {
+    var git: GitClient {
+        get { self[GitClient.self] }
+        set { self[GitClient.self] = newValue }
+    }
+}

Tests/AppTests/AnalyzeErrorTests.swift

@@ -73,14 +73,6 @@ final class AnalyzeErrorTests: AppTestCase {
             Repository(package: pkgs[1], defaultBranch: "main", name: "2", owner: "foo"),
         ].save(on: app.db)
 
-        Current.git.commitCount = { @Sendable _ in 1 }
-        Current.git.firstCommitDate = { @Sendable _ in .t0 }
-        Current.git.lastCommitDate = { @Sendable _ in .t1 }
-        Current.git.getTags = { @Sendable checkoutDir in
-            if checkoutDir.hasSuffix("foo-1") { return [] }
-            if checkoutDir.hasSuffix("foo-2") { return [.tag(1, 2, 3)] }
-            throw SetupError()
-        }
         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) }
@@ -104,6 +96,14 @@ final class AnalyzeErrorTests: AppTestCase {
         withDependencies {
             $0.date.now = .t0
             $0.environment.allowSocialPosts = { true }
+            $0.git.commitCount = { @Sendable _ in 1 }
+            $0.git.firstCommitDate = { @Sendable _ in .t0 }
+            $0.git.getTags = { @Sendable checkoutDir in
+                if checkoutDir.hasSuffix("foo-1") { return [] }
+                if checkoutDir.hasSuffix("foo-2") { return [.tag(1, 2, 3)] }
+                throw SetupError()
+            }
+            $0.git.lastCommitDate = { @Sendable _ in .t1 }
             $0.httpClient.mastodonPost = { @Sendable [socialPosts = self.socialPosts] message in
                 socialPosts.withValue { $0.append(message) }
             }