UPdated for 07-25 chain

Author: kjessup

Sources/PerfectLib/Dir.swift

@@ -69,7 +69,7 @@ public struct Dir {
 	public func create(perms: PermissionMode = [.rwxUser, .rxGroup, .rxOther]) throws {
 		let pth = realPath
 		var currPath = pth.begins(with: "/") ? "/" : ""
-        for component in pth.pathComponents where component != "/" {
+		for component in URL(fileURLWithPath: pth).pathComponents where component != "/" {
             currPath += component
             defer {
                 currPath += "/"
@@ -95,15 +95,15 @@ public struct Dir {
 
 	/// Returns the name of the directory.
 	public var name: String {
-		return internalPath.lastPathComponent
+		return URL(fileURLWithPath: internalPath).lastPathComponent
 	}
 
 	/// Returns a Dir object representing the current Dir's parent. Returns nil if there is no parent.
 	public var parentDir: Dir? {
 		guard internalPath != "/" else {
 			return nil // can not go up
 		}
-		return Dir(internalPath.stringByDeletingLastPathComponent)
+		return Dir(URL(fileURLWithPath: internalPath).deletingLastPathComponent().path)
 	}
 
 	/// Returns the path to the current directory.
@@ -122,7 +122,7 @@ public struct Dir {
 	}
 
 	var realPath: String {
-		return internalPath.stringByResolvingSymlinksInPath
+		return URL(fileURLWithPath: internalPath).resolvingSymlinksInPath().path
 	}
 
 #if os(Linux)

Sources/PerfectLib/DynamicLoader.swift

@@ -22,6 +22,7 @@
 #else
 	import Darwin
 #endif
+import Foundation
 
 struct DynamicLoader {
 
@@ -37,9 +38,9 @@ struct DynamicLoader {
 	}
 
 	func loadFramework(atPath at: String) -> Bool {
-		let resolvedPath = at.stringByResolvingSymlinksInPath
-		let moduleName = resolvedPath.lastPathComponent.stringByDeletingPathExtension
-		let file = File(resolvedPath + "/" + moduleName)
+		let resolvedPath = URL(fileURLWithPath: at).resolvingSymlinksInPath()
+		let moduleName = resolvedPath.deletingPathExtension().lastPathComponent
+		let file = File(resolvedPath.path + "/" + moduleName)
         guard file.exists else {
             return false
         }
@@ -48,11 +49,10 @@ struct DynamicLoader {
 	}
 
 	func loadLibrary(atPath at: String) -> Bool {
-		var fileName = at.lastPathComponent
-		if fileName.begins(with: "lib") {
-			fileName.characters.removeFirst(3)
+		var moduleName = URL(fileURLWithPath: at).deletingPathExtension().lastPathComponent
+		if moduleName.begins(with: "lib") {
+			moduleName.characters.removeFirst(3)
 		}
-		let moduleName = fileName.stringByDeletingPathExtension
 		return self.loadRealPath(at, moduleName: moduleName)
 	}
 

Sources/PerfectLib/File.swift

@@ -45,6 +45,8 @@ let F_OK: Int32 = 0
 import Darwin
 #endif
 
+import Foundation
+
 let fileCopyBufferSize = 16384
 
 /// Provides access to a file on the local file system
@@ -85,7 +87,7 @@ public class File {
         guard lastChar != "/" && lastChar != "." else {
             return trailPath
         }
-        return internalPath.stringByDeletingLastPathComponent + "/" + trailPath
+        return URL(fileURLWithPath: internalPath).deletingLastPathComponent().path + "/" + trailPath
     }
 
     /// Returns the modification date for the file in the standard UNIX format of seconds since 1970/01/01 00:00:00 GMT

Sources/PerfectLib/Utilities.swift

@@ -435,7 +435,7 @@ extension String {
 		return nil != self.range(ofString: strng)
 	}
 }
-
+/*
 #if os(OSX)
 extension String {
 
@@ -583,7 +583,7 @@ extension String {
 	}
 }
 #endif
-
+*/
 extension String {
 	func begins(with str: String) -> Bool {
 		return self.characters.starts(with: str.characters)

Tests/PerfectLib/PerfectLibTests.swift

@@ -466,13 +466,13 @@ class PerfectLibTests: XCTestCase {
 
     func testDeletingPathExtension() {
         let path = "/a/b/c.txt"
-        let del = path.stringByDeletingPathExtension
+        let del = URL(fileURLWithPath: path).deletingPathExtension().path
         XCTAssert("/a/b/c" == del)
     }
 
     func testGetPathExtension() {
         let path = "/a/b/c.txt"
-        let ext = path.pathExtension
+        let ext = URL(fileURLWithPath: path).pathExtension
         XCTAssert("txt" == ext)
     }
 
@@ -487,7 +487,7 @@ class PerfectLibTests: XCTestCase {
 
             while unPath != "/tmp" {
                 try Dir(unPath).delete()
-                unPath = unPath.stringByDeletingLastPathComponent
+                unPath = URL(fileURLWithPath: unPath).deletingLastPathComponent().path
             }
         } catch {
             XCTAssert(false, "Error while creating dirs: \(error)")