[none] fix: Fixed a ImpactAnalysis error when Cocoapods.lock was missing (#4)

* [none] fix: Fixed a ImpactAnalysis error when Cocoapods.lock was missing

* Targets are now marked as affected if a new lockfile has been added

Author: dmnre

ImpactAnalysis/Package.resolved

@@ -531,44 +531,65 @@ extension ImpactAnalysisWorkspaceMapper {
 
     // MARK: - Lockfiles diff calculation
 
-    private func lockfiles() throws -> (original: CocoapodsLockfile, new: CocoapodsLockfile) {
-        let originalLockfile: Data
+    private func lockfiles() throws -> (original: CocoapodsLockfile?, new: CocoapodsLockfile?) {
+        let originalLockfile: Data?
         let originalLockfileContext: ParseYamlContext
-        let newLockfile: Data
+        let newLockfile: Data?
         let newLockfileContext: ParseYamlContext
 
         let lockfilePath = try RelativePath(validating: "Geko/Dependencies/Cocoapods.lock")
         if environment.impactAnalysisDebug {
             let rootDir = fileHandler.currentPath
 
-            originalLockfile = try system.capture(["git", "show", "HEAD:\(lockfilePath.pathString)"]).chomp().data(using: .utf8)!
+            originalLockfile = try? system.capture(["git", "show", "HEAD:\(lockfilePath.pathString)"]).chomp()
+                .data(using: .utf8)
             originalLockfileContext = .git(path: lockfilePath, ref: "HEAD")
 
             let newLockfilePath = rootDir.appending(lockfilePath)
-            newLockfile = try fileHandler.readFile(newLockfilePath)
+            newLockfile = try? fileHandler.readFile(newLockfilePath)
             newLockfileContext = .file(path: newLockfilePath)
         } else {
-            originalLockfile = try system.capture(["git", "show", "\(targetRef):\(lockfilePath.pathString)"]).chomp()
-                .data(using: .utf8)!
+            originalLockfile = try? system.capture(["git", "show", "\(targetRef):\(lockfilePath.pathString)"]).chomp()
+                .data(using: .utf8)
             originalLockfileContext = .git(path: lockfilePath, ref: "HEAD")
 
-            newLockfile = try system.capture(["git", "show", "\(sourceRef):\(lockfilePath.pathString)"]).chomp()
-                .data(using: .utf8)!
+            newLockfile = try? system.capture(["git", "show", "\(sourceRef):\(lockfilePath.pathString)"]).chomp()
+                .data(using: .utf8)
             newLockfileContext = .git(path: lockfilePath, ref: "HEAD")
         }
 
-        let originalLockfileYml = try CocoapodsLockfile.from(data: originalLockfile, context: originalLockfileContext)!
-        let newLockfileYml = try CocoapodsLockfile.from(data: newLockfile, context: newLockfileContext)!
+        var originalLockfileYml: CocoapodsLockfile?
+        var newLockfileYml: CocoapodsLockfile?
+
+        if let originalLockfile {
+            originalLockfileYml = try CocoapodsLockfile.from(data: originalLockfile, context: originalLockfileContext)
+        }
+
+        if let newLockfile {
+            newLockfileYml = try CocoapodsLockfile.from(data: newLockfile, context: newLockfileContext)
+        }
 
         return (originalLockfileYml, newLockfileYml)
     }
 
     private func lockfileChanges(
         workspace: inout WorkspaceWithProjects,
         externalDependenciesGraph: DependenciesGraph,
-        originalLockfile: CocoapodsLockfile,
-        newLockfile: CocoapodsLockfile
+        originalLockfile: CocoapodsLockfile?,
+        newLockfile: CocoapodsLockfile?
     ) throws -> Set<ImpactGraphDependency> {
+        guard let newLockfile else { return [] }
+
+        guard let originalLockfile else {
+            var changedDependencies = Set<String>()
+
+            for (_, newSourceData) in newLockfile.podsBySource {
+                changedDependencies.formUnion(newSourceData.pods.keys)
+            }
+
+            return mapImpactDependencies(from: changedDependencies, externalDependenciesGraph: externalDependenciesGraph)
+        }
+
         var changedDependencies = Set<String>()
 
         func compare(_ origLockfile: CocoapodsLockfile, _ newLockfile: CocoapodsLockfile) {
@@ -597,6 +618,13 @@ extension ImpactAnalysisWorkspaceMapper {
         compare(originalLockfile, newLockfile)
         compare(newLockfile, originalLockfile)
 
+        return mapImpactDependencies(from: changedDependencies, externalDependenciesGraph: externalDependenciesGraph)
+    }
+
+    private func mapImpactDependencies(
+        from changedDependencies: Set<String>,
+        externalDependenciesGraph: DependenciesGraph
+    ) -> Set<ImpactGraphDependency> {
         var result = Set<ImpactGraphDependency>()
 
         for dependency in changedDependencies {

ImpactAnalysis/Sources/ImpactAnalysis/ImpactAnalysisWorkspaceMapper.swift

@@ -28,7 +28,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/geko-tech/ProjectDescription", branch: "release/1.0.0"),
+        .package(url: "https://github.com/geko-tech/project-description", branch: "release/1.0.0"),
         .package(url: "https://github.com/apple/swift-tools-support-core", from: "0.6.1"),
         .package(url: "https://github.com/apple/swift-log", from: "1.5.3"),
         .package(url: "https://github.com/apple/swift-crypto", from: "3.15.1"),
@@ -39,15 +39,15 @@ let package = Package(
         .target(
             name: "PluginSupport",
             dependencies: dependencies + [
-                .product(name: "ProjectDescription", package: "ProjectDescription"),
+                .product(name: "ProjectDescription", package: "project-description"),
                 .product(name: "Crypto", package: "swift-crypto")
             ],
             cSettings: [.define("_GNU_SOURCE", .when(platforms: [.linux]))]
         ),
         .target(
             name: "PluginSupportStatic",
             dependencies: dependencies + [
-                .product(name: "ProjectDescriptionStatic", package: "ProjectDescription"),
+                .product(name: "ProjectDescriptionStatic", package: "project-description"),
                 .product(name: "Crypto", package: "swift-crypto")
             ],
             cSettings: [.define("_GNU_SOURCE", .when(platforms: [.linux]))]

PluginSupport/Package.resolved

@@ -2,4 +2,6 @@
 
 This repository contains official Geko plugins and examples of Geko plugins.
 
-TODO: add links to documentation
+# Documentation
+
+Documentation is available at [geko-tech.github.io/geko/guides/features/plugins/](https://geko-tech.github.io/geko/guides/features/plugins/)

PluginSupport/Package.swift

@@ -14,20 +14,20 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/geko-tech/ProjectDescription", branch: "release/1.0.0")
+        .package(url: "https://github.com/geko-tech/project-description", branch: "release/1.0.0")
     ],
     targets: [
         .target(
             name: "WorkspaceMapperExample",
             dependencies: [
-                .product(name: "ProjectDescription", package: "ProjectDescription"),
+                .product(name: "ProjectDescription", package: "project-description"),
                 "ProjectDescriptionHelpers"
             ],
         ),
         .target(
             name: "ProjectDescriptionHelpers",
             dependencies: [
-                .product(name: "ProjectDescription", package: "ProjectDescription"),
+                .product(name: "ProjectDescription", package: "project-description"),
             ],
             path: "ProjectDescriptionHelpers"
         )