changes to pass cocoapods validation

Author: guidosabatini-sysdata

Diff for: DockerSwift.podspec

@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target   = '9.0'
   s.swift_version           = '4.2'
   s.social_media_url        =  'https://www.facebook.com/sysdata.it/'
-  s.summary                 = 'DockerSwift handles in some easy steps all connections with your remote servers. Offers you some classes to call Web Services defining http method, request, response, .... and some classes to handle resources download.'
+  s.summary                 = 'DockerSwift handles in some easy steps all connections with your remote servers.'
   s.description             = <<-DESC
 DockerSwift handles in some easy steps all connections with your remote servers. Offers you some classes to call Web Services defining http method, request, response, .... and some classes to handle resources download.
                        DESC

Diff for: DockerSwift/Classes/Service/Docker+Blabber.swift

@@ -35,6 +35,23 @@ public func SDLogModuleVerbose(_ message: @autoclosure () -> String, module: Str
     SDLogger.shared().log(with: .verbose, module: module,  file: String(describing: file), function: String(describing: function), line: line, message: message())
 }
 #else
+public func SDLogModuleError(_ message: @autoclosure () -> String, module: String, file: StaticString = #file , function: StaticString = #function, line: UInt = #line)
+{
+    print(message())
+}
+public func SDLogModuleInfo(_ message: @autoclosure () -> String, module: String,file: StaticString = #file , function: StaticString = #function, line: UInt = #line)
+{
+    print(message())
+}
+public func SDLogModuleWarning(_ message: @autoclosure () -> String, module: String,file: StaticString = #file , function: StaticString = #function, line: UInt = #line)
+{
+    print(message())
+}
+public func SDLogModuleVerbose(_ message: @autoclosure () -> String, module: String,file: StaticString = #file , function: StaticString = #function, line: UInt = #line)
+{
+    print(message())
+}
+
 public func SDLogError(_ message: @autoclosure () -> String, file: StaticString = #file , function: StaticString = #function, line: UInt = #line)
 {
     print(message())

Diff for: DockerSwift/Classes/Service/Request.swift

@@ -91,7 +91,7 @@ extension Request {
 
         // search for "/:" to find the start of a path parameter
         while let paramRange = findNextPathParamPlaceholderRange(in: composedUrl) {
-            let paramName = composedUrl.substring(with: composedUrl.index(after: paramRange.lowerBound)..<paramRange.upperBound)
+            let paramName = String(composedUrl[composedUrl.index(after: paramRange.lowerBound)..<paramRange.upperBound])
             let param = try findPathParam(with: paramName, in: pathParameters)
             composedUrl.replaceSubrange(paramRange, with: param)
         }
@@ -158,7 +158,7 @@ open class RequestPList: Request {
 extension Request {
 
     open override var description: String {
-        var string = "REQUEST URL: \(service.baseUrl)\(service.path)\nMETHOD:\(method.rawValue)\nHEADERS:\(headers ?? [:]))"
+        var string = "REQUEST URL: \(service.baseUrl)\(service.path)\nMETHOD:\(method.rawValue)\nHEADERS:\(headers))"
         if !urlParameters.isEmpty {
             string.append("\nPARAMETERS:\(urlParameters)")
         }
@@ -172,7 +172,7 @@ extension Request {
     }
 
     open var shortDescription: String {
-        var string = "REQUEST \(method.rawValue) at \(urlStringDescription)"
+        let string = "REQUEST \(method.rawValue) at \(urlStringDescription)"
         return string
     }
 

Diff for: DockerSwift/Classes/Service/Response.swift

@@ -72,7 +72,7 @@ open class Response<Val, ErrVal>: Responsable {
 //MARK: CustomStringConvertible
 extension Response {
     public var description: String {
-        var received = response != nil || request.sentInDemoMode
+        let received = response != nil || request.sentInDemoMode
         var d = ""
         if received {
             d.append("RESPONSE RECEIVED - URL= \(request.urlStringDescription)")
@@ -83,7 +83,6 @@ extension Response {
                 d.append("\nBODY=\n\(body)")
             }
         } else {
-            var urlString: String = ""
             d.append("RESPONSE NOT RECEIVED - URL= \(request.urlStringDescription)")
         }
         return d
@@ -150,7 +149,7 @@ open class DownloadResponse: Response<Any, Any> {
             if let localURL = localURL {
                 let data = try Data(contentsOf: localURL)
                 let value = UIImage(data: data)
-                result = .success(value)
+                result = .success(value as Any)
             } else {
                 SDLogModuleWarning("🌍⚠️ localURL not defined", module: DockerServiceLogModuleName)
             }

Diff for: DockerSwift/Classes/Service/ServiceManager.swift

@@ -71,7 +71,7 @@ open class ServiceManager { // : Singleton, Initializable
     private func upload<Resp: Responsable>(serviceCall: ServiceCall<Resp>, fileURL: URL) throws {
         let urlRequest = try serviceCall.request.buildUrlRequest()
         SDLogModuleInfo("🌍▶️ Service Manager: start upload \(serviceCall.request.shortDescription)", module: DockerServiceLogModuleName)
-        var request = serviceCall.service.sessionManager.upload(fileURL, with: urlRequest as URLRequestConvertible).validate()
+        let request = serviceCall.service.sessionManager.upload(fileURL, with: urlRequest as URLRequestConvertible).validate()
         serviceCall.request.internalRequest = request
         sendRequest(request: request, serviceCall: serviceCall)
     }
@@ -121,7 +121,7 @@ open class ServiceManager { // : Singleton, Initializable
     private func download<Resp: Responsable>(serviceCall: ServiceCall<Resp>, to destination: @escaping DownloadRequest.DownloadFileDestination) throws {
         let urlRequest = try serviceCall.request.buildUrlRequest()
         SDLogModuleInfo("🌍▶️ Service Manager: start download \(serviceCall.request.shortDescription)", module: DockerServiceLogModuleName)
-        var request = serviceCall.service.sessionManager.download(urlRequest as URLRequestConvertible, to: destination).validate()
+        let request = serviceCall.service.sessionManager.download(urlRequest as URLRequestConvertible, to: destination).validate()
         serviceCall.request.internalRequest = request
         sendRequest(request: request, serviceCall: serviceCall)
     }
@@ -166,7 +166,7 @@ open class ServiceManager { // : Singleton, Initializable
             default:
                 response = responseClass.init(statusCode: 0, data: data ?? Data(), request: serviceCall.request, response: urlResponse)
                 var httpErrorCode = NSURLErrorUnknown
-                if let err = error as? NSError {
+                if let err = error as NSError? {
                     httpErrorCode = err.code
                 }
                 responseError = DockerError.missingResponse(error ?? NSError(domain: NSURLErrorDomain, code: NSURLErrorUnknown, userInfo: nil), httpErrorCode)
@@ -181,7 +181,7 @@ open class ServiceManager { // : Singleton, Initializable
 
     open func completeServiceCall<Resp: Responsable>(_ serviceCall: ServiceCall<Resp>, with response: Resp, error: DockerError?) {
         if error != nil || (serviceCall.request.useDifferentResponseForErrors && serviceCall.request.httpErrorStatusCodeRange.contains(response.httpStatusCode)) {
-            SDLogModuleError("🌍‼️ Service completed service with error \(error)", module: DockerServiceLogModuleName)
+            SDLogModuleError("🌍‼️ Service completed service with error \(String(describing: error))", module: DockerServiceLogModuleName)
 
             // errori da mappare eventualmente
             SDLogModuleVerbose("🌍‼️ Trying to map error response", module: DockerServiceLogModuleName)
@@ -271,7 +271,7 @@ public protocol ServiceCallable {
     var completion: ServiceCompletion<Resp> { get }
     var progressBlock: ProgressHandler? { get }
 
-    weak var delegate: ServiceManager? { get }
+    var delegate: ServiceManager? { get }
 
     var isProcessing: Bool { get }
 

Diff for: Example/DockerSwift/AppDelegate.swift

@@ -8,7 +8,9 @@
 
 import UIKit
 import DockerSwift
+#if BLABBER
 import Blabber
+#endif
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -18,7 +20,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+        #if BLABBER
         SDLogger.shared().setup()
+        #endif
         return true
     }