Merge pull request #10 from QiuZhiFei/dev

fix: error output

Author: QiuZhiFei

Examples/main.swift

@@ -23,7 +23,7 @@ Commands.Bash.run("ls /bin/ls").log()
 Commands.Ruby.run("require 'base64'; puts Base64.encode64('qiuzhifei')").log()
 
 // Python
-Commands.Python.run("import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))").log()
+Commands.Python.run("import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))").log()
 
 // Custom
 let node = Commands.Alias("node", dashc: "-e")

README.md

@@ -37,11 +37,11 @@ let result = Commands.Task.run("python main.py")
 ```
 Execute python commands.
 ```swift
-let result = Commands.Task.run("python -c import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))")
+let result = Commands.Task.run("python -c import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))")
 ```
 Or
 ```swift
-let result = Commands.Python.run("import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))")
+let result = Commands.Python.run("import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))")
 ```
 
 ### Ruby

README_cn.md

@@ -37,11 +37,11 @@ let result = Commands.Task.run("python main.py")
 ```
 Execute python commands.
 ```swift
-let result = Commands.Task.run("python -c import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))")
+let result = Commands.Task.run("python -c import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))")
 ```
 Or
 ```swift
-let result = Commands.Python.run("import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))")
+let result = Commands.Python.run("import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))")
 ```
 
 ### Ruby

Sources/Commands/CommandsTask.swift

@@ -36,7 +36,7 @@ public extension Commands.Task {
       }
 
       let response = Commands.Response(statusCode: process.terminationStatus,
-                                       output: errorActual,
+                                       output: outputActual,
                                        errorOutput: errorActual)
       return Commands.Result.Failure(request, response: response)
     } catch let error {

Tests/CommandsTests/Resources/python/main.py

@@ -1,2 +1,2 @@
 import base64;
-print(base64.b64encode('qiuzhifei').decode('ascii'));
+print(base64.b64encode(b'qiuzhifei').decode('ascii'));

Tests/CommandsTests/swift_commandsTests.swift

@@ -15,7 +15,7 @@ final class swift_commandsTests: XCTestCase {
 
     let lsResult = Commands.Bash.run("ls \(dir)")
     XCTAssert(lsResult.isFailure)
-    XCTAssert(lsResult.output.contains("No such file or directory"))
+    XCTAssert(lsResult.errorOutput.contains("No such file or directory"))
   }
 
   func testCommandsRuby() throws {
@@ -32,7 +32,7 @@ final class swift_commandsTests: XCTestCase {
   func testCommandsPython() throws {
     let python = Commands.Python
 
-    let base64Result = python.run("import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))")
+    let base64Result = python.run("import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))")
     XCTAssert(base64Result.isSuccess)
     XCTAssert(base64Result.output == "qiuzhifei".data(using: .utf8)!.base64EncodedString())
     XCTAssert(base64Result.output == "cWl1emhpZmVp")
@@ -90,8 +90,8 @@ final class swift_commandsTests: XCTestCase {
 
     // python
     XCTAssertEqual(
-      Commands.Python.run("import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))"),
-      Commands.Task.run("python -c import base64; print(base64.b64encode('qiuzhifei').decode('ascii'))")
+      Commands.Python.run("import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))"),
+      Commands.Task.run("python -c import base64; print(base64.b64encode(b'qiuzhifei').decode('ascii'))")
     )
 
     // node