Updated config to work without Foundation

Sources/Vapor/Config/Config.swift

@@ -1,15 +1,5 @@
-#if swift(>=3.0)
-import Foundation
-
-extension NSData: SequenceType {
-    public func generate() -> UnsafeBufferPointer<UInt8>.Generator {
-        return UnsafeBufferPointer<UInt8>(start: UnsafePointer<UInt8>(self.bytes), count: self.length).generate()
-    }
-}
-
 public class Config {
 	public static let configDir = Application.workDir + "Config"
-	private let fileManager = NSFileManager.defaultManager()
 	private var repository: [String: Json]
 
 	public init(repository: [String: Json] = [:], application: Application? = nil) {
@@ -77,7 +67,7 @@ public class Config {
 
 	/* Convenience call to conditionally populate config if it exists */
 	public func populate(application: Application) -> Bool {
-		if fileManager.fileExistsAtPath(self.dynamicType.configDir) {
+		if FileManager.fileAtPath(self.dynamicType.configDir).exists {
 			do {
 				try populate(self.dynamicType.configDir, application: application)
 				return true
@@ -91,21 +81,17 @@ public class Config {
 	}
 
 	public func populate(path: String, application: Application) throws {
-		var url = NSURL(fileURLWithPath: path)
-		var files = [String: [NSURL]]()
+		var path = path.finish("/")
+		var files = [String: [String]]()
 
 		// Populate config files by environment
-		try populateConfigFiles(&files, in: url)
+		try populateConfigFiles(&files, in: path)
 
 		for env in application.environment.description.keys {
-			#if os(Linux)
-				url = url.URLByAppendingPathComponent(env)!
-			#else
-				url = url.URLByAppendingPathComponent(env)
-			#endif
-
-			if url.path.flatMap(fileManager.fileExistsAtPath) == true {
-				try populateConfigFiles(&files, in: url)
+			path += env + "/"
+
+			if FileManager.fileAtPath(path).exists {
+				try populateConfigFiles(&files, in: path)
 			}
 		}
 
@@ -118,7 +104,7 @@ public class Config {
 			}
 
 			for file in files {
-				let data = try NSData(contentsOfURL: file, options: [])
+				let data = try FileManager.readBytesFromFile(file)
 				let json = try Json.deserialize(data)
 
 				if repository[group] == nil {
@@ -133,7 +119,7 @@ public class Config {
 		// containing multiple groups
 		if let env = files[".env"] {
 			for file in env {
-				let data = try NSData(contentsOfURL: file, options: [])
+				let data = try FileManager.readBytesFromFile(file)
 				let json = try Json.deserialize(data)
 
 				guard case let .ObjectValue(object) = json else {
@@ -151,17 +137,16 @@ public class Config {
 		}
 	}
 
-	private func populateConfigFiles(files: inout [String: [NSURL]], in url: NSURL) throws {
-		let contents = try fileManager.contentsOfDirectoryAtURL(url, includingPropertiesForKeys: nil, options: [ ])
+	private func populateConfigFiles(files: inout [String: [String]], in path: String) throws {
+		let contents = try FileManager.contentsOfDirectory(path)
+		let suffix = ".json"
 
 		for file in contents {
-			guard file.pathExtension == "json" else {
+			guard let fileName = file.split("/").last, suffixRange = fileName.rangeOfString(suffix) where suffixRange.endIndex == fileName.characters.endIndex else {
 				continue
 			}
 
-			guard let name = file.URLByDeletingPathExtension?.lastPathComponent else {
-				continue
-			}
+			let name = fileName.substringToIndex(suffixRange.startIndex)
 
 			if files[name] == nil {
 				files[name] = []
@@ -209,4 +194,3 @@ extension String {
 	}
 
 }
-#endif

Sources/Vapor/Fixes/FileManager.swift

@@ -81,4 +81,55 @@ class FileManager {
         }
         return (true, isDirectory)
     }
-}
+
+	static func expandPath(path: String) throws -> String {
+		let result = realpath(path, nil)
+
+		guard result != nil else {
+			throw Error.Unreadable
+		}
+
+		defer { free(result) }
+
+		if let expanded = String.fromCString(result) {
+			return expanded
+		} else {
+			throw Error.Unreadable
+		}
+	}
+
+	static func contentsOfDirectory(path: String) throws -> [String] {
+		var gt = glob_t()
+		defer { globfree(&gt) }
+
+		let path = try self.expandPath(path).finish("/")
+		let pattern = strdup(path + "*")
+
+		switch glob(pattern, GLOB_MARK | GLOB_NOSORT, nil, &gt) {
+		case GLOB_NOMATCH:
+			return [ ]
+		case GLOB_ABORTED:
+			throw Error.Unreadable
+		default:
+			break
+		}
+
+		var contents = [String]()
+		let count: Int
+
+		#if os(Linux)
+			count = Int(gt.gl_pathc)
+		#else
+			count = Int(gt.gl_matchc)
+		#endif
+
+		for i in 0..<count {
+			if let path = String.fromCString(gt.gl_pathv[i]) {
+				contents.append(path)
+			}
+		}
+
+		return contents
+	}
+
+}

Sources/Vapor/Fixes/StringExtensions.swift

@@ -28,7 +28,7 @@ import libc
     extension String {
 
     }
-#else 
+#else
     extension String {
         func hasPrefix(str: String) -> Bool {
             let strGen = str.characters.generate()
@@ -107,7 +107,15 @@ extension String {
     func split(maxSplit: Int = Int.max, separator: Character) -> [String] {
         return self.characters.split(maxSplit) { $0 == separator }.map(String.init)
     }
-
+
+    public func finish(ending: String) -> String {
+        if hasSuffix(ending) {
+            return self
+        } else {
+            return self + ending
+        }
+    }
+
     func replace(old: Character, new: Character) -> String {
         var buffer = [Character]()
         self.characters.forEach { buffer.append($0 == old ? new : $0) }

Tests/Vapor/ConfigTests.swift

@@ -48,7 +48,7 @@ class ConfigTests: XCTestCase {
 		do {
 			try app.config.populate("./Sources/VaporDev/Config", application: app)
 		} catch {
-			XCTAssert(false, "Failed to load config: \(config)")
+			XCTAssert(false, "Failed to load config: \(error)")
 		}
 
 		return app.config