Merge pull request #15 from intelygenz/release/1.1

Release 1.1 with specific Error types.
intelygenz · Sep 12, 2018 · 03555e5 · 03555e5
2 parents c6f893e + beee0d1
commit 03555e5
Show file tree

Hide file tree

Showing 39 changed files with 681 additions and 512 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Release 1.1
+
+- [x] Set kommand error closure specifying Error type.
+
 # Release 1.0.2
 
 - [x] Ready for Swift 4.2.

diff --git a/Kommander.podspec b/Kommander.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'Kommander'
-  s.version          = '1.0.2'
+  s.version          = '1.1'
   s.summary          = 'A command pattern implementation written in Swift'
 
   s.homepage         = 'https://github.com/intelygenz/Kommander-iOS'

diff --git a/Kommander.xcodeproj/project.pbxproj b/Kommander.xcodeproj/project.pbxproj
@@ -590,56 +590,56 @@
 				TargetAttributes = {
 					815B58021E6573C700818819 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = "";
 						ProvisioningStyle = Automatic;
 					};
 					815B58151E6573C800818819 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = "";
 						ProvisioningStyle = Automatic;
 						TestTargetID = 815B58021E6573C700818819;
 					};
 					81925CC41E3A0FFC001701F3 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					81925CCD1E3A0FFC001701F3 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = 1000;
 						ProvisioningStyle = Automatic;
 					};
 					819D155C1E76AEFB00BB1F07 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					81DBBAD61E768DB300EF01D8 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = "";
 						ProvisioningStyle = Automatic;
 					};
 					81DBBAE31E768DE100EF01D8 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
 					81DBBB171E7691F300EF01D8 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = "";
 						ProvisioningStyle = Automatic;
 					};
 					81DBBB231E7691F400EF01D8 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 3VW789WSMP;
+						DevelopmentTeam = Q6BEQCNWYM;
 						LastSwiftMigration = "";
 						ProvisioningStyle = Automatic;
 					};
@@ -990,9 +990,9 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(DYLIB_CURRENT_VERSION)";
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = 3VW789WSMP;
-				DYLIB_COMPATIBILITY_VERSION = 1.0.1;
-				DYLIB_CURRENT_VERSION = 1.0.2;
+				DEVELOPMENT_TEAM = Q6BEQCNWYM;
+				DYLIB_COMPATIBILITY_VERSION = 1.1;
+				DYLIB_CURRENT_VERSION = 1.1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1064,9 +1064,9 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = "$(DYLIB_CURRENT_VERSION)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = 3VW789WSMP;
-				DYLIB_COMPATIBILITY_VERSION = 1.0.1;
-				DYLIB_CURRENT_VERSION = 1.0.2;
+				DEVELOPMENT_TEAM = Q6BEQCNWYM;
+				DYLIB_COMPATIBILITY_VERSION = 1.1;
+				DYLIB_CURRENT_VERSION = 1.1;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

diff --git a/Kommander.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/Kommander.xcodeproj/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,16 +2,4 @@
 <Bucket
    type = "4"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/Kommander.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Kommander.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildSystemType</key>
+	<string>Latest</string>
+</dict>
+</plist>
diff --git a/Major/ViewController.swift b/Major/ViewController.swift
@@ -59,8 +59,8 @@ class ViewController: UIViewController {
         kommander.make {
             sleep(self.sleepTime)
             throw CocoaError(.featureUnsupported)
-        }.error { error in
-            print("Error: " + String(describing: error!))
+        }.error(CocoaError.self) {
+            print("Error: " + $0.localizedDescription)
         }.execute()
     }
 

