Merge pull request #4 from shogo4405/v2.0.0

v2.0.0
shogo4405 · Nov 21, 2018 · 7c0e4f9 · 7c0e4f9
2 parents 2dcde19 + 4b8df54
commit 7c0e4f9
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/Logboard.podspec b/Logboard.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Logboard"
-  s.version      = "1.2.1"
+  s.version      = "2.0.0"
   s.summary      = "Simple Logging framework"
 
   s.description  = <<-DESC

diff --git a/Platforms/iOS/Info.plist b/Platforms/iOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Platforms/macOS/Info.plist b/Platforms/macOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Platforms/tvOS/Info.plist b/Platforms/tvOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/Platforms/watchOS/Info.plist b/Platforms/watchOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/README.md b/README.md
@@ -21,8 +21,8 @@ logger.error("error")
 ## Requirements
 |-|iOS|OSX|tvOS|watchOS|XCode|Swift|CocoaPods|Carthage|
 |:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
-|1.2.0|8.0+|10.9+|9.0+|2.0|10.0+|4.2|1.3.0|0.31.0+|
-|1.1.0|8.0+|10.9+|9.0+|2.0|9.0+|4.0|1.2.0|0.20.0+|
+|2.0.0+|8.0+|10.9+|9.0+|2.0|10.0+|4.2|1.3.0|0.31.0+|
+|1.2.0+|8.0+|10.9+|9.0+|2.0|10.0+|4.2|1.3.0|0.31.0+|
 
 ## Installation
 *Please set up your project Swift 4.2.*
@@ -33,7 +33,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 
 def import_pods
-pod 'Logboard', '~> 1.2.1'
+pod 'Logboard', '~> 2.0.0'
 end
 
 target 'Your Target'  do
@@ -43,7 +43,7 @@ end
 ```
 ### Carthage
 ```
