Fix configurator relative path handling

typealiased · Jan 10, 2022 · c9a18a8 · c9a18a8
1 parent 2c90c82
commit c9a18a8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/Sources/MockingbirdCli/Arguments/InferableArgument.swift b/Sources/MockingbirdCli/Arguments/InferableArgument.swift
@@ -6,11 +6,15 @@ struct ArgumentContext: Codable {
   let environment: [String: String]
   let arguments: [String]
 
-  static var shared = ArgumentContext(
-    workingPath: Path(FileManager.default.currentDirectoryPath),
-    environment: ProcessInfo.processInfo.environment,
-    arguments: CommandLine.arguments
-  )
+  static var shared = ArgumentContext()
+
+  init(workingPath: Path = Path(FileManager.default.currentDirectoryPath),
+       environment: [String: String] = ProcessInfo.processInfo.environment,
+       arguments: [String] = CommandLine.arguments) {
+    self.workingPath = workingPath
+    self.environment = environment
+    self.arguments = arguments
+  }
 }
 
 protocol InferableArgument {

diff --git a/Sources/MockingbirdCli/Commands/Configure.swift b/Sources/MockingbirdCli/Commands/Configure.swift
@@ -94,9 +94,15 @@ extension Mockingbird {
     mutating func run() throws {
       let start = Date()
       let parsedConfigureArguments = try infer()
-      let parsedGenerateArguments = try parsedConfigureArguments.generateCommand.infer()
+      let parsedGenerateArguments = try parsedConfigureArguments.generateCommand
+        .infer(context: ArgumentContext(workingPath: parsedConfigureArguments.project.parent()))
 
-      logInfo("🛠  Project: \(parsedConfigureArguments.project.abbreviate())")
+      if parsedConfigureArguments.sourceProject == parsedConfigureArguments.project {
+        logInfo("🛠  Project: \(parsedConfigureArguments.project.abbreviate())")
+      } else {
+        logInfo("🛠  Test Project: \(parsedConfigureArguments.project.abbreviate())")
+        logInfo("🛠  Source Project: \(parsedConfigureArguments.sourceProject.abbreviate())")
+      }
       logInfo("🎯 Test Target: \(parsedConfigureArguments.testTarget)")
       logInfo("🧰 Supporting sources: \(parsedGenerateArguments.support.abbreviate())")
 

diff --git a/Sources/MockingbirdCli/Commands/Generate.swift b/Sources/MockingbirdCli/Commands/Generate.swift
@@ -99,11 +99,12 @@ extension Mockingbird {
     }
 
     @discardableResult
-    nonmutating func infer() throws -> Arguments {
-      let validProject = try validateRequiredArgument(inferArgument(project), name: "project")
+    nonmutating func infer(context: ArgumentContext = .shared) throws -> Arguments {
+      let validProject = try validateRequiredArgument(inferArgument(project, in: context),
+                                                      name: "project")
       let validSrcroot = try validateRequiredArgument(
         srcroot ?? DirectoryPath(path: validProject.path.parent()), name: "srcroot")
-      let validTestBundle = try validateOptionalArgument(inferArgument(testbundle),
+      let validTestBundle = try validateOptionalArgument(inferArgument(testbundle, in: context),
                                                          name: "testbundle")
       let validSupportPath = support?.path ?? (validSrcroot.path + "MockingbirdSupport")
 

diff --git a/Sources/MockingbirdCli/Handlers/Installer.swift b/Sources/MockingbirdCli/Handlers/Installer.swift
@@ -116,7 +116,8 @@ struct Installer {
   private func rewriteDerivedDataPath(_ path: Path) throws -> String? {
     // It's possible to use a custom derived data path (in addition to a custom build products
     // location), but this is very uncommon so we won't try to handle it.
-    guard path.starts(with: Path("~/Library/Developer/Xcode/DerivedData/")) else {
+    let derivedDataRootPath = Path("~/Library/Developer/Xcode/DerivedData/").absolute().string
+    guard path.absolute().string.starts(with: derivedDataRootPath) else {
       return nil
     }
     log("Attempting to rewrite the derived data path \(path.abbreviate())")