Commit: 9396c04ed9faffd38288e3d2ffd4766b55af98ba - AppBuilderWithGit (git)

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

Commit MetaInfo

• Revisión: 9396c04ed9faffd38288e3d2ffd4766b55af98ba (tree)
• Tiempo: 2018-04-08 10:47:15
• Autor: masakih <masakih@user...>
• Commiter: masakih

Log Message

ProjectFinderクラスを関数群に変更

Cambiar Resumen

• modified: AppBuilderWithGit/BuildInfo.swift
• modified: AppBuilderWithGit/ProjectFinder.swift
• modified: AppBuilderWithGitTests/AppBuilderWithGitTests.swift

Diferencia incremental

--- a/AppBuilderWithGit/BuildInfo.swift
+++ b/AppBuilderWithGit/BuildInfo.swift
@@ -39,7 +39,7 @@ struct BuildInfo {
     
     init?(projectURL: URL) {
         
-        guard let projectFileURL = ProjectFinder.find(in: projectURL)
+        guard let projectFileURL = find(in: projectURL)
             else { return nil }
         
         self.projectURL = projectURL

--- a/AppBuilderWithGit/ProjectFinder.swift
+++ b/AppBuilderWithGit/ProjectFinder.swift
@@ -8,39 +8,44 @@
 
 import Foundation
 
-
-final class ProjectFinder {
+func find(in url: URL, depth: Int = 1) -> URL? {
     
-    static func find(in url: URL, depth: Int = 1) -> URL? {
-        
-        guard depth != 0 else { return nil }
-        
-        guard let contents = try? FileManager.default.contentsOfDirectory(at: url,
-                                                                          includingPropertiesForKeys: [.isDirectoryKey])
-            else {
-                return nil
-        }
-        
-        if let url = contents.lazy.filter({ $0.pathExtension == "xcworkspace" }).first {
-            
-            return url
-        }
-        
-        if let url = contents.lazy.filter({ $0.pathExtension == "xcodeproj" }).first {
-            
-            return url
-        }
+    if let workspace = findFile(pattern: "\\w*\\.xcworkspace$", in: url, depth: depth) {
         
+        return workspace
+    }
+    
+    if let project = findFile(pattern: "\\w*\\.xcodeproj$", in: url, depth: depth) {
         
-        func isDir(_ url: URL) -> Bool {
-            
-            return (try? url.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
-        }
+        return project
+    }
+    
+    return nil
+}
+
+func findFile(pattern: String, in url: URL, depth: Int = 1) -> URL? {
+    
+    guard depth != 0 else { return nil }
+    
+    guard let contents = try? FileManager.default.contentsOfDirectory(at: url,
+                                                                      includingPropertiesForKeys: [.isDirectoryKey])
+        else {
+            return nil
+    }
+    
+    if let url = contents.lazy.filter({ $0.path.match(pattern) }).first {
         
-        return contents.lazy
-            .filter(isDir)
-            .flatMap { find(in: $0, depth: depth - 1) }
-            .first
+        return url
+    }
+    
+    
+    func isDir(_ url: URL) -> Bool {
         
+        return (try? url.resourceValues(forKeys: [.isDirectoryKey]))?.isDirectory ?? false
     }
+    
+    return contents.lazy
+        .filter(isDir)
+        .flatMap { findFile(pattern: pattern, in: $0, depth: depth - 1) }
+        .first
 }

--- a/AppBuilderWithGitTests/AppBuilderWithGitTests.swift
+++ b/AppBuilderWithGitTests/AppBuilderWithGitTests.swift
@@ -34,4 +34,18 @@ class AppBuilderWithGitTests: XCTestCase {
         
         XCTAssertFalse(".xcodeproj.copy".match("\\w*\\.xcodeproj$"))
     }
+    
+    
+    func testFileFinder() {
+        
+        let bundleURL = Bundle.main.bundleURL
+        
+        XCTAssertNotNil(findFile(pattern: "Contents", in: bundleURL))
+        
+        XCTAssertNotNil(findFile(pattern: "PkgInfo", in: bundleURL, depth: 3))
+        
+        XCTAssertNil(findFile(pattern: "pkgInfo", in: bundleURL, depth: 3))
+
+        
+    }
 }