Renaming all elements from CloudEnvironment to CloudFoundryEnv.

.gitignore

@@ -1,4 +1,2 @@
 .build/*
 Packages/*
-CloudEnvironment.xcodeproj/xcuserdata/*
-CloudEnvironment.xcodeproj/project.xcworkspace/xcuserdata/*

Package.swift

@@ -17,10 +17,10 @@
 import PackageDescription
 
 let package = Package(
-    name: "CloudEnvironment",
+    name: "CloudFoundryEnv",
     targets: [
       Target(
-        name: "CloudEnvironment",
+        name: "CloudFoundryEnv",
         dependencies: []
       ),
     ],

README.md

@@ -28,15 +28,15 @@ To leverage the Swift-cfenv package in your Swift application, you should specif
      ])
  ```
 
- Once the Package.swift file of your application has been updated accordingly, you can import the `CloudEnvironment` module in your code:
+ Once the Package.swift file of your application has been updated accordingly, you can import the `CloudFoundryEnv` module in your code:
 
 ```swift
-import CloudEnvironment
+import CloudFoundryEnv
 
 ...
 
 do {
-  let appEnv = try CloudEnvironment.getAppEnv()
+  let appEnv = try CloudFoundryEnv.getAppEnv()
   // Use the given port and binding host values to create a socket for our server...
   let ip: String = appEnv.bind
   let port: Int = appEnv.port
@@ -48,7 +48,7 @@ do {
 
   ...
 
-} catch CloudEnvironmentError.InvalidValue {
+} catch CloudFoundryEnvError.InvalidValue {
   print("Oops, something went wrong... Server did not start!")
 }
 ```
@@ -67,8 +67,8 @@ The following environment variables, which are set when your application is runn
 If the `VCAP_APPLICATION` isn't set, it is then assumed that your application is running locally. For such cases, the [`AppEnv`](#appenv) instance returns values that are still useful for starting your application. Therefore, this Swift package can be used when running in Cloud Foundry and when running locally.
 
 ## API
-### `CloudEnvironment`
-To get an instance of the [`AppEnv`](#appenv) structure, you can use one of the following methods of the `CloudEnvironment` structure:
+### `CloudFoundryEnv`
+To get an instance of the [`AppEnv`](#appenv) structure, you can use one of the following methods of the `CloudFoundryEnv` structure:
 
 - `getAppEnv(options: JSON)`
 - `getAppEnv()`

Sources/CloudEnvironment/AppEnv.swift → Sources/CloudFoundryEnv/AppEnv.swift

@@ -251,7 +251,7 @@ public struct AppEnv {
       if let json = JSONUtils.convertStringToJSON(text: environmentVars[variableName]) {
         return json
       }
-      throw CloudEnvironmentError.InvalidValue("Environment variable \(variableName) is not a valid JSON string!")
+      throw CloudFoundryEnvError.InvalidValue("Environment variable \(variableName) is not a valid JSON string!")
     }
   }
 
@@ -275,7 +275,7 @@ public struct AppEnv {
     if let number = Int(portString) {
       return number
     } else {
-      throw CloudEnvironmentError.InvalidValue("Invalid PORT value: \(portString)")
+      throw CloudFoundryEnvError.InvalidValue("Invalid PORT value: \(portString)")
     }
   }
 

Sources/CloudEnvironment/CloudEnvironment.swift → Sources/CloudFoundryEnv/CloudFoundryEnv.swift

@@ -19,7 +19,7 @@ import SwiftyJSON
 /**
  * Functions as a factory to create instances of the AppEnv structure.
  */
