Add compatibility with Swift 3.0

Author: kylef

.gitignore

@@ -1,15 +1,12 @@
-/.build/
-Example/example
-tests.swift
-Tests/Integration/Failing
-Tests/Integration/Failing-dot-output.txt
-Tests/Integration/Failing-output.txt
-Tests/Integration/Failing-tap-output.txt
-Tests/Integration/Passing
-Tests/Integration/Passing-dot-output.txt
-Tests/Integration/Passing-output.txt
-Tests/Integration/Passing-tap-output.txt
-Tests/Integration/Disabled
-Tests/Integration/Disabled-dot-output.txt
-Tests/Integration/Disabled-output.txt
-Tests/Integration/Disabled-tap-output.txt
+.build/
+Packages/
+*.xcodeproj
+IntegrationTests/Failing-dot-output.txt
+IntegrationTests/Failing-output.txt
+IntegrationTests/Failing-tap-output.txt
+IntegrationTests/Passing-dot-output.txt
+IntegrationTests/Passing-output.txt
+IntegrationTests/Passing-tap-output.txt
+IntegrationTests/Disabled-dot-output.txt
+IntegrationTests/Disabled-output.txt
+IntegrationTests/Disabled-tap-output.txt

.swift-version

@@ -0,0 +1 @@
+3.0-GM-CANDIDATE

.travis.yml

@@ -1,11 +1,8 @@
-language: objective-c
-osx_image: xcode7.3
-env:
-- SWIFT_VERSION=2.2
-- SWIFT_VERSION=3.0-preview-1-SNAPSHOT-2016-05-31-a
+language: generic
+sudo: required
+dist: trusty
 install:
 - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
-- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo python -m ensurepip; fi
-- sudo pip install swim
 script:
-- swim test
+- swift test
+- cd IntegrationTests && swift build && ./run.sh Failing Passing Disabled

Example/example.swift

@@ -1,7 +1,7 @@
 F
 
  a person named kyle is Kyle
-  Tests/Integration/Failing.swift:10 Katie is not equal to Kyle
+  Sources/Failing/main.swift:10 Katie is not equal to Kyle
 
   ```
   try expect(person) == "Kyle"

Tests/Integration/Disabled-expected-dot-output.txt IntegrationTests/Disabled-expected-dot-output.txt

@@ -4,7 +4,7 @@
 
 
  a person named kyle is Kyle
-  Tests/Integration/Failing.swift:10 Katie is not equal to Kyle
+  Sources/Failing/main.swift:10 Katie is not equal to Kyle
 
   ```
   try expect(person) == "Kyle"

Tests/Integration/Disabled-expected-output.txt IntegrationTests/Disabled-expected-output.txt

@@ -0,0 +1,3 @@
+not ok 1 - a person named kyle is Kyle
+# Katie is not equal to Kyle from Sources/Failing/main.swift:10
+1..1

Tests/Integration/Disabled-expected-tap-output.txt IntegrationTests/Disabled-expected-tap-output.txt

@@ -0,0 +1,11 @@
+import PackageDescription
+
+
+let package = Package(
+  name: "SpectreIntegration",
+  targets: [
+    Target(name: "Passing", dependencies: ["Spectre"]),
+    Target(name: "Disabled", dependencies: ["Spectre"]),
+    Target(name: "Failing", dependencies: ["Spectre"]),
+  ]
+)

Tests/Integration/Failing-expected-dot-output.txt IntegrationTests/Failing-expected-dot-output.txt

@@ -0,0 +1 @@
+../../Sources/

Tests/Integration/Failing-expected-output.txt IntegrationTests/Failing-expected-output.txt

@@ -6,33 +6,35 @@ for var in "$@"; do
   echo "-> '$var'"
   rm $var-output.txt $var-dot-output.txt $var-tap-output.txt 2>/dev/null
 
-  ./$var > $var-output.txt
+  ./.build/debug/$var > $var-output.txt
   if [ $? != 0 ]; then
-    if [ $var != "Tests/Integration/Failing" ]; then
+    if [ $var != "Failing" ]; then
       echo "    - Integration Failed"
       EXIT_CODE=1
     fi
