提交: c18bdde6c419289c79816f3c5287eeefbb39e931 - AppBuilderWithGit (git)

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

Commit MetaInfo

• 修訂: c18bdde6c419289c79816f3c5287eeefbb39e931 (tree)
• 時間: 2018-05-25 22:36:36
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

<<< でカレントディレクトリを設定できるようにした

Change Summary

• modified: AppBuilderWithGit/Carthage.swift
• modified: AppBuilderWithGit/CocoaPods.swift
• modified: AppBuilderWithGit/CommandFinder.swift
• modified: AppBuilderWithGit/Git.swift
• modified: AppBuilderWithGit/Process-extensions.swift
• modified: AppBuilderWithGit/ProjectBuilder.swift

差異

--- a/AppBuilderWithGit/Carthage.swift
+++ b/AppBuilderWithGit/Carthage.swift
@@ -61,8 +61,9 @@ final class Carthage {
             throw CarthageError.commandNotFound
         }
         
-        let carthage = Process() <<< carthageURL.path <<< ["bootstrap"]
-        carthage.currentDirectoryPath = cartfile.deletingLastPathComponent().path
+        let carthage = Process() <<< ExcutableURL(url: carthageURL)
+            <<< ["bootstrap"]
+            <<< cartfile.deletingLastPathComponent()
         
         carthage >>> { output, error in
             

--- a/AppBuilderWithGit/CocoaPods.swift
+++ b/AppBuilderWithGit/CocoaPods.swift
@@ -61,8 +61,9 @@ final class CocoaPods {
             throw CarthageError.commandNotFound
         }
         
-        let pod = Process() <<< podURL.path <<< ["install"]
-        pod.currentDirectoryPath = podfile.deletingLastPathComponent().path
+        let pod = Process() <<< ExcutableURL(url: podURL)
+            <<< ["install"]
+            <<< podfile.deletingLastPathComponent()
         
         pod >>> { output, error in
             

--- a/AppBuilderWithGit/CommandFinder.swift
+++ b/AppBuilderWithGit/CommandFinder.swift
@@ -10,7 +10,7 @@ import Foundation
 
 func existCommand(_ commandName: String) -> Bool {
     
-    let which = Process() <<< "/usr/bin/which" <<< [commandName]
+    let which = Process() <<< ExcutableURL(fileURLWithPath: "/usr/bin/which") <<< [commandName]
     
     if let currentPath = which.environment?["PATH"] {
         
@@ -26,7 +26,7 @@ func existCommand(_ commandName: String) -> Bool {
 
 func commandPath(_ commandName: String) -> URL? {
     
-    let which = Process() <<< "/usr/bin/which" <<< [commandName]
+    let which = Process() <<< ExcutableURL(fileURLWithPath: "/usr/bin/which") <<< [commandName]
     
     if let currentPath = which.environment?["PATH"] {
         
@@ -42,6 +42,7 @@ func commandPath(_ commandName: String) -> URL? {
             let lines = output.lines
         
             guard let path = lines.first else {
+                
                 return nil
             }
             

--- a/AppBuilderWithGit/Git.swift
+++ b/AppBuilderWithGit/Git.swift
@@ -87,9 +87,9 @@ final class Git {
             throw GitError.other("URL is invalid")
         }
         
-        let git = Process() <<< gitURL.path <<< args
-        
-        git.currentDirectoryPath = workingURL.path
+        let git = Process() <<< ExcutableURL(url: gitURL)
+            <<< args
+            <<< workingURL
         
         let errorString = git >>> { (stdout, stderr) -> String in
             
@@ -108,7 +108,6 @@ final class Git {
             
             throw GitError.gitError(git.terminationStatus, errorString)
         }
-        
     }
     
     private func clone() throws {
@@ -177,6 +176,5 @@ final class Git {
         }
         
         return url.lastPathComponent
-        
     }
 }

--- a/AppBuilderWithGit/Process-extensions.swift
+++ b/AppBuilderWithGit/Process-extensions.swift
@@ -14,22 +14,41 @@ struct Output {
     private let fileHandle: FileHandle
     
     init(fileHandle: FileHandle) {
+        
         self.fileHandle = fileHandle
     }
     
     var data: Data {
+        
         return fileHandle.readDataToEndOfFile()
     }
     
     var string: String? {
+        
         return String(data: data, encoding: .utf8)
     }
     
     var lines: [String] {
+        
         return string?.components(separatedBy: "\n") ?? []
     }
 }
 
+struct ExcutableURL {
+    
+    let url: URL
+    
+    init(fileURLWithPath path: String) {
+        
+        url = URL(fileURLWithPath: path)
+    }
+    
+    init(url: URL) {
+        
+        self.url = url
+    }
+}
+
 precedencegroup ArgumentPrecedence {
     
     associativity: left
@@ -38,9 +57,17 @@ precedencegroup ArgumentPrecedence {
 infix operator <<< : ArgumentPrecedence
 
 /// Processにexecutable pathを設定する。
-func <<< (lhs: Process, rhs: String) -> Process {
+func <<< (lhs: Process, rhs: ExcutableURL) -> Process {
+    
+    if #available(macOS 10.13, *) {
+        
+        lhs.executableURL = rhs.url
+        
+    } else {
+        
+        lhs.launchPath = rhs.url.path
+    }
     
-    lhs.launchPath = rhs
     return lhs
 }
 
@@ -48,6 +75,22 @@ func <<< (lhs: Process, rhs: String) -> Process {
 func <<< (lhs: Process, rhs: [String]) -> Process {
     
     lhs.arguments = rhs
+    
+    return lhs
+}
+
+/// Current directoryを設定する。
+func <<< (lhs: Process, rhs: URL) -> Process {
+    
+    if #available(macOS 10.13, *) {
+        
+        lhs.currentDirectoryURL = rhs
+        
+    } else {
+        
+        lhs.currentDirectoryPath = rhs.path
+    }
+    
     return lhs
 }
 

--- a/AppBuilderWithGit/ProjectBuilder.swift
+++ b/AppBuilderWithGit/ProjectBuilder.swift
@@ -33,7 +33,6 @@ final class ProjectBuilder {
         }
         
         self.info = info
-        
     }
     
     var productURL: URL { return info.productURL }
@@ -52,8 +51,10 @@ final class ProjectBuilder {
                 throw ProjectBuilderError.other("URL is Invalid.")
         }
         
-        let xcodebuild = Process() <<< builderURL.path <<< info.arguments
-        xcodebuild.currentDirectoryPath = info.projectURL.path
+        let xcodebuild = Process() <<< ExcutableURL(url: builderURL)
+            <<< info.arguments
+            <<< info.projectURL
+        
         xcodebuild >>> { stdout, stderr in
             
             let log = LogStocker("xcodebuild.log")
@@ -68,6 +69,4 @@ final class ProjectBuilder {
             throw ProjectBuilderError.commandFail
         }
     }
-
-    
 }