diff --git a/Package.swift b/Package.swift
@@ -2,6 +2,19 @@ import PackageDescription
 
 let package = Package(
   name: "Kommander",
+  products: [
+    .library(
+        name: "Kommander",
+        targets: ["Kommander"])
+    ],
   dependencies : [],
-  exclude: ["Major", "Major watchOS", "Major watchOS Extension", "MajorUITests", "KommanderTests"]
-)
+  exclude: ["Major", "Major watchOS", "Major watchOS Extension", "MajorUITests", "KommanderTests"],
+  targets: [
+    .target(
+        name: "Kommander",
+        dependencies: []),
+    .testTarget(
+        name: "KommanderTests",
+        dependencies: []),
+    ]
+)
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ Inspired on the Java library [**Kommander**](https://github.com/Wokdsem/Kommande
 - [x] Retry kommand or multiple kommands
 - [x] Set kommand success closure
 - [x] Set kommand error closure
+- [x] Set kommand error closure specifying Error type
 - [x] Main thread dispatcher
 - [x] Current thread dispatcher
 - [x] Custom OperationQueue dispatcher
@@ -116,6 +117,16 @@ Kommander().make {
 }.execute()
 ```
 
+##### Specify Error type:
+
+```swift
+Kommander().make {
+    throw MyError.error
+}.error(MyError.self) { error in
+    // error is MyError type.
+}.execute()
+```
+
 ##### Retry after cancellation:
 
 ```swift

diff --git a/Source/Dispatcher.swift b/Source/Dispatcher.swift
@@ -96,15 +96,17 @@ open class Dispatcher {
 }
 
 public extension Array where Element: Operation {
+
     /// Execute [Operation] instance collection in OperationQueue
-    public func execute(by operationQueue: OperationQueue, waitUntilFinished: Bool = false) {
+    public func execute(in operationQueue: OperationQueue, waitUntilFinished: Bool = false) {
         operationQueue.addOperations(self, waitUntilFinished: waitUntilFinished)
     }
 
     /// Execute [Operation] instance collection in Dispatcher
-    public func execute(by dispatcher: Dispatcher, waitUntilFinished: Bool = false) {
+    public func execute(in dispatcher: Dispatcher, waitUntilFinished: Bool = false) {
         dispatcher.execute(self, waitUntilFinished: waitUntilFinished)
     }
+
 }
 
 private extension Dispatcher {

diff --git a/Source/Kommand.swift b/Source/Kommand.swift
@@ -107,12 +107,35 @@ open class Kommand<Result> {
         return self
     }
 
+    /// Specify Kommand<Result> error closure
+    @discardableResult open func error<Reason: Swift.Error>(_ type: Reason.Type, _ error: @escaping (_ error: Reason) -> Void) -> Self {
+        self.errorClosure = {
+            guard let reason = $0 as? Reason else {
+                assertionFailure("Unexpected error thrown. \(Reason.self) expected, \($0.debugDescription) thrown.")
+                return
+            }
+            error(reason)
+        }
+        return self
+    }
+
     /// Specify Kommand<Result> retry closure
     @discardableResult open func retry(_ retry: @escaping RetryClosure) -> Self {
         self.retryClosure = retry
         return self
     }
 
+    /// Specify Kommand<Result> error closure
+    @discardableResult open func retry<Reason: Swift.Error>(_ type: Reason.Type, _ retry: @escaping (_ error: Reason?, _ executionCount: UInt) -> Bool) -> Self {
+        self.retryClosure = {
+            guard let reason = $0 as? Reason else {
+                return retry(nil, $1)
+            }
+            return retry(reason, $1)
+        }
+        return self
+    }
+
     open var result: Result? {
         guard case .succeeded(let result) = state else {
             return nil
@@ -129,7 +152,7 @@ open class Kommand<Result> {
 
     /// Execute Kommand<Result> after delay
     @discardableResult open func execute(after delay: DispatchTimeInterval) -> Self {
-        executor?.execute(after: delay, closure: { 
+        executor?.execute(after: delay, closure: {
             self.execute()
         })
         return self

diff --git a/Source/Kommander.swift b/Source/Kommander.swift
@@ -59,7 +59,7 @@ open class Kommander {
 
     /// Execute [Kommand<Result>] instances collection concurrently or sequentially after delay
     open func execute<Result>(_ kommands: [Kommand<Result>], concurrent: Bool = true, waitUntilFinished: Bool = false, after delay: DispatchTimeInterval) {
-        executor.execute(after: delay) { 
+        executor.execute(after: delay) {
             self.execute(kommands, concurrent: concurrent, waitUntilFinished: waitUntilFinished)
         }
     }