Swift 2.2 / SwiftLint

Author: s-aska

.swiftlint.yml

@@ -0,0 +1,4 @@
+included:
+- KeyClip
+disabled_rules:
+- line_length

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.4
+
+Swift 2.2　optimization
+SwiftLint
+
 # 1.3.3
 
 Rename scheme name

KeyClip/Builder.swift

@@ -10,28 +10,28 @@ import Foundation
 
 public extension KeyClip {
     public class Builder {
-        
+
         var accessGroup: String?
         var service: String = NSBundle.mainBundle().bundleIdentifier ?? "pw.aska.KeyClip"
         var accessible: String = kSecAttrAccessibleAfterFirstUnlock as String
-        
+
         public init() {}
-        
+
         public func accessGroup(accessGroup: String) -> Builder {
             self.accessGroup = accessGroup
             return self
         }
-        
+
         public func service(service: String) -> Builder {
             self.service = service
             return self
         }
-        
+
         public func accessible(accessible: String) -> Builder {
             self.accessible = accessible
             return self
         }
-        
+
         public func build() -> Ring {
             return Ring(accessGroup: accessGroup, service: service, accessible: accessible)
         }

KeyClip/KeyClip.swift

@@ -10,83 +10,83 @@ import Foundation
 import Security
 
 public class KeyClip {
-    
+
     // MARK: Types
-    
+
     private struct Static {
         private static let instance = KeyClip.Builder().build()
         private static var printError = false
     }
-    
+
     public class var printError: Bool {
         return Static.printError
     }
-    
+
     // MARK: Public Methods
-    
+
     public class func exists(key: String, failure: ((NSError) -> Void)? = nil) -> Bool {
         return Static.instance.exists(key, failure: failure)
     }
-    
+
     public class func save(key: String, data: NSData, failure: ((NSError) -> Void)? = nil) -> Bool {
         return Static.instance.save(key, data: data, failure: failure)
     }
-    
+
     public class func save(key: String, string: String, failure: ((NSError) -> Void)? = nil) -> Bool {
         return Static.instance.save(key, string: string, failure: failure)
     }
-    
+
     public class func save(key: String, dictionary: NSDictionary, failure: ((NSError) -> Void)? = nil) -> Bool {
         return Static.instance.save(key, dictionary: dictionary, failure: failure)
     }
-    
+
     public class func load(key: String, failure: ((NSError) -> Void)? = nil) -> NSData? {
         return Static.instance.load(key, failure: failure)
     }
-    
+
     public class func load(key: String, failure: ((NSError) -> Void)? = nil) -> NSDictionary? {
         return Static.instance.load(key, failure: failure)
     }
-    
+
     public class func load(key: String, failure: ((NSError) -> Void)? = nil) -> String? {
         return Static.instance.load(key, failure: failure)
     }
-    
+
     public class func load<T>(key: String, success: (NSDictionary) -> T, failure: ((NSError) -> Void)?) -> T? {
         return Static.instance.load(key, success: success, failure: failure)
     }
-    
+
     public class func load<T>(key: String, success: (NSDictionary) -> T) -> T? {
         return Static.instance.load(key, success: success, failure: nil)
     }
-    
+
     public class func delete(key: String, failure: ((NSError) -> Void)? = nil) -> Bool {
         return Static.instance.delete(key, failure: failure)
     }
-    
+
     public class func clear(failure: ((NSError) -> Void)? = nil) -> Bool {
         return Static.instance.clear(failure: failure)
     }
-    
+
     public class func printError(printError: Bool) {
         Static.printError = printError
     }
-    
+
     // MARK: Debug Methods
-    
+
     public class func defaultAccessGroup() -> String {
         let query: [String: AnyObject] = [
             kSecClass            as String : kSecClassGenericPassword,
             kSecAttrAccount      as String : "pw.aska.KeyClip.application-identifier-check",
             kSecReturnAttributes as String : kCFBooleanTrue ]
-        
+
         var result: AnyObject?
         var status = withUnsafeMutablePointer(&result) { SecItemCopyMatching(query, UnsafeMutablePointer($0)) }
-        
+
         if status == errSecItemNotFound {
             status = withUnsafeMutablePointer(&result) { SecItemAdd(query, UnsafeMutablePointer($0)) }
         }
-        
+
         if status == errSecSuccess {
             if let dictionary = result as? NSDictionary {
                 if let accessGroup = dictionary[kSecAttrAccessGroup as NSString] as? NSString {
@@ -95,9 +95,9 @@ public class KeyClip {
                 }
             }
         }
-        
+
         assertionFailure("failure get application-identifier")
-        
+
         return ""
     }
 }

KeyClip/Ring.swift

@@ -10,34 +10,34 @@ import Foundation
 
 public extension KeyClip {
     public class Ring {
-        
+
         let accessGroup: String?
         let service: String
         let accessible: String
-        
+
         // MARK: Initializer
-        
+
         init(accessGroup: String?, service: String, accessible: String) {
             self.accessGroup = accessGroup
             self.service = service
             self.accessible = accessible
         }
-        
+
         // MARK: Public Methods
-        
+
         public func exists(key: String, failure: ((NSError) -> Void)? = nil) -> Bool {
             var query: [String: AnyObject] = [
                 kSecAttrService as String : self.service,
                 kSecClass       as String : kSecClassGenericPassword,
                 kSecAttrAccount as String : key,
                 kSecAttrGeneric as String : key ]
-            
+
             if let accessGroup = self.accessGroup {
                 query[kSecAttrAccessGroup as String] = accessGroup
             }
-            
+
             let status = SecItemCopyMatching(query, nil)
-            
+
             switch status {
             case errSecSuccess:
                 return true
@@ -48,43 +48,43 @@ public extension KeyClip {
                 return false
             }
         }
-        
+
         public func save(key: String, data: NSData, failure: ((NSError) -> Void)? = nil) -> Bool {
             var query: [String: AnyObject] = [
                 kSecAttrService as String : self.service,
                 kSecClass       as String : kSecClassGenericPassword,
                 kSecAttrAccount as String : key,
                 kSecAttrGeneric as String : key ]
-            
+
             if let accessGroup = self.accessGroup {
                 query[kSecAttrAccessGroup as String] = accessGroup
             }
-            
+
             var status: OSStatus
-            
+
             if self.exists(key, failure: failure) {
                 status = SecItemUpdate(query, [kSecValueData as String: data])
             } else {
                 query[kSecAttrAccessible as String] = self.accessible
                 query[kSecValueData as String] = data
                 status = SecItemAdd(query as CFDictionaryRef, nil)
             }
-            
+
             if status == errSecSuccess {
                 return true
             } else {
                 self.failure(status: status, failure: failure)
             }
             return false
         }
-        
+
         public func save(key: String, string: String, failure: ((NSError) -> Void)? = nil) -> Bool {
             if let data = string.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) {
                 return self.save(key, data: data, failure: failure)
             }
             return false
         }
-        
+
         public func save(key: String, dictionary: NSDictionary, failure: ((NSError) -> Void)? = nil) -> Bool {
             var error: NSError?
             do {
@@ -98,7 +98,7 @@ public extension KeyClip {
             }
             return false
         }
-        
+
         public func load(key: String, failure: ((NSError) -> Void)? = nil) -> NSData? {
             var query: [String: AnyObject] = [
                 kSecAttrService as String : self.service,
@@ -107,14 +107,14 @@ public extension KeyClip {
                 kSecAttrGeneric as String : key,
                 kSecReturnData  as String : kCFBooleanTrue,
                 kSecMatchLimit  as String : kSecMatchLimitOne ]
-            
+
             if let accessGroup = self.accessGroup {
                 query[kSecAttrAccessGroup as String] = accessGroup
             }
-            
+
             var result: AnyObject?
             let status = withUnsafeMutablePointer(&result) { SecItemCopyMatching(query, UnsafeMutablePointer($0)) }
-            
+
             if status == errSecSuccess {
                 if let data = result as? NSData {
                     return data
@@ -124,7 +124,7 @@ public extension KeyClip {
             }
             return nil
         }
-        
+
         public func load(key: String, failure: ((NSError) -> Void)? = nil) -> NSDictionary? {
             var error: NSError?
             if let data: NSData = self.load(key, failure: failure) {
@@ -140,7 +140,7 @@ public extension KeyClip {
             }
             return nil
         }
-        
+
         public func load(key: String, failure: ((NSError) -> Void)? = nil) -> String? {
             if let data: NSData = self.load(key, failure: failure) {
                 if let string = NSString(data: data, encoding: NSUTF8StringEncoding) {
@@ -149,74 +149,75 @@ public extension KeyClip {
             }
             return nil
         }
-        
+
         public func load<T>(key: String, success: (NSDictionary) -> T, failure: ((NSError) -> Void)?) -> T? {
             if let dictionary: NSDictionary = self.load(key) {
                 return success(dictionary)
             }
             return nil
         }
-        
+
         public func load<T>(key: String, success: (NSDictionary) -> T) -> T? {
             return self.load(key, success: success, failure: nil)
         }
-        
+
         public func delete(key: String, failure: ((NSError) -> Void)? = nil) -> Bool {
             var query: [String: AnyObject] = [
                 kSecAttrService as String : self.service,
                 kSecClass       as String : kSecClassGenericPassword,
                 kSecAttrAccount as String : key,
                 kSecAttrGeneric as String : key ]
-            
+
             if let accessGroup = self.accessGroup {
                 query[kSecAttrAccessGroup as String] = accessGroup
             }
-            
+
             let status = SecItemDelete(query as CFDictionaryRef)
-            
+
             if status == errSecSuccess {
                 return true
             } else  if status != errSecItemNotFound {
                 self.failure(status: status, failure: failure)
             }
             return false
         }
-        
+
         public func clear(failure failure: ((NSError) -> Void)? = nil) -> Bool {
             var query: [String: AnyObject] = [
                 kSecAttrService as String : self.service,
                 kSecClass       as String : kSecClassGenericPassword ]
-            
+
             if let accessGroup = self.accessGroup {
                 query[kSecAttrAccessGroup as String] = accessGroup
             }
-            
+
             let status = SecItemDelete(query as CFDictionaryRef)
-            
+
             if status == errSecSuccess {
                 return true
             } else  if status != errSecItemNotFound {
                 self.failure(status: status, failure: failure)
             }
             return false
         }
-        
+
         // MARK: Private Methods
-        
-        private func failure(status status: OSStatus, function: String = __FUNCTION__, line: Int = __LINE__, failure: ((NSError) -> Void)?) {
+
+        private func failure(status status: OSStatus, function: String = #function, line: Int = #line, failure: ((NSError) -> Void)?) {
             let userInfo = [ NSLocalizedDescriptionKey : statusMessage(status) ]
             self.failure(error: NSError(domain: "pw.aska.KeyClip", code: Int(status), userInfo: userInfo), function: function, line: line, failure: failure)
         }
-        
-        private func failure(error error: NSError, function: String = __FUNCTION__, line: Int = __LINE__, failure: ((NSError) -> Void)?) {
+
+        private func failure(error error: NSError, function: String = #function, line: Int = #line, failure: ((NSError) -> Void)?) {
             failure?(error)
-            
+
             if KeyClip.printError {
                 NSLog("[KeyClip] function:\(function) line:\(line) \(error.debugDescription)")
             }
         }
-        
+
         // /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/Security.framework/Headers/SecBase.h
+        // swiftlint:disable:next cyclomatic_complexity
         private func statusMessage(status: OSStatus) -> String {
             #if os(iOS)
                 switch status {