Commit: 81e90367cee925935df142fc7e2f11dfdfbcebdd - AppBuilderWithGit (git)

gitリポジトリのurlを貼り付けるだけでアプリケーションのビルドを実行するアプリ。 macOS用

Commit MetaInfo

• Revisión: 81e90367cee925935df142fc7e2f11dfdfbcebdd (tree)
• Tiempo: 2018-04-08 11:58:29
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

コマンドが正しく見つけられなかったので修正

暫定版

Cambiar Resumen

• modified: AppBuilderWithGit/CommandFinder.swift
• modified: AppBuilderWithGitTests/AppBuilderWithGitTests.swift

Diferencia incremental

--- a/AppBuilderWithGit/CommandFinder.swift
+++ b/AppBuilderWithGit/CommandFinder.swift
@@ -13,3 +13,27 @@ func existCommand(_ commandName: String) -> Bool {
     return Process() <<< "/usr/bin/which" <<< [commandName]
         >>> { output in output.lines.count == 2 }
 }
+
+func commandPath(_ commandName: String) -> URL? {
+    
+    let which = Process() <<< "/usr/bin/which" <<< [commandName]
+    if let currentPath = which.environment?["PATH"] {
+        
+        print(currentPath)
+        which.environment!["PATH"] = "/usr/local/bin/:" + currentPath
+    } else {
+        which.environment = ["PATH": "/bin:/sbin:/local/bin:/local/sbin:/usr/local/bin"]
+    }
+    return which >>> { (output: Output) -> URL? in
+            
+            let lines = output.lines
+            
+            print(lines)
+            
+            guard let path = lines.first else {
+                return nil
+            }
+            
+            return URL(fileURLWithPath: path)
+    }
+}

--- a/AppBuilderWithGitTests/AppBuilderWithGitTests.swift
+++ b/AppBuilderWithGitTests/AppBuilderWithGitTests.swift
@@ -19,6 +19,11 @@ class AppBuilderWithGitTests: XCTestCase {
         XCTAssertFalse(existCommand("skjdlfkjsaldfjalkj"))
     }
     
+    func testCommandPath() {
+        
+        XCTAssertEqual(commandPath("carthage")?.path, "/usr/local/bin/carthage")
+        XCTAssertEqual(commandPath("pod")?.path, "/usr/local/bin/pod")
+    }
     
     func testMatch() {
         
@@ -45,7 +50,6 @@ class AppBuilderWithGitTests: XCTestCase {
         XCTAssertNotNil(findFile(pattern: "PkgInfo", in: bundleURL, depth: 3))
         
         XCTAssertNil(findFile(pattern: "pkgInfo", in: bundleURL, depth: 3))
-
         
     }
 }