-public struct CloudEnvironment {
+public struct CloudFoundryEnv {
 
   public static func getAppEnv(options: JSON = [:]) throws -> AppEnv {
     return try AppEnv(options: options)

Sources/CloudEnvironment/CloudEnvironmentError.swift → Sources/CloudFoundryEnv/CloudFoundryEnvError.swift

@@ -14,6 +14,6 @@
  * limitations under the License.
  **/
 
-public enum CloudEnvironmentError: ErrorProtocol {
+public enum CloudFoundryEnvError: ErrorProtocol {
   case InvalidValue(String)
 }

Tests/CloudEnvironment/MainTests.swift → Tests/CloudFoundryEnv/MainTests.swift

@@ -24,7 +24,7 @@ import XCTest
 import Foundation
 import SwiftyJSON
 
-@testable import CloudEnvironment
+@testable import CloudFoundryEnv
 
 /**
 * Online tool for escaping JSON: http://www.freeformatter.com/javascript-escape.html
@@ -59,7 +59,7 @@ class MainTests : XCTestCase {
 
   func testGetApp() {
     do {
-      let appEnv = try CloudEnvironment.getAppEnv(options: jsonOptions)
+      let appEnv = try CloudFoundryEnv.getAppEnv(options: jsonOptions)
       if let app = appEnv.getApp() {
         XCTAssertNotNil(app)
         XCTAssertEqual(app.port, 61263, "Application port number should match.")
@@ -100,7 +100,7 @@ class MainTests : XCTestCase {
   func testGetServices() {
     do {
       //print("json \(json)")
-      let appEnv = try CloudEnvironment.getAppEnv(options: jsonOptions)
+      let appEnv = try CloudFoundryEnv.getAppEnv(options: jsonOptions)
       //let servs = appEnv.services
       //print("servs \(servs)")
       let services = appEnv.getServices()
@@ -122,7 +122,7 @@ class MainTests : XCTestCase {
 
   func testGetService() {
     do {
-      let appEnv = try CloudEnvironment.getAppEnv(options: jsonOptions)
+      let appEnv = try CloudFoundryEnv.getAppEnv(options: jsonOptions)
       let checkService = { (name: String) in
         if let service = appEnv.getService(spec: name) {
           self.verifyService(service: service)
@@ -148,7 +148,7 @@ class MainTests : XCTestCase {
   func testGetAppEnv() {
     do {
       // Case #1 - Running locally, no options
-      var appEnv = try CloudEnvironment.getAppEnv()
+      var appEnv = try CloudFoundryEnv.getAppEnv()
       XCTAssertEqual(appEnv.isLocal, true, "AppEnv's isLocal should be true.")
       XCTAssertEqual(appEnv.port, 8090, "AppEnv's port should be 8090.")
       XCTAssertNil(appEnv.name, "AppEnv's name should be nil.")
@@ -159,7 +159,7 @@ class MainTests : XCTestCase {
       XCTAssertEqual(appEnv.services.count, 0, "AppEnv's services array should contain 0 elements.")
 
       // Case #2 - Running locally with options
-      appEnv = try CloudEnvironment.getAppEnv(options: jsonOptions)
+      appEnv = try CloudFoundryEnv.getAppEnv(options: jsonOptions)
       XCTAssertEqual(appEnv.isLocal, true, "AppEnv's isLocal should be true.")
       XCTAssertEqual(appEnv.port, 8090, "AppEnv's port should be 8090.")
       XCTAssertEqual(appEnv.name, "swift-test")
@@ -181,7 +181,7 @@ class MainTests : XCTestCase {
       let name = "Cloudant NoSQL DB-kd"
 
       // Case #1 - Running locally, no options
-      let appEnv = try CloudEnvironment.getAppEnv()
+      let appEnv = try CloudFoundryEnv.getAppEnv()
       let serviceURL = appEnv.getServiceURL(spec: name, replacements: nil)
       XCTAssertNil(serviceURL, "The serviceURL should be nil.")
 
@@ -208,7 +208,7 @@ class MainTests : XCTestCase {
 
   func testGetServiceCreds() {
     do {
-      let appEnv = try CloudEnvironment.getAppEnv(options: jsonOptions)
+      let appEnv = try CloudFoundryEnv.getAppEnv(options: jsonOptions)
       let checkServiceCreds = { (name: String) in
         if let serviceCreds = appEnv.getServiceCreds(spec: name) {
           self.verifyServiceCreds(serviceCreds: serviceCreds)
@@ -238,7 +238,7 @@ class MainTests : XCTestCase {
   }
 
   private func verifyServiceURLWithOptions(name: String, replacements: String?, expectedServiceURL: String) throws {
-    let appEnv = try CloudEnvironment.getAppEnv(options: jsonOptions)
+    let appEnv = try CloudFoundryEnv.getAppEnv(options: jsonOptions)
     let substitutions = JSONUtils.convertStringToJSON(text: replacements)
     if let serviceURL = appEnv.getServiceURL(spec: name, replacements: substitutions) {
         XCTAssertEqual(serviceURL, expectedServiceURL, "ServiceURL should match '\(expectedServiceURL)'.")

Tests/CloudEnvironment/UtilsTests.swift → Tests/CloudFoundryEnv/UtilsTests.swift

@@ -24,7 +24,7 @@ import XCTest
 import Foundation
 import SwiftyJSON
 
-@testable import CloudEnvironment
+@testable import CloudFoundryEnv
 
 /**
 * Online tool for escaping JSON: http://www.freeformatter.com/javascript-escape.html

Tests/LinuxMain.swift

@@ -16,7 +16,7 @@
 
 import XCTest
 
-@testable import CloudEnvironmentTestSuite
+@testable import CloudFoundryEnvTestSuite
 
 XCTMain([
     testCase(MainTests.allTests),