Fix review suggestions

This commit is contained in:
Tom Quist
2019-06-17 00:01:33 +02:00
parent 25260963c7
commit c8aef74a93
5 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -82,9 +82,9 @@ public struct SpecFile {
}
}
public func resolvedDictionary(environmentVariables: [String: String] = ProcessInfo.processInfo.environment) -> JSONDictionary {
public func resolvedDictionary(variables: [String: String] = [:]) -> JSONDictionary {
var resolvedSpec = resolvingPaths().mergedDictionary()
for (key, value) in environmentVariables {
for (key, value) in variables {
resolvedSpec = resolvedSpec.replaceString("${\(key)}", with: value)
}
return resolvedSpec
+1 -1
View File
@@ -58,7 +58,7 @@ class GenerateCommand: Command {
// load project spec
do {
project = try specLoader.loadProject(path: projectSpecPath)
project = try specLoader.loadProject(path: projectSpecPath, variables: ProcessInfo.processInfo.environment)
info("Loaded project:\n \(project.debugDescription.replacingOccurrences(of: "\n", with: "\n "))")
} catch {
throw GenerationError.projectSpecParsingError(error)
+2 -2
View File
@@ -15,9 +15,9 @@ public class SpecLoader {
self.version = version
}
public func loadProject(path: Path, environmentVariables: [String: String] = ProcessInfo.processInfo.environment) throws -> Project {
public func loadProject(path: Path, variables: [String: String] = [:]) throws -> Project {
let spec = try SpecFile(path: path)
let resolvedDictionary = spec.resolvedDictionary(environmentVariables: environmentVariables)
let resolvedDictionary = spec.resolvedDictionary(variables: variables)
let project = try Project(basePath: spec.basePath, jsonDictionary: resolvedDictionary)
self.project = project