This closes #5 implementing retry policy.

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Intelygenz <[email protected]>
+Copyright (c) 2018 Intelygenz <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

README.md

@@ -109,25 +109,39 @@ Kommander().make {
 ```swift
 Kommander().make {
     throw CocoaError(.featureUnsupported)
-}.error({ error in
+}.error { error in
     print(String(describing: error!))
-}).execute()
+}.execute()
 ```
 
+##### Retry after cancellation:
+
 ```swift
 let kommand = Kommander().make { () -> Any? in
     // Your code here
 }.success { result in
     // Your success handling here
-}.error({ error in
+}.error { error in
     // Your error handling here
-}).execute()
+}.execute()
 
 kommand.cancel()
 
 kommand.retry()
 ```
 
+##### Retry after failure:
+
+```swift
+let kommand = Kommander().make { () -> Any? in
+    // Your code here
+}.error { error in
+    // Your error handling here
+}.retry { error, executionCount in
+    return executionCount < 2
+}.execute()
+```
+
 #### Creating Kommanders:
 
 ```swift

Source/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Intelygenz.</string>
+	<string>Copyright © 2018 Intelygenz.</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

Source/Kommand.swift

@@ -31,6 +31,8 @@ open class Kommand<Result> {
     public typealias SuccessClosure = (_ result: Result) -> Void
     /// Error closure type
     public typealias ErrorClosure = (_ error: Error?) -> Void
+    /// Retry closure type
+    public typealias RetryClosure = (_ error: Error?, _ executionCount: UInt) -> Bool
 
     /// Kommand<Result> state
     internal(set) public final var state = State.uninitialized
@@ -45,6 +47,10 @@ open class Kommand<Result> {
     private(set) final var successClosure: SuccessClosure?
     /// Error closure
     private(set) final var errorClosure: ErrorClosure?
+    /// Retry closure
+    private(set) final var retryClosure: RetryClosure?
+    /// Retry count
+    internal(set) final var executionCount: UInt
     /// Operation to cancel
     internal(set) final weak var operation: Operation?
 
@@ -53,6 +59,7 @@ open class Kommand<Result> {
         self.deliverer = deliverer
         self.executor = executor
         self.actionClosure = actionClosure
+        executionCount = 0
         state = .ready
     }
 
@@ -78,6 +85,12 @@ open class Kommand<Result> {
         return self
     }
 
+    /// Specify Kommand<Result> retry closure
+    @discardableResult open func retry(_ retry: @escaping RetryClosure) -> Self {
+        self.retryClosure = retry
+        return self
+    }
+
     /// Execute Kommand<Result> after delay
     @discardableResult open func execute(after delay: DispatchTimeInterval) -> Self {
         executor?.execute(after: delay, closure: { 
@@ -96,6 +109,7 @@ open class Kommand<Result> {
                 if let actionClosure = self.actionClosure {
                     self.state = .running
                     let result = try actionClosure()
+                    self.executionCount += 1
                     guard self.state == .running else {
                         return
                     }
@@ -111,6 +125,12 @@ open class Kommand<Result> {
                 self.deliverer?.execute {
                     self.state = .finished
                     self.errorClosure?(error)
+                    self.executor?.execute {
+                        if self.retryClosure?(error, self.executionCount) == true {
+                            self.state = .ready
+                            self.execute()
+                        }
+                    }
                 }
             }
         }

Source/Kommander.swift

@@ -116,6 +116,7 @@ private extension Kommander {
                 if let actionClosure = kommand.actionClosure {
                     kommand.state = .running
                     let result = try actionClosure()
+                    kommand.executionCount += 1
                     guard kommand.state == .running else {
                         return
                     }
@@ -131,6 +132,12 @@ private extension Kommander {
                 self.deliverer.execute {
                     kommand.state = .finished
                     kommand.errorClosure?(error)
+                    self.executor.execute {
+                        if kommand.retryClosure?(error, kommand.executionCount) == true {
+                            kommand.state = .ready
+                            kommand.execute()
+                        }
+                    }
                 }
             }
         }