Commit: b2f398418e58f76b7354bac497d2fd8592dddf85 - AppBuilderWithGit (git)

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

Commit MetaInfo

• Revisión: b2f398418e58f76b7354bac497d2fd8592dddf85 (tree)
• Tiempo: 2018-04-08 14:17:21
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

例外を投げるようにした

Cambiar Resumen

• modified: AppBuilderWithGit/Carthage.swift
• modified: AppBuilderWithGit/ViewController.swift

Diferencia incremental

--- a/AppBuilderWithGit/Carthage.swift
+++ b/AppBuilderWithGit/Carthage.swift
@@ -8,6 +8,13 @@
 
 import Foundation
 
+enum CarthageError: Error {
+    
+    case commandNotFound
+    
+    case commandFail
+}
+
 final class Carthage {
     
     let baseURL: URL
@@ -42,7 +49,7 @@ final class Carthage {
         return true
     }
     
-    func execute() {
+    func execute() throws {
         
         guard let cartfile = cartfileURL else {
             
@@ -51,15 +58,15 @@ final class Carthage {
         
         guard let carthageURL = carthageURL else {
             
-            return
+            throw CarthageError.commandNotFound
         }
         
-        let log = LogStocker("carthage.log")
-        
         let carthage = Process() <<< carthageURL.path <<< ["update"]
         carthage.currentDirectoryPath = cartfile.deletingLastPathComponent().path
         
         carthage >>> { output, error in
+            
+            let log = LogStocker("carthage.log")
             log?.write(output.data)
             log?.write(error.data)
         }
@@ -67,7 +74,7 @@ final class Carthage {
         
         if carthage.terminationStatus != 0 {
             
-            log?.write("Carthage error exit with status \(carthage.terminationStatus)")
+            throw CarthageError.commandFail
         }
     }
 }

--- a/AppBuilderWithGit/ViewController.swift
+++ b/AppBuilderWithGit/ViewController.swift
@@ -112,7 +112,10 @@ extension ViewController {
                 case .none:
                     self.message = "Finish cloning"
                     
-                    self.carthage(gitCloner.repository)
+                    guard self.carthage(gitCloner.repository) else {
+                        
+                        return
+                    }
                     
                     self.build(gitCloner.repository)
                     
@@ -127,20 +130,31 @@ extension ViewController {
         }
     }
     
-    private func carthage(_ url: URL) {
+    private func carthage(_ url: URL) -> Bool {
         
         message = "Checking Carthage."
         
-        let carthage = Carthage(url)
-        
-        guard carthage.checkCarthage() else {
+        do {
+            
+            let carthage = Carthage(url)
+            
+            guard carthage.checkCarthage() else {
+                
+                return true
+            }
+            
+            message = "Building frameworks with Carthage."
             
-            return
+            try carthage.execute()
+            
+            return true
+            
+        } catch {
+            
+            message = "Fail to carthage."
+            
+            return false
         }
-        
-        message = "Building frameworks with Carthage."
-        
-        carthage.execute()
     }
     
     private func build(_ url: URL) {