Improve directory URL naming (and mocks) (#593)

Author: tinder-cfuller

Sources/NodesXcodeTemplatesGenerator/XcodeTemplateGenerator.swift

@@ -12,8 +12,8 @@ internal final class XcodeTemplateGenerator {
         self.fileSystem = fileSystem
     }
 
-    internal func generate(template: XcodeTemplate, into url: URL) throws {
-        let url: URL = url
+    internal func generate(template: XcodeTemplate, into directory: URL) throws {
+        let url: URL = directory
             .appendingPathComponent(template.name)
             .appendingPathExtension("xctemplate")
         try? fileSystem.removeItem(at: url)
@@ -23,36 +23,36 @@ internal final class XcodeTemplateGenerator {
         try copyIcons(into: url)
     }
 
-    private func renderStencils(for template: XcodeTemplate, into url: URL) throws {
+    private func renderStencils(for template: XcodeTemplate, into directory: URL) throws {
         let stencilRenderer: StencilRenderer = .init()
         try template.stencils.forEach { stencil in
             let contents: String = try stencilRenderer.render(stencil, with: template.stencilContext.dictionary)
             try fileSystem.write(Data(contents.utf8),
-                                 to: url
+                                 to: directory
                                     .appendingPathComponent("___FILEBASENAME___\(stencil.name)")
                                     .appendingPathExtension("swift"),
                                  atomically: true)
         }
     }
 
-    private func writePropertyList(for template: XcodeTemplate, into url: URL) throws {
+    private func writePropertyList(for template: XcodeTemplate, into directory: URL) throws {
         try fileSystem.write(template.propertyList.encode(),
-                             to: url
+                             to: directory
                                 .appendingPathComponent("TemplateInfo")
                                 .appendingPathExtension("plist"),
                              atomically: true)
     }
 
-    private func copyIcons(into url: URL) throws {
+    private func copyIcons(into directory: URL) throws {
         let bundle: Bundle = .moduleRelativeToExecutable ?? .module
         // swiftlint:disable:next force_unwrapping
         try fileSystem.copyItem(at: bundle.url(forResource: "Tinder", withExtension: "png")!,
-                                to: url
+                                to: directory
                                     .appendingPathComponent("TemplateIcon")
                                     .appendingPathExtension("png"))
         // swiftlint:disable:next force_unwrapping
         try fileSystem.copyItem(at: bundle.url(forResource: "Tinder@2x", withExtension: "png")!,
-                                to: url
+                                to: directory
                                     .appendingPathComponent("TemplateIcon@2x")
                                     .appendingPathExtension("png"))
     }

Sources/NodesXcodeTemplatesGenerator/XcodeTemplates.swift

@@ -20,18 +20,18 @@ public final class XcodeTemplates {
     public func generate(
         identifier: String
     ) throws {
-        let url: URL = fileSystem.libraryURL
+        let directory: URL = fileSystem.libraryURL
             .appendingPathComponent("Developer")
             .appendingPathComponent("Xcode")
             .appendingPathComponent("Templates")
             .appendingPathComponent("File Templates")
             .appendingPathComponent("Nodes Architecture Framework (\(identifier))")
-        try? fileSystem.removeItem(at: url)
-        try generate(at: url)
+        try? fileSystem.removeItem(at: directory)
+        try generate(into: directory)
     }
 
     public func generate(
-        at url: URL
+        into directory: URL
     ) throws {
         var templates: [XcodeTemplate] = UIFramework.Kind
             .allCases
@@ -46,6 +46,6 @@ public final class XcodeTemplates {
             WorkerXcodeTemplate(config: config)
         ]
         let generator: XcodeTemplateGenerator = .init(fileSystem: fileSystem)
-        try templates.forEach { try generator.generate(template: $0, into: url) }
+        try templates.forEach { try generator.generate(template: $0, into: directory) }
     }
 }

Tests/NodesXcodeTemplatesGeneratorTests/ConfigTests.swift

@@ -23,15 +23,15 @@ final class ConfigTests: XCTestCase, TestFactories {
 
     func testConfig() throws {
         let fileSystem: FileSystemMock = .init()
-        let url: URL = .init(fileURLWithPath: "/")
+        let url: URL = .init(fileURLWithPath: "/", isDirectory: true)
         fileSystem.contents[url] = Data(givenConfig().utf8)
         let config: Config = try .init(at: url.path, using: fileSystem)
         assertSnapshot(of: config, as: .dump)
     }
 
     func testConfigWithEmptyFileContents() throws {
         let fileSystem: FileSystemMock = .init()
-        let url: URL = .init(fileURLWithPath: "/")
+        let url: URL = .init(fileURLWithPath: "/", isDirectory: true)
         fileSystem.contents[url] = Data("".utf8)
         let config: Config = try .init(at: url.path, using: fileSystem)
         expect(config) == Config()

Tests/NodesXcodeTemplatesGeneratorTests/XcodeTemplatesTests.swift

@@ -21,8 +21,8 @@ final class XcodeTemplatesTests: XCTestCase {
 
     func testGenerateWithURL() throws {
         let fileSystem: FileSystemMock = .init()
-        let url: URL = .init(fileURLWithPath: "/")
-        try XcodeTemplates(config: givenConfig(), fileSystem: fileSystem).generate(at: url)
+        let url: URL = .init(fileURLWithPath: "/", isDirectory: true)
+        try XcodeTemplates(config: givenConfig(), fileSystem: fileSystem).generate(into: url)
         // swiftlint:disable:next large_tuple
         let writes: [(contents: String, path: String, atomically: Bool)] = fileSystem.writes
         writes.forEach { assertSnapshot(of: $0.contents, as: .lines, named: "Contents.\(name(from: $0.path))") }