Commit: 401881ee109078d94650a8f7cbe5d53b66d8f1aa - AppBuilderWithGit (git)

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

Commit MetaInfo

• Revision: 401881ee109078d94650a8f7cbe5d53b66d8f1aa (tree)
• Time: 2017-08-16 22:06:59
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

コマンドのログを残すようにした

Change Summary

• modified: AppBuilderWithGit.xcodeproj/project.pbxproj
• modified: AppBuilderWithGit/Git.swift
• add: AppBuilderWithGit/LogStocker.swift
• modified: AppBuilderWithGit/ProjectBuilder.swift

Incremental Difference

--- a/AppBuilderWithGit.xcodeproj/project.pbxproj
+++ b/AppBuilderWithGit.xcodeproj/project.pbxproj
@@ -17,6 +17,7 @@
 		F41A45081F3D98180066F83D /* ProjectBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A45071F3D98180066F83D /* ProjectBuilder.swift */; };
 		F41A45141F3E9DFA0066F83D /* BuildInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A45131F3E9DFA0066F83D /* BuildInfo.swift */; };
 		F41A45161F3EC0950066F83D /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A45151F3EC0950066F83D /* WindowController.swift */; };
+		F41A45181F401D4B0066F83D /* LogStocker.swift in Sources */ = {isa = PBXBuildFile; fileRef = F41A45171F401D4B0066F83D /* LogStocker.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -32,6 +33,7 @@
 		F41A45071F3D98180066F83D /* ProjectBuilder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProjectBuilder.swift; sourceTree = "<group>"; };
 		F41A45131F3E9DFA0066F83D /* BuildInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BuildInfo.swift; sourceTree = "<group>"; };
 		F41A45151F3EC0950066F83D /* WindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = "<group>"; };
+		F41A45171F401D4B0066F83D /* LogStocker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LogStocker.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -71,6 +73,7 @@
 				F41A45031F3D782A0066F83D /* Git.swift */,
 				F41A45051F3D83AE0066F83D /* ProjectFinder.swift */,
 				F41A45071F3D98180066F83D /* ProjectBuilder.swift */,
+				F41A45171F401D4B0066F83D /* LogStocker.swift */,
 				F41A45131F3E9DFA0066F83D /* BuildInfo.swift */,
 				F41A44F21F3D6B1B0066F83D /* Assets.xcassets */,
 				F41A44F41F3D6B1B0066F83D /* Main.storyboard */,
@@ -150,6 +153,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F41A45181F401D4B0066F83D /* LogStocker.swift in Sources */,
 				F41A45021F3D77020066F83D /* ApplicationDirecrories.swift in Sources */,
 				F41A45081F3D98180066F83D /* ProjectBuilder.swift in Sources */,
 				F41A45041F3D782A0066F83D /* Git.swift in Sources */,

--- a/AppBuilderWithGit/Git.swift
+++ b/AppBuilderWithGit/Git.swift
@@ -70,6 +70,11 @@ final class Git {
     
     private func excuteGit(workingURL: URL, args: [String]) throws {
         
+        guard !args.isEmpty else {
+            
+            throw GitError.other("Iligal arguments")
+        }
+        
         let xcodeURL = NSApplication.appDelegate.xcodeURL
         guard let gitURL = xcodeURL?.appendingPathComponent("/Contents/Developer/usr/bin/git") else {
             
@@ -91,6 +96,12 @@ final class Git {
         let pipe = Pipe()
         git.standardError = pipe
         
+        let logPipe = Pipe()
+        git.standardOutput = logPipe
+        git.standardError = logPipe
+        let log = LogStocker("git-" + args[0] + ".log")
+        log?.read(logPipe.fileHandleForReading)
+        
         git.launch()
         git.waitUntilExit()
         

--- /dev/null
+++ b/AppBuilderWithGit/LogStocker.swift
@@ -0,0 +1,66 @@
+//
+//  LogStocker.swift
+//  AppBuilderWithGit
+//
+//  Created by Hori,Masaki on 2017/08/13.
+//  Copyright © 2017年 Hori,Masaki. All rights reserved.
+//
+
+import Foundation
+
+private func fileURL(for name: String) -> URL? {
+    
+    let base = ApplicationDirecrories.support.appendingPathComponent("Logs")
+    guard checkDirectory(base) else {
+        
+        return base.appendingPathComponent(name)
+    }
+    
+    return base.appendingPathComponent(name)
+}
+
+private func nameWithDate(_ name: String) -> String {
+    
+    let formatter = DateFormatter()
+    formatter.dateFormat = "yyyy-MM-dd-HH-mm-ss-A"
+    
+    return formatter.string(from: Date()) + "-" + name
+    
+}
+
+final class LogStocker {
+    
+    private let output: FileHandle
+    
+    init?(_ name: String) {
+        
+        do {
+            
+            let datename = nameWithDate(name)
+            guard let url = fileURL(for: datename) else { return nil }
+            
+            try Data().write(to: url)
+            
+            output = try FileHandle(forWritingTo: url)
+            
+        } catch {
+            
+            print("can not open file for log writing.\n\(error)")
+            
+            return nil
+        }
+        
+    }
+    
+    deinit { output.closeFile() }
+    
+    func read(_ fileHandle: FileHandle) {
+        
+        DispatchQueue.global().async {
+            
+            self.output.write(fileHandle.readDataToEndOfFile())
+        }
+        
+    }
+    
+}

--- a/AppBuilderWithGit/ProjectBuilder.swift
+++ b/AppBuilderWithGit/ProjectBuilder.swift
@@ -56,34 +56,9 @@ final class ProjectBuilder {
         
         let pipe = Pipe()
         xcodebuild.standardOutput = pipe
-        
-        weak var token: NSObjectProtocol?
-        token = NotificationCenter.default
-            .addObserver(forName: FileHandle.readCompletionNotification,
-                         object: pipe.fileHandleForReading,
-                         queue: nil) { [weak xcodebuild] notifiction in
-                            
-                            if let data = notifiction.userInfo?[NSFileHandleNotificationDataItem] as? Data,
-                                let string = String(data: data, encoding: .utf8) {
-                                
-                                print(string)
-                                
-                            }
-                            
-                            if let task = xcodebuild,
-                                task.isRunning,
-                                let handle = notifiction.object as? FileHandle {
-                                
-                                handle.readInBackgroundAndNotify()
-                                
-                            } else {
-                                
-                                token.map(NotificationCenter.default.removeObserver)
-                            }
-                            
-        }
-        
-        pipe.fileHandleForReading.readInBackgroundAndNotify()
+        xcodebuild.standardError = pipe
+        let log = LogStocker("xcodebuild.log")
+        log?.read(pipe.fileHandleForReading)
         
         xcodebuild.launch()
         xcodebuild.waitUntilExit()