Merge branch 'master' into swift-2.3

* master: Update README.md Update rocket link Add padding symbols Add spacing over heading for rocket section Update rocket link position and style Add link to Rocket to README build with APPLICATION_EXTENSION_API_ONLY = YES
Update README.md
2016-09-17 13:32:40 +10:00 · 2016-08-19 13:28:08 +10:00 · 2016-08-13 11:58:01 +10:00 · 2016-08-13 11:56:33 +10:00 · 2016-08-13 11:53:55 +10:00 · 2016-08-13 11:53:13 +10:00
10 changed files with 144 additions and 26 deletions
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name             = "Locksmith"
-  s.version          = "2.0.2"
+  s.version          = "2.0.8"
  s.summary          = "Locksmith is a powerful, protocol-oriented library for working with the keychain in Swift."
  s.description      = <<-DESC
                       Locksmith is a powerful, protocol-oriented library for working with the iOS, Mac OS X, watchOS, and tvOS keychain in Swift. It provides extensive support for a lot of different keychain requests, and extensively uses Swift-native concepts.
@@ -346,26 +346,32 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0720;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Mathew Palmer";
 				TargetAttributes = {
 					0EC25C581BA385AA004191AF = {
 						CreatedOnToolsVersion = 7.0;
+						LastSwiftMigration = 0800;
 					};
 					0EC25C611BA385AB004191AF = {
 						CreatedOnToolsVersion = 7.0;
+						LastSwiftMigration = 0800;
 					};
 					0EC25C741BA385F6004191AF = {
 						CreatedOnToolsVersion = 7.0;
+						LastSwiftMigration = 0800;
 					};
 					0EC25C7D1BA385F6004191AF = {
 						CreatedOnToolsVersion = 7.0;
+						LastSwiftMigration = 0800;
 					};
 					0EC25CA61BA39C9F004191AF = {
 						CreatedOnToolsVersion = 7.0;
+						LastSwiftMigration = 0800;
 					};
 					FBD0C9481C1866BE00291F2A = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -542,6 +548,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOS";
 				PRODUCT_NAME = Locksmith;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -562,6 +569,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOS";
 				PRODUCT_NAME = Locksmith;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
@@ -576,6 +585,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -590,6 +600,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-iOSTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
@@ -613,6 +625,7 @@
 				PRODUCT_NAME = Locksmith;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -636,6 +649,8 @@
 				PRODUCT_NAME = Locksmith;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
@@ -652,6 +667,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-OS-XTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_VERSION = 2.3;
 			};
 			name = Debug;
 		};
@@ -668,6 +684,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "net.matthewpalmer.Locksmith-OS-XTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 			};
 			name = Release;
 		};
@@ -687,6 +705,7 @@
 				PRODUCT_NAME = Locksmith;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -709,6 +728,8 @@
 				PRODUCT_NAME = Locksmith;
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 4;
 				WATCHOS_DEPLOYMENT_TARGET = 2.0;
 			};
@@ -718,6 +739,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -738,6 +760,7 @@
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
@@ -767,6 +790,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
@@ -786,6 +810,7 @@
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -807,11 +832,13 @@
 		FBD0C94E1C1866BE00291F2A /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				BITCODE_GENERATION_MODE = bitcode;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -820,6 +847,7 @@
 				PRODUCT_NAME = Locksmith;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -828,12 +856,14 @@
 		FBD0C94F1C1866BE00291F2A /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				BITCODE_GENERATION_MODE = bitcode;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_BITCODE = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -842,6 +872,8 @@
 				PRODUCT_NAME = Locksmith;
 				SDKROOT = appletvos;
 				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 2.3;
 				TARGETED_DEVICE_FAMILY = 3;
 				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0720"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -7,6 +7,14 @@ A powerful, protocol-oriented library for working with the keychain in Swift.
 - [x] ⌚️ watchOS 2
 - [x] 📺 tvOS

