From 9808613c75505ff5e9e313f93bd2bde649cbc44d Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Sun, 26 Jan 2014 11:57:57 -0500
Subject: [PATCH] Prepare for Travis-CI.

---
 .travis.yml                               |  5 +++++
 External/UbiquityStoreManager             |  2 +-
 MasterPassword/ObjC/MPAppDelegate_Store.m | 16 +++++++++-------
 README.md                                 |  6 ++++++
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 README.md

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..d61c90bc
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: objective-c
+xcode_project: Pearl.xcodeproj
+xcode_scheme: Pearl
+xcode_sdk: iphonesimulator
+install: ./Scripts/updateDependencies
diff --git a/External/UbiquityStoreManager b/External/UbiquityStoreManager
index 8057eda0..a5ee62e1 160000
--- a/External/UbiquityStoreManager
+++ b/External/UbiquityStoreManager
@@ -1 +1 @@
-Subproject commit 8057eda021a45092006686048a0a295074405f02
+Subproject commit a5ee62e1cca559e27aba92ac65ffc4da44827dfe
diff --git a/MasterPassword/ObjC/MPAppDelegate_Store.m b/MasterPassword/ObjC/MPAppDelegate_Store.m
index 752f6987..f7120155 100644
--- a/MasterPassword/ObjC/MPAppDelegate_Store.m
+++ b/MasterPassword/ObjC/MPAppDelegate_Store.m
@@ -98,7 +98,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
 
     storeManager = [[UbiquityStoreManager alloc] initStoreNamed:nil withManagedObjectModel:nil localStoreURL:nil
                                             containerIdentifier:MPCloudContainerIdentifier
-                                         additionalStoreOptions:@{ STORE_OPTIONS }
+                                             storeConfiguration:nil storeOptions:@{ STORE_OPTIONS }
                                                        delegate:self];
 
 #if TARGET_OS_IPHONE
@@ -197,7 +197,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
             URLByAppendingPathComponent:@"Database.nosync" isDirectory:YES]
             URLByAppendingPathComponent:uuid isDirectory:NO] URLByAppendingPathExtension:@"sqlite"];
 
-    return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL contentName:uuid];
+    return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL];
 }
 
 - (BOOL)migrateV2CloudStore {
@@ -218,7 +218,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
             URLByAppendingPathComponent:@"CloudStore.nosync" isDirectory:YES]
             URLByAppendingPathComponent:uuid isDirectory:NO] URLByAppendingPathExtension:@"sqlite"];
 
-    return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL contentName:uuid];
+    return [self migrateFromCloudStore:oldCloudStoreURL cloudContent:oldCloudContentURL];
 }
 
 - (BOOL)migrateV1LocalStore {
@@ -255,7 +255,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
     return YES;
 }
 
-- (BOOL)migrateFromCloudStore:(NSURL *)oldCloudStoreURL cloudContent:(NSURL *)oldCloudContentURL contentName:(NSString *)contentName {
+- (BOOL)migrateFromCloudStore:(NSURL *)oldCloudStoreURL cloudContent:(NSURL *)oldCloudContentURL {
 
     if (![self.storeManager cloudSafeForSeeding]) {
         inf(@"Can't migrate cloud store: A new cloud store already exists.");
@@ -274,7 +274,8 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
 
 #pragma mark - UbiquityStoreManagerDelegate
 
-- (NSManagedObjectContext *)ubiquityStoreManager:(UbiquityStoreManager *)manager managedObjectContextForUbiquityChanges:(NSNotification *)note {
+- (NSManagedObjectContext *)ubiquityStoreManager:(UbiquityStoreManager *)manager
+          managedObjectContextForUbiquityChanges:(NSNotification *)note {
 
     return [self mainManagedObjectContextIfReady];
 }
@@ -578,7 +579,8 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
 
     // Ask for confirmation to import these sites and the master password of the user.
     inf(@"Importing %lu sites, deleting %lu sites, for user: %@", (unsigned long)[importedSiteElements count], (unsigned long)[elementsToDelete count], [MPUserEntity idFor:importUserName]);
-    NSString *userMasterPassword = askUserPassword( user? user.name: importUserName, [importedSiteElements count], [elementsToDelete count] );
+    NSString *userMasterPassword = askUserPassword( user? user.name: importUserName, [importedSiteElements count],
+            [elementsToDelete count] );
     if (!userMasterPassword) {
         inf(@"Import cancelled.");
         return MPImportResultCancelled;
@@ -645,7 +647,7 @@ PearlAssociatedObjectProperty(NSManagedObjectContext*, MainManagedObjectContext,
     MPCheckpoint( MPCheckpointSitesImported, nil );
 
     [[NSNotificationCenter defaultCenter] postNotificationName:MPSitesImportedNotification object:nil userInfo:@{
-            MPSitesImportedNotificationUserKey: user
+            MPSitesImportedNotificationUserKey : user
     }];
 
     return MPImportResultSuccess;
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..3156f547
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+[![Gittip](http://img.shields.io/gittip/lhunath.png)](https://www.gittip.com/lhunath/)
+[![Travis CI](http://img.shields.io/travis-ci/Lyndir/MasterPassword.png)](https://travis-ci.org/Lyndir/MasterPassword)
+
+# Master Password
+
+Master Password is an algorithm and Java/iOS application to solve the real trouble with passwords.