migration utilities (beta), swift 2 conversion

CoreStore/Logging/CoreStore+Logging.swift

@@ -60,7 +60,8 @@ public extension CoreStore {
             message: message,
             fileName: fileName,
             lineNumber: lineNumber,
-            functionName: functionName)
+            functionName: functionName
+        )
     }
     
     internal static func assert(@autoclosure condition: () -> Bool, _ message: String, fileName: StaticString = __FILE__, lineNumber: Int = __LINE__, functionName: StaticString = __FUNCTION__) {
@@ -70,6 +71,17 @@ public extension CoreStore {
             message: message,
             fileName: fileName,
             lineNumber: lineNumber,
-            functionName: functionName)
+            functionName: functionName
+        )
+    }
+    
+    @noreturn internal static func fatalError(message: String, fileName: StaticString = __FILE__, lineNumber: Int = __LINE__, functionName: StaticString = __FUNCTION__) {
+        
+        self.logger.fatalError(
+            message,
+            fileName: fileName,
+            lineNumber: lineNumber,
+            functionName: functionName
+        )
     }
 }

CoreStore/Logging/CoreStoreLogger.swift

@@ -56,7 +56,7 @@ public protocol CoreStoreLogger {
     :lineNumber: the source line number
     :functionName: the source function name
     */
-    func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
     
     /**
     Handles errors sent by the `CoreStore` framework.
@@ -67,7 +67,7 @@ public protocol CoreStoreLogger {
     :lineNumber: the source line number
     :functionName: the source function name
     */
-    func handleError(#error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
     
     /**
     Handles assertions made throughout the `CoreStore` framework.
@@ -79,6 +79,16 @@ public protocol CoreStoreLogger {
     :functionName: the source function name
     */
     func assert(@autoclosure condition: () -> Bool, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
+    
+    /**
+    Handles fatal errors made throughout the `CoreStore` framework. Implementations should guarantee that the method does not return, either by calling fatalError() or preconditionFailure(), or by raising an exception.
+    
+    :message: the error message
+    :fileName: the source file name
+    :lineNumber: the source line number
+    :functionName: the source function name
+    */
+    @noreturn func fatalError(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString)
 }
 
 
@@ -98,3 +108,9 @@ internal func typeName(value: AnyClass) -> String {
     
     return "<\(value)>"
 }
+
+internal func typeName(name: String?) -> String {
+    
+    let typeName = name ?? "unknown"
+    return "<\(typeName)>"
+}

CoreStore/Logging/DefaultLogger.swift

@@ -31,15 +31,15 @@ import Foundation
 /**
 The `DefaultLogger` is a basic implementation of the `CoreStoreLogger` protocol.
 
-- The `log(...)` method calls `println(...)` to print the level, source file name, line number, function name, and the log message.
-- The `handleError(...)` method calls `println(...)` to print the source file name, line number, function name, and the error message.
+- The `log(...)` method calls `print(...)` to print the level, source file name, line number, function name, and the log message.
+- The `handleError(...)` method calls `print(...)` to print the source file name, line number, function name, and the error message.
 - The `assert(...)` method calls `assert(...)` on the arguments.
 */
 public final class DefaultLogger: CoreStoreLogger {
     
     public init() { }
    
-    public func log(#level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func log(level level: LogLevel, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
         
         #if DEBUG
             let levelString: String
@@ -49,14 +49,14 @@ public final class DefaultLogger: CoreStoreLogger {
             case .Warning: levelString = "Warning"
             case .Fatal: levelString = "Fatal"
             }
-            Swift.println("[CoreStore:\(levelString)] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
+            Swift.print("[CoreStore:\(levelString)] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
         #endif
     }
     
-    public func handleError(#error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+    public func handleError(error error: NSError, message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
         
         #if DEBUG
-            Swift.println("[CoreStore:Error] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message): \(error)\n")
+            Swift.print("[CoreStore:Error] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message): \(error)\n")
         #endif
     }
     
@@ -66,4 +66,9 @@ public final class DefaultLogger: CoreStoreLogger {
             Swift.assert(condition, message, file: fileName, line: numericCast(lineNumber))
         #endif
     }
+    
+    @noreturn public func fatalError(message: String, fileName: StaticString, lineNumber: Int, functionName: StaticString) {
+        
+        Swift.fatalError("[CoreStore:Abort] \(fileName.stringValue.lastPathComponent):\(lineNumber) \(functionName)\n  ↪︎ \(message)\n")
+    }
 }