Commit: 4cdbaf87cbafa5a85bbe0ed83e99743806e4ee62 - AppBuilderWithGit (git)

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

Commit MetaInfo

• Révision: 4cdbaf87cbafa5a85bbe0ed83e99743806e4ee62 (tree)
• l'heure: 2018-04-08 14:29:09
• Auteur: masakih <masakih@user...>
• Commiter: masakih

Message de Log

Cartfile検索を厳格にした

Change Summary

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

Modification

--- a/AppBuilderWithGit/Carthage.swift
+++ b/AppBuilderWithGit/Carthage.swift
@@ -26,7 +26,7 @@ final class Carthage {
     
     private var cartfileURL: URL? {
         
-        return findFile(pattern: "Cartfile$", in: baseURL, depth: 2)
+        return findFile(pattern: "^Cartfile$", in: baseURL, depth: 2)
     }
     
     private var carthageURL: URL? {

--- a/AppBuilderWithGit/ProjectFinder.swift
+++ b/AppBuilderWithGit/ProjectFinder.swift
@@ -33,7 +33,7 @@ func findFile(pattern: String, in url: URL, depth: Int = 1) -> URL? {
             return nil
     }
     
-    if let url = contents.lazy.filter({ $0.path.match(pattern) }).first {
+    if let url = contents.lazy.filter({ $0.lastPathComponent.match(pattern) }).first {
         
         return url
     }

--- a/AppBuilderWithGitTests/AppBuilderWithGitTests.swift
+++ b/AppBuilderWithGitTests/AppBuilderWithGitTests.swift
@@ -39,6 +39,12 @@ class AppBuilderWithGitTests: XCTestCase {
         XCTAssertFalse("Hoge.xcodeproj.copy".match("\\w*\\.xcodeproj$"))
         
         XCTAssertFalse(".xcodeproj.copy".match("\\w*\\.xcodeproj$"))
+        
+        
+        XCTAssertTrue("Cartfile".match("^Cartfile$"))
+        XCTAssertFalse("hogeCartfile".match("^Cartfile$"))
+        XCTAssertFalse("Cartfilehoge".match("^Cartfile$"))
+
     }