add app and run directories to context

kattouf · Sep 26, 2024 · 5b74445 · 5b74445
1 parent e91ac70
commit 5b74445
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 5 deletions.
diff --git a/Sources/Sake/CLI/RunCommand.swift b/Sources/Sake/CLI/RunCommand.swift
@@ -24,7 +24,13 @@ struct RunCommand: SakeParsableCommand {
         let commands = try commandsProvider.allCommands()
 
         if let command = commands[command] {
-            let context = Command.Context(arguments: args, environment: ProcessInfo.processInfo.environment)
+            let context = Command.Context(
+                arguments: args,
+                environment: ProcessInfo.processInfo.environment,
+                appDirectory: Bundle.main.bundleURL.findBuildDirectory()?.deletingLastPathComponent()
+                    .path ?? "<Could not find SakeApp directory>",
+                runDirectory: FileManager.default.currentDirectoryPath
+            )
             let runner = CommandRunner(command: command, context: context)
             do {
                 try runner.run()
@@ -46,3 +52,19 @@ struct RunCommand: SakeParsableCommand {
         throw SakeAppError.commandRunFailed(command: command, error: error)
     }
 }
+
+private extension URL {
+    func findBuildDirectory() -> URL? {
+        var currentURL = self
+
+        while currentURL.path != "/" {
+            let buildDirectory = currentURL.appendingPathComponent(".build")
+            if FileManager.default.fileExists(atPath: buildDirectory.path) {
+                return buildDirectory
+            }
+            currentURL.deleteLastPathComponent()
+        }
+
+        return nil
+    }
+}
diff --git a/Sources/Sake/Command+Map.swift b/Sources/Sake/Command+Map.swift
@@ -25,10 +25,20 @@ public extension Command {
 
 public extension Command.Context {
     func mapArguments(_ transform: ([String]) throws -> [String]) throws -> Command.Context {
-        try Command.Context(arguments: transform(arguments), environment: environment)
+        try Command.Context(
+            arguments: transform(arguments),
+            environment: environment,
+            appDirectory: appDirectory,
+            runDirectory: runDirectory
+        )
     }
 
     func mapEnvironment(_ transform: ([String: String]) throws -> [String: String]) throws -> Command.Context {
-        try Command.Context(arguments: arguments, environment: transform(environment))
+        try Command.Context(
+            arguments: arguments,
+            environment: transform(environment),
+            appDirectory: appDirectory,
+            runDirectory: runDirectory
+        )
     }
 }
diff --git a/Sources/Sake/Command.swift b/Sources/Sake/Command.swift
@@ -2,10 +2,14 @@ public extension Command {
     struct Context {
         public let arguments: [String]
         public let environment: [String: String]
+        public let appDirectory: String
+        public let runDirectory: String
 
-        public init(arguments: [String], environment: [String: String]) {
+        init(arguments: [String], environment: [String: String], appDirectory: String, runDirectory: String) {
             self.arguments = arguments
             self.environment = environment
+            self.appDirectory = appDirectory
+            self.runDirectory = runDirectory
         }
     }
 }

diff --git a/Tests/SakeTests/CommandRunnerTests.swift b/Tests/SakeTests/CommandRunnerTests.swift
@@ -121,7 +121,9 @@ private extension Command.Context {
     static var empty: Command.Context {
         Command.Context(
             arguments: [],
-            environment: [:]
+            environment: [:],
+            appDirectory: "",
+            runDirectory: ""
         )
     }
 }