-github "shogo4405/Logboard" ~> 1.2.1
+github "shogo4405/Logboard" ~> 2.0.0
 ```
 
 ## Appenders

diff --git a/Sources/ConsoleAppender.swift b/Sources/ConsoleAppender.swift
@@ -4,8 +4,8 @@ public class ConsoleAppender: LogboardAppender {
     public init() {
     }
 
-    public func append(_ logboard: Logboard, level: Logboard.Level, message: String, file: StaticString, function: StaticString, line: Int) {
-        print(Logboard.dateFormatter.string(from: Date()), "[\(level)]", "[\(logboard.identifier)]", "[\(filename(file.description)):\(line)]", function, ">", message)
+    public func append(_ logboard: Logboard, level: Logboard.Level, message: [Any], file: StaticString, function: StaticString, line: Int) {
+        print(Logboard.dateFormatter.string(from: Date()), "[\(level)]", "[\(logboard.identifier)]", "[\(filename(file.description)):\(line)]", function, ">", message.map({ String(describing: $0) }).joined(separator: ""))
     }
     public func append(_ logboard: Logboard, level: Logboard.Level, format: String, arguments: CVarArg, file: StaticString, function: StaticString, line: Int) {
         print(Logboard.dateFormatter.string(from: Date()), "[\(level)]", "[\(logboard.identifier)]", "[\(filename(file.description)):\(line)]", function, ">", String(format: format, arguments))

diff --git a/Sources/Logboard.swift b/Sources/Logboard.swift
@@ -72,7 +72,7 @@ public class Logboard {
         return self.level.rawValue <= level.rawValue
     }
 
-    public func trace(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    public func trace(_ message: Any..., file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         guard isEnabledFor(level: .trace) else { return }
         appender.append(self, level: .trace, message: message, file: file, function: function, line: line)
     }
@@ -82,7 +82,7 @@ public class Logboard {
         appender.append(self, level: .trace, format: format, arguments: arguments, file: file, function: function, line: line)
     }
 
-    public func debug(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    public func debug(_ message: Any..., file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         guard isEnabledFor(level: .debug) else { return }
         appender.append(self, level: .debug, message: message, file: file, function: function, line: line)
     }
@@ -92,7 +92,7 @@ public class Logboard {
         appender.append(self, level: .debug, format: format, arguments: arguments, file: file, function: function, line: line)
     }
 
-    public func info(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    public func info(_ message: Any..., file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         guard isEnabledFor(level: .info) else { return }
         appender.append(self, level: .info, message: message, file: file, function: function, line: line)
     }
@@ -102,7 +102,7 @@ public class Logboard {
         appender.append(self, level: .info, format: format, arguments: arguments, file: file, function: function, line: line)
     }
 
-    public func warn(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    public func warn(_ message: Any..., file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         guard isEnabledFor(level: .warn) else { return }
         appender.append(self, level: .warn, message: message, file: file, function: function, line: line)
     }
@@ -112,7 +112,7 @@ public class Logboard {
         appender.append(self, level: .warn, format: format, arguments: arguments, file: file, function: function, line: line)
     }
 
-    public func error(_ message: String, file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
+    public func error(_ message: Any..., file: StaticString = #file, function: StaticString = #function, line: Int = #line) {
         guard isEnabledFor(level: .error) else { return }
         appender.append(self, level: .error, message: message, file: file, function: function, line: line)
     }

diff --git a/Sources/LogboardAppender.swift b/Sources/LogboardAppender.swift
@@ -1,6 +1,6 @@
 import Foundation
 
 public protocol LogboardAppender {
-    func append(_ logboard: Logboard, level: Logboard.Level, message: String, file: StaticString, function: StaticString, line: Int)
+    func append(_ logboard: Logboard, level: Logboard.Level, message: [Any], file: StaticString, function: StaticString, line: Int)
     func append(_ logboard: Logboard, level: Logboard.Level, format: String, arguments: CVarArg, file: StaticString, function: StaticString, line: Int)
 }
diff --git a/Sources/MultiAppender.swift b/Sources/MultiAppender.swift
@@ -6,7 +6,7 @@ public class MultiAppender: LogboardAppender {
     public init() {
     }
 
-    public func append(_ logboard: Logboard, level: Logboard.Level, message: String, file: StaticString, function: StaticString, line: Int) {
+    public func append(_ logboard: Logboard, level: Logboard.Level, message: [Any], file: StaticString, function: StaticString, line: Int) {
         for appender in appenders {
             appender.append(logboard, level: level, message: message, file: file, function: function, line: line)
         }

diff --git a/Sources/NullAppender.swift b/Sources/NullAppender.swift
@@ -4,7 +4,7 @@ public class NullAppender: LogboardAppender {
     public init() {
     }
 
-    public func append(_ logboard: Logboard, level: Logboard.Level, message: String, file: StaticString, function: StaticString, line: Int) {
+    public func append(_ logboard: Logboard, level: Logboard.Level, message: [Any], file: StaticString, function: StaticString, line: Int) {
     }
     public func append(_ logboard: Logboard, level: Logboard.Level, format: String, arguments: CVarArg, file: StaticString, function: StaticString, line: Int) {
     }

diff --git a/Sources/SocketAppender.swift b/Sources/SocketAppender.swift
@@ -14,15 +14,15 @@ public class SocketAppender: LogboardAppender {
         socket.close(isDisconnected: false)
     }
 
-    public func append(_ logboard: Logboard, level: Logboard.Level, message: String, file: StaticString, function: StaticString, line: Int) {
+    public func append(_ logboard: Logboard, level: Logboard.Level, message: [Any], file: StaticString, function: StaticString, line: Int) {
         let strings: [String] = [
             Logboard.dateFormatter.string(from: Date()),
             level.description,
             logboard.identifier,
             file.description,
             String(line),
             function.description,
-            message
+            message.map({ String(describing: $0) }).joined(separator: "")
         ]
         if let data: Data = (strings.joined(separator: "\t") + "\r\n\r\n").data(using: .utf8) {
             socket.doOutput(data: data)