+> &nbsp;
+>
+> 🚀 I make [Rocket](http://matthewpalmer.net/rocket?utm_source=locksmith&utm_medium=readme&utm_campaign=open_source), an app that gives you Slack-style emoji everywhere on your Mac.
+>
+> &nbsp;
+
+## Details
+
 How is Locksmith different to other keychain wrappers?

 * Locksmith’s API is both super-simple and deeply powerful
@@ -32,7 +40,7 @@ Locksmith is available through [CocoaPods](http://cocoapods.org).

 Locksmith is available through [Carthage](https://github.com/Carthage/Carthage).

-    github 'matthewpalmer/Locksmith'
+    github "matthewpalmer/Locksmith"

 ## Quick start

@@ -39,15 +39,14 @@ public struct Locksmith {
    }
    
    public static func updateData(data: [String: AnyObject], forUserAccount userAccount: String, inService service: String = LocksmithDefaultService) throws {
-        // Delete and then re-save
-        do {
-            try Locksmith.deleteDataForUserAccount(userAccount, inService: service)
-        } catch {
-            // Deletion is likely to fail if the piece of data doesn't exist yet.
-            // This doesn't matter--we only tell the user about errors on the save request.
+        struct UpdateRequest: GenericPasswordSecureStorable, CreateableSecureStorable {
+            let service: String
+            let account: String
+            let data: [String: AnyObject]
        }
-        
-        return try Locksmith.saveData(data, forUserAccount: userAccount, inService: service)
+
+        let request = UpdateRequest(service: service, account: userAccount, data: data)
+        try request.updateInSecureStore()
    }
 }

@@ -424,6 +423,7 @@ public protocol CreateableSecureStorable: SecureStorable {
    var data: [String: AnyObject] { get }
    var performCreateRequestClosure: PerformRequestClosureType { get }
    func createInSecureStore() throws
+    func updateInSecureStore() throws
 }

 // MARK: - ReadableSecureStorable
@@ -509,6 +509,27 @@ public protocol DeleteableSecureStorable: SecureStorable {

 // MARK: - Default property dictionaries

+extension CreateableSecureStorable {
+    func updateInSecureStore(query: [String: AnyObject]) throws {
+        var attributesToUpdate = query
+        attributesToUpdate[String(kSecClass)] = nil
+
+        let status = SecItemUpdate(query, attributesToUpdate)
+
+        if let error = LocksmithError(fromStatusCode: Int(status)) {
+            if error == .NotFound || error == .NotAvailable {
+                try self.createInSecureStore()
+            } else {
+                throw error
+            }
+        } else {
+            if status != errSecSuccess {
+                throw LocksmithError.Undefined
+            }
+        }
+    }
+}
+
 public extension CreateableSecureStorable where Self : GenericPasswordSecureStorable {
    var asCreateableSecureStoragePropertyDictionary: [String: AnyObject] {
        var old = genericPasswordBaseStoragePropertyDictionary
@@ -521,6 +542,9 @@ public extension CreateableSecureStorable where Self : GenericPasswordSecureStor
    func createInSecureStore() throws {
        try performSecureStorageAction(performCreateRequestClosure, secureStoragePropertyDictionary: asCreateableSecureStoragePropertyDictionary)
    }
+    func updateInSecureStore() throws {
+        try self.updateInSecureStore(self.asCreateableSecureStoragePropertyDictionary)
+    }
 }

 public extension CreateableSecureStorable where Self : InternetPasswordSecureStorable {
@@ -543,6 +567,9 @@ public extension CreateableSecureStorable where Self : InternetPasswordSecureSto
    func createInSecureStore() throws {
        try performSecureStorageAction(performCreateRequestClosure, secureStoragePropertyDictionary: asCreateableSecureStoragePropertyDictionary)
    }
+    func updateInSecureStore() throws {
+        try self.updateInSecureStore(self.asCreateableSecureStoragePropertyDictionary)
+    }
 }

 public extension DeleteableSecureStorable {
@@ -53,6 +53,12 @@ class LocksmithTests: XCTestCase {
        let loaded3 = Locksmith.loadDataForUserAccount(userAccount, inService: service)! as! TestingDictionaryType
        
        XCTAssertEqual(loaded3, updatedData)
+        
+        try! Locksmith.deleteDataForUserAccount(userAccount, inService: service)
+        
+        try! Locksmith.updateData(["some update": "data"], forUserAccount: userAccount, inService: service)
+        let updateResult = Locksmith.loadDataForUserAccount(userAccount, inService: service)! as! [String: String]
+        XCTAssertEqual(updateResult, ["some update": "data"])
    }
    
    func testStaticMethodsForDefaultService() {
@@ -94,6 +100,40 @@ class LocksmithTests: XCTestCase {
        createGenericPasswordWithData(data)
    }
    
+    func testUpdateCreatesIfNotExists() {
+        let data = ["some": "data"]
+        
+        struct CreateGenericPassword: CreateableSecureStorable, GenericPasswordSecureStorable, ReadableSecureStorable {
+            var data: [String: AnyObject]
+            let account: String
+            let service: String
+        }
+        
+        let update = CreateGenericPassword(data: data, account: userAccount, service: service)
+        try! update.updateInSecureStore()
+        
+        let read = update.readFromSecureStore()!.data as! [String: String]
+        XCTAssertEqual(read, ["some": "data"])
+    }
+    
+    func testUpdateForGenericPassword() {
+        let data = ["some": "data"]
+        
+        struct CreateGenericPassword: CreateableSecureStorable, GenericPasswordSecureStorable, ReadableSecureStorable {
+            var data: [String: AnyObject]
+            let account: String
+            let service: String
+        }
+        
+        var create = CreateGenericPassword(data: data, account: userAccount, service: service)
+        try! create.createInSecureStore() // make sure it doesn't throw
+        create.data = ["other": "data"]
+        try! create.updateInSecureStore()
+        
+        let read = create.readFromSecureStore()!.data as! [String: String]
+        XCTAssertEqual(read, ["other": "data"])
+    }
+    
    func testLoadForGenericPassword() {
        let data = ["one": "two"]
        createGenericPasswordWithData(data)
@@ -239,7 +279,7 @@ class LocksmithTests: XCTestCase {
    func testInternetPasswordMetaAttributesAreCreatedAndReturned() {
        struct CreateInternetPassword: CreateableSecureStorable, InternetPasswordSecureStorable {
            let account: String
-            let data: [String: AnyObject]
+            var data: [String: AnyObject]
            let server: String
            let port: Int
            let internetProtocol: LocksmithInternetProtocol
@@ -265,20 +305,31 @@ class LocksmithTests: XCTestCase {
            let authenticationType: LocksmithInternetAuthenticationType
        }
        
-        let c = CreateInternetPassword(account: userAccount, data: initialData, server: server, port: port, internetProtocol: internetProtocol, authenticationType: authenticationType, path: path, securityDomain: securityDomain)
+        var c = CreateInternetPassword(account: userAccount, data: initialData, server: server, port: port, internetProtocol: internetProtocol, authenticationType: authenticationType, path: path, securityDomain: securityDomain)
        try! c.createInSecureStore()
+
+        func assertResultMetadataIsOk(result: InternetPasswordSecureStorableResultType?) {
+            XCTAssertEqual(result?.account, userAccount)
+            XCTAssertEqual(result?.server, server)
+            XCTAssertEqual(result?.port, port)
+            XCTAssertEqual(result?.internetProtocol, internetProtocol)
+            XCTAssertEqual(result?.authenticationType, authenticationType)
+            XCTAssertEqual(result?.securityDomain, securityDomain)
+            XCTAssertEqual(result?.path, path)
+        }
        
        let r = ReadInternetPassword(account: userAccount, server: server, port: port, internetProtocol: internetProtocol, authenticationType: authenticationType)
        let result = r.readFromSecureStore()
-
-        XCTAssertEqual(result?.account, userAccount)
        XCTAssertEqual(result!.data as! [String: String], initialData)
-        XCTAssertEqual(result?.server, server)
-        XCTAssertEqual(result?.port, port)
-        XCTAssertEqual(result?.internetProtocol, internetProtocol)
-        XCTAssertEqual(result?.authenticationType, authenticationType)
-        XCTAssertEqual(result?.securityDomain, securityDomain)
-        XCTAssertEqual(result?.path, path)
+        assertResultMetadataIsOk(result)
+        
+        // Assert that metadata is maintained after an update
+        c.data = ["other internet": "junk"]
+        try! c.updateInSecureStore()
+        
+        let result2 = r.readFromSecureStore()
+        XCTAssertEqual(result2!.data as! [String: String], ["other internet": "junk"])
+        assertResultMetadataIsOk(result2)
    }
    
    func assertStringPairsMatchInDictionary(dictionary: NSDictionary, pairs: [(key: CFString, expectedOutput: String)]) {
Author	SHA1	Message	Date
matthewpalmer	8d59a42f52	Merge branch 'master' into swift-2.3 * master: Update README.md Update rocket link Add padding symbols Add spacing over heading for rocket section Update rocket link position and style Add link to Rocket to README build with APPLICATION_EXTENSION_API_ONLY = YES	2016-09-17 13:32:40 +10:00
Matthew Palmer	9613c8fd22	Update README.md	2016-08-19 13:28:08 +10:00
matthewpalmer	f2269ef8d1	Update rocket link	2016-08-13 11:58:01 +10:00
matthewpalmer	4d00c74922	Add padding symbols	2016-08-13 11:56:33 +10:00
matthewpalmer	1e8fcc8c2c	Add spacing over heading for rocket section	2016-08-13 11:53:55 +10:00
matthewpalmer	9e1e912788	Update rocket link position and style	2016-08-13 11:53:13 +10:00
matthewpalmer	c6838a31f2	Add link to Rocket to README	2016-08-13 11:44:55 +10:00
Matthew Palmer	cdd1b2893a	Merge pull request #127 from Podfactor/app-extension-safe Fix warning when linking against Locksmith from an app extension	2016-07-09 06:38:03 +10:00
matthewpalmer	49da6a45e7	Merge branch 'davbeck-swift-2.3' into swift-2.3 * davbeck-swift-2.3: Updated for Swift 2.3	2016-07-09 06:34:25 +10:00
David Beck	a2fe855f63	Updated for Swift 2.3 No breaking code changes applied to this project for Swift 2.3, just an update to the project to set it's version.	2016-06-14 07:51:13 -07:00
Tom Brow	7b9237c39e	build with APPLICATION_EXTENSION_API_ONLY = YES	2016-05-31 17:25:45 -05:00
Matthew Palmer	1b278e59a5	Merge pull request #118 from jakemarsh/master Carthage doesn't allow single quotes. Change README to doubles.	2016-04-09 13:25:19 +10:00
Jake Marsh	1359edf840	Update README.md Carthage doesn't allow single quotes. Change to doubles.	2016-04-06 19:24:58 -07:00
matthewpalmer	6b32c7ec68	Fix regression in update method to fix #110	2016-02-16 20:23:02 +11:00
Matthew Palmer	80df919791	Merge pull request #108 from matthewpalmer/2.0.7 2.0.7	2016-02-14 18:24:59 +11:00
matthewpalmer	2f54712fda	Bump podspec	2016-02-14 18:17:57 +11:00
matthewpalmer	78060ecc28	Add extra tests for new update method	2016-02-14 18:15:06 +11:00
Sergey Galezdinov	e04d6291d4	Use SecItemUpdate function for updating the data. Added missing updateInSecureStore method to CreateableSecureStorable	2016-02-11 02:46:34 +03:00
Matthew Palmer	c29ebcdba8	Merge pull request #102 from gilt/bitcode full bitcode is needed for running Debug on an Apple TV device, even in Debug mode	2016-01-24 10:39:30 +11:00
Matthew Palmer	ed56b9015c	Merge pull request #101 from gilt/build_all_architectures don't set ONLY_ACTIVE_ARCH to YES	2016-01-24 10:39:06 +11:00
Evan Maloney	b5f7410d0e	full bitcode is needed for running Debug on device without this setting, it won't be possible to run a Debug build on the device; 'marker' only works in the sim	2016-01-22 14:24:00 -05:00
Evan Maloney	e002690ccf	don't set ONLY_ACTIVE_ARCH to YES When embedding this project directly into another Xcode project in a target that: • Is being built for a platform that has a simulator/device dichotomy (iOS, tvOS, watchOS), and • Is inside a parent project building a Debug configuration You will get one of two kinds of errors: • Either the framework module itself is missing at the 'import' level, or • Some or all of the framework's public symbols can't be found The solution is to disable ONLY_ACTIVE_ARCH, which will ensure that both processor architectures are built and the symbols can be found.	2016-01-22 12:23:25 -05:00