dnrops
/
tuist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove directories parameter.

This commit is contained in:
Marek Fořt 2020-03-20 13:51:23 +01:00
parent fef4af1f61
commit 2df8abd238
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/ProjectDescription/Template/Template.swift
View File

@ -8,17 +8,13 @@ public struct Template: Codable, Equatable {
public let attributes: [Attribute]
/// Files to generate
public let files: [File]
/// Directories to generate
public let directories: [String]
public init(description: String,
attributes: [Attribute] = [],
files: [File] = [],
directories: [String] = []) {
files: [File] = []) {
self.description = description
self.attributes = attributes
self.files = files
self.directories = directories
dumpIfNeeded(self)
}

25
Sources/TuistCore/Models/Template.swift
View File

@ -1,26 +1,16 @@
import Basic
public struct Template: Equatable {
public static func == (lhs: Template, rhs: Template) -> Bool {
lhs.description == rhs.description
&& lhs.attributes == rhs.attributes
&& lhs.files == rhs.files
&& lhs.directories == rhs.directories
}
public let description: String
public let attributes: [Attribute]
public let files: [(path: RelativePath, contents: Contents)]
public let directories: [RelativePath]
public let files: [File]
public init(description: String,
attributes: [Attribute] = [],
files: [(path: RelativePath, contents: Contents)] = [],
directories: [RelativePath] = []) {
files: [File] = []) {
self.description = description
self.attributes = attributes
self.files = files
self.directories = directories
}
public enum Attribute: Equatable {
@ -50,4 +40,15 @@ public struct Template: Equatable {
case string(String)
case file(AbsolutePath)
}
public struct File: Equatable {
public let path: RelativePath
public let contents: Contents
public init(path: RelativePath,
contents: Contents) {
self.path = path
self.contents = contents
}
}
}

10
Sources/TuistLoader/Loaders/TemplateLoader.swift
View File

@ -35,14 +35,12 @@ public class TemplateLoader: TemplateLoading {
extension TuistCore.Template {
static func from(manifest: ProjectDescription.Template, at path: AbsolutePath) throws -> TuistCore.Template {
let attributes = try manifest.attributes.map(TuistCore.Template.Attribute.from)
let files = try manifest.files.map { (path: RelativePath($0.path),
contents: try TuistCore.Template.Contents.from(manifest: $0.contents,
at: path)) }
let directories = manifest.directories.map { RelativePath($0) }
let files = try manifest.files.map { File(path: RelativePath($0.path),
contents: try TuistCore.Template.Contents.from(manifest: $0.contents,
at: path)) }
return TuistCore.Template(description: manifest.description,
attributes: attributes,
files: files,
directories: directories)
files: files)
}
}

5
fixtures/ios_app_with_templates/Tuist/Templates/custom/Template.swift
View File

@ -14,7 +14,6 @@ let template = Template(
platformAttribute
],
files: [
.string(path: "custom_dir/custom.swift", contents: testContents)
],
directories: ["custom_dir"]
.string(path: "\(nameAttribute)/custom.swift", contents: testContents)
]
)