-  elif [ $var = "Tests/Integration/Failing" ]; then
+  elif [ $var = "Failing" ]; then
     echo "    - Failing Integration Succeeded"
     EXIT_CODE=1
   fi
-  ./$var -t > $var-dot-output.txt
+
+  ./.build/debug/$var -t > $var-dot-output.txt
   if [ $? != 0 ]; then
-    if [ $var != "Tests/Integration/Failing" ]; then
+    if [ $var != "Failing" ]; then
       echo "    - Dot Integration Failed"
       EXIT_CODE=1
     fi
-  elif [ $var = "Tests/Integration/Failing" ]; then
+  elif [ $var = "Failing" ]; then
     echo "    - Failing Dot Integration Succeeded"
     EXIT_CODE=1
   fi
-  ./$var --tap > $var-tap-output.txt
+
+  ./.build/debug/$var --tap > $var-tap-output.txt
   if [ $? != 0 ]; then
-    if [ $var != "Tests/Integration/Failing" ]; then
+    if [ $var != "Failing" ]; then
       echo "    - Tap Integration Failed"
       EXIT_CODE=1
     fi
-  elif [ $var = "Tests/Integration/Failing" ]; then
+  elif [ $var = "Failing" ]; then
     echo "    - Failing Tap Integration Succeeded"
     EXIT_CODE=1
   fi

IntegrationTests/Failing-expected-tap-output.txt

@@ -8,13 +8,13 @@ class Case : CaseType {
   let disabled: Bool
   let closure:() throws -> ()
 
-  init(name:String, disabled: Bool = false, closure:() throws -> ()) {
+  init(name: String, disabled: Bool = false, closure: @escaping () throws -> ()) {
     self.name = name
     self.disabled = disabled
     self.closure = closure
   }
 
-  func run(reporter:ContextReporter) {
+  func run(reporter: ContextReporter) {
     if disabled {
       reporter.addDisabled(name)
       return

IntegrationTests/Package.swift

@@ -11,20 +11,20 @@ public protocol ContextType {
   /// Creates a new disabled sub-context
   func xdescribe(_ name: String, closure: (ContextType) -> Void)
 
-  func before(closure: () -> Void)
-  func after(closure: () -> Void)
+  func before(_ closure: @escaping () -> Void)
+  func after(_ closure: @escaping () -> Void)
 
   /// Adds a new test case
-  func it(_ name: String, closure: () throws -> Void)
+  func it(_ name: String, closure: @escaping () throws -> Void)
 
   /// Adds a disabled test case
-  func xit(_ name: String, closure: () throws -> Void)
+  func xit(_ name: String, closure: @escaping () throws -> Void)
 }
 
 class Context : ContextType, CaseType {
   let name: String
   let disabled: Bool
-  private weak var parent: Context?
+  fileprivate weak var parent: Context?
   var cases = [CaseType]()
 
   typealias Before = (() -> Void)
@@ -63,19 +63,19 @@ class Context : ContextType, CaseType {
     cases.append(context)
   }
 
-  func before(closure: () -> Void) {
+  func before(_ closure: @escaping () -> Void) {
     befores.append(closure)
   }
 
-  func after(closure: () -> Void) {
+  func after(_ closure: @escaping () -> Void) {
     afters.append(closure)
   }
 
-  func it(_ name: String, closure: () throws -> Void) {
+  func it(_ name: String, closure: @escaping () throws -> Void) {
     cases.append(Case(name: name, closure: closure))
   }
 
-  func xit(_ name: String, closure: () throws -> Void) {
+  func xit(_ name: String, closure: @escaping () throws -> Void) {
     cases.append(Case(name: name, disabled: true, closure: closure))
   }
 
@@ -98,14 +98,9 @@ class Context : ContextType, CaseType {
     reporter.report(name) { reporter in
       cases.forEach {
         runBefores()
-#if swift(>=3.0)
         $0.run(reporter: reporter)
-#else
-        $0.run(reporter)
-#endif
         runAfters()
       }
     }
   }
 }
-