Use GitResetService to reset git repos

JamitLabs · May 3, 2019 · c7ec9d9 · c7ec9d9
1 parent c78a837
commit c7ec9d9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift b/Sources/AccioKit/Commands/Protocols/DependencyInstaller.swift
@@ -35,14 +35,12 @@ extension DependencyInstaller {
 
                 if try FileManager.default.isDirectory(atPath: frameworkCheckoutPath) {
                     do {
-                        try bash("git -C '\(frameworkCheckoutPath)' reset HEAD --hard --quiet 2> /dev/null")
-                        try bash("git -C '\(frameworkCheckoutPath)' clean -fd --quiet 2> /dev/null")
-                        try bash("git -C '\(frameworkCheckoutPath)' clean -fdX --quiet 2> /dev/null")
+                        try GitResetService.shared.resetGit(atPath: frameworkCheckoutPath)
                     }
                     catch {
                         // Remove checkout if git reset fails for some reason
                         // If the checkout is missing, SPM will automatically clone again in the next step
-                        try FileManager.default.removeItem(atPath: frameworkCheckoutPath)
+                        try bash("rm -rf '\(frameworkCheckoutPath)'")
                     }
                 }
             }

diff --git a/Sources/AccioKit/Services/CachedBuilderService.swift b/Sources/AccioKit/Services/CachedBuilderService.swift
@@ -27,9 +27,7 @@ final class CachedBuilderService {
                     frameworkProducts.append(frameworkProduct)
 
                 case .carthage:
-                    try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet")
-                    try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet")
-
+                    try GitResetService.shared.resetGit(atPath: framework.projectDirectory)
                     let frameworkProduct = try carthageBuilderService.build(
                         framework: framework,
                         platform: platform,

diff --git a/Sources/AccioKit/Services/CarthageBuilderService.swift b/Sources/AccioKit/Services/CarthageBuilderService.swift
@@ -43,9 +43,7 @@ final class CarthageBuilderService {
 
         // revert any changes to prevent issues when removing checked out dependency
         try bash("rm -rf '\(framework.projectDirectory)/Carthage/Build'")
-        try bash("git -C '\(framework.projectDirectory)' reset HEAD --hard --quiet 2> /dev/null")
-        try bash("git -C '\(framework.projectDirectory)' clean -fd --quiet 2> /dev/null")
-        try bash("git -C '\(framework.projectDirectory)' clean -fdX --quiet 2> /dev/null")
+        try GitResetService.shared.resetGit(atPath: framework.projectDirectory)
 
         guard FileManager.default.fileExists(atPath: frameworkProduct.frameworkDirPath) && FileManager.default.fileExists(atPath: frameworkProduct.symbolsFilePath) else {
             print("Failed to build products to \(platformBuildDir)/\(framework.libraryName).framework(.dSYM).", level: .error)

diff --git a/Sources/AccioKit/Services/GitResetService.swift b/Sources/AccioKit/Services/GitResetService.swift
@@ -0,0 +1,12 @@
+import Foundation
+
+final class GitResetService {
+    static let shared = GitResetService()
+
+    private init() { }
+
+    func resetGit(atPath directory: String) throws {
+        try bash("git -C '\(directory)' reset HEAD --hard --quiet 2> /dev/null")
+        try bash("git -C '\(directory)' clean -fd --quiet 2> /dev/null")
+    }
+}