Update tests

.gitignore

@@ -20,10 +20,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 
-#Carthage
-*/Carthage/Checkouts/
-Cartfile.resolved
-
 # Bundler
 .bundle
 vendor/

.travis.yml

@@ -6,6 +6,9 @@ install:
   - (cd Lib && bundle install --path=vendor/bundle --binstubs=vendor/bin)
 script:
   - (cd Lib && bundle exec rake test:ios test:osx)
+branches:
+  only:
+    - master
 env:
   global:
     - LANG=en_US.UTF-8

Lib/KeychainAccess.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		140C8F0F1A4EBE3100F85556 /* KeychainAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = 140C8F0E1A4EBE3100F85556 /* KeychainAccess.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		140C8F151A4EBE3100F85556 /* KeychainAccess.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 140C8F0A1A4EBE3100F85556 /* KeychainAccess.framework */; };
 		140C8F231A4EBEEA00F85556 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140F197A1A49D89200B0016A /* Keychain.swift */; };
 		140C8F241A4EBF9A00F85556 /* KeychainAccessTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140F196E1A49D79500B0016A /* KeychainAccessTests.swift */; };
@@ -36,8 +35,6 @@
 
 /* Begin PBXFileReference section */
 		140C8F0A1A4EBE3100F85556 /* KeychainAccess.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KeychainAccess.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		140C8F0D1A4EBE3100F85556 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		140C8F0E1A4EBE3100F85556 /* KeychainAccess.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KeychainAccess.h; sourceTree = "<group>"; };
 		140C8F141A4EBE3100F85556 /* KeychainAccess-MacTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "KeychainAccess-MacTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		140F195C1A49D79400B0016A /* KeychainAccess.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = KeychainAccess.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		140F19601A49D79400B0016A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -82,29 +79,11 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		140C8F0B1A4EBE3100F85556 /* KeychainAccess */ = {
-			isa = PBXGroup;
-			children = (
-				140C8F0E1A4EBE3100F85556 /* KeychainAccess.h */,
-				140C8F0C1A4EBE3100F85556 /* Supporting Files */,
-			);
-			path = KeychainAccess;
-			sourceTree = "<group>";
-		};
-		140C8F0C1A4EBE3100F85556 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				140C8F0D1A4EBE3100F85556 /* Info.plist */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 		140F19521A49D79400B0016A = {
 			isa = PBXGroup;
 			children = (
 				140F195E1A49D79400B0016A /* KeychainAccess */,
 				140F196B1A49D79500B0016A /* KeychainAccessTests */,
-				140C8F0B1A4EBE3100F85556 /* KeychainAccess */,
 				140F195D1A49D79400B0016A /* Products */,
 			);
 			sourceTree = "<group>";
@@ -162,7 +141,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				140C8F0F1A4EBE3100F85556 /* KeychainAccess.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Lib/KeychainAccess/Keychain.swift

@@ -87,7 +87,7 @@ public enum FailableOf<T> {
         self = .Failure(error)
     }
     
-    public var successed: Bool {
+    public var succeeded: Bool {
         switch self {
         case .Success:
             return true

Lib/KeychainAccessTests/KeychainAccessTests.swift

@@ -287,7 +287,7 @@ class KeychainAccessTests: XCTestCase {
         XCTAssertNil(keychain.getData("JSONData"), "not stored JSON data")
         
         keychain.set(JSONData!, key: "JSONData")
-        XCTAssertEqual(keychain.getData("JSONData")!, JSONData!, "stored JSONData")
+        XCTAssertEqual(keychain.getData("JSONData")!, JSONData!, "stored JSON data")
     }
     
     func testRemoveString() {
@@ -392,6 +392,12 @@ class KeychainAccessTests: XCTestCase {
                 XCTAssertEqual(username.value!, "kishikawa_katsumi")
             }
             
+            if username.succeeded { // check succeeded property
+                XCTAssertEqual(username.value!, "kishikawa_katsumi")
+            } else {
+                XCTFail("unknown error occurred")
+            }
+            
             if username.failed { // failed property
                 XCTFail("unknown error occurred")
             } else {
@@ -406,13 +412,19 @@ class KeychainAccessTests: XCTestCase {
                 XCTFail("unknown error occurred")
             }
             
-            if let error = username.error { // error object
+            if let error = password.error { // error object
                 XCTFail("unknown error occurred")
             } else {
                 XCTAssertEqual(password.value!, "password_1234")
             }
             
-            if username.failed { // failed property
+            if password.succeeded { // check succeeded property
+                XCTAssertEqual(password.value!, "password_1234")
+            } else {
+                XCTFail("unknown error occurred")
+            }
+            
+            if password.failed { // failed property
                 XCTFail("unknown error occurred")
             } else {
                 XCTAssertEqual(password.value!, "password_1234")
@@ -444,6 +456,12 @@ class KeychainAccessTests: XCTestCase {
                 XCTAssertEqual(username.value!, "katsumi_kishikawa")
             }
             
+            if username.succeeded { // check succeeded property
+                XCTAssertEqual(username.value!, "katsumi_kishikawa")
+            } else {
+                XCTFail("unknown error occurred")
+            }
+            
             if username.failed { // failed property
                 XCTFail("unknown error occurred")
             } else {
@@ -458,13 +476,19 @@ class KeychainAccessTests: XCTestCase {
                 XCTFail("unknown error occurred")
             }
             
-            if let error = username.error { // check error object
+            if let error = password.error { // check error object
                 XCTFail("unknown error occurred")
             } else {
                 XCTAssertEqual(password.value!, "1234_password")
             }
             
-            if username.failed { // check failed property
+            if password.succeeded { // check succeeded property
+                XCTAssertEqual(password.value!, "1234_password")
+            } else {
+                XCTFail("unknown error occurred")
+            }
+            
+            if password.failed { // check failed property
                 XCTFail("unknown error occurred")
             } else {
                 XCTAssertEqual(password.value!, "1234_password")
@@ -502,6 +526,7 @@ class KeychainAccessTests: XCTestCase {
         let service_2 = "com.kishikawakatsumi.KeychainAccess"
         let service_3 = "example.com"
         
+        Keychain().removeAll()
         Keychain(service: service_1).removeAll()
         Keychain(service: service_2).removeAll()
         Keychain(service: service_3).removeAll()
@@ -522,7 +547,7 @@ class KeychainAccessTests: XCTestCase {
         XCTAssertNil(Keychain(service: service_3).get("username"), "not stored username")
         
         Keychain(service: service_1).set(username_1, key: "username")
-        XCTAssertEqual(Keychain(service: service_1).get("username")!, username_1, "stored username")
+        XCTAssertEqual(Keychain().get("username")!, username_1, "stored username")
         XCTAssertEqual(Keychain(service: service_1).get("username")!, username_1, "stored username")
         XCTAssertNil(Keychain(service: service_2).get("username"), "not stored username")
         XCTAssertNil(Keychain(service: service_3).get("username"), "not stored username")

README.md

@@ -139,7 +139,17 @@ if let error = failable.error {
 }
 ```
 
-**3. check `failed` property**
+**3. check `succeeded` property**
+
+```swift
+if failable.succeeded {
+    println("token: \(failable.value)")
+} else {
+    println("error: \(failable.error)")
+}
+```
+
+**4. check `failed` property**
 
 ```swift
 if failable.failed {