From cbec3ad732122eba0432d4258affe850dd9e16be Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Thu, 23 Nov 2017 19:16:38 +0100 Subject: [PATCH] add fatalError helper function --- Sources/XcodeGen/Logger.swift | 2 +- Sources/XcodeGen/main.swift | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Sources/XcodeGen/Logger.swift b/Sources/XcodeGen/Logger.swift index fd0fc579..21a5c655 100644 --- a/Sources/XcodeGen/Logger.swift +++ b/Sources/XcodeGen/Logger.swift @@ -17,7 +17,7 @@ struct Logger { // MARK: - Logging - func fatal(_ message: String) { + func error(_ message: String) { print(isColored ? message.red : message) } diff --git a/Sources/XcodeGen/main.swift b/Sources/XcodeGen/main.swift index 31dffb6c..c6ef9093 100644 --- a/Sources/XcodeGen/main.swift +++ b/Sources/XcodeGen/main.swift @@ -11,12 +11,16 @@ let version = "1.4.0" func generate(spec: String, project: String, isQuiet: Bool) { let logger = Logger(isQuiet: isQuiet) + func fatalError(_ message: String) -> Never { + logger.error(message) + exit(1) + } + let specPath = Path(spec).normalize() let projectPath = Path(project).normalize() if !specPath.exists { - logger.fatal("No project spec found at \(specPath.absolute())") - exit(1) + fatalError("No project spec found at \(specPath.absolute())") } let spec: ProjectSpec @@ -24,11 +28,9 @@ func generate(spec: String, project: String, isQuiet: Bool) { spec = try ProjectSpec(path: specPath) logger.info("📋 Loaded spec:\n \(spec.debugDescription.replacingOccurrences(of: "\n", with: "\n "))") } catch let error as JSONUtilities.DecodingError { - logger.fatal("Parsing spec failed: \(error.description)") - exit(1) + fatalError("Parsing spec failed: \(error.description)") } catch { - logger.fatal("Parsing spec failed: \(error.localizedDescription)") - exit(1) + fatalError("Parsing spec failed: \(error.localizedDescription)") } do { @@ -41,11 +43,9 @@ func generate(spec: String, project: String, isQuiet: Bool) { try project.write(path: projectFile, override: true) logger.success("💾 Saved project to \(projectFile.string)") } catch let error as SpecValidationError { - logger.fatal(error.description) - exit(1) + fatalError(error.description) } catch { - logger.fatal("Generation failed: \(error.localizedDescription)") - exit(1) + fatalError("Generation failed: \(error.localizedDescription)") } }