added clean-cache subcommand

Author: tgymnich

Sources/Commands/SwiftPackageTool.swift

@@ -153,6 +153,9 @@ public class SwiftPackageTool: SwiftTool<PackageToolOptions> {
         case .reset:
             try getActiveWorkspace().reset(with: diagnostics)
 
+        case .cleanCache:
+            try getActiveWorkspace().cleanCache(with: diagnostics)
+
         case .apidiff:
             let apiDigesterPath = try getToolchain().getSwiftAPIDigester()
             let apiDigesterTool = SwiftAPIDigester(tool: apiDigesterPath)
@@ -468,9 +471,10 @@ public class SwiftPackageTool: SwiftTool<PackageToolOptions> {
             to: { $0.editOptions.path = $1.path })
 
         parser.add(subparser: PackageMode.clean.rawValue, overview: "Delete build artifacts")
+        parser.add(subparser: PackageMode.cleanCache.rawValue, overview: "Clean the repository cache")
         parser.add(subparser: PackageMode.fetch.rawValue, overview: "")
-        parser.add(subparser: PackageMode.reset.rawValue, overview: "Reset the complete cache/build directory")
-        
+        parser.add(subparser: PackageMode.reset.rawValue, overview: "Reset the complete build directory")
+
         let updateParser = parser.add(subparser: PackageMode.update.rawValue, overview: "Update package dependencies")
         binder.bind(
             positional: updateParser.add(
@@ -830,6 +834,7 @@ public class PackageToolOptions: ToolOptions {
 
 public enum PackageMode: String, StringEnumArgument {
     case clean
+    case cleanCache = "clean-cache"
     case config
     case format = "_format"
     case describe

Sources/Workspace/Workspace.swift

@@ -618,6 +618,32 @@ extension Workspace {
         }
     }
 
+    /// Cleans the repository cache.
+    ///
+    /// - Parameters:
+    ///     - diagnostics: The diagnostics engine that reports errors, warnings
+    ///       and notes.
+    public func cleanCache(with diagnostics: DiagnosticsEngine) {
+        // If we have no data yet, we're done.
+        guard fileSystem.exists(repositoryManager.path) else {
+            return
+        }
+
+        guard let repositories = diagnostics.wrap({ try fileSystem.getDirectoryContents(repositoryManager.path) }) else {
+            return
+        }
+
+        for repository in repositories {
+            let filePath = dataPath.appending(RelativePath(repository))
+            let lock = FileLock(name: filePath.basename, cachePath: filePath)
+            diagnostics.wrap {
+                try lock.withLock {
+                    try fileSystem.removeFileTree(filePath)
+                }
+            }
+        }
+    }
+
     /// Resets the entire workspace by removing the data directory.
     ///
     /// - Parameters: