Merge pull request #97 from finestructure/develop

Release 0.8.0

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [finestructure]

.swift-version

@@ -1 +1 @@
-5.1.3
+5.2.4

.travis.yml

@@ -18,13 +18,13 @@ jobs:
     - name: macos spm test
       stage: test
       os: osx
-      osx_image: xcode11.1
+      osx_image: xcode11.5
       script: make test-macos-spm
 
     - name: macos xcode test
       stage: test
       os: osx
-      osx_image: xcode11.1
+      osx_image: xcode11.5
       script: make test-macos-xcode
       after_success:
         # upload coverage data

Dockerfile.base

@@ -1,4 +1,4 @@
-FROM swift:5.1.3
+FROM swift:5.2.4
 
 WORKDIR /package
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 finestructure OÜ
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -17,6 +17,7 @@ build-docker-app: build-docker-base
 	docker build --tag rester:$(VERSION) -f Dockerfile.app --build-arg VERSION=$(VERSION) .
 
 test-linux-spm: build-docker-base
+	# NB: the following requires > 4GB RAM for your docker machine
 	docker run --rm rester-base swift test --parallel
 
 test-macos-xcode:

Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/mxcl/LegibleError.git",
         "state": {
           "branch": null,
-          "revision": "c615c01e461e8a3495ba4ea75f5d671c76820105",
-          "version": "1.0.1"
+          "revision": "ce5c54a30ab3d4e8c3d32cbd85557867eb6221ec",
+          "version": "1.0.3"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/mxcl/PromiseKit",
         "state": {
           "branch": null,
-          "revision": "80963d4317bcdc03891e0fbaa744f20511d1bc08",
-          "version": "6.12.0"
+          "revision": "f6b15b7626a4399864ffa1d5ec2ed9cf0cea5556",
+          "version": "6.13.2"
         }
       },
       {
@@ -87,8 +87,8 @@
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
         "state": {
           "branch": null,
-          "revision": "12c6a7ce9d67f39a23c6bab757bdb073bd997885",
-          "version": "1.7.1"
+          "revision": "2fd91357e90efe82bfa6845d1e7d5bc2f5025d35",
+          "version": "1.8.1"
         }
       },
       {

Package.swift

@@ -4,8 +4,9 @@ import PackageDescription
 let package = Package(
     name: "Rester",
     platforms: [
-        .iOS(.v10),
+        .iOS(.v11),
         .macOS(.v10_10),
+        .tvOS(.v10)
     ],
     products: [
         .executable(name: "rester", targets: ["Rester"]),
@@ -21,7 +22,7 @@ let package = Package(
         .package(url: "https://github.com/mxcl/PromiseKit", from: "6.0.0"),
         .package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
         .package(url: "https://github.com/pointfreeco/swift-gen.git", from: "0.2.0"),
-        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.7.1"),
+        .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.8.1"),
         .package(url: "https://github.com/PromiseKit/Foundation.git", from: "3.3.4"),
     ],
     targets: [

Tests/ResterTests/Dictionary+extTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 16/04/2019.
 //
 
+#if !os(watchOS)
+
 @testable import ResterCore
 import XCTest
 
@@ -45,3 +47,5 @@ class Dictionary_extTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/ExampleTests.swift

@@ -5,14 +5,15 @@
 //  Created by Sven A. Schmidt on 17/03/2019.
 //
 
+#if !os(iOS) && !os(tvOS) && !os(watchOS)
+
 import Path
 import Regex
 import ResterCore
 import SnapshotTesting
 import XCTest
 
 
-#if !os(iOS)
 class ExampleTests: XCTestCase {
 
     func test_examples() throws {

Tests/ResterTests/IssuesTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 01/04/2019.
 //
 
+#if !os(watchOS)
+
 import XCTest
 
 import Yams
@@ -44,3 +46,5 @@ class IssuesTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/LaunchTests.swift

@@ -5,11 +5,12 @@
 //  Created by Sven A. Schmidt on 19/02/2019.
 //
 
+#if !os(iOS) && !os(tvOS) && !os(watchOS)
+
 import XCTest
 import SnapshotTesting
 
 
-#if !os(iOS)
 class LaunchTests: XCTestCase {
 
     func test_launch_binary() throws {

Tests/ResterTests/MatcherTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 16/04/2019.
 //
 
+#if !os(watchOS)
+
 @testable import ResterCore
 import XCTest
 import Yams
@@ -125,3 +127,5 @@ class MatcherTests: XCTestCase {
         XCTAssertEqual(try Matcher(value: regex), .regex("abc(def)?".r!))
     }
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/ParameterTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 14/03/2019.
 //
 
+#if !os(watchOS)
+
 import XCTest
 @testable import ResterCore
 
@@ -39,3 +41,5 @@ class ParameterTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/PathTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 14/03/2019.
 //
 
+#if !os(watchOS)
+
 import XCTest
 
 class PathTests: XCTestCase {
@@ -15,3 +17,5 @@ class PathTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/RequestLoggingTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 11/04/2019.
 //
 
+#if !os(watchOS)
+
 import LegibleError
 import Path
 @testable import ResterCore
@@ -140,3 +142,5 @@ class RequestLoggingTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/RequestTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 04/02/2019.
 //
 
+#if !os(watchOS)
+
 import XCTest
 
 import Path
@@ -525,3 +527,5 @@ extension Request.Details {
         self.init(url: url, method: nil, headers: nil, query: nil, body: nil, validation: nil, delay: nil, log: nil, variables: nil, when: when)
     }
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/RequestValidationTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 11/04/2019.
 //
 
+#if !os(watchOS)
+
 @testable import ResterCore
 import XCTest
 import Yams
@@ -121,3 +123,5 @@ class RequestValidationTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/ResponseTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 15/04/2019.
 //
 
+#if !os(watchOS)
+
 @testable import ResterCore
 import XCTest
 
@@ -50,3 +52,5 @@ class ResponseTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/ResterTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 19/02/2019.
 //
 
+#if !os(watchOS)
+
 import XCTest
 
 import Gen
@@ -352,7 +354,7 @@ class ResterTests: XCTestCase {
         let expectation = self.expectation(description: #function)
         _ = r.test(before: {_ in}, after: { (name: $0, result: $1) })
             .done { results in
-                XCTAssertEqual(results.map { $0.name }, ["r2"])
+                XCTAssertEqual(results.map { $0.name }, ["r1"])
                 expectation.fulfill()
             }.catch {
                 XCTFail($0.legibleLocalizedDescription)
@@ -552,4 +554,4 @@ class ResterTests: XCTestCase {
 
 }
 
-
+#endif  // !os(watchOS)

Tests/ResterTests/RestfileTests.swift

@@ -5,6 +5,8 @@ import Yams
 @testable import ResterCore
 
 
+#if !os(watchOS)
+
 class RestfileTests: XCTestCase {
 
     func test_decode_variables() throws {
@@ -291,3 +293,5 @@ class RestfileTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/StatsTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 10/04/2019.
 //
 
+#if !os(watchOS)
+
 import XCTest
 @testable import ResterCore
 
@@ -43,3 +45,5 @@ class StatsTests: XCTestCase {
         XCTAssertEqual(values.stddev, 2.19, accuracy: 0.01)
     }
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/SubstitutableTests.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 31/01/2019.
 //
 
+#if !os(watchOS)
+
 @testable import ResterCore
 import XCTest
 import Yams
@@ -55,3 +57,5 @@ class SubstitutableTests: XCTestCase {
     }
 
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/TempDir.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 10/04/2019.
 //
 
+#if !os(watchOS)
+
 import Foundation
 import Path
 
@@ -40,3 +42,5 @@ func withTempDir<T>(body: (Path) throws -> T) throws -> T {
     let tmp = try TempDir()
     return try body(tmp.path)
 }
+
+#endif  // !os(watchOS)

Tests/ResterTests/TestUtils.swift

@@ -5,6 +5,8 @@
 //  Created by Sven A. Schmidt on 30/01/2019.
 //
 
+#if !os(watchOS)
+
 import Foundation
 import Path
 import Regex
@@ -162,7 +164,7 @@ extension String {
 }
 
 
-#if !os(iOS)
+#if !os(iOS) && !os(tvOS)
 func launch(arguments: [String] = []) throws -> (status: Int32, output: String) {
     // Some of the APIs that we use below are available in macOS 10.13 and above.
     guard #available(macOS 10.13, *) else {
@@ -198,7 +200,7 @@ func launch(arguments: [String] = []) throws -> (status: Int32, output: String)
 #endif
 
 
-#if !os(iOS)
+#if !os(iOS) && !os(tvOS)
 func launch(with requestFile: Path, extraArguments: [String] = []) throws -> (status: Int32, output: String) {
     let arguments = [requestFile.string] + extraArguments
     let (status, output) = try launch(arguments: arguments)
@@ -221,3 +223,5 @@ extension Optional {
         }
     }
 }
+
+#endif  // !os(watchOS)