Merge pull request #1 from OskarGroth/master

Update dependency name

Author: Ponyboy47

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>swift-log-file.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

.swiftpm/xcode/package.xcworkspace/xcuserdata/oskar.xcuserdatad/UserInterfaceState.xcuserstate

@@ -12,16 +12,16 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-log.git", from: "1.0.0"),
-        .package(url: "https://github.com/Ponyboy47/Trailblazer.git", from: "0.16.0"),
+        .package(url: "https://github.com/Ponyboy47/Pathman.git", from: "0.20.1"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
             name: "FileLogging",
-            dependencies: ["Logging", "TrailBlazer"]),
+            dependencies: ["Logging", "Pathman"]),
         .testTarget(
             name: "FileLoggingTests",
-            dependencies: ["FileLogging", "Logging", "TrailBlazer"])
+            dependencies: ["FileLogging", "Logging", "Pathman"])
     ]
 )

.swiftpm/xcode/xcuserdata/oskar.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,6 +1,6 @@
 import Foundation
 import Logging
-import TrailBlazer
+import Pathman
 
 // The formatter used for the timestamp when writing messages to the log file
 private let _formatter: DateFormatter = {

Package.swift

@@ -1,4 +1,4 @@
-import TrailBlazer
+import Pathman
 
 var unusedStreams = Set<FileStream>()
 
@@ -16,17 +16,6 @@ public class _FileLogFactory {
     /// The encoding to default to when creating file-based logs from a factory
     public static var defaultEncoding: String.Encoding = .utf8
 
-    public convenience init(path: String,
-                            encoding: String.Encoding = _FileLogFactory.defaultEncoding) {
-        if let file = FilePath(path) {
-            self.init(file: file, encoding: encoding)
-        } else if let dir = DirectoryPath(path) {
-            self.init(directory: dir, encoding: encoding)
-        } else {
-            fatalError("Path '\(path)' must be either a file, directory, or nonexistent path (treated as a new file)")
-        }
-    }
-
     public convenience init(file: FilePath,
                             encoding: String.Encoding = _FileLogFactory.defaultEncoding) {
         // Ensure log files have the '.log' extension
@@ -76,9 +65,7 @@ public final class FileLogHandlerFactory: _FileLogFactory {
         }
 
         let path = parent! + "\(label).log"
-        guard let file = FilePath(path.absolute ?? path) else {
-            fatalError("Path '\(path.string)' exists and is not a file")
-        }
+        let file = FilePath(path.absolute ?? path)
 
         do {
             let stream = try file.open(mode: "a")
@@ -90,7 +77,7 @@ public final class FileLogHandlerFactory: _FileLogFactory {
             }
             return .init(label: label, opened: stream, encoding: encoding)
         } catch {
-            fatalError("Failed to open \(file) for appending")
+            fatalError("Unable to open \(file) for appending: \(error.localizedDescription)")
         }
     }
 }
@@ -99,19 +86,6 @@ public final class RotatingFileLogHandlerFactory<Handler: RotatingFileLogHandler
     public var options: Handler.RotateOptions
     public var max: UInt?
 
-    public convenience init(path: String,
-                            encoding: String.Encoding = _FileLogFactory.defaultEncoding,
-                            options: Handler.RotateOptions,
-                            max: UInt? = nil) {
-        if let file = FilePath(path) {
-            self.init(file: file, encoding: encoding, options: options, max: max)
-        } else if let dir = DirectoryPath(path) {
-            self.init(directory: dir, encoding: encoding, options: options, max: max)
-        } else {
-            fatalError("Path '\(path)' must be either a file, directory, or nonexistent path (treated as a new file)")
-        }
-    }
-
     public convenience init(file: FilePath,
                             encoding: String.Encoding = _FileLogFactory.defaultEncoding,
                             options: Handler.RotateOptions,
@@ -148,9 +122,7 @@ public final class RotatingFileLogHandlerFactory<Handler: RotatingFileLogHandler
         }
 
         let path = parent! + "\(label).log"
-        guard let file = FilePath(path.absolute ?? path) else {
-            fatalError("Path '\(path.string)' exists and is not a file")
-        }
+        let file = FilePath(path.absolute ?? path)
 
         do {
             let stream = try file.open(mode: "a")

Sources/FileLogging/FileHandler.swift

@@ -1,6 +1,6 @@
 import Foundation
 import Logging
-import TrailBlazer
+import Pathman
 
 public struct DateRotatingFileLogHandler: RotatingFileLogHandler {
     private let filename: String

Sources/FileLogging/FileLogFactory.swift

@@ -1,5 +1,5 @@
 import Logging
-import TrailBlazer
+import Pathman
 
 public struct FileLogHandler: ConstantStreamFileHandler {
     public let stream: FileStream

Sources/FileLogging/Handlers/DateRotatingFileLogHandler.swift

@@ -1,6 +1,6 @@
 import Foundation
 import Logging
-import TrailBlazer
+import Pathman
 
 var currentStreams = [AnyHashable: FileStream]()
 

Sources/FileLogging/Handlers/FileLogHandler.swift

@@ -1,6 +1,6 @@
 import Foundation
 import Logging
-import TrailBlazer
+import Pathman
 
 public struct SizeRotatingFileLogHandler: RotatingFileLogHandler {
     private let filename: String
@@ -41,7 +41,7 @@ public struct SizeRotatingFileLogHandler: RotatingFileLogHandler {
 
     public func rotate(message: Data) -> String? {
         let msgSize = message.count
-        guard logFile.size + msgSize > maxSize else { return nil }
+        guard logFile.size + Int64(msgSize) > maxSize else { return nil }
 
         guard msgSize <= maxSize else {
             fatalError("Message is larger than maximum byte size allowed per file rotation (\(msgSize) > \(maxSize))")

Sources/FileLogging/Handlers/RotatingFileLogHandler.swift

@@ -1,12 +1,12 @@
 @testable import FileLogging
 import Foundation
 import Logging
-import TrailBlazer
+import Pathman
 import XCTest
 
 final class FileLoggingTests: XCTestCase {
     func testHammer() {
-        var logFile = FilePath("/tmp/test.log")!
+        var logFile = FilePath("/tmp/test.log")
 
         let factory = FileLogHandlerFactory(file: logFile)
         LoggingSystem.bootstrap(factory.makeFileLogHandler)
@@ -23,7 +23,7 @@ final class FileLoggingTests: XCTestCase {
     }
 
     func testHammerRotating() {
-        let logFile = FilePath("/tmp/test.log")!
+        let logFile = FilePath("/tmp/test.log")
 
         let factory = RotatingFileLogHandlerFactory<DateRotatingFileLogHandler>(file: logFile, options: 9.seconds)
         LoggingSystem.bootstrap(factory.makeRotatingFileLogHandler)