Merge pull request #115 from JohnSundell/arguments-with-space

Support script arguments containing a space
JohnSundell · Aug 14, 2017 · 5c05891 · 5c05891
2 parents 765af24 + 06f7b1b
commit 5c05891
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Sources/MarathonCore/Script.swift b/Sources/MarathonCore/Script.swift
@@ -90,7 +90,12 @@ internal final class Script {
 
     func run(in executionFolder: Folder, with arguments: [String]) throws -> String {
         let scriptPath = folder.path + ".build/debug/" + name
-        let command = scriptPath + " " + arguments.joined(separator: " ")
+        var command = scriptPath
+
+        if !arguments.isEmpty {
+            command += " \"" + arguments.joined(separator: "\" \"") + "\""
+        }
+
         return try executionFolder.moveToAndPerform(command: command, printer: printer)
     }
 

diff --git a/Tests/MarathonTests/MarathonTests.swift b/Tests/MarathonTests/MarathonTests.swift
@@ -332,6 +332,14 @@ class MarathonTests: XCTestCase {
         XCTAssertTrue(output.hasPrefix("🚘"))
     }
 
+    func testRunningScriptWithArgumentContainingSpace() throws {
+        let scriptFile = try folder.createFile(named: "script.swift")
+        try scriptFile.write(string: "print(CommandLine.arguments[1])")
+
+        let output = try run(with: ["run", scriptFile.path, "Hello world"])
+        XCTAssertEqual(output, "Hello world")
+    }
+
     // MARK: - Installing scripts
 
     func testInstallingLocalScript() throws {
@@ -830,6 +838,7 @@ extension MarathonTests {
             ("testRunningScriptWithVerboseOutput", testRunningScriptWithVerboseOutput),
             ("testRunningRemoteScriptFromURL", testRunningRemoteScriptFromURL),
             ("testRunningRemoteScriptFromGitHubRepository", testRunningRemoteScriptFromGitHubRepository),
+            ("testRunningScriptWithArgumentContainingSpace", testRunningScriptWithArgumentContainingSpace),
             ("testInstallingLocalScript", testInstallingLocalScript),
             ("testInstallingRemoteScriptWithDependenciesUsingRegularGithubURL", testInstallingRemoteScriptWithDependenciesUsingRegularGithubURL),
             ("testInstallingRemoteScriptWithDependenciesUsingRawGithubURL", testInstallingRemoteScriptWithDependenciesUsingRawGithubURL),