refactor: dependency inject FileSystemInfo

Author: RomanPodymov

Sources/PathKit.swift

@@ -19,25 +19,35 @@ public struct Path {
   public static let separator = "/"
 
   /// The underlying string representation
-  internal var path: String
+  internal let path: String
 
-  internal static var fileManager = FileManager.default
+  internal static let fileManager = FileManager.default
 
-  internal var fileSystemInfo: FileSystemInfo = DefaultFileSystemInfo()
+  internal let fileSystemInfo: FileSystemInfo
 
   // MARK: Init
 
   public init() {
-    self.path = ""
+    self.init("")
   }
 
   /// Create a Path from a given String
   public init(_ path: String) {
+    self.init(path, fileSystemInfo: DefaultFileSystemInfo())
+  }
+    
+  internal init(_ path: String, fileSystemInfo: FileSystemInfo) {
     self.path = path
+    self.fileSystemInfo = fileSystemInfo
   }
 
+  internal init(fileSystemInfo: FileSystemInfo) {
+    self.init("", fileSystemInfo: fileSystemInfo)
+  }
+    
   /// Create a Path by joining multiple path components together
   public init<S : Collection>(components: S) where S.Iterator.Element == String {
+    let path: String
     if components.isEmpty {
       path = "."
     } else if components.first == Path.separator && components.count > 1 {
@@ -46,6 +56,7 @@ public struct Path {
     } else {
       path = components.joined(separator: Path.separator)
     }
+    self.init(path)
   }
 }
 
@@ -65,7 +76,7 @@ extension Path : ExpressibleByStringLiteral {
   }
 
   public init(stringLiteral value: StringLiteralType) {
-    self.path = value
+    self.init(value)
   }
 }
 

Tests/PathKitTests/PathKitSpec.swift

@@ -167,17 +167,15 @@ describe("PathKit") {
   $0.it("can abbreviate paths on a case sensitive fs") {
     let home = Path.home.string
     let fakeFSInfo = FakeFSInfo(caseSensitive: true)
-    var path = Path("\(home.uppercased())")
-    path.fileSystemInfo = fakeFSInfo
+    let path = Path("\(home.uppercased())", fileSystemInfo: fakeFSInfo)
 
     try expect(path.abbreviate().string) == home.uppercased()
   }
 
   $0.it("can abbreviate paths on a case insensitive fs") {
     let home = Path.home.string
     let fakeFSInfo = FakeFSInfo(caseSensitive: false)
-    var path = Path("\(home.uppercased())")
-    path.fileSystemInfo = fakeFSInfo
+    let path = Path("\(home.uppercased())", fileSystemInfo: fakeFSInfo)
 
     try expect(path.abbreviate()) == Path("~")
   }