Font relative paths

CHANGELOG.md

@@ -6,7 +6,9 @@
 
 ### Bug Fixes
 
-_None_
+* Fonts: fix an issue where SwiftGen would fallback to the full font file path instead of using the relative path to the search location.  
+  [David Jennes](https://github.com/djbe) 
+  [#52](https://github.com/SwiftGen/SwiftGenKit/pull/52)
 
 ### Breaking Changes
 

Sources/Parsers/FontsParser.swift

@@ -42,8 +42,8 @@ extension PathKit.Path {
   /// - Parameter parent: The parent Path to get the relative path against
   /// - Returns: The relative Path, or nil if parent was not a parent dir of self
   func relative(to parent: Path) -> Path? {
-    let pc = parent.components
-    let fc = self.components
+    let pc = parent.absolute().components
+    let fc = self.absolute().components
     return fc.starts(with: pc) ? Path(components: fc.dropFirst(pc.count)) : nil
   }
 }
@@ -84,6 +84,8 @@ public final class FontsParser: Parser {
 
   public func parse(path: Path) {
     let dirChildren = path.iterateChildren(options: [.skipsHiddenFiles, .skipsPackageDescendants])
+    let parentDir = path.absolute().parent()
+
     for file in dirChildren {
       var value: AnyObject? = nil
       let url = file.url as NSURL
@@ -93,7 +95,7 @@ public final class FontsParser: Parser {
         continue
       }
       guard UTTypeConformsTo(uti as CFString, "public.font" as CFString) else { continue }
-      let fonts = CTFont.parse(file: file, relativeTo: path)
+      let fonts = CTFont.parse(file: file, relativeTo: parentDir)
       fonts.forEach { addFont($0) }
     }
   }

Tests/SwiftGenKitTests/FontsTests.swift

@@ -7,7 +7,8 @@
 //
 
 import XCTest
-import SwiftGenKit
+@testable import SwiftGenKit
+import PathKit
 import AppKit.NSFont
 
 class FontsTests: XCTestCase {
@@ -25,4 +26,32 @@ class FontsTests: XCTestCase {
     let result = parser.stencilContext()
     XCTDiffContexts(result, expected: "defaults.plist", sub: .fonts)
   }
+
+  // MARK: - Path relative(to:)
+
+  func testPathRelativeTo_UnrelatedIsNil() throws {
+    let parent = Path("/a/b/c")
+    let file = Path("/d/e/f")
+
+    XCTAssertNil(file.relative(to: parent))
+  }
+
+  func testPathRelativeTo_RelatedIsNotNil() throws {
+    let parent = Path("/a/b/c")
+    let file = Path("/a/b/c/d/e")
+
+    XCTAssertNotNil(file.relative(to: parent))
+  }
+
+  func testPathRelativeTo_ResultIsNotFullPath() throws {
+    let parent = Path("a/b/c")
+    let absoluteParent = parent.absolute()
+    let file = Path("a/b/c/d/e")
+    let absoluteFile = file.absolute()
+
+    XCTAssertEqual(file.relative(to: parent), "d/e")
+    XCTAssertEqual(file.relative(to: absoluteParent), "d/e")
+    XCTAssertEqual(absoluteFile.relative(to: parent), "d/e")
+    XCTAssertEqual(absoluteFile.relative(to: absoluteParent), "d/e")
+  }
 }