Issue.path resolution (#48)

* Extracts Path resolution

* Corrects test case

* Uses updated FileKit api

* Adds Test case

.gitignore

@@ -6,6 +6,7 @@
 ## Build generated
 build/
 DerivedData/
+.DS_Store
 
 ## Various settings
 *.pbxuser

Package.swift

@@ -30,14 +30,15 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMajor(from: "1.0.0"))
+        .package(url: "https://github.com/IBM-Swift/LoggerAPI.git", .upToNextMajor(from: "1.0.0")),
+        .package(url: "https://github.com/IBM-Swift/FileKit.git", .upToNextMajor(from: "0.0.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: "Configuration",
-            dependencies: ["LoggerAPI"]
+            dependencies: ["LoggerAPI", "FileKit"]
         ),
         .testTarget(
             name: "ConfigurationTests",

Sources/Configuration/ConfigurationManager.swift

@@ -16,6 +16,7 @@
 
 import Foundation
 import LoggerAPI
+import FileKit
 
 /// ConfigurationManager class
 ///
@@ -79,11 +80,11 @@ public class ConfigurationManager {
         public var path: String {
             switch self {
             case .executable:
-                return executableFolder
+                return FileKit.executableFolder
             case .pwd:
-                return presentWorkingDirectory
+                return FileKit.workingDirectory
             case .project:
-                return projectFolder
+                return FileKit.projectFolder
             case .customPath(let path):
                 return path
             }

Tests/ConfigurationTests/ConfigurationManagerTest.swift

@@ -16,6 +16,7 @@
 
 import XCTest
 import Foundation
+import FileKit
 @testable import Configuration
 
 class ConfigurationManagerTest: XCTestCase {
@@ -32,9 +33,12 @@ class ConfigurationManagerTest: XCTestCase {
 
     static let testJSONURL = URL(fileURLWithPath: #file).appendingPathComponent("../test.json").standardized
 
-    static let symlinkInPWD = URL(fileURLWithPath: "test.json")
+    static let symlinkInPWD = { () -> URL in
+        var pwd = FileKit.workingDirectoryURL.appendingPathComponent("test.json")
+        return FileKit.executableURL.path.hasSuffix("/xctest") ? pwd : URL(fileURLWithPath: "test.json")
+    }()
 
-    static let symlinkInExecutableFolder = URL(fileURLWithPath: executableFolder).appendingPathComponent("test.json").standardized
+    static let symlinkInExecutableFolder = URL(fileURLWithPath: FileKit.executableFolder).appendingPathComponent("test.json").standardized
 
     let jsonString = "{\n    \"env\": \"<default>\",\n    \"OAuth\": {\n        \"name\": \"facebook\",\n        \"configuration\": {\n            \"clientID\": \"<default>\",\n            \"clientSecret\": \"<default>\",\n            \"profileFields\": [\"displayName\", \"emails\", \"id\", \"name\"],\n            \"profileURL\": \"https://graph.facebook.com/v2.6/me\",\n            \"scope\": [\"email\"],\n            \"state\": true\n        }\n    },\n    \"port\": \"<default>\"\n}"
 
@@ -172,6 +176,10 @@ class ConfigurationManagerTest: XCTestCase {
         manager = ConfigurationManager().load(file: "test.json", relativeFrom: .pwd)
         XCTAssertEqual(manager["OAuth:configuration:state"] as? Bool, true)
 
+        // Project Folder
+        manager = ConfigurationManager().load(file: "test.json", relativeFrom: .project)
+        XCTAssertEqual(manager["OAuth:configuration:state"] as? Bool, true)
+
         // Executable
         manager = ConfigurationManager().load(file: "test.json", relativeFrom: .executable)
         XCTAssertEqual(manager["OAuth:configuration:state"] as? Bool, true)