Built with Xcode 8.3.1

s4cha · s4cha · commit 24e07df98288 · 2017-04-13T14:38:18.000+02:00
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -3,6 +3,7 @@ disabled_rules:
 - trailing_whitespace
 - large_tuple
 - force_try
+- identifier_name
 opt_in_rules:
 # - missing_docs
 - force_unwrapping
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # then
 [![Language: Swift 2 and 3](https://img.shields.io/badge/language-swift2|3-f48041.svg?style=flat)](https://developer.apple.com/swift)
-![Platform: iOS 8+](https://img.shields.io/badge/platform-iOS%208%2B-blue.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+![Platform: iOS 8+/macOS10.11](https://img.shields.io/badge/platform-iOS%208%2B | OSX-blue.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Cocoapods compatible](https://img.shields.io/badge/Cocoapods-compatible-4BC51D.svg?style=flat)](https://cocoapods.org)
 [![Build Status](https://www.bitrise.io/app/ea9933b066f6a2c4.svg?token=i7LK0uQC1rVuXhDq1iskYg&branch=master)](https://www.bitrise.io/app/ea9933b066f6a2c4)
 [![codebeat badge](https://codebeat.co/badges/768d3017-1e65-47e0-b287-afcb8954a1da)](https://codebeat.co/projects/github-com-s4cha-then)
@@ -390,7 +390,7 @@ Grab this repository and build the Framework target on the example project. Then
 
 ## Swift Version
 Swift 2 -> version **1.4.2**  
-Swift 3 -> version **2.2.1**
+Swift 3 -> version **2.2.2**
 
 <!-- Place this tag in your head or just before your close body tag. -->
 <script async defer src="https://buttons.github.io/buttons.js"></script>
diff --git a/Source/Info.plist b/Source/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/then.framework.zip b/then.framework.zip
diff --git a/thenMacOS/Info.plist b/thenMacOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.1</string>
+	<string>2.2.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/thenPromise.podspec b/thenPromise.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'thenPromise'
-  s.version          = "2.2.1"
+  s.version          = "2.2.2"
   s.summary          = "Elegant Promises for Swift"
   s.homepage         = "https://github.com/freshOS/then"
   s.license          = { :type => "MIT", :file => "LICENSE" }
diff --git a/thenTests/AsyncAwaitTests.swift b/thenTests/AsyncAwaitTests.swift
@@ -28,7 +28,7 @@ class AsyncAwaitTests: XCTestCase {
     func testFailingAsyncAwait() {
         let exp = expectation(description: "")
         async {
-            let _ = try await(failingFetchUserFollowStatusFromName("JohnDoe"))
+            _ = try await(failingFetchUserFollowStatusFromName("JohnDoe"))
             XCTFail()
         }.onError { _ in
             exp.fulfill()
@@ -39,7 +39,7 @@ class AsyncAwaitTests: XCTestCase {
     func testCatchFailingAsyncAwait() {        
         let exp = expectation(description: "")
         do {
-            let _ = try await(failingFetchUserFollowStatusFromName("JohnDoe"))
+            _ = try await(failingFetchUserFollowStatusFromName("JohnDoe"))
             XCTFail()
         } catch {
             exp.fulfill()
diff --git a/thenTests/FinallyTests.swift b/thenTests/FinallyTests.swift
@@ -45,7 +45,7 @@ class FinallyTests: XCTestCase {
         syncRejectionPromise().registerFinally {
              XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             exp.fulfill()
         }
         waitForExpectations(timeout: 1, handler: nil)
diff --git a/thenTests/Helpers.swift b/thenTests/Helpers.swift
@@ -70,7 +70,7 @@ func syncRejectionPromise() -> Promise<Int> {
 func fetchUserId() -> Promise<Int> {
     return Promise { resolve, _ in
         print("fetching user Id ...")
-        wait {
+        testWait {
             resolve(1234)
             print("GOT USER ID 1234")
         }
@@ -80,33 +80,33 @@ func fetchUserId() -> Promise<Int> {
 func fetchUserNameFromId(_ identifier: Int) -> Promise<String> {
     return Promise { resolve, _ in
         print("fetching UserName FromId : \(identifier) ...")
-        wait { resolve("John Smith") }
+        testWait { resolve("John Smith") }
     }
 }
 
 func fetchUserFollowStatusFromName(_ name: String) -> Promise<Bool> {
     return Promise { resolve, _ in
         print("fetchUserFollowStatusFromName: \(name) ...")
-        wait { resolve(false) }
+        testWait { resolve(false) }
     }
 }
 
 func failingFetchUserFollowStatusFromName(_ name: String) -> Promise<Bool> {
     return Promise { _, reject in
         print("fetchUserFollowStatusFromName: \(name) ...")
-        wait { reject(MyError.defaultError) }
+        testWait { reject(MyError.defaultError) }
     }
 }
 
-func wait(_ callback:@escaping () -> Void) {
+func testWait(_ callback:@escaping () -> Void) {
     let delay = 0.1 * Double(NSEC_PER_SEC)
     let time = DispatchTime.now() + Double(Int64(delay)) / Double(NSEC_PER_SEC)
     DispatchQueue.global(qos: DispatchQoS.QoSClass.background).asyncAfter(deadline: time) {
         callback()
     }
 }
 
-func wait(_ time: Double, callback: @escaping () -> Void) {
+func testWait(_ time: Double, callback: @escaping () -> Void) {
     let delay = time * Double(NSEC_PER_SEC)
     let time = DispatchTime.now() + Double(Int64(delay)) / Double(NSEC_PER_SEC)
     DispatchQueue.main.asyncAfter(deadline: time) {
@@ -116,9 +116,9 @@ func wait(_ time: Double, callback: @escaping () -> Void) {
 
 func upload() -> Promise<Void> {
     return Promise<Void> { resolve, _, progress in
-        wait {
+        testWait {
             progress(0.8)
-            wait {
+            testWait {
                 resolve()
             }
         }
@@ -127,9 +127,9 @@ func upload() -> Promise<Void> {
 
 func failingUpload() -> Promise<Void> {
     return Promise<Void> { _, reject, progress in
-        wait {
+        testWait {
             progress(0.8)
-            wait {
+            testWait {
                 reject(NSError(domain: "", code: 1223, userInfo: nil))
             }
         }
diff --git a/thenTests/OnErrorTests.swift b/thenTests/OnErrorTests.swift
@@ -116,7 +116,7 @@ class OnErrorTests: XCTestCase {
         syncRejectionPromise().registerOnError { _ in
             XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             exp.fulfill()
         }
         waitForExpectations(timeout: 1, handler: nil)
diff --git a/thenTests/RaceTests.swift b/thenTests/RaceTests.swift
@@ -14,12 +14,12 @@ class RaceTests: XCTestCase {
     func testRaceFirstArrivesFirst() {
         let e = expectation(description: "")
         let p1 = Promise<String> { r, _ in
-            wait(1) {
+            testWait(1) {
                 r("1")
             }
         }
         let p2 = Promise<String> { r, _ in
-            wait(2) {
+            testWait(2) {
                 r("2")
             }
         }
@@ -34,7 +34,7 @@ class RaceTests: XCTestCase {
         let e = expectation(description: "")
         let p1 = Promise<String>.reject()
         let p2 = Promise<String> { r, _ in
-            wait(2) {
+            testWait(2) {
                 r("2")
             }
         }
diff --git a/thenTests/RegisterThenTests.swift b/thenTests/RegisterThenTests.swift
@@ -21,7 +21,7 @@ class RegisterThenTests: XCTestCase {
             }.registerThen {_ in
                 XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             timerExpectation.fulfill()
         }
         waitForExpectations(timeout: 5, handler: nil)
@@ -38,7 +38,7 @@ class RegisterThenTests: XCTestCase {
             }.registerThen {_ in
                 XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             timerExpectation.fulfill()
         }
         waitForExpectations(timeout: 5, handler: nil)
@@ -54,7 +54,7 @@ class RegisterThenTests: XCTestCase {
             }.registerThen { _ in
                 XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             timerExpectation.fulfill()
         }
         waitForExpectations(timeout: 5, handler: nil)
@@ -97,7 +97,7 @@ class RegisterThenTests: XCTestCase {
             .registerThen { _ in
                 XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             timerExpectation.fulfill()
         }
         waitForExpectations(timeout: 5, handler: nil)
@@ -110,7 +110,7 @@ class RegisterThenTests: XCTestCase {
             }.registerThen { _ in
                 XCTFail()
         }
-        wait(1) {
+        testWait(1) {
             timerExpectation.fulfill()
         }
         waitForExpectations(timeout: 5, handler: nil)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class FinallyTests: XCTestCase {`
`45`	`45`	`syncRejectionPromise().registerFinally {`
`46`	`46`	`XCTFail()`
`47`	`47`	`}`
`48`		`- wait(1) {`
	`48`	`+ testWait(1) {`
`49`	`49`	`exp.fulfill()`
`50`	`50`	`}`
`51`	`51`	`waitForExpectations(timeout: 1, handler: nil)`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func syncRejectionPromise() -> Promise<Int> {`
`70`	`70`	`func fetchUserId() -> Promise<Int> {`
`71`	`71`	`return Promise { resolve, _ in`
`72`	`72`	`print("fetching user Id ...")`
`73`		`- wait {`
	`73`	`+ testWait {`
`74`	`74`	`resolve(1234)`
`75`	`75`	`print("GOT USER ID 1234")`
`76`	`76`	`}`
`@@ -80,33 +80,33 @@ func fetchUserId() -> Promise<Int> {`
`80`	`80`	`func fetchUserNameFromId(_ identifier: Int) -> Promise<String> {`
`81`	`81`	`return Promise { resolve, _ in`
`82`	`82`	`print("fetching UserName FromId : \(identifier) ...")`
`83`		`- wait { resolve("John Smith") }`
	`83`	`+ testWait { resolve("John Smith") }`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`func fetchUserFollowStatusFromName(_ name: String) -> Promise<Bool> {`
`88`	`88`	`return Promise { resolve, _ in`
`89`	`89`	`print("fetchUserFollowStatusFromName: \(name) ...")`
`90`		`- wait { resolve(false) }`
	`90`	`+ testWait { resolve(false) }`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func failingFetchUserFollowStatusFromName(_ name: String) -> Promise<Bool> {`
`95`	`95`	`return Promise { _, reject in`
`96`	`96`	`print("fetchUserFollowStatusFromName: \(name) ...")`
`97`		`- wait { reject(MyError.defaultError) }`
	`97`	`+ testWait { reject(MyError.defaultError) }`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-func wait(_ callback:@escaping () -> Void) {`
	`101`	`+func testWait(_ callback:@escaping () -> Void) {`
`102`	`102`	`let delay = 0.1 * Double(NSEC_PER_SEC)`
`103`	`103`	`let time = DispatchTime.now() + Double(Int64(delay)) / Double(NSEC_PER_SEC)`
`104`	`104`	`DispatchQueue.global(qos: DispatchQoS.QoSClass.background).asyncAfter(deadline: time) {`
`105`	`105`	`callback()`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`		`-func wait(_ time: Double, callback: @escaping () -> Void) {`
	`109`	`+func testWait(_ time: Double, callback: @escaping () -> Void) {`
`110`	`110`	`let delay = time * Double(NSEC_PER_SEC)`
`111`	`111`	`let time = DispatchTime.now() + Double(Int64(delay)) / Double(NSEC_PER_SEC)`
`112`	`112`	`DispatchQueue.main.asyncAfter(deadline: time) {`
`@@ -116,9 +116,9 @@ func wait(_ time: Double, callback: @escaping () -> Void) {`
`116`	`116`
`117`	`117`	`func upload() -> Promise<Void> {`
`118`	`118`	`return Promise<Void> { resolve, _, progress in`
`119`		`- wait {`
	`119`	`+ testWait {`
`120`	`120`	`progress(0.8)`
`121`		`- wait {`
	`121`	`+ testWait {`
`122`	`122`	`resolve()`
`123`	`123`	`}`
`124`	`124`	`}`
`@@ -127,9 +127,9 @@ func upload() -> Promise<Void> {`
`127`	`127`
`128`	`128`	`func failingUpload() -> Promise<Void> {`
`129`	`129`	`return Promise<Void> { _, reject, progress in`
`130`		`- wait {`
	`130`	`+ testWait {`
`131`	`131`	`progress(0.8)`
`132`		`- wait {`
	`132`	`+ testWait {`
`133`	`133`	`reject(NSError(domain: "", code: 1223, userInfo: nil))`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ class OnErrorTests: XCTestCase {`
`116`	`116`	`syncRejectionPromise().registerOnError { _ in`
`117`	`117`	`XCTFail()`
`118`	`118`	`}`
`119`		`- wait(1) {`
	`119`	`+ testWait(1) {`
`120`	`120`	`exp.fulfill()`
`121`	`121`	`}`
`122`	`122`	`waitForExpectations(timeout: 1, handler: nil)`