Allowing users to switch to KituraNIO

Kitura · Aug 29, 2018 · bc8952a · bc8952a
1 parent b0b1eec
commit bc8952a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,6 +34,10 @@ matrix:
       dist: trusty
       sudo: required
       env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-19-a
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: SWIFT_SNAPSHOT=swift-4.2-DEVELOPMENT-SNAPSHOT-2018-06-19-a KITURA_NIO=1
     - os: osx
       osx_image: xcode9.2
       sudo: required
@@ -46,6 +50,13 @@ matrix:
       osx_image: xcode10
       sudo: required
       env: SWIFT_SNAPSHOT=4.2
+    - os: osx
+      osx_image: xcode10
+      sudo: required
+      env: SWIFT_SNAPSHOT=4.2 KITURA_NIO=1
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install libressl ; fi
 
 script:
   - ./build.sh
diff --git a/Package.swift b/Package.swift
@@ -18,6 +18,15 @@
  **/
 
 import PackageDescription
+import Foundation
+
+var kituraNetPackage: Package.Dependency
+
+if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil {
+    kituraNetPackage = .package(url: "https://github.com/IBM-Swift/Kitura-NIO.git", from: "1.0.0")
+} else {
+    kituraNetPackage = .package(url: "https://github.com/IBM-Swift/Kitura-net.git", from: "2.1.0")
+}
 
 let package = Package(
     name: "Kitura",
@@ -29,7 +38,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/IBM-Swift/Kitura-net.git", from: "2.1.0"),
+        kituraNetPackage,
         .package(url: "https://github.com/IBM-Swift/Kitura-TemplateEngine.git", from: "2.0.0"),
         .package(url: "https://github.com/IBM-Swift/KituraContracts.git", from: "1.0.0"),
         .package(url: "https://github.com/IBM-Swift/TypeDecoder.git", from: "1.1.0")

diff --git a/Tests/KituraTests/TestServer.swift b/Tests/KituraTests/TestServer.swift
@@ -33,6 +33,7 @@ class TestServer: KituraTest {
 
     let httpPort = 8080
     let fastCgiPort = 9000
+    let useNIO = ProcessInfo.processInfo.environment["KITURA_NIO"] != nil
 
     override func setUp() {
         super.setUp()
@@ -42,7 +43,7 @@ class TestServer: KituraTest {
     private func setupServerAndExpectations(expectStart: Bool, expectStop: Bool, expectFail: Bool, httpPort: Int?=nil, fastCgiPort: Int?=nil) {
         let router = Router()
         let httpServer = Kitura.addHTTPServer(onPort: httpPort ?? self.httpPort, with: router)
-        let fastCgiServer = Kitura.addFastCGIServer(onPort: fastCgiPort ?? self.fastCgiPort, with: router)
+        let fastCgiServer = useNIO ? FastCGIServer() : Kitura.addFastCGIServer(onPort: fastCgiPort ?? self.fastCgiPort, with: router)
 
         if expectStart {
             let httpStarted = expectation(description: "HTTPServer started()")
@@ -51,15 +52,24 @@ class TestServer: KituraTest {
             httpServer.started {
                 httpStarted.fulfill()
             }
-            fastCgiServer.started {
+
+            if useNIO {
                 fastCgiStarted.fulfill()
+            } else {
+                fastCgiServer.started {
+                    fastCgiStarted.fulfill()
+                }
             }
+
         } else {
             httpServer.started {
                 XCTFail("httpServer.started should not have been called")
             }
-            fastCgiServer.started {
-                XCTFail("fastCgiServer.started should not have been called")
+
+            if !useNIO {
+                fastCgiServer.started {
+                    XCTFail("fastCgiServer.started should not have been called")
+                }
             }
         }
 
@@ -70,8 +80,13 @@ class TestServer: KituraTest {
             httpServer.stopped {
                 httpStopped.fulfill()
             }
-            fastCgiServer.stopped {
+
+            if useNIO {
                 fastCgiStopped.fulfill()
+            } else {
+                fastCgiServer.stopped {
+                    fastCgiStopped.fulfill()
+                }
             }
         }
 
@@ -82,15 +97,24 @@ class TestServer: KituraTest {
             httpServer.failed { error in
                 httpFailed.fulfill()
             }
-            fastCgiServer.failed { error in
+
+            if useNIO {
                 fastCgiFailed.fulfill()
+            } else {
+                fastCgiServer.failed { error in
+                    fastCgiFailed.fulfill()
+                }
             }
+
         } else {
             httpServer.failed { error in
                 XCTFail("\(error)")
             }
-            fastCgiServer.failed { error in
-                XCTFail("\(error)")
+
+            if !useNIO {
+                fastCgiServer.failed { error in
+                    XCTFail("\(error)")
+                }
             }
         }
     }

diff --git a/build.sh b/build.sh
@@ -4,7 +4,7 @@ set -o verbose
 
 if [ -n "${DOCKER_IMAGE}" ]; then
     docker pull ${DOCKER_IMAGE}
-    docker run --env SWIFT_SNAPSHOT -v ${TRAVIS_BUILD_DIR}:${TRAVIS_BUILD_DIR} ${DOCKER_IMAGE} /bin/bash -c "apt-get update && apt-get install -y git sudo lsb-release wget libxml2 && cd $TRAVIS_BUILD_DIR && ./build.sh"
+    docker run --env SWIFT_SNAPSHOT --env KITURA_NIO -v ${TRAVIS_BUILD_DIR}:${TRAVIS_BUILD_DIR} ${DOCKER_IMAGE} /bin/bash -c "apt-get update && apt-get install -y git sudo lsb-release wget libxml2 && cd $TRAVIS_BUILD_DIR && ./build.sh"
 else
     git clone https://github.com/IBM-Swift/Package-Builder.git
     ./Package-Builder/build-package.sh -projectDir $(pwd)