Fix update directories not being pruned (bad merge)

Need to -flattenMap: to the list of directories
Ignore the RACUnit we use to hack lazy memoization
2014-01-24 23:09:33 -08:00 · 2014-01-24 23:07:24 -08:00 · 2014-01-24 23:03:48 -08:00 · 2014-01-24 23:01:00 -08:00 · 2014-01-24 22:48:31 -08:00 · 2013-12-23 20:58:01 -08:00
185 changed files with 2978 additions and 10431 deletions
@@ -1,22 +1,9 @@
+[submodule "External/ReactiveCocoa"]
+	path = External/ReactiveCocoa
+	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
+[submodule "External/Mantle"]
+	path = External/Mantle
+	url = https://github.com/MantleFramework/Mantle.git
 [submodule "External/OHHTTPStubs"]
 	path = External/OHHTTPStubs
 	url = https://github.com/github/OHHTTPStubs
-[submodule "Carthage.checkout/Nimble"]
-	path = Carthage/Checkouts/Nimble
-	url = https://github.com/Quick/Nimble.git
-[submodule "Carthage.checkout/ReactiveCocoa"]
-	path = Carthage/Checkouts/ReactiveCocoa
-	url = https://github.com/ReactiveCocoa/ReactiveCocoa.git
-[submodule "Carthage.checkout/Quick"]
-	path = Carthage/Checkouts/Quick
-	url = https://github.com/Quick/Quick.git
-[submodule "Carthage.checkout/xcconfigs"]
-	path = Carthage/Checkouts/xcconfigs
-	url = https://github.com/jspahrsummers/xcconfigs.git
-[submodule "Carthage.checkout/Mantle"]
-	path = Carthage/Checkouts/Mantle
-	url = https://github.com/Mantle/Mantle.git
-[submodule "Carthage/Checkouts/Nimble"]
-	url = https://github.com/Quick/Nimble.git
-[submodule "Carthage/Checkouts/Quick"]
-	url = https://github.com/Quick/Quick.git
@@ -1,10 +0,0 @@
-osx_image: xcode9.4
-language: objective-c
-
-install: script/bootstrap
-script: script/cibuild
-notifications:
-  email: false
-env:
-  global:
-    secure: L4C3hHzXc/sgL35dIz3kjqIzPWnXCHsFOgbOcz0f249zlnegeKHQdChm4HUDtfrbmKLMYQCIvVfcgPeLaHkCSeHqXUihXLT2LglK+0GX3MBbFzde9x1uln2O68hH1tTmBg2O2i4Dtc4D3e+2tVv3XmhQDZt0znIVO6n9YgevDqw=
@@ -1,2 +0,0 @@
-github "Mantle/Mantle" ~> 1.5.3
-github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3
@@ -1,3 +0,0 @@
-github "jspahrsummers/xcconfigs" ~> 0.8.1
-github "Quick/Quick" ~> 1.1.0
-github "Quick/Nimble" ~> 6.1.0
@@ -1,5 +0,0 @@
-github "Mantle/Mantle" "1.5.8"
-github "Quick/Nimble" "v6.1.0"
-github "Quick/Quick" "v1.1.0"
-github "ReactiveCocoa/ReactiveCocoa" "v2.5"
-github "jspahrsummers/xcconfigs" "0.8.1"
@@ -6,7 +6,6 @@ and transparent as updates to a website**.
 Instead of publishing a feed of versions from which your app must select,
 Squirrel updates to the version your server tells it to. This allows you to
 intelligently update your clients based on the request you give to Squirrel.
-The server can remotely drive behaviors like rolling back or phased rollouts.

 Your request can include authentication details, custom headers or a request
 body so that your server has the context it needs in order to supply the most
@@ -14,10 +13,10 @@ suitable update.

 The update JSON Squirrel requests should be dynamically generated based on
 criteria in the request, and whether an update is required. Squirrel relies
-on server side support for determining whether an update is required, see
-[Server Support](#server-support).
+on server side support for determining whether an update is required, see [Server
+Support](#server-support) below.

-Squirrel's installer is also designed to be fault tolerant, and ensure that any
+Squirrel’s installer is also designed to be fault tolerant, and ensure that any
 updates installed are valid.

 ![:shipit:](http://shipitsquirrel.github.io/images/ship%20it%20squirrel.png)
@@ -27,27 +26,24 @@ updates installed are valid.
 1. Install xctool with `brew install xctool`
 1. Add the Squirrel repository as a git submodule
 1. Run `script/bootstrap` from within the submodule
-1. Add references to Squirrel.xcodeproj and its [dependencies](#dependencies) to
-   your project
+1. Add a reference to Squirrel.xcodeproj to your project
 1. Add Squirrel.framework as a target dependency
 1. Link Squirrel.framework and add it to a Copy Files build phase which copies
 it into your Frameworks directory
 1. Ensure your application includes the [dependencies](#dependencies). Squirrel
 does not embed them itself.

-If you’re developing Squirrel on its own, then use `Squirrel.xcworkspace`.
-
 # Dependencies

 Squirrel depends on [ReactiveCocoa](http://github.com/ReactiveCocoa/ReactiveCocoa)
-and [Mantle](https://github.com/Mantle/Mantle).
+and [Mantle](https://github.com/MantleFramework/Mantle).

 If your application is already using ReactiveCocoa, ensure it is using the same
 version as Squirrel.

 Otherwise, add a target dependency and Copy Files build phase entry for the
 ReactiveCocoa.framework target included in Squirrel's repository, in
-`Carthage/Checkouts/ReactiveCocoa`.
+External/ReactiveCocoa.

 Similarly, ensure your application includes Mantle, or copies in the Squirrel
 version.
@@ -64,16 +60,7 @@ Once Squirrel is added to your project, you need to configure and start it.
 #import <Squirrel/Squirrel.h>

 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
-	NSURLComponents *components = [[NSURLComponents alloc] init];
-
-	components.scheme = @"https";
-	components.host = @"mycompany.com";
-	components.path = @"/myapp/latest";
-
-	NSString *bundleVersion = NSBundle.mainBundle.sqrl_bundleVersion;
-	components.query = [[NSString stringWithFormat:@"version=%@", bundleVersion] stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet]
-
-	self.updater = [[SQRLUpdater alloc] initWithUpdateRequest:[NSURLRequest requestWithURL:components.URL]];
+	self.updater = [[SQRLUpdater alloc] initWithUpdateRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://mycompany.com/myapp/latest"]]];

 	// Check for updates every 4 hours.
 	[self.updater startAutomaticChecksWithInterval:60 * 60 * 4];
@@ -84,26 +71,7 @@ Squirrel will periodically request and automatically download any updates. When
 your application terminates, any downloaded update will be automatically
 installed.

-## Update Requests
-
-Squirrel is indifferent to the request the client application provides for
-update checking. `Accept: application/json` is added to the request headers
-because Squirrel is responsible for parsing the response.
-
-For the requirements imposed on the responses and the body format of an update
-response see [Server Support](#server-support).
-
-Your update request must *at least* include a version identifier so that the
-server can determine whether an update for this specific version is required. It
-may also include other identifying criteria such as operating system version or
-username, to allow the server to deliver as fine grained an update as you
-would like.
-
-How you include the version identifier or other criteria is specific to the
-server that you are requesting updates from. A common approach is to use query
-parameters, [Configuration](#configuration) shows an example of this.
-
-## Update Available Notifications
+## Update Notifications

 To know when an update is ready to be installed, you can subscribe to the
 `updates` signal on `SQRLUpdater`:
@@ -114,18 +82,12 @@ To know when an update is ready to be installed, you can subscribe to the
 }];
 ```

-## Installing Updates
+If you've been notified of an available update, and don't want to wait for it to
+be installed automatically, you can terminate the app to begin the installation
+process immediately.

-While downloaded updates are automatically installed when your application
-terminates, if don't want to wait you can manually terminate the app to begin
-the installation process immediately.
-
-Once an [update available notification](#update-available-notifications) has
-been received, you may want to present an interface informing the user about
-the update and offering the ability to install and relaunch.
-
-To explicitly install a downloaded update and automatically relaunch afterward,
-subscribe to the `relaunchToInstallUpdate` signal on `SQRLUpdater`:
+If you want to install a downloaded update and automatically relaunch afterward,
+`SQRLUpdater` can do that:

 ```objc
 [[self.updater relaunchToInstallUpdate] subscribeError:^(NSError *error) {
@@ -133,33 +95,17 @@ subscribe to the `relaunchToInstallUpdate` signal on `SQRLUpdater`:
 }];
 ```

-# Server Support
+# Update JSON Format

-Your server should determine whether an update is required based on the
-[Update Request](#update-requests) your client issues.
-
-If an update is required your server should respond with a status code of
-[200 OK](http://tools.ietf.org/html/rfc2616#section-10.2.1) and include the
-[update JSON](#update-server-json-format) in the body. Squirrel **will** download and
-install this update, even if the version of the update is the same as the
-currently running version. To save redundantly downloading the same version
-multiple times your server must not inform the client to update.
-
-If no update is required your server must respond with a status code of
-[204 No Content](http://tools.ietf.org/html/rfc2616#section-10.2.5). Squirrel
-will check for an update again at the interval you specify.
-
-## Update Server JSON Format
-
-When an update is available, Squirrel expects the following schema in response
-to the update request provided:
+Squirrel requests the URL you provide with `Accept: application/json` and
+expects the following schema in response:

 ```json
 {
-	"url": "https://mycompany.example.com/myapp/releases/myrelease",
+	"url": "http://mycompany.com/myapp/releases/myrelease",
 	"name": "My Release Name",
 	"notes": "Theses are some release notes innit",
-	"pub_date": "2013-09-18T12:29:53+01:00"
+	"pub_date": "2013-09-18T12:29:53+01:00",
 }
 ```

@@ -170,44 +116,23 @@ installing ZIP updates. If future update formats are supported their MIME type
 will be added to the `Accept` header so that your server can return the
 appropriate format.

-"pub_date" if present must be formatted according to ISO 8601.
+"pub_date" if present must be formatted according to ISO 8601

-## Update File JSON Format
+# Server Support

-The alternate update technique uses a plain JSON file meaning you can store your
-update metadata on S3 or another static file store. The format of this file is
-detailed below:
+If an update is required your server should respond with a status code of
+[200 OK](http://tools.ietf.org/html/rfc2616#section-10.2.1) and include the
+update JSON in the body. Squirrel **will** download and install this update,
+even if the version of the update is the same as the currently running version.
+To save redundantly downloading the same version multiple times your server must
+inform the client not to update.

-```json
-{
-	"currentRelease": "1.2.3",
-	"releases": [
-		{
-			"version": "1.2.1",
-			"updateTo": {
-				"version": "1.2.1",
-				"pub_date": "2013-09-18T12:29:53+01:00",
-				"notes": "Theses are some release notes innit",
-				"name": "1.2.1",
-				"url": "https://mycompany.example.com/myapp/releases/myrelease"
-			}
-		},
-		{
-			"version": "1.2.3",
-			"updateTo": {
-				"version": "1.2.3",
-				"pub_date": "2014-09-18T12:29:53+01:00",
-				"notes": "Theses are some more release notes innit",
-				"name": "1.2.3",
-				"url": "https://mycompany.example.com/myapp/releases/myrelease3"
-			}
-		}
-	]
-}
-```
+If no update is required your server must respond with a status code of
+[204 No Content](http://tools.ietf.org/html/rfc2616#section-10.2.5). Squirrel
+will check for an update again at the interval you specify.

 # User Interface

 Squirrel does not provide any GUI components for presenting updates. If you want
 to indicate updates to the user, make sure to [listen for downloaded
-updates](#update-available-notifications).
+updates](#update-notifications).
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
-   version = "2.0">
+   LastUpgradeVersion = "0500"
+   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
      buildImplicitDependencies = "YES">
@@ -22,14 +22,14 @@
         </BuildActionEntry>
         <BuildActionEntry
            buildForTesting = "YES"
-            buildForRunning = "NO"
+            buildForRunning = "YES"
            buildForProfiling = "NO"
            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForAnalyzing = "YES">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "D0C22BEE179CC00E00158214"
-               BuildableName = "SquirrelTests.xctest"
+               BuildableName = "SquirrelTests.octest"
               BlueprintName = "SquirrelTests"
               ReferencedContainer = "container:Squirrel.xcodeproj">
            </BuildableReference>
@@ -37,71 +37,32 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
-      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "NO">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Test">
      <Testables>
         <TestableReference
            skipped = "NO">
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "D0C22BEE179CC00E00158214"
-               BuildableName = "SquirrelTests.xctest"
+               BuildableName = "SquirrelTests.octest"
               BlueprintName = "SquirrelTests"
               ReferencedContainer = "container:Squirrel.xcodeproj">
            </BuildableReference>
         </TestableReference>
      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D0C22BD6179CC00E00158214"
-            BuildableName = "Squirrel.framework"
-            BlueprintName = "Squirrel"
-            ReferencedContainer = "container:Squirrel.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <EnvironmentVariables>
-         <EnvironmentVariable
-            key = "FORCE_APP_IDENTIFIER"
-            value = "com.github.Squirrel.SquirrelTests"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "SQUIRREL_TEST_LOCAL_CDN"
-            value = "True"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-         <EnvironmentVariable
-            key = "SQUIRREL_TEST_LOCAL_SERVER"
-            value = "True"
-            isEnabled = "YES">
-         </EnvironmentVariable>
-      </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
-      debugXPCServices = "NO"
-      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D0C22BD6179CC00E00158214"
-            BuildableName = "Squirrel.framework"
-            BlueprintName = "Squirrel"
-            ReferencedContainer = "container:Squirrel.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
      <EnvironmentVariables>
         <EnvironmentVariable
            key = "SQRLUpdateFromURL"
@@ -113,20 +74,11 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
-      buildConfiguration = "Profile"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Profile"
      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D0C22BD6179CC00E00158214"
-            BuildableName = "Squirrel.framework"
-            BlueprintName = "Squirrel"
-            ReferencedContainer = "container:Squirrel.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
   </ProfileAction>
   <AnalyzeAction
      buildConfiguration = "Debug">
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0500"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -23,10 +23,10 @@
      </BuildActionEntries>
   </BuildAction>
   <TestAction
-      buildConfiguration = "Test"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Test">
      <Testables>
      </Testables>
      <MacroExpansion>
@@ -38,21 +38,17 @@
            ReferencedContainer = "container:Squirrel.xcodeproj">
         </BuildableReference>
      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <BuildableProductRunnable>
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D08D4E0B17B451500012B22D"
@@ -65,13 +61,12 @@
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
-      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <BuildableProductRunnable>
         <BuildableReference
            BuildableIdentifier = "primary"
            BlueprintIdentifier = "D08D4E0B17B451500012B22D"
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0500"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
@@ -20,45 +20,47 @@
               ReferencedContainer = "container:Squirrel.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D0C22BEE179CC00E00158214"
+               BuildableName = "SquirrelTests.octest"
+               BlueprintName = "SquirrelTests"
+               ReferencedContainer = "container:Squirrel.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
      </BuildActionEntries>
   </BuildAction>
   <TestAction
-      buildConfiguration = "Test"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Test">
      <Testables>
      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
   </TestAction>
   <LaunchAction
-      buildConfiguration = "Debug"
      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
      launchStyle = "0"
      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
      ignoresPersistentStateOnLaunch = "NO"
      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D014AC0017B97885007D79D0"
-            BuildableName = "ShipIt"
-            BlueprintName = "ShipIt"
-            ReferencedContainer = "container:Squirrel.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
      <AdditionalOptions>
      </AdditionalOptions>
   </LaunchAction>
   <ProfileAction
-      buildConfiguration = "Release"
      shouldUseLaunchSchemeArgsEnv = "YES"
      savedToolIdentifier = ""
      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
      debugDocumentVersioning = "YES">
   </ProfileAction>
   <AnalyzeAction
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:Squirrel.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Carthage/Checkouts/Mantle/Mantle.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Carthage/Checkouts/ReactiveCocoa/ReactiveCocoa.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:External/OHHTTPStubs/OHHTTPStubs/OHHTTPStubs.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Carthage/Checkouts/Quick/Quick.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
-   </FileRef>
-</Workspace>
@@ -14,7 +14,4 @@
 // Info.plist, or nil if the key is not present.
@property (nonatomic, copy, readonly) NSString *sqrl_bundleVersion;

-/// The value of the `kCFBundleExecutableKey` key.
-@property (nonatomic, copy, readonly) NSString *sqrl_executableName;
-
@end
@@ -14,8 +14,4 @@
 	return [self objectForInfoDictionaryKey:(id)kCFBundleVersionKey];
 }

- (NSString *)sqrl_executableName {
-	return [self objectForInfoDictionaryKey:(id)kCFBundleExecutableKey];
-}
-
@end
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <ReactiveCocoa/RACSignal.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>

@interface RACSignal (SQRLTransactionExtensions)

@@ -7,8 +7,6 @@
 //

 #import "RACSignal+SQRLTransactionExtensions.h"
-
-#import <ReactiveCocoa/RACDisposable.h>
 #import <IOKit/pwr_mgt/IOPMLib.h>

 // How long before power assertions time out.
@@ -99,15 +97,12 @@ static RACDisposable *SQRLCreateTransaction(NSString *name, NSString *descriptio
 		va_end(args);
 	}

-	return [[RACSignal createSignal:^(id<RACSubscriber> subscriber) {
-		RACDisposable *transactionDisposable = SQRLCreateTransaction(name, description);
-		RACDisposable *subscriptionDisposable = [self subscribe:subscriber];
-
-		return [RACDisposable disposableWithBlock:^{
-			[subscriptionDisposable dispose];
-			[transactionDisposable dispose];
-		}];
-	}] setNameWithFormat:@"[%@] -sqrl_addTransactionWithName: %@ description: %@", self.name, name, description];
+	return [[RACSignal
+		create:^(id<RACSubscriber> subscriber) {
+			[subscriber.disposable addDisposable:SQRLCreateTransaction(name, description)];
+			[self subscribe:subscriber];
+		}]
+		setNameWithFormat:@"[%@] -sqrl_addTransactionWithName: %@ description: %@", self.name, name, description];
 }

 - (RACSignal *)sqrl_addSubscriptionTransactionWithName:(NSString *)name description:(NSString *)descriptionFormat, ... {
@@ -119,13 +114,13 @@ static RACDisposable *SQRLCreateTransaction(NSString *name, NSString *descriptio
 		va_end(args);
 	}

-	return [[RACSignal createSignal:^(id<RACSubscriber> subscriber) {
-		RACDisposable *transactionDisposable = SQRLCreateTransaction(name, description);
-		RACDisposable *subscriptionDisposable = [self subscribe:subscriber];
-		[transactionDisposable dispose];
-
-		return subscriptionDisposable;
-	}] setNameWithFormat:@"[%@] -sqrl_addSubscriptionTransactionWithName: %@ description: %@", self.name, name, description];
+	return [[RACSignal
+		create:^(id<RACSubscriber> subscriber) {
+			RACDisposable *transactionDisposable = SQRLCreateTransaction(name, description);
+			[self subscribe:subscriber];
+			[transactionDisposable dispose];
+		}]
+		setNameWithFormat:@"[%@] -sqrl_addSubscriptionTransactionWithName: %@ description: %@", self.name, name, description];
 }

@end
@@ -21,44 +21,32 @@ extern const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode;

@class RACSignal;

-// Implements the verification of Apple code signatures and requirements.
+// Implements the verification of Apple code signatures.
@interface SQRLCodeSignature : MTLModel

 // A serialized version of the `SecRequirementRef` that the receiver was
 // initialized with.
@property (nonatomic, copy, readonly) NSData *requirementData;

-// Determines the designated requirement of the currently-executing application.
-// The returned code signature can be used to verify that a bundle is code sign
-// valid and meets the designated requirement of the current application.
+// Determines the code signature of the currently-executing application.
 //
 // error - If not NULL, set to any error that occurs.
 //
 // Returns a `SQRLCodeSignature`, or nil if an error occurs retrieving the
-// designated requirement for the running code.
+// signature for the running code.
 + (instancetype)currentApplicationSignature:(NSError **)error;

-// Determines the designated requirement of the specified bundle. The returned
-// code signature can be used to verify that an arbitrary bundle is valid and
-// meets the designated requirement of `bundle`.
+// Initializes the receiver with the given requirement.
 //
-// bundleURL - Must not be nil, the location of a bundle directory structure
-//             which has been code signed and includes a designated requirement.
-//             This bundle's designated requirement is used when verifying other
-//             bundles.
-// error     - If not NULL, set to any error that occurs.
-//
-// Returns a `SQRLCodeSignature`, or nil if an error occurs retrieving the
-// designated requirement of the bundle at `bundleURL`.
-+ (instancetype)signatureWithBundle:(NSURL *)bundleURL error:(NSError **)error;
+// requirement - The code requirement for tested bundles. This must not be NULL.
+- (id)initWithRequirement:(SecRequirementRef)requirement;

-// Verifies the code signature of the specified bundle and verifies that the
-// bundle meets the receiver's requirement.
+// Verifies that the code signature of the specified bundle matches the receiver.
 //
 // bundleURL - The URL to the bundle to verify on disk. This must not be nil.
 //
 // Returns a signal which will synchronously send completed on success, or error
-// if the requirement was not verified successfully.
+// if the code signature was not verified successfully.
 - (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL;

@end
@@ -7,11 +7,8 @@
 //

 #import "SQRLCodeSignature.h"
-
-#import "EXTKeyPathCoding.h"
-#import "EXTScope.h"
-#import <ReactiveCocoa/RACSignal+Operations.h>
-#import <ReactiveCocoa/RACSubscriber.h>
+#import <ReactiveCocoa/EXTScope.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>
 #import <Security/Security.h>

 NSString * const SQRLCodeSignatureErrorDomain = @"SQRLCodeSignatureErrorDomain";
@@ -22,14 +19,9 @@ const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode = -2;
@interface SQRLCodeSignature ()

 // A `SecRequirementRef` that tested bundles must satisfy.
-@property (atomic, strong) id requirement;
-
-// Initializes the receiver with the given requirement.
 //
-// This is the designated initializer for this class.
-//
-// requirement - The code requirement for tested bundles. This must not be NULL.
- (id)initWithRequirement:(SecRequirementRef)requirement;
+// This property is automatically retained.
+@property (atomic) id requirement;

@end

@@ -45,49 +37,8 @@ const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode = -2;

 #pragma mark Lifecycle

-+ (instancetype)currentApplicationSignature:(NSError **)errorRef {
-	SecCodeRef staticCode = NULL;
-	OSStatus error = SecCodeCopySelf(kSecCSDefaultFlags, &staticCode);
-	if (error != noErr) {
-		if (errorRef != NULL) *errorRef = [NSError errorWithDomain:NSOSStatusErrorDomain code:error userInfo:nil];
-		return nil;
-	}
-
-	@onExit {
-		CFRelease(staticCode);
-	};
-
-	return [self signatureWithCode:staticCode error:errorRef];
-}
-
-+ (instancetype)signatureWithBundle:(NSURL *)bundleURL error:(NSError **)errorRef {
-	SecStaticCodeRef bundleCode = NULL;
-	OSStatus error = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &bundleCode);
-	if (error != noErr) {
-		if (errorRef != NULL) *errorRef = [NSError errorWithDomain:NSOSStatusErrorDomain code:error userInfo:nil];
-		return nil;
-	}
-
-	@onExit {
-		CFRelease(bundleCode);
-	};
-
-	return [self signatureWithCode:bundleCode error:errorRef];
-}
-
-+ (instancetype)signatureWithCode:(SecStaticCodeRef)code error:(NSError **)errorRef {
-	SecRequirementRef designatedRequirement = NULL;
-	OSStatus error = SecCodeCopyDesignatedRequirement(code, kSecCSDefaultFlags, &designatedRequirement);
-	if (error != noErr) {
-		if (errorRef != NULL) *errorRef = [NSError errorWithDomain:NSOSStatusErrorDomain code:error userInfo:nil];
-		return nil;
-	}
-
-	@onExit {
-		CFRelease(designatedRequirement);
-	};
-
-	return [[SQRLCodeSignature alloc] initWithRequirement:designatedRequirement];
+ (instancetype)currentApplicationSignature:(NSError **)error {
+	return [self modelWithDictionary:nil error:error];
 }

 - (id)initWithRequirement:(SecRequirementRef)requirement {
@@ -98,12 +49,41 @@ const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode = -2;
 	} error:NULL];
 }

+- (id)initWithDictionary:(NSDictionary *)dictionary error:(NSError **)error {
+	self = [super initWithDictionary:dictionary error:error];
+	if (self == nil) return nil;
+
+	if (self.requirement == nil) {
+		SecCodeRef staticCode = NULL;
+		OSStatus result = SecCodeCopySelf(kSecCSDefaultFlags, &staticCode);
+		@onExit {
+			if (staticCode != NULL) CFRelease(staticCode);
+		};
+
+		if (result != noErr) {
+			if (error != NULL) *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:result userInfo:nil];
+			return nil;
+		}
+
+		SecRequirementRef req = NULL;
+		result = SecCodeCopyDesignatedRequirement(staticCode, kSecCSDefaultFlags, &req);
+		self.requirement = CFBridgingRelease(req);
+
+		if (result != noErr) {
+			if (error != NULL) *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:result userInfo:nil];
+			return nil;
+		}
+	}
+
+	return self;
+}
+
 #pragma mark Verification

 - (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL {
 	NSParameterAssert(bundleURL != nil);

-	return [[RACSignal createSignal:^ RACDisposable * (id<RACSubscriber> subscriber) {
+	return [[RACSignal create:^(id<RACSubscriber> subscriber) {
 		SecStaticCodeRef staticCode = NULL;
 		
 		OSStatus result = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
@@ -120,8 +100,10 @@ const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode = -2;
 			if (failureReason != nil) userInfo[NSLocalizedFailureReasonErrorKey] = failureReason;
 			
 			[subscriber sendError:[NSError errorWithDomain:SQRLCodeSignatureErrorDomain code:SQRLCodeSignatureErrorCouldNotCreateStaticCode userInfo:userInfo]];
-			return nil;
+			return;
 		}
+
+		if (subscriber.disposable.disposed) return;
 		
 		CFErrorRef validityError = NULL;
 		result = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSCheckAllArchitectures, (__bridge SecRequirementRef)self.requirement, &validityError);
@@ -139,11 +121,10 @@ const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode = -2;
 			if (validityError != NULL) userInfo[NSUnderlyingErrorKey] = (__bridge NSError *)validityError;
 			
 			[subscriber sendError:[NSError errorWithDomain:SQRLCodeSignatureErrorDomain code:SQRLCodeSignatureErrorDidNotPass userInfo:userInfo]];
-			return nil;
+			return;
 		}
 		
 		[subscriber sendCompleted];
-		return nil;
 	}] setNameWithFormat:@"-verifyCodeSignatureOfBundle: %@", bundleURL];
 }

@@ -6,16 +6,13 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>

@class RACSignal;

 // Provides the file locations that Squirrel/ShipIt use.
@interface SQRLDirectoryManager : NSObject

-// The application identifier to use in file locations.
-@property (nonatomic, copy, readonly) NSString *applicationIdentifier;
-
 // Returns the shared `SQRLDirectoryManager` for the running application, based
 // on the bundle identifier or application name.
 + (instancetype)currentApplicationManager;
@@ -29,24 +26,14 @@
 //                 on-disk locations for. This must not be nil.
 - (instancetype)initWithApplicationIdentifier:(NSString *)appIdentifier;

-// Finds or creates a storage folder.
+// Finds or creates an Application Support folder.
 //
 // Returns a signal which synchronously sends a URL then completes, or errors.
- (RACSignal *)storageURL;
+- (RACSignal *)applicationSupportURL;

 // Determines where archived `SQRLShipItState` should be saved.
 //
 // Returns a signal which synchronously sends a URL then completes, or errors.
 - (RACSignal *)shipItStateURL;

-// Determines where ShipIt's stdout log should be saved.
-//
-// Returns a signal which synchronously sends a URL then completes, or errors.
- (RACSignal *)shipItStdoutURL;
-
-// Determines where ShipIt's stderr log should be saved.
-//
-// Returns a signal which synchronously sends a URL then completes, or errors.
- (RACSignal *)shipItStderrURL;
-
@end
@@ -7,8 +7,14 @@
 //

 #import "SQRLDirectoryManager.h"
+#import <ReactiveCocoa/ReactiveCocoa.h>

-#import <ReactiveCocoa/RACSignal+Operations.h>
+@interface SQRLDirectoryManager ()
+
+// The application identifier to use in file locations.
+@property (nonatomic, copy, readonly) NSString *applicationIdentifier;
+
+@end

@implementation SQRLDirectoryManager

@@ -24,7 +30,7 @@
 		// Should only fallback to when running under otest, where
 		// NSBundle.mainBundle doesn't return useful data.
 		if (identifier == nil) {
-			identifier = NSProcessInfo.processInfo.environment[@"FORCE_APP_IDENTIFIER"];
+			identifier = NSRunningApplication.currentApplication.localizedName;
 		}

 		NSAssert(identifier != nil, @"Could not automatically determine the current application's identifier");
@@ -47,11 +53,11 @@

 #pragma mark Folder URLs

- (RACSignal *)storageURL {
+- (RACSignal *)applicationSupportURL {
 	return [[RACSignal
 		defer:^{
 			NSError *error = nil;
-			NSURL *folderURL = [NSFileManager.defaultManager URLForDirectory:NSCachesDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:&error];
+			NSURL *folderURL = [NSFileManager.defaultManager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:&error];
 			if (folderURL == nil) {
 				return [RACSignal error:error];
 			}
@@ -63,55 +69,16 @@

 			return [RACSignal return:folderURL];
 		}]
-		setNameWithFormat:@"%@ -storageURL", self];
-}
-
-// Returns a signal to a URL with the given filename and job name inside of the storage folder
-//
-// filename - The name of the file in the storage folder to return in this URL
-// jobname - The name to give the returned RACSignal
-// ensureWritable - If set to true, we will append an integer to the end of the filename in order to find a writeable URL.
-// 		This fixes an issue wherein the stdout and stderr files may have been owned by root, and thus prevented ShipIt from launching.
- (RACSignal *)URLForFileNamed:(NSString *)filename withJobNamed:(NSString *)jobname ensureWritable:(BOOL)ensureWritable {
-	return [[[self
-			  storageURL]
-			 map:^(NSURL *folderURL) {
-				 NSURL *fileURL = [folderURL URLByAppendingPathComponent:filename];
-				 if (ensureWritable) {
-
-					 int attempts = 0;
-					 while (attempts < 100) {
-
-						 NSNumber *writable = nil;
-						 NSError *writableError = nil;
-						 BOOL gotWritable = [fileURL getResourceValue:&writable forKey:NSURLIsWritableKey error:&writableError];
-
-						 if (!gotWritable || writable.boolValue) {
-							 return fileURL;
-						 }
-
-						 attempts++;
-						 fileURL = [folderURL URLByAppendingPathComponent:[NSString stringWithFormat:@"%@.%i", filename, attempts]];
-					 }
-					 
-					 NSLog(@"Error: Unable to find writable log file after 100 attempts.");
-				 }
-
-				 return fileURL;
-			 }]
-			setNameWithFormat:@"%@ -%@", self, jobname];
+		setNameWithFormat:@"%@ -applicationSupportURL", self];
 }

 - (RACSignal *)shipItStateURL {
-	return [self URLForFileNamed:@"ShipItState.plist" withJobNamed:@"shipItStateURL" ensureWritable:false];
-}
-
- (RACSignal *)shipItStdoutURL {
-	return [self URLForFileNamed:@"ShipIt_stdout.log" withJobNamed:@"shipItStdoutURL" ensureWritable:true];
-}
-
- (RACSignal *)shipItStderrURL {
-	return [self URLForFileNamed:@"ShipIt_stderr.log" withJobNamed:@"shipItStderrURL" ensureWritable:true];
+	return [[[self
+		applicationSupportURL]
+		map:^(NSURL *folderURL) {
+			return [folderURL URLByAppendingPathComponent:@"ShipItState.plist"];
+		}]
+		setNameWithFormat:@"%@ -shipItStateURL", self];
 }

 #pragma mark NSObject
@@ -40,9 +40,9 @@
 #pragma mark MTLJSONSerializing

 + (NSDictionary *)JSONKeyPathsByPropertyKey {
-	return @{
+	return [super.JSONKeyPathsByPropertyKey mtl_dictionaryByAddingEntriesFromDictionary:@{
 		@keypath(SQRLDownloadedUpdate.new, bundleURL): NSNull.null
-	};
+	}];
 }

@end
@@ -1,17 +0,0 @@
-//
-//  SQRLInstaller+Private.h
-//  Squirrel
-//
-//  Created by Keith Duncan on 08/01/2014.
-//  Copyright (c) 2014 GitHub. All rights reserved.
-//
-
-#import "SQRLInstaller.h"
-
-// The defaults key to store a `SQRLInstallerOwnedBundle` so that a moved bundle
-// can be restored.
-extern NSString * const SQRLInstallerOwnedBundleKey;
-
-// The defaults key to store the number of installation attempts that have been
-// made.
-extern NSString * const SQRLShipItInstallationAttemptsKey;
@@ -11,7 +11,7 @@
 // The domain for errors originating within SQRLInstaller.
 extern NSString * const SQRLInstallerErrorDomain;

-// There was an error copying the target or update bundle to a backup location.
+// There was an error copying the target bundle to the backup location.
 extern const NSInteger SQRLInstallerErrorBackupFailed;

 // There was an error replacing the target bundle with the update.
@@ -34,39 +34,35 @@ extern const NSInteger SQRLInstallerErrorInvalidState;
 // There was an error moving a bundle across volumes.
 extern const NSInteger SQRLInstallerErrorMovingAcrossVolumes;

-// There was an error changing the file permissions of the update.
-extern const NSInteger SQRLInstallerErrorChangingPermissions;
+@class RACSignal;
+@class RACAction;
+@class SQRLShipItState;
+@class SQRLDirectoryManager;

-@class RACCommand;
-
-// Performs the installation of an update, saving its intermediate state to user
-// defaults.
+// Performs the installation of an update, using the `SQRLShipItState` on disk,
+// as located by `SQRLDirectoryManager`.
 //
 // This class is meant to be used only after the app that will be updated has
 // terminated.
@interface SQRLInstaller : NSObject

-// Initializes an installer using the given application identifier, which is
-// used to scope resumable state stored to user defaults.
+// Attempts to install the update or resume an in-progress installation.
 //
-// applicationIdentifier - The defaults domain in which to store resumable
-//                         state. Must not be nil.
- (instancetype)initWithApplicationIdentifier:(NSString *)applicationIdentifier;
-
-// When executed with a `SQRLShipItRequest`, attempts to install the update or
-// resume an in-progress installation.
-//
-// Each execution will complete or error on an unspecified scheduler when
+// Returns a signal which completes or errors on an unspecified scheduler when
 // installation has completed or failed.
-@property (nonatomic, strong, readonly) RACCommand *installUpdateCommand;
+- (RACSignal *)installUpdateWithState:(SQRLShipItState *)state;

-// When executed with a `SQRLShipItRequest`, aborts an installation, and
-// attempts to restore the old version of the application if necessary.
+// Aborts an installation, and attempts to restore the old version of the
+// application if necessary.
 //
-// This must not be executed while `installUpdateCommand` is executing.
+// This must not be executed while `installUpdateWithState:` is executing.
 //
-// Each execution will complete or error on an unspecified scheduler once
+// Returns a signal while completes or errors on an unspecified scheduler once
 // aborting/recovery has finished.
-@property (nonatomic, strong, readonly) RACCommand *abortInstallationCommand;
+- (RACSignal *)abortInstallationWithState:(SQRLShipItState *)state;
+
+// Initializes an installer using the given directory manager to read and write the
+// state of the installation.
+- (id)initWithDirectoryManager:(SQRLDirectoryManager *)directoryManager;

@end
@@ -7,24 +7,17 @@
 //

 #import "SQRLInstaller.h"
-
-#import <libkern/OSAtomic.h>
-#import "EXTScope.h"
-#import <ReactiveCocoa/NSEnumerator+RACSequenceAdditions.h>
-#import <ReactiveCocoa/NSObject+RACPropertySubscribing.h>
-#import <ReactiveCocoa/RACCommand.h>
-#import <ReactiveCocoa/RACSequence.h>
-#import <ReactiveCocoa/RACSignal+Operations.h>
-#import <ReactiveCocoa/RACSubscriber.h>
-#import <sys/xattr.h>
-
 #import "NSBundle+SQRLVersionExtensions.h"
 #import "NSError+SQRLVerbosityExtensions.h"
 #import "RACSignal+SQRLTransactionExtensions.h"
 #import "SQRLCodeSignature.h"
-#import "SQRLShipItRequest.h"
+#import "SQRLDirectoryManager.h"
+#import "SQRLShipItState.h"
 #import "SQRLTerminationListener.h"
-#import "SQRLInstallerOwnedBundle.h"
+#import <libkern/OSAtomic.h>
+#import <ReactiveCocoa/EXTScope.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <sys/xattr.h>

 NSString * const SQRLInstallerErrorDomain = @"SQRLInstallerErrorDomain";

@@ -35,58 +28,85 @@ const NSInteger SQRLInstallerErrorInvalidBundleVersion = -4;
 const NSInteger SQRLInstallerErrorMissingInstallationData = -5;
 const NSInteger SQRLInstallerErrorInvalidState = -6;
 const NSInteger SQRLInstallerErrorMovingAcrossVolumes = -7;
-const NSInteger SQRLInstallerErrorChangingPermissions = -8;

-NSString * const SQRLShipItInstallationAttemptsKey = @"SQRLShipItInstallationAttempts";
-NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
+// Maps an installer state to a selector to invoke.
+typedef struct {
+	// The state for which the associated method should be invoked.
+	SQRLInstallerState installerState;
+
+	// A method accepting a `SQRLShipItState` argument and returning a cold
+	// signal.
+	//
+	// If NULL, installation should complete.
+	SEL selector;
+} SQRLInstallerDispatchTableEntry;

@interface SQRLInstaller ()

-// The defaults domain to store all resumable state in.
-@property (nonatomic, copy, readonly) NSString *applicationIdentifier;
+// Finds the state file to read and write from.
+@property (nonatomic, strong, readonly) SQRLDirectoryManager *directoryManager;

-// The bundle currently owned by this installer.
+// Reads the given key from `state`, failing if it's not set.
 //
-// Stores the bundle moved aside by an install request so that the original
-// bundle can be restored to its original location if needed.
-@property (atomic, strong) SQRLInstallerOwnedBundle *ownedBundle;
-
-// Reads the given key from `request`, failing if it's not set.
-//
-// key     - The property key to read from `request`. This must not be nil, and
-//           should refer to a property of object type.
-// request - The request object to read. This must not be nil.
+// key   - The property key to read from `state`. This must not be nil, and
+//         should refer to a property of object type.
+// state - The state object to read. This must not be nil.
 //
 // Returns a signal which synchronously sends the non-nil read value then
 // completes, or errors.
- (RACSignal *)getRequiredKey:(NSString *)key fromRequest:(SQRLShipItRequest *)request;
+- (RACSignal *)getRequiredKey:(NSString *)key fromState:(SQRLShipItState *)state;

-// Moves the updateBundleURL to an owned directory to prevent symlink attack,
-// takes user:group ownership of the bundle, then verifies that it meets the
-// designated requirement of the targetBundleURL.
+// Performs the remaining stages of installation, as specified by `state`.
 //
-// request - The request whose update should be prepared and validated.
+// state - The installation state. This must not be nil.
 //
-// Returns a signal which sends the owned & validated bundle URL then completes,
-// or errors.
- (RACSignal *)prepareAndValidateUpdateBundleURLForRequest:(SQRLShipItRequest *)request;
+// Returns a signal which will complete or error on an unspecified thread.
+- (RACSignal *)resumeInstallationFromState:(SQRLShipItState *)state;

-// Saves a `SQRLInstallerOwnedBundle` for the targetBundleURL to the
-// preferences, then moves the targetBundleURL to an owned directory.
+// Moves the specified bundle to a backup location.
 //
-// request - The request whose target should be removed in preparation of an
-//           update being installed.
+// bundleURL - The URL to the bundle that should be backed up. This must not be
+//             nil.
 //
-// Returns a signal which completes, or errors.
- (RACSignal *)acquireTargetBundleURLForRequest:(SQRLShipItRequest *)request;
+// Returns a signal which will send the `NSURL` to the proposed backup location
+// as soon as possible, then complete once the bundle has actually been moved.
+- (RACSignal *)backUpBundleAtURL:(NSURL *)bundleURL;

-// Deletes a bundle that was moved into place using -moveAndTakeOwnershipOfBundleAtURL:.
+// Deletes a bundle that was backed up using -backUpBundleAtURL:.
 //
-// bundleURL - The URL to the backup bundle, as sent from -moveAndTakeOwnershipOfBundleAtURL:.
+// backupURL - The URL to the backup bundle, as sent from -backUpBundleAtURL:.
 //             This must not be nil.
 //
 // Returns a signal which will synchronously complete or error.
- (RACSignal *)deleteOwnedBundleAtURL:(NSURL *)bundleURL;
+- (RACSignal *)deleteBackupAtURL:(NSURL *)backupURL;
+
+// Validates the code signature of a bundle, optionally restoring it upon
+// failure.
+//
+// bundleURL       - The URL of the bundle whose code signature should be
+//                   verified. This must not be nil.
+// signature       - The code signature that the bundle must match. This must
+//                   not be nil.
+// backupBundleURL - If not nil, the URL to a bundle that should replace
+//                   `bundleURL` if the code signature does not pass validation.
+//
+// Returns a signal which will synchronously complete if `bundleURL` passes
+// validation, or if the bundle was recovered from `backupBundleURL`. If
+// validation or recovery fails, an error will be sent.
+- (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL usingSignature:(SQRLCodeSignature *)signature recoveringUsingBackupAtURL:(NSURL *)backupBundleURL;
+
+// Attempts to determine whether a bundle has already been moved on disk.
+//
+// sourceURL - The original URL to the bundle. This must not be nil.
+// targetURL - The proposed destination URL for the bundle. This must not be
+//             nil.
+// signature - The code signature that any item must match in order to be
+//             considered the correct bundle. This must not be nil.
+//
+// Returns a signal which will synchronously send YES if `targetURL` points to
+// a bundle matching the code signature, NO if it doesn't and `sourceURL` still
+// exists, or an error otherwise.
+- (RACSignal *)checkWhetherBundlePreviouslyAtURL:(NSURL *)sourceURL wasInstalledAtURL:(NSURL *)targetURL usingSignature:(SQRLCodeSignature *)signature;

 // Moves `sourceURL` to `targetURL`.
 //
@@ -98,7 +118,7 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 // sourceURL - The URL to move from. This must not be nil.
 //
 // Retruns a signal which will synchronously complete or error.
- (RACSignal *)installItemToURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL;
+- (RACSignal *)installItemAtURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL;

 // Recursively clears the quarantine extended attribute from the given
 // directory.
@@ -112,96 +132,56 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 // Returns a signal which will send completed or error on a background thread.
 - (RACSignal *)clearQuarantineForDirectory:(NSURL *)directory;

-// Recursively changes the owner and group of the given directory tree to that
-// of the current process, then disables writing for anyone but the owner.
-//
-// directoryURL - The URL to the folder to take ownership of. This must not be
-//                nil.
-//
-// Returns a signal which will synchronously complete or error.
- (RACSignal *)takeOwnershipOfDirectory:(NSURL *)directoryURL;
-
@end

@implementation SQRLInstaller

 #pragma mark Lifecycle

- (id)initWithApplicationIdentifier:(NSString *)applicationIdentifier {
-	NSParameterAssert(applicationIdentifier != nil);
+- (id)initWithDirectoryManager:(SQRLDirectoryManager *)directoryManager {
+	NSParameterAssert(directoryManager != nil);

 	self = [super init];
 	if (self == nil) return nil;

-	_applicationIdentifier = [applicationIdentifier copy];
-
-	@weakify(self);
-
-	RACSignal *aborting = [[[[RACObserve(self, abortInstallationCommand)
-		ignore:nil]
-		map:^(RACCommand *command) {
-			return command.executing;
-		}]
-		switchToLatest]
-		setNameWithFormat:@"aborting"];
-
-	_installUpdateCommand = [[RACCommand alloc] initWithEnabled:[aborting not] signalBlock:^(SQRLShipItRequest *request) {
-		@strongify(self);
-		NSParameterAssert(request != nil);
-
-		// Request can be changed between launches, the installer may have
-		// already have an owned bundle, for a previous targetURL.
-		//
-		// If that's the case, we need to abort the previous owned bundle, and
-		// then handle the new install request.
-
-		return [[[[self
-			abortInstall]
-			doError:^(NSError *error) {
-				NSLog(@"Couldn't abort install and restore owned bundle to previous location %@, error %@", self.ownedBundle.originalURL, error.sqrl_verboseDescription);
-			}]
-			catchTo:[RACSignal empty]]
-			then:^{
-				return [self installRequest:request];
-			}];
-	}];
-
-	_abortInstallationCommand = [[RACCommand alloc] initWithEnabled:[self.installUpdateCommand.executing not] signalBlock:^(SQRLShipItRequest *request) {
-		@strongify(self);
-
-		return [self abortInstall];
-	}];
-
+	_directoryManager = directoryManager;
+	
 	return self;
 }

-#pragma mark Preferences
+#pragma mark Actions

- (SQRLInstallerOwnedBundle *)ownedBundle {
-	id archiveData = CFBridgingRelease(CFPreferencesCopyValue((__bridge CFStringRef)SQRLInstallerOwnedBundleKey, (__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost));
-	if (![archiveData isKindOfClass:NSData.class]) return nil;
+- (RACSignal *)installUpdateWithState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);

-	SQRLInstallerOwnedBundle *ownedBundle = [NSKeyedUnarchiver unarchiveObjectWithData:archiveData];
-	if (![ownedBundle isKindOfClass:SQRLInstallerOwnedBundle.class]) return nil;
-
-	return ownedBundle;
+	return [[self
+		resumeInstallationFromState:state]
+		sqrl_addTransactionWithName:NSLocalizedString(@"Updating", nil) description:NSLocalizedString(@"%@ is being updated, and interrupting the process could corrupt the application", nil), state.targetBundleURL.path];
 }

- (void)setOwnedBundle:(SQRLInstallerOwnedBundle *)ownedBundle {
-	NSData *archiveData = (ownedBundle == nil ? nil : [NSKeyedArchiver archivedDataWithRootObject:ownedBundle]);
-	CFPreferencesSetValue((__bridge CFStringRef)SQRLInstallerOwnedBundleKey, (__bridge CFPropertyListRef)archiveData, (__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-	CFPreferencesSynchronize((__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
+- (RACSignal *)abortInstallationWithState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);
+
+	return [[[RACSignal
+		zip:@[
+			[self getRequiredKey:@keypath(state.targetBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.codeSignature) fromState:state]
+		] reduce:^(NSURL *targetBundleURL, SQRLCodeSignature *codeSignature) {
+			return [self verifyBundleAtURL:targetBundleURL usingSignature:codeSignature recoveringUsingBackupAtURL:state.backupBundleURL];
+		}]
+		flatten]
+		sqrl_addTransactionWithName:NSLocalizedString(@"Aborting update", nil) description:NSLocalizedString(@"An update to %@ is being rolled back, and interrupting the process could corrupt the application", nil), state.targetBundleURL.path];
 }

-#pragma mark Properties
+#pragma mark Installer State

- (RACSignal *)getRequiredKey:(NSString *)key fromRequest:(SQRLShipItRequest *)request {
+- (RACSignal *)getRequiredKey:(NSString *)key fromState:(SQRLShipItState *)state {
 	NSParameterAssert(key != nil);
-	NSParameterAssert(request != nil);
+	NSParameterAssert(state != nil);

 	return [[RACSignal
 		defer:^{
-			id value = [request valueForKey:key];
+			id value = [state valueForKey:key];
 			if (value == nil) {
 				NSString *errorDescription = [NSString stringWithFormat:NSLocalizedString(@"Missing %@", nil), key];
 				return [RACSignal error:[self missingDataErrorWithDescription:errorDescription]];
@@ -209,275 +189,309 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 				return [RACSignal return:value];
 			}
 		}]
-		setNameWithFormat:@"%@ -getRequiredKey: %@ fromRequest: %@", self, key, request];
+		setNameWithFormat:@"%@ -getRequiredKey: %@ fromState: %@", self, key, state];
 }

-#pragma mark Installer States
+- (RACSignal *)resumeInstallationFromState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);

- (RACSignal *)prepareAndValidateUpdateBundleURLForRequest:(SQRLShipItRequest *)request {
-	NSParameterAssert(request != nil);
+	const SQRLInstallerDispatchTableEntry dispatchTablePrototype[] = {
+		{ .installerState = SQRLInstallerStateNothingToDo, .selector = NULL },
+		{ .installerState = SQRLInstallerStateClearingQuarantine, .selector = @selector(clearQuarantineWithState:) },
+		{ .installerState = SQRLInstallerStateBackingUp, .selector = @selector(backUpWithState:) },
+		{ .installerState = SQRLInstallerStateInstalling, .selector = @selector(installWithState:) },
+		{ .installerState = SQRLInstallerStateVerifyingInPlace, .selector = @selector(verifyInPlaceWithState:) },
+	};

-	return [[[[[[[self
-		ownedTemporaryDirectoryURL]
-		flattenMap:^(NSURL *directoryURL) {
-			return [self copyBundleAtURL:request.updateBundleURL toDirectory:directoryURL];
-		}]
+	const size_t tableCount = sizeof(dispatchTablePrototype) / sizeof(*dispatchTablePrototype);
+	NSValue *boxedDispatchTable = [NSValue valueWithBytes:dispatchTablePrototype objCType:@encode(__typeof__(dispatchTablePrototype))];
+
+	RACSignal *step = [RACSignal defer:^{
+		SQRLInstallerDispatchTableEntry dispatchTable[tableCount];
+		[boxedDispatchTable getValue:&dispatchTable];
+
+		SQRLInstallerState installerState = state.installerState;
+
+		size_t tableIndex;
+		for (tableIndex = 0; tableIndex < tableCount; tableIndex++) {
+			if (dispatchTable[tableIndex].installerState == installerState) {
+				break;
+			}
+		}
+
+		if (tableIndex >= tableCount) {
+			NSDictionary *userInfo = @{
+				NSLocalizedDescriptionKey: [NSString stringWithFormat:NSLocalizedString(@"Invalid installer state %i", nil), (int)installerState],
+				NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"Try installing the update again.", nil)
+			};
+
+			return [RACSignal error:[NSError errorWithDomain:SQRLInstallerErrorDomain code:SQRLInstallerErrorInvalidState userInfo:userInfo]];
+		}
+
+		SEL selector = dispatchTable[tableIndex].selector;
+		if (selector == NULL) {
+			// Nothing to do.
+			return [RACSignal empty];
+		}
+
+		NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:selector]];
+		invocation.target = self;
+		invocation.selector = selector;
+		
+		SQRLShipItState *stateArg = state;
+		[invocation setArgument:&stateArg atIndex:2];
+		[invocation invoke];
+
+		__unsafe_unretained RACSignal *step = nil;
+		[invocation getReturnValue:&step];
+
+		SQRLInstallerState nextState;
+		if (tableIndex + 1 >= tableCount) {
+			nextState = SQRLInstallerStateNothingToDo;
+		} else {
+			nextState = dispatchTable[tableIndex + 1].installerState;
+		}
+
+		return [[[step
+			doCompleted:^{
+				NSLog(@"Completed state %i", (int)installerState);
+			}]
+			ignoreValues]
+			concat:[RACSignal return:@(nextState)]];
+	}];
+
+	return [[self
+		stepRepeatedly:step withState:state]
+		setNameWithFormat:@"%@ -resumeInstallationFromState: %@", self, state];
+}
+
+- (RACSignal *)stepRepeatedly:(RACSignal *)step withState:(SQRLShipItState *)state {
+	NSParameterAssert(step != nil);
+	NSParameterAssert(state != nil);
+
+	return [step flattenMap:^(NSNumber *nextState) {
+		state.installerState = nextState.integerValue;
+		state.installationStateAttempt = 1;
+		return [[state
+			writeUsingURL:self.directoryManager.shipItStateURL]
+			// Automatically begin the next step.
+			concat:[self stepRepeatedly:step withState:state]];
+	}];
+}
+
+- (RACSignal *)clearQuarantineWithState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);
+
+	return [[[self
+		getRequiredKey:@keypath(state.updateBundleURL) fromState:state]
 		flattenMap:^(NSURL *bundleURL) {
-			return [[[self
-				clearQuarantineForDirectory:bundleURL]
-				ignoreValues]
-				concat:[RACSignal return:bundleURL]];
+			return [self clearQuarantineForDirectory:bundleURL];
 		}]
-		zipWith:[self codeSignatureForBundleAtURL:request.targetBundleURL]]
-		reduceEach:^(NSURL *updateBundleURL, SQRLCodeSignature *codeSignature) {
-			return [[[self
-				verifyBundleAtURL:updateBundleURL usingSignature:codeSignature]
-				ignoreValues]
-				concat:[RACSignal return:updateBundleURL]];
-		}]
-		flatten]
-		setNameWithFormat:@"%@ -prepareAndValidateUpdateBundleURLForRequest: %@", self, request];
+		setNameWithFormat:@"%@ -clearQuarantineWithState: %@", self, state];
 }

- (RACSignal *)acquireTargetBundleURLForRequest:(SQRLShipItRequest *)request {
-	NSParameterAssert(request != nil);
+- (RACSignal *)backUpWithState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);

 	return [[[[RACSignal
 		zip:@[
-			[self ownedTemporaryDirectoryURL],
-			[self codeSignatureForBundleAtURL:request.targetBundleURL],
-		] reduce:^(NSURL *directoryURL, SQRLCodeSignature *codeSignature) {
-			NSURL *targetBundleURL = request.targetBundleURL;
-			NSURL *newBundleURL = [directoryURL URLByAppendingPathComponent:targetBundleURL.lastPathComponent];
+			[self getRequiredKey:@keypath(state.targetBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.codeSignature) fromState:state],
+		] reduce:^(NSURL *bundleURL, SQRLCodeSignature *codeSignature) {
+			RACSignal *skipBackup = [RACSignal return:@NO];
+			if (state.backupBundleURL != nil) {
+				skipBackup = [self checkWhetherBundlePreviouslyAtURL:bundleURL wasInstalledAtURL:state.backupBundleURL usingSignature:codeSignature];
+			}

-			return [[SQRLInstallerOwnedBundle alloc] initWithOriginalURL:request.targetBundleURL temporaryURL:newBundleURL codeSignature:codeSignature];
+			return [skipBackup flattenMap:^(NSNumber *skip) {
+				if (skip.boolValue) {
+					return [RACSignal empty];
+				} else {
+					return [self backUpBundleAtURL:bundleURL];
+				}
+			}];
 		}]
-		doNext:^(SQRLInstallerOwnedBundle *ownedBundle) {
-			self.ownedBundle = ownedBundle;
+		flatten]
+		flattenMap:^(NSURL *backupBundleURL) {
+			// Save the chosen backup URL as soon as we have it, so we
+			// can resume even if the state change hasn't taken effect.
+			//
+			// N.B. It's important that this method remain
+			// synchronous, so it finishes before returning
+			// control to -backUpBundleAtURL:. Really, the flow
+			// here should be refactored so it doesn't matter.
+			state.backupBundleURL = backupBundleURL;
+			return [state writeUsingURL:self.directoryManager.shipItStateURL];
 		}]
-		flattenMap:^(SQRLInstallerOwnedBundle *ownedBundle) {
-			return [self installItemToURL:ownedBundle.temporaryURL fromURL:ownedBundle.originalURL];
-		}]
-		setNameWithFormat:@"%@ -acquireTargetBundleURLForRequest: %@", self, request];
+		setNameWithFormat:@"%@ -backUpWithState: %@", self, state];
 }

- (RACSignal *)renameIfNeeded:(SQRLShipItRequest *)request updateBundleURL:(NSURL *)updateBundleURL {
-	if (!request.useUpdateBundleName) return [RACSignal return:request];
+- (RACSignal *)installWithState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);

-	return [[self
-		renamedTargetIfNeededWithTargetURL:request.targetBundleURL sourceURL:updateBundleURL]
-		flattenMap:^(NSURL *newTargetURL) {
-			if ([newTargetURL isEqual:request.targetBundleURL]) return [RACSignal return:request];
-
-			SQRLShipItRequest *updatedRequest = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:request.updateBundleURL targetBundleURL:newTargetURL bundleIdentifier:request.bundleIdentifier launchAfterInstallation:request.launchAfterInstallation useUpdateBundleName:request.useUpdateBundleName];
-			return [[self
-				installItemToURL:newTargetURL fromURL:request.targetBundleURL]
-				concat:[RACSignal return:updatedRequest]];
-		}];
-}
-
- (RACSignal *)installRequest:(SQRLShipItRequest *)request {
-	NSParameterAssert(request != nil);
-
-	return [[[[self
-		prepareAndValidateUpdateBundleURLForRequest:request]
-		flattenMap:^(NSURL *updateBundleURL) {
+	return [[[RACSignal
+		zip:@[
+			[self getRequiredKey:@keypath(state.targetBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.updateBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.backupBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.codeSignature) fromState:state]
+		] reduce:^(NSURL *targetBundleURL, NSURL *updateBundleURL, NSURL *backupBundleURL, SQRLCodeSignature *codeSignature) {
 			return [[[[self
-				renameIfNeeded:request updateBundleURL:updateBundleURL]
-				flattenMap:^(SQRLShipItRequest *request) {
-					return [[self acquireTargetBundleURLForRequest:request] concat:[RACSignal return:request]];
+				checkWhetherBundlePreviouslyAtURL:updateBundleURL wasInstalledAtURL:targetBundleURL usingSignature:codeSignature]
+				flattenMap:^(NSNumber *skip) {
+					if (skip.boolValue) {
+						return [RACSignal empty];
+					} else {
+						return [self installItemAtURL:targetBundleURL fromURL:updateBundleURL];
+					}
 				}]
-				flattenMap:^(SQRLShipItRequest *request) {
-					return [[[[[[self
-						installItemToURL:request.targetBundleURL fromURL:updateBundleURL]
-						concat:[RACSignal return:request.updateBundleURL]]
-						concat:[RACSignal return:updateBundleURL]]
-						concat:[RACSignal defer:^{
-							return [RACSignal return:self.ownedBundle.temporaryURL];
-						}]]
-						flattenMap:^(NSURL *location) {
-							return [[[self
-								deleteOwnedBundleAtURL:location]
-								doError:^(NSError *error) {
-									NSLog(@"Couldn't remove owned bundle at location %@, error %@", location, error.sqrl_verboseDescription);
-								}]
-								catchTo:[RACSignal empty]];
-						}]
-						concat:[RACSignal return:request]];
+				catch:^(NSError *error) {
+					NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Failed to replace bundle %@ with update %@", nil), targetBundleURL, updateBundleURL];
+					return [RACSignal error:[self errorByAddingDescription:description code:SQRLInstallerErrorReplacingTarget toError:error]];
 				}]
-				doCompleted:^{
-					self.ownedBundle = nil;
+				catch:^(NSError *error) {
+					// Verify that the target bundle didn't get corrupted during
+					// failure. Try recovering it if it did.
+					return [[self
+						verifyBundleAtURL:targetBundleURL usingSignature:codeSignature recoveringUsingBackupAtURL:backupBundleURL]
+						// Recovery succeeded, but we still want to pass
+						// through the original error.
+						concat:[RACSignal error:error]];
 				}];
 		}]
-		sqrl_addTransactionWithName:NSLocalizedString(@"Updating", nil) description:NSLocalizedString(@"%@ is being updated, and interrupting the process could corrupt the application", nil), request.targetBundleURL.path]
-		setNameWithFormat:@"%@ -installRequest: %@", self, request];
+		flatten]
+		setNameWithFormat:@"%@ -installWithState: %@", self, state];
 }

- (RACSignal *)abortInstall {
-	// The request may have been tampered with to select a new targetURL to
-	// which the moved bundles should be restored.
-	//
-	// Discard the request parameters and restore the owned bundle to its
-	// original location.
-
-	SQRLInstallerOwnedBundle *ownedBundle = self.ownedBundle;
-	if (ownedBundle == nil) return [RACSignal empty];
-
-	return [[[[self
-		installItemToURL:ownedBundle.originalURL fromURL:ownedBundle.temporaryURL]
-		doCompleted:^{
-			self.ownedBundle = nil;
-		}]
-		sqrl_addTransactionWithName:NSLocalizedString(@"Aborting update", nil) description:NSLocalizedString(@"An update to %@ is being rolled back, and interrupting the process could corrupt the application", nil), ownedBundle.originalURL.path]
-		setNameWithFormat:@"%@ -abortInstall", self];
-}
-
-#pragma mark Bundle Ownership
-
- (RACSignal *)ownedTemporaryDirectoryURL {
-	return [[[RACSignal
-		defer:^{
-			NSString *tmpPath = [NSTemporaryDirectory() stringByResolvingSymlinksInPath];
-			NSString *template = [NSString stringWithFormat:@"%@.XXXXXXXX", self.applicationIdentifier];
-
-			char *fullTemplate = strdup([tmpPath stringByAppendingPathComponent:template].UTF8String);
-			@onExit {
-				free(fullTemplate);
-			};
-
-			if (mkdtemp(fullTemplate) == NULL) {
-				return [RACSignal error:[NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil]];
-			}
-
-			NSURL *URL = [NSURL fileURLWithPath:[NSFileManager.defaultManager stringWithFileSystemRepresentation:fullTemplate length:strlen(fullTemplate)] isDirectory:YES];
-			return [RACSignal return:URL];
-		}]
-		catch:^(NSError *error) {
-			NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Could not create temporary folder", nil)];
-			return [RACSignal error:[self errorByAddingDescription:description code:SQRLInstallerErrorBackupFailed toError:error]];
-		}]
-		setNameWithFormat:@"%@ -ownedDirectoryURL", self];
-}
-
- (RACSignal *)copyBundleAtURL:(NSURL *)bundleURL toDirectory:(NSURL *)directoryURL {
-	NSParameterAssert(bundleURL != nil);
-	NSParameterAssert(directoryURL != nil);
-
-	NSURL *newBundleURL = [directoryURL URLByAppendingPathComponent:bundleURL.lastPathComponent];
+- (RACSignal *)verifyInPlaceWithState:(SQRLShipItState *)state {
+	NSParameterAssert(state != nil);

 	return [[[RACSignal
-		defer:^{
-			NSError *error;
-			BOOL copy = [NSFileManager.defaultManager copyItemAtURL:bundleURL toURL:newBundleURL error:&error];
-			if (!copy) return [RACSignal error:error];
-
-			return [RACSignal return:newBundleURL];
+		zip:@[
+			[self getRequiredKey:@keypath(state.targetBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.backupBundleURL) fromState:state],
+			[self getRequiredKey:@keypath(state.codeSignature) fromState:state]
+		] reduce:^(NSURL *targetBundleURL, NSURL *backupBundleURL, SQRLCodeSignature *codeSignature) {
+			return [[self
+				verifyBundleAtURL:targetBundleURL usingSignature:codeSignature recoveringUsingBackupAtURL:backupBundleURL]
+				concat:[[self
+					deleteBackupAtURL:backupBundleURL]
+					catchTo:[RACSignal empty]]];
 		}]
-		catch:^(NSError *error) {
-			NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Failed to copy bundle %@ to directory %@", nil), bundleURL, newBundleURL];
-			return [RACSignal error:[self errorByAddingDescription:description code:SQRLInstallerErrorBackupFailed toError:error]];
-		}]
-		setNameWithFormat:@"%@ -copyBundleAtURL: %@ toDirectory: %@", self, bundleURL, directoryURL];
+		flatten]
+		setNameWithFormat:@"%@ -verifyInPlaceWithState: %@", self, state];
 }

- (RACSignal *)deleteOwnedBundleAtURL:(NSURL *)bundleURL {
-	NSParameterAssert(bundleURL != nil);
+#pragma mark Backing Up

-	return [[[RACSignal
-		defer:^{
-			NSError *error;
-			if ([NSFileManager.defaultManager removeItemAtURL:bundleURL error:&error]) {
-				return [RACSignal empty];
-			} else {
+- (RACSignal *)backUpBundleAtURL:(NSURL *)targetBundleURL {
+	NSParameterAssert(targetBundleURL != nil);
+
+	return [[[[[[self.directoryManager
+		applicationSupportURL]
+		flattenMap:^(NSURL *applicationSupportURL) {
+			NSError *error = nil;
+			NSURL *temporaryDirectoryURL = [NSFileManager.defaultManager URLForDirectory:NSItemReplacementDirectory inDomain:NSUserDomainMask appropriateForURL:applicationSupportURL create:YES error:&error];
+			if (temporaryDirectoryURL == nil) {
 				return [RACSignal error:error];
 			}
+
+			return [RACSignal return:temporaryDirectoryURL];
 		}]
-		then:^{
+		catch:^(NSError *error) {
+			NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Could not create backup folder", nil)];
+			return [RACSignal error:[self errorByAddingDescription:description code:SQRLInstallerErrorBackupFailed toError:error]];
+		}]
+		map:^(NSURL *temporaryDirectoryURL) {
+			return [temporaryDirectoryURL URLByAppendingPathComponent:targetBundleURL.lastPathComponent];
+		}]
+		flattenMap:^(NSURL *backupBundleURL) {
+			return [[[[self
+				installItemAtURL:backupBundleURL fromURL:targetBundleURL]
+				catch:^(NSError *error) {
+					NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Failed to move bundle %@ to backup location %@", nil), targetBundleURL, backupBundleURL];
+					return [RACSignal error:[self errorByAddingDescription:description code:SQRLInstallerErrorBackupFailed toError:error]];
+				}]
+				ignoreValues]
+				// Return the backup URL before doing any work, to increase
+				// fault tolerance.
+				startWith:backupBundleURL];
+		}]
+		setNameWithFormat:@"%@ -backUpBundleAtURL: %@", self, targetBundleURL];
+}
+
+- (RACSignal *)deleteBackupAtURL:(NSURL *)backupURL {
+	NSParameterAssert(backupURL != nil);
+
+	return [[RACSignal
+		defer:^{
+			NSError *error = nil;
+			if (![NSFileManager.defaultManager removeItemAtURL:backupURL error:&error]) {
+				return [RACSignal error:error];
+			}
+
 			// Also remove the temporary directory that the backup lived in.
-			NSURL *temporaryDirectoryURL = bundleURL.URLByDeletingLastPathComponent;
+			NSURL *temporaryDirectoryURL = backupURL.URLByDeletingLastPathComponent;

 			// However, use rmdir() to skip it in case there are other files
 			// contained within (for whatever reason).
-			if (rmdir(temporaryDirectoryURL.path.fileSystemRepresentation) == 0) {
-				return [RACSignal empty];
-			} else {
-				int code = errno;
-				NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-
-				const char *desc = strerror(code);
-				if (desc != NULL) {
-					userInfo[NSLocalizedDescriptionKey] = @(desc);
-				} else {
-					userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Unknown POSIX error", @"");
-				}
-
-				userInfo[NSLocalizedFailureReasonErrorKey] = [NSString stringWithFormat:NSLocalizedString(@"Couldn't remove temp dir \"%@\"", @""), temporaryDirectoryURL.path];
-				userInfo[NSURLErrorKey] = temporaryDirectoryURL;
-
-				return [RACSignal error:[NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:userInfo]];
+			if (rmdir(temporaryDirectoryURL.path.fileSystemRepresentation) != 0) {
+				return [RACSignal error:[NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil]];
 			}
+
+			return [RACSignal empty];
 		}]
-		setNameWithFormat:@"%@ -deleteOwnedBundleAtURL: %@", self, bundleURL];
+		setNameWithFormat:@"%@ -deleteBackupAtURL: %@", self, backupURL];
 }

-#pragma mark Verification
-
- (RACSignal *)codeSignatureForBundleAtURL:(NSURL *)URL {
-	return [[RACSignal
-		defer:^{
-			NSError *error;
-			SQRLCodeSignature *codeSignature = [SQRLCodeSignature signatureWithBundle:URL error:&error];
-			if (codeSignature == nil) return [RACSignal error:error];
-			return [RACSignal return:codeSignature];
-		}]
-		setNameWithFormat:@"%@ -codeSignatureForBundleAtURL: %@", self, URL];
-}
-
- (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL usingSignature:(SQRLCodeSignature *)signature {
+- (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL usingSignature:(SQRLCodeSignature *)signature recoveringUsingBackupAtURL:(NSURL *)backupBundleURL {
 	NSParameterAssert(bundleURL != nil);
 	NSParameterAssert(signature != nil);

-	return [[[self
-		takeOwnershipOfDirectory:bundleURL]
-		then:^{
-			return [signature verifyBundleAtURL:bundleURL];
+	return [[[signature
+		verifyBundleAtURL:bundleURL]
+		catch:^(NSError *error) {
+			if (backupBundleURL == nil) return [RACSignal error:error];
+
+			return [[[RACSignal
+				defer:^{
+					[NSFileManager.defaultManager removeItemAtURL:bundleURL error:NULL];
+
+					return [self installItemAtURL:bundleURL fromURL:backupBundleURL];
+				}]
+				doCompleted:^{
+					NSLog(@"Restored backup bundle to %@", bundleURL);
+				}]
+				doError:^(NSError *recoveryError) {
+					NSLog(@"Could not restore backup bundle %@ to %@: %@", backupBundleURL, bundleURL, recoveryError.sqrl_verboseDescription);
+				}];
 		}]
-		setNameWithFormat:@"%@ -verifyBundleAtURL: %@ usingSignature: %@", self, bundleURL, signature];
+		setNameWithFormat:@"%@ -verifyBundleAtURL: %@ usingSignature: %@ recoveringUsingBackupAtURL: %@", self, bundleURL, signature, backupBundleURL];
 }

 #pragma mark Installation

-/// Check if the target should be renamed and provide the renamed URL.
-///
-/// targetURL - The URL for the target. Cannot be nil.
-/// sourceURL - The URL for the source. Cannot be nil.
-///
-/// Returns a signal which will send the URL for the renamed target. If a rename
-/// isn't needed then it will send `targetURL`.
- (RACSignal *)renamedTargetIfNeededWithTargetURL:(NSURL *)targetURL sourceURL:(NSURL *)sourceURL {
-	return [RACSignal defer:^{
-		NSBundle *sourceBundle = [NSBundle bundleWithURL:sourceURL];
-		NSString *targetExecutableName = targetURL.lastPathComponent.stringByDeletingPathExtension;
-		NSString *sourceExecutableName = sourceBundle.sqrl_executableName;
+- (RACSignal *)checkWhetherBundlePreviouslyAtURL:(NSURL *)sourceURL wasInstalledAtURL:(NSURL *)targetURL usingSignature:(SQRLCodeSignature *)signature {
+	NSParameterAssert(targetURL != nil);
+	NSParameterAssert(sourceURL != nil);
+	NSParameterAssert(signature != nil);

-		// If they're already the same then we're good.
-		if ([targetExecutableName isEqual:sourceExecutableName]) {
-			return [RACSignal return:targetURL];
-		}
-
-		NSString *newAppName = [sourceExecutableName stringByAppendingPathExtension:@"app"];
-		NSURL *newTargetURL = [targetURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:newAppName];
-
-		// If there's already something there then don't rename to it.
-		if ([NSFileManager.defaultManager fileExistsAtPath:newTargetURL.path]) {
-			return [RACSignal return:targetURL];
-		}
-
-		return [RACSignal return:newTargetURL];
-	}];
+	return [[[[self
+		verifyBundleAtURL:targetURL usingSignature:signature recoveringUsingBackupAtURL:nil]
+		concat:[RACSignal return:@YES]]
+		catch:^(NSError *error) {
+			BOOL directory;
+			if ([NSFileManager.defaultManager fileExistsAtPath:sourceURL.path isDirectory:&directory]) {
+				// If the source still exists, this isn't an error.
+				return [RACSignal return:@NO];
+			} else {
+				return [RACSignal error:error];
+			}
+		}]
+		setNameWithFormat:@"%@ -checkWhetherBundlePreviouslyAtURL: %@ wasInstalledAtURL: %@", self, sourceURL, targetURL];
 }

- (RACSignal *)installItemToURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL {
+- (RACSignal *)installItemAtURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL {
 	NSParameterAssert(targetURL != nil);
 	NSParameterAssert(sourceURL != nil);

@@ -489,7 +503,7 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 			} else {
 				int code = errno;
 				NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-
+				
 				const char *desc = strerror(code);
 				if (desc != NULL) userInfo[NSLocalizedDescriptionKey] = @(desc);

@@ -517,7 +531,7 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 		setNameWithFormat:@"%@ -installItemAtURL: %@ fromURL: %@", self, targetURL, sourceURL];
 }

-#pragma mark Quarantine Bit Removal
+#pragma Quarantine Bit Removal

 - (RACSignal *)clearQuarantineForDirectory:(NSURL *)directory {
 	NSParameterAssert(directory != nil);
@@ -530,7 +544,7 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 				return YES;
 			}];

-			return enumerator.rac_sequence.signal;
+			return enumerator.allObjects.rac_signal;
 		}]
 		flattenMap:^(NSURL *URL) {
 			const char *path = URL.path.fileSystemRepresentation;
@@ -541,16 +555,9 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 				// file to begin with.
 				if (code != ENOATTR) {
 					NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-
+					
 					const char *desc = strerror(code);
-					if (desc != NULL) {
-						userInfo[NSLocalizedDescriptionKey] = @(desc);
-					} else {
-						userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Unknown POSIX error", @"");
-					}
-
-					userInfo[NSLocalizedFailureReasonErrorKey] = [NSString stringWithFormat:NSLocalizedString(@"Couldn't remove quarantine attribute from \"%@\". This most likely means the file is read-only.", @""), URL.path];
-					userInfo[NSURLErrorKey] = URL;
+					if (desc != NULL) userInfo[NSLocalizedDescriptionKey] = @(desc);

 					return [RACSignal error:[NSError errorWithDomain:NSPOSIXErrorDomain code:code userInfo:userInfo]];
 				}
@@ -561,97 +568,6 @@ NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 		setNameWithFormat:@"%@ -clearQuarantineForDirectory: %@", self, directory];
 }

-#pragma mark File Security
-
- (RACSignal *)readFileSecurityOfURL:(NSURL *)location {
-	NSParameterAssert(location != nil);
-
-	return [[RACSignal
-		defer:^{
-			NSError *error;
-			NSFileSecurity *fileSecurity;
-			if (![location getResourceValue:&fileSecurity forKey:NSURLFileSecurityKey error:&error]) {
-				return [RACSignal error:error];
-			}
-
-			return [RACSignal return:fileSecurity];
-		}]
-		setNameWithFormat:@"%@ -readFileSecurity: %@", self, location];
-}
-
- (RACSignal *)writeFileSecurity:(NSFileSecurity *)fileSecurity toURL:(NSURL *)location {
-	NSParameterAssert(location != nil);
-
-	return [[RACSignal
-		defer:^{
-			NSError *error;
-			if (![location setResourceValue:fileSecurity forKey:NSURLFileSecurityKey error:&error]) {
-				return [RACSignal error:error];
-			}
-
-			return [RACSignal empty];
-		}]
-		setNameWithFormat:@"%@ -writeFileSecurity: %@", self, location];
-}
-
- (RACSignal *)takeOwnershipOfDirectory:(NSURL *)directoryURL {
-	NSParameterAssert(directoryURL != nil);
-
-	return [[[RACSignal
-		createSignal:^(id<RACSubscriber> subscriber) {
-			NSDirectoryEnumerator *enumerator = [NSFileManager.defaultManager enumeratorAtURL:directoryURL includingPropertiesForKeys:@[ NSURLFileSecurityKey ] options:0 errorHandler:^ BOOL (NSURL *url, NSError *error) {
-				[subscriber sendError:error];
-				return NO;
-			}];
-
-			return [[enumerator.rac_sequence.signal
-				startWith:directoryURL]
-				subscribe:subscriber];
-		}]
-		flattenMap:^(NSURL *itemURL) {
-			return [[[self
-				readFileSecurityOfURL:itemURL]
-				flattenMap:^(NSFileSecurity *fileSecurity) {
-					if (![self takeOwnershipOfFileSecurity:fileSecurity]) {
-						NSDictionary *errorInfo = @{
-							NSLocalizedDescriptionKey: NSLocalizedString(@"Permissions Error", nil),
-							NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:NSLocalizedString(@"Couldn’t update permissions of %@", nil), itemURL.path],
-							NSURLErrorKey: itemURL
-						};
-
-						return [RACSignal error:[NSError errorWithDomain:SQRLInstallerErrorDomain code:SQRLInstallerErrorChangingPermissions userInfo:errorInfo]];
-					}
-
-					return [RACSignal return:fileSecurity];
-				}]
-				flattenMap:^(NSFileSecurity *fileSecurity) {
-					return [self writeFileSecurity:fileSecurity toURL:itemURL];
-				}];
-		}]
-		setNameWithFormat:@"%@ -takeOwnershipOfDirectory: %@", self, directoryURL];
-}
-
- (BOOL)takeOwnershipOfFileSecurity:(NSFileSecurity *)fileSecurity {
-	CFFileSecurityRef actualFileSecurity = (__bridge CFFileSecurityRef)fileSecurity;
-
-	// If ShipIt is running as root, this will change the owner to
-	// root:wheel.
-	if (!CFFileSecuritySetOwner(actualFileSecurity, getuid())) return NO;
-	if (!CFFileSecuritySetGroup(actualFileSecurity, getgid())) return NO;
-
-	mode_t fileMode = 0;
-	if (!CFFileSecurityGetMode(actualFileSecurity, &fileMode)) return NO;
-
-	// Remove write permission from group and other, leave executable
-	// bit as it was for both.
-	//
-	// Permissions will be r-(x?)r-(x?) afterwards, with owner
-	// permissions left as is.
-	fileMode = (fileMode & ~(S_IWGRP | S_IWOTH));
-
-	return CFFileSecuritySetMode(actualFileSecurity, fileMode);
-}
-
 #pragma mark Error Handling

 - (NSError *)missingDataErrorWithDescription:(NSString *)description {
@@ -1,37 +0,0 @@
-//
-//  SQRLInstallerOwnedBundle.h
-//  Squirrel
-//
-//  Created by Keith Duncan on 08/01/2014.
-//  Copyright (c) 2014 GitHub. All rights reserved.
-//
-
-#import <Mantle/Mantle.h>
-
-@class SQRLCodeSignature;
-
-// Tracks original and temporary locations of a bundle. Should be created and
-// serialised before moving a bundle aside.
-//
-// Can be used to ensure new targetURL requests meet the original bundle at that
-// location's code signature, even though it's been moved aside.
-@interface SQRLInstallerOwnedBundle : MTLModel
-
-// Designated initialiser.
-//
-// originalURL   - Where the bundle currently resides, and should be restored to
-//                 should an error occur.
-// temporaryURL  - Where the bundle will be moved to, so that another bundle can
-//                 take its place at originalURL.
-// codeSignature - The code signature of the original bundle, so that the
-//                 signature can be used irrespective of where the bundle
-//                 currently resides.
-//
-// Returns an initialised owned bundle for serializing.
- (instancetype)initWithOriginalURL:(NSURL *)originalURL temporaryURL:(NSURL *)temporaryURL codeSignature:(SQRLCodeSignature *)codeSignature;
-
-@property (readonly, copy, nonatomic) NSURL *originalURL;
-@property (readonly, copy, nonatomic) NSURL *temporaryURL;
-@property (readonly, copy, nonatomic) SQRLCodeSignature *codeSignature;
-
-@end
@@ -1,23 +0,0 @@
-//
-//  SQRLInstallerOwnedBundle.m
-//  Squirrel
-//
-//  Created by Keith Duncan on 08/01/2014.
-//  Copyright (c) 2014 GitHub. All rights reserved.
-//
-
-#import "SQRLInstallerOwnedBundle.h"
-
-#import "EXTKeyPathCoding.h"
-
-@implementation SQRLInstallerOwnedBundle
-
- (instancetype)initWithOriginalURL:(NSURL *)originalURL temporaryURL:(NSURL *)temporaryURL codeSignature:(SQRLCodeSignature *)codeSignature {
-	return [self initWithDictionary:@{
-		@keypath(self.originalURL): originalURL,
-		@keypath(self.temporaryURL): temporaryURL,
-		@keypath(self.codeSignature): codeSignature,
-	} error:NULL];
-}
-
-@end
@@ -22,7 +22,8 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
@implementation SQRLShipItLauncher

 + (NSString *)shipItJobLabel {
-	return [SQRLDirectoryManager.currentApplicationManager.applicationIdentifier stringByAppendingString:@".ShipIt"];
+	NSString *currentAppIdentifier = NSBundle.mainBundle.bundleIdentifier ?: [NSString stringWithFormat:@"%@:%d", NSProcessInfo.processInfo.processName, NSProcessInfo.processInfo.processIdentifier];
+	return [currentAppIdentifier stringByAppendingString:@".ShipIt"];
 }

 + (RACSignal *)shipItJobDictionary {
@@ -31,13 +32,9 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
 	return [[[RACSignal
 		defer:^{
 			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:jobLabel];
-			return [RACSignal zip:@[
-				[directoryManager shipItStdoutURL],
-				[directoryManager shipItStderrURL],
-				[directoryManager shipItStateURL]
-			]];
+			return [directoryManager applicationSupportURL];
 		}]
-		reduceEach:^(NSURL *stdoutURL, NSURL *stderrURL, NSURL *shipItStateURL) {
+		map:^(NSURL *appSupportURL) {
 			NSBundle *squirrelBundle = [NSBundle bundleForClass:self.class];
 			NSAssert(squirrelBundle != nil, @"Could not open Squirrel.framework bundle");

@@ -60,16 +57,14 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
 			// Pass in the service name so ShipIt knows how to broadcast itself.
 			[arguments addObject:jobLabel];

-			// We need to pass the path to ShipIt rather than having ShipIt
-			// calculate the path itself. This is because ShipIt may run as a
-			// different user if it had to escalate to be able to replace the
-			// bundle.
-			[arguments addObject:shipItStateURL.path];
-
 			jobDict[@(LAUNCH_JOBKEY_PROGRAMARGUMENTS)] = arguments;
-			jobDict[@(LAUNCH_JOBKEY_STANDARDOUTPATH)] = stdoutURL.path;
-			jobDict[@(LAUNCH_JOBKEY_STANDARDERRORPATH)] = stderrURL.path;
+			jobDict[@(LAUNCH_JOBKEY_STANDARDOUTPATH)] = [appSupportURL URLByAppendingPathComponent:@"ShipIt_stdout.log"].path;
+			jobDict[@(LAUNCH_JOBKEY_STANDARDERRORPATH)] = [appSupportURL URLByAppendingPathComponent:@"ShipIt_stderr.log"].path;

+			#if DEBUG
+			jobDict[@(LAUNCH_JOBKEY_DEBUG)] = @YES;
+			#endif
+			
 			return jobDict;
 		}]
 		setNameWithFormat:@"+shipItJobDictionary"];
@@ -77,7 +72,7 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;

 + (RACSignal *)shipItAuthorization {
 	return [[RACSignal
-		createSignal:^ RACDisposable * (id<RACSubscriber> subscriber) {
+		create:^(id<RACSubscriber> subscriber) {
 			AuthorizationItem rightItems[] = {
 				{
 					.name = kSMRightModifySystemDaemons,
@@ -121,15 +116,10 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
 			} else {
 				[subscriber sendError:[NSError errorWithDomain:NSOSStatusErrorDomain code:authorizationError userInfo:nil]];
 			}
-
-			return nil;
 		}]
 		setNameWithFormat:@"+shipItAuthorization"];
 }

-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
 + (RACSignal *)launchPrivileged:(BOOL)privileged {
 	return [[[RACSignal
 		zip:@[
@@ -160,6 +150,4 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
 		setNameWithFormat:@"+launchPrivileged: %i", (int)privileged];
 }

-#pragma clang diagnostic pop
-
@end
@@ -1,100 +0,0 @@
-//
-//  SQRLShipItRequest.h
-//  Squirrel
-//
-//  Created by Keith Duncan on 08/01/2014.
-//  Copyright (c) 2014 GitHub. All rights reserved.
-//
-
-#import <Mantle/Mantle.h>
-
-@class RACSignal;
-
-// The domain for errors originating within `SQRLShipItRequest`.
-extern NSString * const SQRLShipItRequestErrorDomain;
-
-// Errors originating from the `SQRLShipItRequestErrorDomain`.
-//
-// SQRLShipItRequestErrorMissingRequiredProperty - A required property was `nil`
-//                                                 upon initialization.
-//
-//                                                 The `userInfo` dictionary for
-//                                                 this error will contain
-//                                                 `SQRLShipItStatePropertyErrorKey`.
-//
-// SQRLShipItRequestErrorUnarchiving             - The saved request could not
-//                                                 be unarchived, possibly
-//                                                 because it's invalid.
-//
-// SQRLShipItRequestErrorArchiving               - The request object could not
-//                                                 be archived.
-typedef enum : NSInteger {
-	SQRLShipItRequestErrorMissingRequiredProperty = 1,
-	SQRLShipItRequestErrorUnarchiving = 2,
-	SQRLShipItRequestErrorArchiving = 3,
-} SQRLShipItRequestError;
-
-// Associated with an `NSString` indicating the required property key that did
-// not have a value upon initialization.
-extern NSString * const SQRLShipItRequestPropertyErrorKey;
-
-// Constructed and written to disk for `ShipIt` to pick up. This represents a
-// single update request from the client's perspective.
-@interface SQRLShipItRequest : MTLModel
-
-// Reads a `SQRLShipItState` from disk, at the location specified by the given
-// URL signal.
-//
-// URLSignal - Determines the file location to read from, the signal should send
-//             an `NSURL` object then complete, or error. This must not be nil.
-//
-// Returns a signal which will synchronously send a `SQRLShipItRequest` then
-// complete, or error.
-+ (RACSignal *)readUsingURL:(RACSignal *)URLSignal;
-
-// Writes the receiver to disk, at the location specified by the given URL
-// signal.
-//
-// URLSignal - Determines the file location to write to. The signal should send
-//             an `NSURL` object then complete, or error. This must not be nil.
-//
-// Returns a signal which will synchronously complete or error.
- (RACSignal *)writeUsingURL:(RACSignal *)URLSignal;
-
-// Designated initialiser.
-//
-// updateBundleURL         - The update bundle which will replace
-//                           targetBundleURL. Must not be nil.
-// targetBundleURL         - Where the update should be installed, if a bundle
-//                           is already present, the update is checked for
-//                           suitability against this bundle. Must not be nil.
-// bundleIdentifier        - The bundle identifier that the installer should
-//                           wait for instances of to terminate before
-//                           installing. Can be nil.
-// launchAfterInstallation - Whether the updated application should be launched
-//                           after installation.
-// useUpdateBundleName     - Should the target use the update bundle's name?
-//
-// Returns a request which can be written to disk for ShipIt to read and
-// perform.
- (instancetype)initWithUpdateBundleURL:(NSURL *)updateBundleURL targetBundleURL:(NSURL *)targetBundleURL bundleIdentifier:(NSString *)bundleIdentifier launchAfterInstallation:(BOOL)launchAfterInstallation useUpdateBundleName:(BOOL)useUpdateBundleName;
-
-// The URL to the downloaded update's app bundle.
-@property (nonatomic, copy, readonly) NSURL *updateBundleURL;
-
-// The URL to the app bundle that should be replaced with the update.
-@property (nonatomic, copy, readonly) NSURL *targetBundleURL;
-
-// The bundle identifier of the application being updated.
-//
-// If not nil, the installer will wait for applications matching this identifier
-// (and `targetBundleURL`) to terminate before continuing.
-@property (nonatomic, copy, readonly) NSString *bundleIdentifier;
-
-// Whether to launch the application after an update is successfully installed.
-@property (nonatomic, assign, readonly) BOOL launchAfterInstallation;
-
-// Whether the app should use the update bundle's name.
-@property (nonatomic, assign, readonly) BOOL useUpdateBundleName;
-
-@end
@@ -1,194 +0,0 @@
-//
-//  SQRLShipItRequest.m
-//  Squirrel
-//
-//  Created by Keith Duncan on 08/01/2014.
-//  Copyright (c) 2014 GitHub. All rights reserved.
-//
-
-#import "SQRLShipItRequest.h"
-
-#import "EXTKeyPathCoding.h"
-#import <ReactiveCocoa/RACSignal+Operations.h>
-
-NSString * const SQRLShipItRequestErrorDomain = @"SQRLShipItRequestErrorDomain";
-
-NSString * const SQRLShipItRequestPropertyErrorKey = @"SQRLShipItRequestPropertyErrorKey";
-
-@interface SQRLShipItRequest () <MTLJSONSerializing>
-@end
-
-@implementation SQRLShipItRequest
-
-#pragma mark Lifecycle
-
- (id)initWithDictionary:(NSDictionary *)dictionary error:(NSError **)error {
-	self = [super initWithDictionary:dictionary error:error];
-	if (self == nil) return nil;
-
-	BOOL (^validateKey)(NSString *) = ^(NSString *key) {
-		if ([self valueForKey:key] != nil) return YES;
-
-		if (error != NULL) {
-			NSDictionary *userInfo = @{
-				NSLocalizedDescriptionKey: NSLocalizedString(@"Missing required value", nil),
-				NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:NSLocalizedString(@"\"%@\" must not be set to nil.", nil), key]
-			};
-
-			*error = [NSError errorWithDomain:SQRLShipItRequestErrorDomain code:SQRLShipItRequestErrorMissingRequiredProperty userInfo:userInfo];
-		}
-
-		return NO;
-	};
-
-	if (!validateKey(@keypath(self.targetBundleURL))) return nil;
-	if (!validateKey(@keypath(self.updateBundleURL))) return nil;
-
-	return self;
-}
-
- (instancetype)initWithUpdateBundleURL:(NSURL *)updateBundleURL targetBundleURL:(NSURL *)targetBundleURL bundleIdentifier:(NSString *)bundleIdentifier launchAfterInstallation:(BOOL)launchAfterInstallation useUpdateBundleName:(BOOL)useUpdateBundleName {
-	return [self initWithDictionary:@{
-		@keypath(self.updateBundleURL): updateBundleURL,
-		@keypath(self.targetBundleURL): targetBundleURL,
-		@keypath(self.bundleIdentifier): bundleIdentifier ?: NSNull.null,
-		@keypath(self.launchAfterInstallation): @(launchAfterInstallation),
-		@keypath(self.useUpdateBundleName): @(useUpdateBundleName),
-	} error:NULL];
-}
-
-#pragma mark Serialization
-
-+ (NSDictionary *)JSONKeyPathsByPropertyKey {
-	return @{};
-}
-
-+ (NSValueTransformer *)updateBundleURLJSONTransformer {
-	return [NSValueTransformer valueTransformerForName:MTLURLValueTransformerName];
-}
-
-+ (NSValueTransformer *)targetBundleURLJSONTransformer {
-	return [NSValueTransformer valueTransformerForName:MTLURLValueTransformerName];
-}
-
-+ (RACSignal *)readUsingURL:(RACSignal *)URL {
-	NSParameterAssert(URL != nil);
-
-	return [[[[URL
-		flattenMap:^(NSURL *stateURL) {
-			NSError *error;
-			NSData *data = [self readFromURL:stateURL error:&error];
-			if (data == nil) {
-				return [RACSignal error:error];
-			}
-
-			return [RACSignal return:data];
-		}]
-		flattenMap:^(NSData *data) {
-			return [self readFromData:data];
-		}]
-		catch:^(NSError *error) {
-			NSDictionary *userInfo = @{
-				NSLocalizedDescriptionKey: NSLocalizedString(@"Could not read update request", nil),
-			};
-			if (error != nil) {
-				userInfo = [userInfo mtl_dictionaryByAddingEntriesFromDictionary:@{
-					NSUnderlyingErrorKey: error,
-				}];
-			}
-			return [RACSignal error:[NSError errorWithDomain:SQRLShipItRequestErrorDomain code:SQRLShipItRequestErrorUnarchiving userInfo:userInfo]];
-		}]
-		setNameWithFormat:@"+readUsingURL: %@", URL];
-}
-
-+ (NSData *)readFromURL:(NSURL *)URL error:(NSError **)errorRef {
-	__block NSData *data = nil;
-
-	NSFileCoordinator *coordinator = [[NSFileCoordinator alloc] initWithFilePresenter:nil];
-	[coordinator coordinateReadingItemAtURL:URL options:NSFileCoordinatorReadingWithoutChanges error:errorRef byAccessor:^(NSURL *newURL) {
-		data = [NSData dataWithContentsOfURL:newURL options:NSDataReadingUncached error:errorRef];
-	}];
-
-	return data;
-}
-
-+ (RACSignal *)readFromData:(NSData *)data {
-	return [[RACSignal
-		defer:^{
-			NSError *error;
-			NSDictionary *JSONDictionary = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
-			if (JSONDictionary == nil) {
-				return [RACSignal error:error];
-			}
-
-			SQRLShipItRequest *request = [MTLJSONAdapter modelOfClass:SQRLShipItRequest.class fromJSONDictionary:JSONDictionary error:&error];
-			if (request == nil) {
-				return [RACSignal error:error];
-			}
-
-			return [RACSignal return:request];
-
-		}]
-		setNameWithFormat:@"+readFromData: <NSData %p>", data];
-}
-
- (RACSignal *)writeUsingURL:(RACSignal *)URL {
-	NSParameterAssert(URL != nil);
-
-	return [[[[RACSignal
-		zip:@[
-			URL,
-			[self serialization]
-		] reduce:^(NSURL *stateURL, NSData *data) {
-			NSError *error;
-			BOOL write = [self writeData:data toURL:stateURL error:&error];
-			if (!write) {
-				return [RACSignal error:error];
-			}
-
-			return [RACSignal empty];
-		}]
-		flatten]
-		catch:^(NSError *error) {
-			NSDictionary *userInfo = @{
-				NSLocalizedDescriptionKey: NSLocalizedString(@"Could not write update request", nil),
-				NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"An unknown error occurred while archiving.", nil),
-			};
-			if (error != nil) {
-				userInfo = [userInfo mtl_dictionaryByAddingEntriesFromDictionary:@{
-					NSUnderlyingErrorKey: error,
-				}];
-			}
-			return [RACSignal error:[NSError errorWithDomain:SQRLShipItRequestErrorDomain code:SQRLShipItRequestErrorArchiving userInfo:userInfo]];
-		}]
-		setNameWithFormat:@"%@ -writeUsingURL: %@", self, URL];
-}
-
- (BOOL)writeData:(NSData *)data toURL:(NSURL *)URL error:(NSError **)errorRef {
-	__block BOOL success = NO;
-
-	NSFileCoordinator *coordinator = [[NSFileCoordinator alloc] initWithFilePresenter:nil];
-	[coordinator coordinateWritingItemAtURL:URL options:0 error:errorRef byAccessor:^(NSURL *newURL) {
-		success = [data writeToURL:newURL options:NSDataWritingAtomic error:errorRef];
-	}];
-
-	return success;
-}
-
- (RACSignal *)serialization {
-	return [[RACSignal
-		defer:^{
-			NSDictionary *JSONDictionary = [MTLJSONAdapter JSONDictionaryFromModel:self];
-
-			NSError *error;
-			NSData *data = [NSJSONSerialization dataWithJSONObject:JSONDictionary options:0 error:&error];
-			if (data == nil) {
-				return [RACSignal error:error];
-			}
-
-			return [RACSignal return:data];
-		}]
-		setNameWithFormat:@"%@ serialization", self];
-}
-
-@end
@@ -0,0 +1,117 @@
+//
+//  SQRLShipItState.h
+//  Squirrel
+//
+//  Created by Justin Spahr-Summers on 2013-10-08.
+//  Copyright (c) 2013 GitHub. All rights reserved.
+//
+
+#import <Mantle/Mantle.h>
+
+// The domain for errors originating within `SQRLShipItState`.
+extern NSString * const SQRLShipItStateErrorDomain;
+
+// A required property was `nil` upon initialization.
+//
+// The `userInfo` dictionary for this error will contain
+// `SQRLShipItStatePropertyErrorKey`.
+extern const NSInteger SQRLShipItStateErrorMissingRequiredProperty;
+
+// The saved state on disk could not be unarchived, possibly because it's
+// invalid.
+extern const NSInteger SQRLShipItStateErrorUnarchiving;
+
+// The state object could not be archived.
+extern const NSInteger SQRLShipItStateErrorArchiving;
+
+// Associated with an NSString indicating the required property key that did not
+// have a value upon initialization.
+extern NSString * const SQRLShipItStatePropertyErrorKey;
+
+// The current state of the installer, for persistence across relaunches and for
+// tolerance of system failures.
+//
+// SQRLInstallerStateNothingToDo        - ShipIt has not started installing yet.
+// SQRLInstallerStateClearingQuarantine - Clearing the quarantine flag on the
+//                                        update bundle so it can used without
+//                                        issue.
+// SQRLInstallerStateBackingUp          - Backing up the target bundle so it can
+//                                        be restored in the event of failure.
+// SQRLInstallerStateInstalling         - Replacing the target bundle with the
+//                                        update bundle.
+// SQRLInstallerStateVerifyingInPlace   - Verifying that the target bundle is
+//                                        still valid after updating.
+//
+// Note that these values must remain backwards compatible, so ShipIt doesn't
+// start up in a weird mode on a newer version.
+typedef enum : NSInteger {
+	SQRLInstallerStateNothingToDo = 0,
+	SQRLInstallerStateClearingQuarantine,
+	SQRLInstallerStateBackingUp,
+	SQRLInstallerStateInstalling,
+	SQRLInstallerStateVerifyingInPlace,
+} SQRLInstallerState;
+
+@class RACSignal;
+@class SQRLCodeSignature;
+
+// Encapsulates all the state needed by the ShipIt process.
+@interface SQRLShipItState : MTLModel
+
+// Reads a `SQRLShipItState` from disk, at the location specified by the given
+// URL signal.
+//
+// URLSignal - Determines the file location to read from, the signal should send
+//             an `NSURL` object then complete, or error. This must not be nil.
+//
+// Returns a signal which will synchronously send a `SQRLShipItState` then
+// complete, or error.
+ (RACSignal *)readUsingURL:(RACSignal *)URL;
+
+// Initializes the receiver with the arguments that will not change during
+// installation.
+- (id)initWithTargetBundleURL:(NSURL *)targetBundleURL updateBundleURL:(NSURL *)updateBundleURL bundleIdentifier:(NSString *)bundleIdentifier codeSignature:(SQRLCodeSignature *)codeSignature;
+
+// Writes the receiver to disk, at the location specified by the given URL
+// signal.
+//
+// URL - Determines the file location to write to. The signal should send an
+//       `NSURL` object then complete, or error. This must not be nil.
+//
+// Returns a signal which will synchronously complete or error.
+- (RACSignal *)writeUsingURL:(RACSignal *)URL;
+
+// The URL to the app bundle that should be replaced with an update.
+@property (nonatomic, copy, readonly) NSURL *targetBundleURL;
+
+// The URL to the downloaded update's app bundle.
+@property (nonatomic, copy, readonly) NSURL *updateBundleURL;
+
+// A code signature that the update bundle must match in order to be valid.
+@property (nonatomic, copy, readonly) SQRLCodeSignature *codeSignature;
+
+// The bundle identifier of the application being updated.
+//
+// If not nil, the installer will wait for applications matching this identifier
+// (and `targetBundleURL`) to terminate before continuing.
+@property (nonatomic, copy, readonly) NSString *bundleIdentifier;
+
+// The current state of the installer.
+@property (atomic, assign) SQRLInstallerState installerState;
+
+// The number of installation attempts that have occurred for the current
+// `state`.
+@property (atomic, assign) NSUInteger installationStateAttempt;
+
+// Whether to relaunch the application after an update is successfully
+// installed.
+@property (atomic, assign) BOOL relaunchAfterInstallation;
+
+// The URL where the target bundle has been backed up to before installing the
+// update.
+//
+// This property is set automatically during the course of installation. It
+// should not be preset.
+@property (atomic, copy) NSURL *backupBundleURL;
+
+@end
@@ -0,0 +1,122 @@
+//
+//  SQRLShipItState.m
+//  Squirrel
+//
+//  Created by Justin Spahr-Summers on 2013-10-08.
+//  Copyright (c) 2013 GitHub. All rights reserved.
+//
+
+#import "SQRLShipItState.h"
+#import <ReactiveCocoa/ReactiveCocoa.h>
+
+NSString * const SQRLShipItStateErrorDomain = @"SQRLShipItStateErrorDomain";
+NSString * const SQRLShipItStatePropertyErrorKey = @"SQRLShipItStatePropertyErrorKey";
+
+const NSInteger SQRLShipItStateErrorMissingRequiredProperty = 1;
+const NSInteger SQRLShipItStateErrorUnarchiving = 2;
+const NSInteger SQRLShipItStateErrorArchiving = 3;
+
+@implementation SQRLShipItState
+
+#pragma mark Lifecycle
+
+- (id)initWithDictionary:(NSDictionary *)dictionary error:(NSError **)error {
+	self = [super initWithDictionary:dictionary error:error];
+	if (self == nil) return nil;
+
+	BOOL (^validateKey)(NSString *) = ^(NSString *key) {
+		if ([self valueForKey:key] != nil) return YES;
+
+		if (error != NULL) {
+			NSDictionary *userInfo = @{
+				NSLocalizedDescriptionKey: NSLocalizedString(@"Missing required value", nil),
+				NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:NSLocalizedString(@"\"%@\" must not be set to nil.", nil), key]
+			};
+
+			*error = [NSError errorWithDomain:SQRLShipItStateErrorDomain code:SQRLShipItStateErrorMissingRequiredProperty userInfo:userInfo];
+		}
+
+		return NO;
+	};
+
+	if (!validateKey(@keypath(self.targetBundleURL))) return nil;
+	if (!validateKey(@keypath(self.updateBundleURL))) return nil;
+	if (!validateKey(@keypath(self.codeSignature))) return nil;
+
+	return self;
+}
+
+- (id)initWithTargetBundleURL:(NSURL *)targetBundleURL updateBundleURL:(NSURL *)updateBundleURL bundleIdentifier:(NSString *)bundleIdentifier codeSignature:(SQRLCodeSignature *)codeSignature {
+	return [self initWithDictionary:@{
+		@keypath(self.targetBundleURL): targetBundleURL,
+		@keypath(self.updateBundleURL): updateBundleURL,
+		@keypath(self.bundleIdentifier): bundleIdentifier ?: NSNull.null,
+		@keypath(self.codeSignature): codeSignature,
+	} error:NULL];
+}
+
+#pragma mark Serialization
+
+ (RACSignal *)readUsingURL:(RACSignal *)URL {
+	NSParameterAssert(URL != nil);
+
+	return [[[URL
+		flattenMap:^(NSURL *stateURL) {
+			NSError *error = nil;
+			NSData *data = [NSData dataWithContentsOfURL:stateURL options:NSDataReadingUncached error:&error];
+			if (data == nil) {
+				return [RACSignal error:error];
+			}
+
+			return [RACSignal return:data];
+		}]
+		flattenMap:^(NSData *data) {
+			SQRLShipItState *state = [NSKeyedUnarchiver unarchiveObjectWithData:data];
+			if (![state isKindOfClass:SQRLShipItState.class]) {
+				NSDictionary *userInfo = @{
+					NSLocalizedDescriptionKey: NSLocalizedString(@"Could not read saved state", nil),
+					NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"An unknown error occurred while unarchiving.", nil)
+				};
+
+				return [RACSignal error:[NSError errorWithDomain:SQRLShipItStateErrorDomain code:SQRLShipItStateErrorUnarchiving userInfo:userInfo]];
+			}
+
+			return [RACSignal return:state];
+		}]
+		setNameWithFormat:@"+readUsingURL: %@", URL];
+}
+
+- (RACSignal *)writeUsingURL:(RACSignal *)URL {
+	NSParameterAssert(URL != nil);
+
+	RACSignal *serialization = [RACSignal defer:^{
+		NSData *data = [NSKeyedArchiver archivedDataWithRootObject:self];
+		if (data == nil) {
+			NSDictionary *userInfo = @{
+				NSLocalizedDescriptionKey: NSLocalizedString(@"Could not save state", nil),
+				NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"An unknown error occurred while archiving.", nil)
+			};
+
+			return [RACSignal error:[NSError errorWithDomain:SQRLShipItStateErrorDomain code:SQRLShipItStateErrorArchiving userInfo:userInfo]];
+		}
+
+		return [RACSignal return:data];
+	}];
+
+	return [[[RACSignal
+		zip:@[
+			URL,
+			serialization
+		] reduce:^(NSURL *stateURL, NSData *data) {
+			NSError *error = nil;
+			if (![data writeToURL:stateURL options:NSDataWritingAtomic error:&error]) {
+				return [RACSignal error:error];
+			}
+
+			return [RACSignal empty];
+		}]
+		flatten]
+		setNameWithFormat:@"%@ -writeUsingURL: %@", self, URL];
+}
+
+@end
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Cocoa/Cocoa.h>
+#import <Foundation/Foundation.h>

@class RACSignal;

@@ -7,14 +7,7 @@
 //

 #import "SQRLTerminationListener.h"
-
-#import "EXTKeyPathCoding.h"
-#import <ReactiveCocoa/NSArray+RACSequenceAdditions.h>
-#import <ReactiveCocoa/RACDisposable.h>
-#import <ReactiveCocoa/RACScheduler.h>
-#import <ReactiveCocoa/RACSequence.h>
-#import <ReactiveCocoa/RACSignal+Operations.h>
-#import <ReactiveCocoa/RACSubscriber.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>

@interface SQRLTerminationListener ()

@@ -52,7 +45,7 @@
 	return [[[[RACSignal
 		defer:^{
 			NSArray *apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:self.bundleIdentifier];
-			return [apps.rac_sequence signalWithScheduler:RACScheduler.immediateScheduler];
+			return apps.rac_signal;
 		}]
 		filter:^(NSRunningApplication *application) {
 			return [application.bundleURL.URLByStandardizingPath isEqual:self.bundleURL];
@@ -67,7 +60,7 @@

 - (RACSignal *)waitForTerminationOfProcessIdentifier:(pid_t)processIdentifier {
 	return [[RACSignal
-		createSignal:^(id<RACSubscriber> subscriber) {
+		create:^(id<RACSubscriber> subscriber) {
 			dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, processIdentifier, DISPATCH_PROC_EXIT, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0));

 			dispatch_source_set_registration_handler(source, ^{
@@ -79,9 +72,10 @@
 			});

 			dispatch_resume(source);
-			return [RACDisposable disposableWithBlock:^{
+			[subscriber.disposable addDisposable:[RACDisposable disposableWithBlock:^{
 				dispatch_source_cancel(source);
-			}];
+				dispatch_release(source);
+			}]];
 		}]
 		setNameWithFormat:@"%@ -waitForTerminationOfProcessIdentifier: %i", self, (int)processIdentifier];
 }
@@ -74,7 +74,7 @@ NSString * const SQRLUpdateJSONPublicationDateKey = @"pub_date";

 + (NSValueTransformer *)releaseDateJSONTransformer {
 	// ISO 8601 Time Zone with ':'
-	NSString * const ISO8601DateFormat = @"yyyy'-'MM'-'dd'T'HH':'mm':'ssZZZZZ";
+	NSString * const ISO8601DateFormat = @"yyyy'-'MM'-'DD'T'HH':'mm':'ssZZZZZ";

 	return [MTLValueTransformer reversibleTransformerWithForwardBlock:^ NSDate * (NSString *dateString) {
 		if (![dateString isKindOfClass:NSString.class]) return nil;
@@ -6,26 +6,6 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Foundation/Foundation.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-
-// Represents the current state of the updater.
-//
-// SQRLUpdaterStateIdle              - Doing absolutely diddly squat.
-// SQRLUpdaterStateCheckingForUpdate - Checking for any updates from the server.
-// SQRLUpdaterStateDownloadingUpdate - Update found, downloading the archive.
-// SQRLUpdaterStateAwaitingRelaunch  - Awaiting a relaunch to install
-//                                     the update.
-typedef enum : NSUInteger {
-       SQRLUpdaterStateIdle,
-       SQRLUpdaterStateCheckingForUpdate,
-       SQRLUpdaterStateDownloadingUpdate,
-       SQRLUpdaterStateAwaitingRelaunch,
-} SQRLUpdaterState;
-
-// Block for providing download requests given a download url
-typedef NSURLRequest * (^SQRLRequestForDownload)(NSURL *);
-
 // The domain for errors originating within SQRLUpdater.
 extern NSString * const SQRLUpdaterErrorDomain;

@@ -63,34 +43,21 @@ extern NSString * const SQRLUpdaterServerDataErrorKey;
 // error with code `SQRLUpdaterErrorInvalidJSON` is generated.
 extern NSString * const SQRLUpdaterJSONObjectErrorKey;

-@class RACCommand;
+@class RACAction;
@class RACDisposable;
@class RACSignal;

-/// Type of mode used to download the release
-typedef enum {
-	JSONFILE=1,
-	RELEASESERVER
-} SQRLUpdaterMode;
-
 // Checks for, downloads, and installs updates.
@interface SQRLUpdater : NSObject

 // Kicks off a check for updates.
 //
-// If an update is available, it will be sent on `updates` once downloaded.
-@property (nonatomic, strong, readonly) RACCommand *checkForUpdatesCommand;
-
-// The current state of the manager.
-//
-// This property is KVO-compliant.
-@property (atomic, readonly) SQRLUpdaterState state;
+// If an update is available, it will be sent on
+// `[checkForUpdatesAction deferred]` and `updates` once downloaded.
+@property (nonatomic, strong, readonly) RACAction *checkForUpdatesAction;

 // Sends an `SQRLDownloadedUpdate` object on the main thread whenever a new
-// update is available.
-//
-// This signal is actually just `checkForUpdatesCommand.executionSignals`,
-// flattened for convenience.
+// update is available. Completes when the receiver deallocates.
@property (nonatomic, strong, readonly) RACSignal *updates;

 // The request that will be sent to check for updates.
@@ -101,15 +68,6 @@ typedef enum {
 // This property must never be set to nil.
@property (atomic, copy) NSURLRequest *updateRequest;

-// The block used for fetching a given download request
-//
-// The default value is the argument that was originally passed to
-// -initWithUpdateRequest:requestForDownload:.
-//
-// If initialized with -initWithUpdateRequest: this block will
-// return a generic NSURLRequest with the provided url.
-@property (nonatomic, copy) SQRLRequestForDownload requestForDownload;
-
 // The `SQRLUpdate` subclass to instantiate with the server's response.
 //
 // By default, this is `SQRLUpdate` itself, but it can be set to a custom
@@ -129,45 +87,6 @@ typedef enum {
 // Returns the initialized `SQRLUpdater`.
 - (id)initWithUpdateRequest:(NSURLRequest *)updateRequest;

-// Initializes an updater that will send the given request to check for updates
-// on a CDN reading a release file in json format.
-//
-// updateRequest - A request to send to check for updates. This request can be
-//                 customized as desired, like by including an `Authorization`
-//                 header to authenticate with a private update server, or
-//                 pointing to a local URL for testing. This must not be nil.
-// forVersion    - the currently installed version
-//
-// Returns the initialized `SQRLUpdater`.
- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest
-					   forVersion:(NSString*)version;
-
-// Initializes an updater that will send the given request to check for updates
-// and passes a block to provide requests for the update downloads.
-//
-// updateRequest - Same as with initWithUpdateRequest
-// requestForDownload - Once the update url is found for the update download, allow
-//                      providing custom requests that can be costomized as desired.
-//                      Useful for including `Authorization` headers just like the
-//                      updateRequest param.
-//
-// Returns the initialized `SQRLUpdater`.
- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQRLRequestForDownload)requestForDownload;
-
-// Initializes an updater that will send the given request to check for updates
-// and passes a block to provide requests for the update downloads.
-//
-// updateRequest - Same as with initWithUpdateRequest
-// requestForDownload - Once the update url is found for the update download, allow
-//                      providing custom requests that can be costomized as desired.
-//                      Useful for including `Authorization` headers just like the
-//                      updateRequest param.
-// forVersion         - currently running version
-// useMode            - either RELEASESERVER or JSONFILE
-//
-// Returns the initialized `SQRLUpdater`.
- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQRLRequestForDownload)requestForDownload forVersion:(NSString*) version useMode:(SQRLUpdaterMode) mode;
-
 // Executes `checkForUpdatesCommand` (if enabled) every `interval` seconds.
 //
 // The first check will not occur until `interval` seconds have passed.
@@ -185,17 +104,14 @@ typedef enum {
 // relaunch. Otherwise, you can simply use `-[NSApplication terminate:]` or any
 // other exit mechanism.
 //
-// After invoking this method, the receiver is responsible for terminating the
-// application upon success. The app must not be terminated in any other way
+// After subscribing to this signal, the receiver is responsible for terminating
+// the application upon success. The app must not be terminated in any other way
 // unless an error occurs.
 //
 // Returns a signal that will error on the main scheduler if anything goes
 // wrong before termination. The signal will never complete.
 - (RACSignal *)relaunchToInstallUpdate;

- (BOOL)isRunningOnReadOnlyVolume;
- (RACSignal *)updateFromJSONData:(NSData *)data;
-
@end

@interface SQRLUpdater (Unavailable)
@@ -15,12 +15,11 @@
 #import "SQRLDirectoryManager.h"
 #import "SQRLDownloadedUpdate.h"
 #import "SQRLShipItLauncher.h"
+#import "SQRLShipItState.h"
 #import "SQRLUpdate.h"
 #import "SQRLZipArchiver.h"
-#import "SQRLShipItRequest.h"
 #import <ReactiveCocoa/EXTScope.h>
 #import <ReactiveCocoa/ReactiveCocoa.h>
-#import <sys/mount.h>

 NSString * const SQRLUpdaterErrorDomain = @"SQRLUpdaterErrorDomain";
 NSString * const SQRLUpdaterServerDataErrorKey = @"SQRLUpdaterServerDataErrorKey";
@@ -33,23 +32,12 @@ const NSInteger SQRLUpdaterErrorInvalidServerResponse = 5;
 const NSInteger SQRLUpdaterErrorInvalidJSON = 6;
 const NSInteger SQRLUpdaterErrorInvalidServerBody = 7;

-/// The application's being run on a read-only volume.
-const NSInteger SQRLUpdaterErrorReadOnlyVolume = 8;
-
-const NSTimeInterval SQURLUpdaterZipDownloadTimeoutSeconds = 20 * 60;
-
 // The prefix used when creating temporary directories for updates. This will be
 // followed by a random string of characters.
 static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";

@interface SQRLUpdater ()

-@property (atomic, readwrite) SQRLUpdaterState state;
-
-/// The etag of the currently downloaded update, nil if no update has been
-/// downloaded.
-@property (atomic, copy) NSString *etag;
-
 // The code signature for the running application, used to check updates before
 // sending them to ShipIt.
@property (nonatomic, strong, readonly) SQRLCodeSignature *signature;
@@ -59,6 +47,16 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 // Sends completed or error.
@property (nonatomic, strong, readonly) RACSignal *shipItLauncher;

+// Lazily removes outdated temporary directories (used for previous updates)
+// upon first subscription.
+//
+// Pruning directories while an update is pending or in progress will result in
+// undefined behavior.
+//
+// Sends each removed directory then completes, or errors, on an unspecified
+// thread.
+@property (nonatomic, strong, readonly) RACSignal *prunedUpdateDirectories;
+
 // Parses an update model from downloaded data.
 //
 // data - JSON data representing an update manifest. This must not be nil.
@@ -126,16 +124,27 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 // Returns a signal which completes or errors on a background thread.
 - (RACSignal *)prepareUpdateForInstallation:(SQRLDownloadedUpdate *)update;

+// Verifies that an existing state is innocuous, and therefore safe to
+// overwrite.
+//
+// This won't be the case if, for example, an update is currently being
+// installed.
+//
+// Returns a signal which sends `existingState` then completes upon successful
+// validation, or errors otherwise.
+- (RACSignal *)validateExistingState:(SQRLShipItState *)existingState;
+
@end

-@implementation SQRLUpdater
+@implementation SQRLUpdater {
+	RACSubject *_updates;
+}

 #pragma mark Properties

 - (RACSignal *)updates {
-	return [[self.checkForUpdatesCommand.executionSignals
-		concat]
-		setNameWithFormat:@"%@ -updates", self];
+	return [_updates
+		deliverOn:RACScheduler.mainThreadScheduler];
 }

 #pragma mark Lifecycle
@@ -146,46 +155,14 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 }

 - (id)initWithUpdateRequest:(NSURLRequest *)updateRequest {
-	return [self initWithUpdateRequest:updateRequest requestForDownload:^(NSURL *downloadURL) {
-		return [NSURLRequest requestWithURL:downloadURL];
-	}];
-}
-
- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest forVersion: (NSString*) version {
-	return [self initWithUpdateRequest:updateRequest requestForDownload:^(NSURL *downloadURL) {
-		return [NSURLRequest requestWithURL:downloadURL];
-	} forVersion:version useMode:JSONFILE];
-}
-
- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQRLRequestForDownload)requestForDownload {
-	return [self initWithUpdateRequest:updateRequest requestForDownload:^(NSURL *downloadURL) {
-		return [NSURLRequest requestWithURL:downloadURL];
-	} forVersion:nil useMode:RELEASESERVER];
-}
-
- (id)initWithUpdateRequest:(NSURLRequest *)updateRequest requestForDownload:(SQRLRequestForDownload)requestForDownload
-				 forVersion:(NSString*) version useMode:(SQRLUpdaterMode) mode {
-
-	//! download simple file
-
 	NSParameterAssert(updateRequest != nil);
-	NSParameterAssert(requestForDownload != nil);
-
-	if (mode == JSONFILE) {
-		NSParameterAssert(version != nil);
-	}

 	self = [super init];
 	if (self == nil) return nil;

-	_requestForDownload = [requestForDownload copy];
-	NSMutableURLRequest* mutableUpdateRequest = [updateRequest mutableCopy];
-
-	if (mode == JSONFILE) {
-		mutableUpdateRequest.cachePolicy = NSURLRequestReloadIgnoringCacheData;
-	}
-	_updateRequest = mutableUpdateRequest;
+	_updateRequest = [updateRequest copy];
 	_updateClass = SQRLUpdate.class;
+
 	NSError *error = nil;
 	_signature = [SQRLCodeSignature currentApplicationSignature:&error];
 	if (_signature == nil) {
@@ -198,152 +175,83 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 #endif
 	}

-	BOOL updatesDisabled = (getenv("DISABLE_UPDATE_CHECK") != NULL);
 	@weakify(self);

-	_checkForUpdatesCommand = [[RACCommand alloc] initWithEnabled:[RACSignal return:@(!updatesDisabled)] signalBlock:^(id _) {
-		@strongify(self);
-		NSParameterAssert(self.updateRequest != nil);
+	_prunedUpdateDirectories = [[[[[[[[RACSignal
+		defer:^{
+			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:SQRLShipItLauncher.shipItJobLabel];
+			return [directoryManager applicationSupportURL];
+		}]
+		flattenMap:^(NSURL *appSupportURL) {
+			NSFileManager *manager = [[NSFileManager alloc] init];
+			NSDirectoryEnumerator *enumerator = [manager enumeratorAtURL:appSupportURL includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsSubdirectoryDescendants errorHandler:^(NSURL *URL, NSError *error) {
+				NSLog(@"Error enumerating item %@ within directory %@: %@", URL, appSupportURL, error);
+				return YES;
+			}];

-		// TODO: Maybe allow this to be an argument to the command?
-		NSMutableURLRequest *request = [self.updateRequest mutableCopy];
-		[request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
-
-		return [[[[[[[[self
-			performHousekeeping]
-
-			//! get file from server
-			then:^{
-				self.state = SQRLUpdaterStateCheckingForUpdate;
-
-				return [NSURLConnection rac_sendAsynchronousRequest:request];
-			}]
-			reduceEach:^(NSURLResponse *response, NSData *bodyData) {
-				if ([response isKindOfClass:NSHTTPURLResponse.class]) {
-					NSHTTPURLResponse *httpResponse = (id)response;
-
-					BOOL readOnlyVolume = [self isRunningOnReadOnlyVolume];
-					if (readOnlyVolume) {
-						NSDictionary *errorInfo = @{
-						NSLocalizedDescriptionKey: NSLocalizedString(@"Cannot update while running on a read-only volume", nil),
-						NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The application is on a read-only volume. Please move the application and try again. If you're on macOS Sierra or later, you'll need to move the application out of the Downloads directory. See https://github.com/Squirrel/Squirrel.Mac/issues/182 for more information.", nil),
-						};
-						NSError *error = [NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorReadOnlyVolume userInfo:errorInfo];
-						return [RACSignal error:error];
+			return [[enumerator.allObjects.rac_signal
+				filter:^(NSURL *enumeratedURL) {
+					NSString *name = enumeratedURL.lastPathComponent;
+					return [name hasPrefix:SQRLUpdaterUniqueTemporaryDirectoryPrefix];
+				}]
+				doNext:^(NSURL *directoryURL) {
+					NSError *error = nil;
+					if (![manager removeItemAtURL:directoryURL error:&error]) {
+						NSLog(@"Error removing old update directory at %@: %@", directoryURL, error.sqrl_verboseDescription);
 					}
+				}];
+		}]
+		collect]
+		// These operators ensure that the actual work only executes once,
+		// without starting it immediately.
+		concat:[RACSignal never]]
+		shareWhileActive]
+		take:1]
+		flattenMap:^(NSArray *URLs) {
+			return URLs.rac_signal;
+		}]
+		setNameWithFormat:@"%@ -prunedUpdateDirectories", self];

-					if (mode == RELEASESERVER) {
-						if (!(httpResponse.statusCode >= 200 && httpResponse.statusCode <= 299)) {
-							NSDictionary *errorInfo = @{
-									NSLocalizedDescriptionKey: NSLocalizedString(@"Update check failed", nil),
-									NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The server sent an invalid response. Try again later.", nil),
-									SQRLUpdaterServerDataErrorKey: bodyData,
-							};
-							NSError *error = [NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorInvalidServerResponse userInfo:errorInfo];
-							return [RACSignal error:error];
-						}
-
-						if (httpResponse.statusCode == 204 /* No Content */) {
-							return [RACSignal empty];
-						}
-					} else if (mode == JSONFILE) {
-						NSError *error = nil;
-						NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:bodyData options:0 error:&error];
-
-						if (dict == nil) {
-							NSMutableDictionary *userInfo = [error.userInfo mutableCopy] ?: [NSMutableDictionary dictionary];
-							userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Update check failed", nil);
-							userInfo[NSLocalizedRecoverySuggestionErrorKey] = NSLocalizedString(@"The server sent an invalid response. Try again later.", nil);
-							userInfo[SQRLUpdaterServerDataErrorKey] = bodyData;
-							if (error != nil) userInfo[NSUnderlyingErrorKey] = error;
-
-							return [RACSignal error:[NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorInvalidServerBody userInfo:userInfo]];
-						}
-
-						NSString *currentRelease = dict[@"currentRelease"];
-						if(currentRelease) {
-							//! if CDN points to the currently running version as the latest version, bail out
-							if([currentRelease isEqualToString:version]) {
-								NSLog(@"The running client is already the latest version.");
-								return [RACSignal empty];
-							}
-
-							if ([version compare:currentRelease options:NSNumericSearch] == NSOrderedDescending) {
-								// currentRelease is lower than version.
-								// Might be a new version for testing that is not deployed yet
-								// no roll back
-								NSLog(@"The running client is newer than the latest deployed release. Not downgrading.");
-								return [RACSignal empty];
-							}
-
-							//! @todo find latest
-							NSArray *releases = dict[@"releases"];
-							for(NSDictionary* release in releases) {
-								if([currentRelease isEqualToString:release[@"version"]]) {
-									bodyData = [NSJSONSerialization dataWithJSONObject:release[@"updateTo"]
-																				options:0 error:&error];
-									break;
-								}
-							}
-						}
-					}
-				}
-				if (bodyData == nil) {
-					NSMutableDictionary *userInfo = [error.userInfo mutableCopy] ?: [NSMutableDictionary dictionary];
-					userInfo[NSLocalizedDescriptionKey] = NSLocalizedString(@"Update check failed", nil);
-					userInfo[NSLocalizedRecoverySuggestionErrorKey] = NSLocalizedString(@"The server sent an invalid response. Try again later.", nil);
-					userInfo[SQRLUpdaterServerDataErrorKey] = bodyData;
-					if (error != nil) userInfo[NSUnderlyingErrorKey] = error;
-
-					return [RACSignal error:[NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorInvalidServerBody userInfo:userInfo]];
-				}
-				return [RACSignal return:bodyData];
-			}]
-			flatten]
-			flattenMap:^(NSData *data) {
-				return [self updateFromJSONData:data];
-			}]
-			flattenMap:^(SQRLUpdate *update) {
-				return [[RACSignal
-					defer:^{
-						self.state = SQRLUpdaterStateDownloadingUpdate;
-
-						return [self downloadAndPrepareUpdate:update];
-					}]
-					doCompleted:^{
-						self.state = SQRLUpdaterStateAwaitingRelaunch;
-					}];
-			}]
-			finally:^{
-				if (self.state == SQRLUpdaterStateAwaitingRelaunch) return;
-				self.state = SQRLUpdaterStateIdle;
-			}]
-			deliverOn:RACScheduler.mainThreadScheduler];
-	}];
-
-	_shipItLauncher = [[[RACSignal
+	_checkForUpdatesAction = [[[RACSignal
 		defer:^{
 			@strongify(self);
+			return [RACSignal return:self.updateRequest];
+		}]
+		flattenMap:^(NSURLRequest *request) {
+			return [self checkForUpdates:request];
+		}]
+		action];

+	_updates = [[RACSubject
+		subject]
+		setNameWithFormat:@"%@ updates", self];
+
+	_shipItLauncher = [[[[[[[RACSignal
+		defer:^{
 			NSURL *targetURL = NSRunningApplication.currentApplication.bundleURL;

-			BOOL targetWritable = [self canWriteToURL:targetURL];
-			BOOL parentWritable = [self canWriteToURL:targetURL.URLByDeletingLastPathComponent];
-			return [SQRLShipItLauncher launchPrivileged:!targetWritable || !parentWritable];
+			NSNumber *targetWritable = nil;
+			NSError *targetWritableError = nil;
+			BOOL gotWritable = [targetURL getResourceValue:&targetWritable forKey:NSURLIsWritableKey error:&targetWritableError];
+
+			// If we can't determine whether it can be written, assume nonprivileged and
+			// wait for another, more canonical error.
+			return [SQRLShipItLauncher launchPrivileged:(gotWritable && !targetWritable.boolValue)];
 		}]
-		replayLazily]
+		// These operators ensure that the actual work only executes once,
+		// without starting it immediately. Super hacky.
+		concat:[RACSignal return:RACUnit.defaultUnit]]
+		concat:[RACSignal never]]
+		shareWhileActive]
+		take:1]
+		ignoreValues]
 		setNameWithFormat:@"shipItLauncher"];
 	
 	return self;
 }

- (BOOL)canWriteToURL:(NSURL *)fileURL {
-	NSNumber *writable = nil;
-	NSError *writableError = nil;
-	BOOL gotWritable = [fileURL getResourceValue:&writable forKey:NSURLIsWritableKey error:&writableError];
-	// If we can't determine whether it can be written, assume nonprivileged and
-	// wait for another, more canonical error.
-	return !gotWritable || writable.boolValue;
+- (void)dealloc {
+	[_updates sendCompleted];
 }

 #pragma mark Checking for Updates
@@ -351,20 +259,69 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 - (RACDisposable *)startAutomaticChecksWithInterval:(NSTimeInterval)interval {
 	@weakify(self);

-	return [[[[[RACSignal
+	return [[[[RACSignal
 		interval:interval onScheduler:[RACScheduler schedulerWithPriority:RACSchedulerPriorityBackground]]
 		flattenMap:^(id _) {
 			@strongify(self);
-			return [[self.checkForUpdatesCommand
-				execute:RACUnit.defaultUnit]
+
+			return [[[self.checkForUpdatesAction
+				signalWithValue:nil]
+				ignoreValues]
 				catch:^(NSError *error) {
 					NSLog(@"Error checking for updates: %@", error);
 					return [RACSignal empty];
 				}];
 		}]
 		takeUntil:self.rac_willDeallocSignal]
-		publish]
-		connect];
+		subscribeCompleted:^{}];
+}
+
+- (RACSignal *)checkForUpdates:(NSURLRequest *)request {
+	NSParameterAssert(request != nil);
+
+	BOOL updatesDisabled = (getenv("DISABLE_UPDATE_CHECK") != NULL);
+	if (updatesDisabled) return [RACSignal empty];
+
+	NSMutableURLRequest *newRequest = [request mutableCopy];
+	[newRequest setValue:@"application/json" forHTTPHeaderField:@"Accept"];
+
+	return [[[[[[[[self.prunedUpdateDirectories
+		catch:^(NSError *error) {
+			NSLog(@"Error pruning old updates: %@", error);
+			return [RACSignal empty];
+		}]
+		ignoreValues]
+		concat:[NSURLConnection rac_sendAsynchronousRequest:newRequest]]
+		reduceEach:^(NSURLResponse *response, NSData *bodyData) {
+			if ([response isKindOfClass:NSHTTPURLResponse.class]) {
+				NSHTTPURLResponse *httpResponse = (id)response;
+				if (!(httpResponse.statusCode >= 200 && httpResponse.statusCode <= 299)) {
+					NSDictionary *errorInfo = @{
+						NSLocalizedDescriptionKey: NSLocalizedString(@"Update check failed", nil),
+						NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The server sent an invalid response. Try again later.", nil),
+						SQRLUpdaterServerDataErrorKey: bodyData,
+					};
+					NSError *error = [NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorInvalidServerResponse userInfo:errorInfo];
+					return [RACSignal error:error];
+				}
+
+				if (httpResponse.statusCode == 204 /* No Content */) {
+					return [RACSignal empty];
+				}
+			}
+
+			return [RACSignal return:bodyData];
+		}]
+		flatten]
+		flattenMap:^(NSData *data) {
+			return [self updateFromJSONData:data];
+		}]
+		flattenMap:^(SQRLUpdate *update) {
+			return [self downloadAndPrepareUpdate:update];
+		}]
+		doNext:^(SQRLDownloadedUpdate *update) {
+			[self->_updates sendNext:update];
+		}];
 }

 - (RACSignal *)updateFromJSONData:(NSData *)data {
@@ -412,90 +369,36 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 	return [[[self
 		uniqueTemporaryDirectoryForUpdate]
 		flattenMap:^(NSURL *downloadDirectory) {
-			void (^cleanUp)(void) = ^{
-				NSError *error;
-				if (![NSFileManager.defaultManager removeItemAtURL:downloadDirectory error:&error]) {
-					NSLog(@"Error removing temporary download directory at %@: %@", downloadDirectory, error.sqrl_verboseDescription);
-				}
-			};
-
 			return [[[self
 				downloadBundleForUpdate:update intoDirectory:downloadDirectory]
 				flattenMap:^(NSBundle *updateBundle) {
-					// If the bundle is nil it means our conditional GET told us
-					// we already downloaded the update. So just clean up.
-					if (updateBundle == nil) {
-						cleanUp();
-						return [RACSignal empty];
-					}
-
 					return [self verifyAndPrepareUpdate:update fromBundle:updateBundle];
 				}]
 				doError:^(id _) {
-					cleanUp();
-				}];
-		}]
-		setNameWithFormat:@"%@ -downloadAndPrepareUpdate: %@", self, update];
-}
-
- (RACSignal *)unarchiveAndPrepareData:(NSData *)data withName:(NSString *)name intoDirectory:(NSURL *)downloadDirectory {
-	return [[[[[RACSignal
-		defer:^{
-			NSURL *zipOutputURL = [downloadDirectory URLByAppendingPathComponent:name];
-			NSError *error = nil;
-			if ([data writeToURL:zipOutputURL options:NSDataWritingAtomic error:&error]) {
-				return [RACSignal return:zipOutputURL];
-			} else {
-				return [RACSignal error:error];
-			}
-		}]
-		doNext:^(NSURL *zipOutputURL) {
-			NSLog(@"Download completed to: %@", zipOutputURL);
-		}]
-		flattenMap:^(NSURL *zipOutputURL) {
-			return [[[[SQRLZipArchiver
-				unzipArchiveAtURL:zipOutputURL intoDirectoryAtURL:downloadDirectory]
-				ignoreValues]
-				concat:[RACSignal return:zipOutputURL]]
-				doCompleted:^{
 					NSError *error = nil;
-					if (![NSFileManager.defaultManager removeItemAtURL:zipOutputURL error:&error]) {
-						NSLog(@"Error removing downloaded archive at %@: %@", zipOutputURL, error.sqrl_verboseDescription);
+					if (![NSFileManager.defaultManager removeItemAtURL:downloadDirectory error:&error]) {
+						NSLog(@"Error removing temporary download directory at %@: %@", downloadDirectory, error.sqrl_verboseDescription);
 					}
 				}];
 		}]
-		flattenMap:^(NSURL *zipOutputURL) {
-			return [self updateBundleMatchingCurrentApplicationInDirectory:downloadDirectory];
-		}]
-		setNameWithFormat:@"%@ -unarchiveAndPrepareData:withName: %@ intoDirectory: %@", self, name, downloadDirectory];
+		setNameWithFormat:@"%@ -downloadAndPrepareUpdate: %@", self, update];
 }

 - (RACSignal *)downloadBundleForUpdate:(SQRLUpdate *)update intoDirectory:(NSURL *)downloadDirectory {
 	NSParameterAssert(update != nil);
 	NSParameterAssert(downloadDirectory != nil);

-	return [[RACSignal
+	return [[[[[RACSignal
 		defer:^{
 			NSURL *zipDownloadURL = update.updateURL;
-			NSMutableURLRequest *zipDownloadRequest = [self.requestForDownload(zipDownloadURL) mutableCopy];
-
+			NSMutableURLRequest *zipDownloadRequest = [NSMutableURLRequest requestWithURL:zipDownloadURL];
 			[zipDownloadRequest setValue:@"application/zip" forHTTPHeaderField:@"Accept"];
-			if (self.etag != nil) {
-				[zipDownloadRequest setValue:self.etag forHTTPHeaderField:@"If-None-Match"];
-			}

-			[zipDownloadRequest setTimeoutInterval:SQURLUpdaterZipDownloadTimeoutSeconds];
-
-			return [[[NSURLConnection
+			return [[[[NSURLConnection
 				rac_sendAsynchronousRequest:zipDownloadRequest]
 				reduceEach:^(NSURLResponse *response, NSData *bodyData) {
 					if ([response isKindOfClass:NSHTTPURLResponse.class]) {
 						NSHTTPURLResponse *httpResponse = (id)response;
-
-						if (httpResponse.statusCode == 304 /* Not Modified */) {
-							return [RACSignal return:nil];
-						}
-
 						if (!(httpResponse.statusCode >= 200 && httpResponse.statusCode <= 299)) {
 							NSDictionary *errorInfo = @{
 								NSLocalizedDescriptionKey: NSLocalizedString(@"Update download failed", nil),
@@ -505,14 +408,36 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 							NSError *error = [NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorInvalidServerResponse userInfo:errorInfo];
 							return [RACSignal error:error];
 						}
-
-						self.etag = httpResponse.allHeaderFields[@"ETag"];
 					}

-					return [self unarchiveAndPrepareData:bodyData withName:zipDownloadURL.lastPathComponent intoDirectory:downloadDirectory];
+					return [RACSignal return:bodyData];
 				}]
-				flatten];
+				flatten]
+				flattenMap:^(NSData *data) {
+					NSURL *zipOutputURL = [downloadDirectory URLByAppendingPathComponent:zipDownloadURL.lastPathComponent];
+
+					NSError *error = nil; 
+					if ([data writeToURL:zipOutputURL options:NSDataWritingAtomic error:&error]) {
+						return [RACSignal return:zipOutputURL];
+					} else {
+						return [RACSignal error:error];
+					}
+				}];
 		}]
+		doNext:^(NSURL *zipOutputURL) {
+			NSLog(@"Download completed to: %@", zipOutputURL);
+		}]
+		flattenMap:^(NSURL *zipOutputURL) {
+			return [[SQRLZipArchiver
+				unzipArchiveAtURL:zipOutputURL intoDirectoryAtURL:downloadDirectory]
+				doCompleted:^{
+					NSError *error = nil;
+					if (![NSFileManager.defaultManager removeItemAtURL:zipOutputURL error:&error]) {
+						NSLog(@"Error removing downloaded archive at %@: %@", zipOutputURL, error.sqrl_verboseDescription);
+					}
+				}];
+		}]
+		concat:[self updateBundleMatchingCurrentApplicationInDirectory:downloadDirectory]]
 		setNameWithFormat:@"%@ -downloadBundleForUpdate: %@ intoDirectory: %@", self, update, downloadDirectory];
 }

@@ -522,10 +447,10 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 	return [[[RACSignal
 		defer:^{
 			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:SQRLShipItLauncher.shipItJobLabel];
-			return [directoryManager storageURL];
+			return [directoryManager applicationSupportURL];
 		}]
-		flattenMap:^(NSURL *storageURL) {
-			NSURL *updateDirectoryTemplate = [storageURL URLByAppendingPathComponent:[SQRLUpdaterUniqueTemporaryDirectoryPrefix stringByAppendingString:@"XXXXXXX"]];
+		flattenMap:^(NSURL *appSupportURL) {
+			NSURL *updateDirectoryTemplate = [appSupportURL URLByAppendingPathComponent:[SQRLUpdaterUniqueTemporaryDirectoryPrefix stringByAppendingString:@"XXXXXXX"]];
 			char *updateDirectoryCString = strdup(updateDirectoryTemplate.path.fileSystemRepresentation);
 			@onExit {
 				free(updateDirectoryCString);
@@ -558,25 +483,27 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 				NSLog(@"Error enumerating item %@ within directory %@: %@", URL, directory, error);
 				return YES;
 			}];
-			
-			NSURL *updateBundleURL = [enumerator.rac_sequence objectPassingTest:^(NSURL *URL) {
-				NSString *type = nil;
-				NSError *error = nil;
-				if (![URL getResourceValue:&type forKey:NSURLTypeIdentifierKey error:&error]) {
-					NSLog(@"Error retrieving UTI for item at %@: %@", URL, error);
-					return NO;
-				}

-				if (!UTTypeConformsTo((__bridge CFStringRef)type, kUTTypeApplicationBundle)) return NO;
+			NSURL *updateBundleURL = [[enumerator.allObjects.rac_signal
+				filter:^(NSURL *URL) {
+					NSString *type = nil;
+					NSError *error = nil;
+					if (![URL getResourceValue:&type forKey:NSURLTypeIdentifierKey error:&error]) {
+						NSLog(@"Error retrieving UTI for item at %@: %@", URL, error);
+						return NO;
+					}

-				NSBundle *bundle = [NSBundle bundleWithURL:URL];
-				if (bundle == nil) {
-					NSLog(@"Could not open application bundle at %@", URL);
-					return NO;
-				}
+					if (!UTTypeConformsTo((__bridge CFStringRef)type, kUTTypeApplicationBundle)) return NO;

-				return [bundle.bundleIdentifier isEqual:NSRunningApplication.currentApplication.bundleIdentifier];
-			}];
+					NSBundle *bundle = [NSBundle bundleWithURL:URL];
+					if (bundle == nil) {
+						NSLog(@"Could not open application bundle at %@", URL);
+						return NO;
+					}
+
+					return [bundle.bundleIdentifier isEqual:NSRunningApplication.currentApplication.bundleIdentifier];
+				}]
+				first];

 			if (updateBundleURL != nil) {
 				return [RACSignal return:updateBundleURL];
@@ -603,100 +530,6 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 		setNameWithFormat:@"%@ -shipItStateURL", self];
 }

-/// Is the host app running on a read-only volume?
- (BOOL)isRunningOnReadOnlyVolume {
-	struct statfs statfsInfo;
-	NSURL *bundleURL = NSRunningApplication.currentApplication.bundleURL;
-	int result = statfs(bundleURL.fileSystemRepresentation, &statfsInfo);
-	if (result == 0) {
-		return (statfsInfo.f_flags & MNT_RDONLY) != 0;
-	} else {
-		// If we can't even check if the volume is read-only, assume it is.
-		return true;
-	}
-}
-
- (RACSignal *)performHousekeeping {
-	return [[RACSignal
-		merge:@[ [self pruneUpdateDirectories], [self truncateLogs] ]]
-		catch:^(NSError *error) {
-			NSLog(@"Error doing housekeeping: %@", error);
-			return [RACSignal empty];
-		}];
-}
-
-/// Lazily removes outdated temporary directories (used for previous updates)
-/// upon subscription.
-///
-/// Pruning directories while an update is pending or in progress will result in
-/// undefined behavior.
-///
-/// Sends each removed directory then completes, or errors, on an unspecified
-/// thread.
- (RACSignal *)pruneUpdateDirectories {
-	return [[[RACSignal
-		defer:^{
-			// If we already have updates downloaded we don't wanna prune them.
-			if (self.state == SQRLUpdaterStateAwaitingRelaunch) return [RACSignal empty];
-
-			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:SQRLShipItLauncher.shipItJobLabel];
-			return [directoryManager storageURL];
-		}]
-		flattenMap:^(NSURL *storageURL) {
-			NSFileManager *manager = [[NSFileManager alloc] init];
-			NSDirectoryEnumerator *enumerator = [manager enumeratorAtURL:storageURL includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsSubdirectoryDescendants errorHandler:^(NSURL *URL, NSError *error) {
-				NSLog(@"Error enumerating item %@ within directory %@: %@", URL, storageURL, error);
-				return YES;
-			}];
-
-			return [[enumerator.rac_sequence.signal
-				filter:^(NSURL *enumeratedURL) {
-					NSString *name = enumeratedURL.lastPathComponent;
-					return [name hasPrefix:SQRLUpdaterUniqueTemporaryDirectoryPrefix];
-				}]
-				doNext:^(NSURL *directoryURL) {
-					NSError *error = nil;
-					if (![manager removeItemAtURL:directoryURL error:&error]) {
-						NSLog(@"Error removing old update directory at %@: %@", directoryURL, error.sqrl_verboseDescription);
-					}
-				}];
-		}]
-		setNameWithFormat:@"%@ -prunedUpdateDirectories", self];
-}
-
-
-// Like truncation, but backwards.
- (RACSignal *)backwardTruncateFile:(NSURL *)fileURL {
-	return [RACSignal defer:^{
-		static const NSInteger MAX_LENGTH = 1024 * 1024 * 8;
-
-		NSError *error;
-		NSFileHandle *handle = [NSFileHandle fileHandleForWritingToURL:fileURL error:&error];
-		if (handle == nil) return [RACSignal error:error];
-
-		unsigned long long fileLength = [handle seekToEndOfFile];
-		if (fileLength <= MAX_LENGTH) return [RACSignal empty];
-
-		[handle seekToFileOffset:fileLength - MAX_LENGTH];
-		NSData *mostRecentData = [handle readDataToEndOfFile];
-		[handle truncateFileAtOffset:0];
-		[handle writeData:mostRecentData];
-
-		return [RACSignal empty];
-	}];
-}
-
- (RACSignal *)truncateLogs {
-	return [[RACSignal
-		defer:^{
-			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:SQRLShipItLauncher.shipItJobLabel];
-			return [RACSignal zip:@[ [directoryManager shipItStdoutURL], [directoryManager shipItStderrURL] ]];
-		}]
-		reduceEach:^(NSURL *stdoutURL, NSURL *stderrURL) {
-			return [RACSignal merge:@[ [self backwardTruncateFile:stdoutURL], [self backwardTruncateFile:stderrURL] ]];
-		}];
-}
-
 #pragma mark Installing Updates

 - (RACSignal *)verifyAndPrepareUpdate:(SQRLUpdate *)update fromBundle:(NSBundle *)updateBundle {
@@ -705,47 +538,62 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";

 	return [[[[self.signature
 		verifyBundleAtURL:updateBundle.bundleURL]
-		then:^{
-			SQRLDownloadedUpdate *downloadedUpdate = [[SQRLDownloadedUpdate alloc] initWithUpdate:update bundle:updateBundle];
-			return [RACSignal return:downloadedUpdate];
-		}]
+		concat:[RACSignal return:[[SQRLDownloadedUpdate alloc] initWithUpdate:update bundle:updateBundle]]]
 		flattenMap:^(SQRLDownloadedUpdate *downloadedUpdate) {
-			return [[self prepareUpdateForInstallation:downloadedUpdate] then:^{
-				return [RACSignal return:downloadedUpdate];
-			}];
+			return [[self
+				prepareUpdateForInstallation:downloadedUpdate]
+				concat:[RACSignal return:downloadedUpdate]];
 		}]
 		setNameWithFormat:@"%@ -verifyAndPrepareUpdate: %@ fromBundle: %@", self, update, updateBundle];
 }

+- (RACSignal *)validateExistingState:(SQRLShipItState *)existingState {
+	return [[RACSignal
+		defer:^{
+			if (existingState.installerState != SQRLInstallerStateNothingToDo) {
+				// If this happens, shit is crazy, because it implies that an
+				// update is being installed over us right now.
+				NSDictionary *userInfo = @{
+					NSLocalizedDescriptionKey: NSLocalizedString(@"Installation in progress", nil),
+					NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:NSLocalizedString(@"An update for %@ is already in progress.", nil), NSRunningApplication.currentApplication.bundleIdentifier],
+				};
+
+				return [RACSignal error:[NSError errorWithDomain:SQRLUpdaterErrorDomain code:SQRLUpdaterErrorPreparingUpdateJob userInfo:userInfo]];
+			}
+
+			return [RACSignal return:existingState];
+		}]
+		setNameWithFormat:@"%@ -validateExistingState: %@", self, existingState];
+}
+
 - (RACSignal *)prepareUpdateForInstallation:(SQRLDownloadedUpdate *)update {
 	NSParameterAssert(update != nil);

-	return [[[[RACSignal
-		defer:^{
-			NSRunningApplication *currentApplication = NSRunningApplication.currentApplication;
-			NSBundle *appBundle = [NSBundle bundleWithURL:currentApplication.bundleURL];
-			// Only use the update bundle's name if the user hasn't renamed the
-			// app themselves.
-			BOOL useUpdateBundleName = [appBundle.sqrl_executableName isEqual:currentApplication.bundleURL.lastPathComponent.stringByDeletingPathExtension];
-
-			SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:update.bundle.bundleURL targetBundleURL:currentApplication.bundleURL bundleIdentifier:currentApplication.bundleIdentifier launchAfterInstallation:NO useUpdateBundleName:useUpdateBundleName];
-			return [request writeUsingURL:self.shipItStateURL];
-		}]
-		then:^{
-			return self.shipItLauncher;
+	return [[[[[[[[SQRLShipItState
+		readUsingURL:self.shipItStateURL]
+		catchTo:[RACSignal empty]]
+		flattenMap:^(SQRLShipItState *existingState) {
+			return [self validateExistingState:existingState];
 		}]
+		ignoreValues]
+		concat:[RACSignal defer:^{
+			SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:NSRunningApplication.currentApplication.bundleURL updateBundleURL:update.bundle.bundleURL bundleIdentifier:NSRunningApplication.currentApplication.bundleIdentifier codeSignature:self.signature];
+			return [state writeUsingURL:self.shipItStateURL];
+		}]]
+		concat:self.shipItLauncher]
 		sqrl_addTransactionWithName:NSLocalizedString(@"Preparing update", nil) description:NSLocalizedString(@"An update for %@ is being prepared. Interrupting the process could corrupt the application.", nil), NSRunningApplication.currentApplication.bundleIdentifier]
 		setNameWithFormat:@"%@ -prepareUpdateForInstallation: %@", self, update];
 }

 - (RACSignal *)relaunchToInstallUpdate {
-	return [[[[[[[[SQRLShipItRequest
+	return [[[[[[[SQRLShipItState
 		readUsingURL:self.shipItStateURL]
-		map:^(SQRLShipItRequest *request) {
-			return [[SQRLShipItRequest alloc] initWithUpdateBundleURL:request.updateBundleURL targetBundleURL:request.targetBundleURL bundleIdentifier:request.bundleIdentifier launchAfterInstallation:YES useUpdateBundleName:request.useUpdateBundleName];
+		flattenMap:^(SQRLShipItState *existingState) {
+			return [self validateExistingState:existingState];
 		}]
-		flattenMap:^(SQRLShipItRequest *request) {
-			return [[request
+		flattenMap:^(SQRLShipItState *state) {
+			state.relaunchAfterInstallation = YES;
+			return [[state
 				writeUsingURL:self.shipItStateURL]
 				sqrl_addTransactionWithName:NSLocalizedString(@"Preparing to relaunch", nil) description:NSLocalizedString(@"%@ is preparing to relaunch to install an update. Interrupting the process could corrupt the application.", nil), NSRunningApplication.currentApplication.bundleIdentifier];
 		}]
@@ -756,7 +604,6 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 		// Never allow `completed` to escape this signal chain (in case
 		// -terminate: is asynchronous or something crazy).
 		concat:[RACSignal never]]
-		replay]
 		setNameWithFormat:@"%@ -relaunchToInstallUpdate", self];
 }

@@ -54,7 +54,7 @@ const NSInteger SQRLZipArchiverShellTaskFailed = 1;

 	_dittoTask = [[NSTask alloc] init];
 	_dittoTask.launchPath = @"/usr/bin/ditto";
-	_dittoTask.environment = @{ @"DITTOABORT": @"1" };
+	_dittoTask.environment = @{ @"DITTOABORT": @1 };
 	_dittoTask.standardError = self.standardErrorPipe;

 	@weakify(self);
@@ -63,7 +63,6 @@ const NSInteger SQRLZipArchiverShellTaskFailed = 1;
 		if (self == nil) return;

 		[self->_taskTerminated sendNext:@(task.terminationStatus)];
-		[self.standardErrorPipe.fileHandleForReading closeFile];
 	};

 	RACSubject *errorDataChunks = [[RACSubject subject] setNameWithFormat:@"errorDataChunks"];
@@ -131,25 +130,23 @@ const NSInteger SQRLZipArchiverShellTaskFailed = 1;
 		// This is important because the signals on `self` complete upon
 		// dealloc.
 		return:self]
-		then:^{
-			return [RACSignal
-				zip:@[ self.taskTerminated, self.standardErrorData ]
-				reduce:^(NSNumber *exitStatus, NSData *errorData) {
-					if (exitStatus.intValue == 0) return [RACSignal empty];
+		ignoreValues]
+		concat:[RACSignal
+			zip:@[ self.taskTerminated, self.standardErrorData ]
+			reduce:^(NSNumber *exitStatus, NSData *errorData) {
+				if (exitStatus.intValue == 0) return [RACSignal empty];

-					NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-					userInfo[SQRLZipArchiverExitCodeErrorKey] = exitStatus;
+				NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
+				userInfo[SQRLZipArchiverExitCodeErrorKey] = exitStatus;

-					NSString *errorString = [[NSString alloc] initWithData:errorData encoding:NSUTF8StringEncoding];
-					errorString = [errorString stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
-					if (errorString.length > 0) userInfo[NSLocalizedDescriptionKey] = errorString;
+				NSString *errorString = [[NSString alloc] initWithData:errorData encoding:NSUTF8StringEncoding];
+				errorString = [errorString stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
+				if (errorString.length > 0) userInfo[NSLocalizedDescriptionKey] = errorString;

-					return [RACSignal error:[NSError errorWithDomain:SQRLZipArchiverErrorDomain code:SQRLZipArchiverShellTaskFailed userInfo:userInfo]];
-				}];
-		}]
+				return [RACSignal error:[NSError errorWithDomain:SQRLZipArchiverErrorDomain code:SQRLZipArchiverShellTaskFailed userInfo:userInfo]];
+			}]]
 		take:1]
 		flatten]
-		replay]
 		setNameWithFormat:@"-launchWithArguments: %@", arguments];

 	self.dittoTask.arguments = arguments;
@@ -7,18 +7,15 @@
 //

 #import <Foundation/Foundation.h>
-
-#import "EXTScope.h"
-#import <ReactiveCocoa/RACCommand.h>
-#import <ReactiveCocoa/RACSignal+Operations.h>
-#import <ReactiveCocoa/RACScheduler.h>
-
+#import <ReactiveCocoa/EXTScope.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>
 #import "NSError+SQRLVerbosityExtensions.h"
 #import "RACSignal+SQRLTransactionExtensions.h"
+#import "SQRLCodeSignature.h"
+#import "SQRLDirectoryManager.h"
 #import "SQRLInstaller.h"
-#import "SQRLInstaller+Private.h"
+#import "SQRLShipItState.h"
 #import "SQRLTerminationListener.h"
-#import "SQRLShipItRequest.h"

 // The maximum number of times ShipIt should run the same installation state, in
 // an attempt to update.
@@ -27,174 +24,127 @@
 // updating will abort.
 static const NSUInteger SQRLShipItMaximumInstallationAttempts = 3;

-static NSString * launchSignal = @"___launch___";
-
 // The domain for errors generated here.
 static NSString * const SQRLShipItErrorDomain = @"SQRLShipItErrorDomain";

-static NSUInteger installationAttempts(NSString *applicationIdentifier) {
-	return CFPreferencesGetAppIntegerValue((__bridge CFStringRef)SQRLShipItInstallationAttemptsKey, (__bridge CFStringRef)applicationIdentifier, NULL);
-}
-
-static BOOL setInstallationAttempts(NSString *applicationIdentifier, NSUInteger attempts) {
-	CFPreferencesSetValue((__bridge CFStringRef)SQRLShipItInstallationAttemptsKey, (__bridge CFPropertyListRef)@(attempts), (__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-	return CFPreferencesSynchronize((__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-}
-
-static BOOL clearInstallationAttempts(NSString *applicationIdentifier) {
-	CFPreferencesSetValue((__bridge CFStringRef)SQRLShipItInstallationAttemptsKey, NULL, (__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-	return CFPreferencesSynchronize((__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-}
-
 // Waits for all instances of the target application (as described in the
-// `request`) to exit, then sends completed.
-static RACSignal *waitForTerminationIfNecessary(SQRLShipItRequest *request) {
+// `state`) to exit, then sends completed.
+static RACSignal *waitForTerminationIfNecessary(SQRLShipItState *state) {
 	return [[RACSignal
 		defer:^{
-			if (request.bundleIdentifier == nil) return [RACSignal empty];
+			if (state.bundleIdentifier == nil) return [RACSignal empty];

-			SQRLTerminationListener *listener = [[SQRLTerminationListener alloc] initWithURL:request.targetBundleURL bundleIdentifier:request.bundleIdentifier];
+			SQRLTerminationListener *listener = [[SQRLTerminationListener alloc] initWithURL:state.targetBundleURL bundleIdentifier:state.bundleIdentifier];
 			return [listener waitForTermination];
 		}]
 		setNameWithFormat:@"waitForTerminationIfNecessary"];
 }

-static void installRequest(RACSignal *readRequestSignal, NSString *applicationIdentifier) {
-	[[[[[readRequestSignal
-		flattenMap:^(SQRLShipItRequest *request) {
-			return waitForTerminationIfNecessary(request);
-		}]
-		ignoreValues]
-		concat:readRequestSignal]
-		flattenMap:^(SQRLShipItRequest *request) {
-			SQRLInstaller *installer = [[SQRLInstaller alloc] initWithApplicationIdentifier:applicationIdentifier];
-
-			NSUInteger attempt = installationAttempts(applicationIdentifier) + 1;
-			setInstallationAttempts(applicationIdentifier, attempt);
-
-			RACSignal *action;
-			if (attempt > SQRLShipItMaximumInstallationAttempts) {
-				action = [[[[installer.abortInstallationCommand
-					execute:request]
-					initially:^{
-						NSLog(@"Too many attempts to install, aborting update");
-					}]
-					catch:^(NSError *error) {
-						NSLog(@"Error aborting installation: %@", error);
-
-						// Exit successfully so launchd doesn't restart us
-						// again.
-						return [RACSignal empty];
-					}]
-					concat:[RACSignal return:request]];
-			} else {
-				action = [[[[installer.installUpdateCommand
-					execute:request]
-					initially:^{
-						BOOL freshInstall = (attempt == 1);
-						if (freshInstall) {
-							NSLog(@"Beginning installation");
-						} else {
-							NSLog(@"Resuming installation attempt %i", (int)attempt);
-						}
-					}]
-					doCompleted:^{
-						NSLog(@"Installation completed successfully");
-					}]
-					sqrl_addTransactionWithName:NSLocalizedString(@"Updating", nil) description:NSLocalizedString(@"%@ is being updated, and interrupting the process could corrupt the application", nil), request.targetBundleURL.path];
-			}
-
-			// Clear the installation attempts for a successful abort or
-			// install.
-			action = [action doCompleted:^{
-				clearInstallationAttempts(applicationIdentifier);
-			}];
-
-			if (request.launchAfterInstallation) {
-				// Launch regardless of whether installation succeeds or fails.
-				action = [[action
-					deliverOn:RACScheduler.mainThreadScheduler]
-					doNext:^(SQRLShipItRequest *finalRequest) {
-						NSLog(@"On main thread and launching: %@", finalRequest.targetBundleURL);
-						NSURL *bundleURL = finalRequest.targetBundleURL;
-						if (bundleURL == nil) {
-							NSLog(@"Missing target bundle URL, cannot launch application");
-							return;
-						}
-
-						NSLog(@"Bundle URL is valid");
-
-						NSError *error;
-						// Temporary workaround, on Big Sur and higher the executable
-						// using NSWorkspace needs to actually exist on disk, at this point
-						// this executable no longer exists on disk so we need to launch the
-						// new one (which should be in the exact same spot) and ask for it
-						// to launch the new app bundle URL
-						if (@available(macOS 11.0, *)) {
-							NSLog(@"Attempting to launch app on 11.0 or higher");
-
-							NSString *exe = NSProcessInfo.processInfo.arguments[0];
-							NSLog(@"Launching new ShipIt at %@ with instructions to launch %@", exe, bundleURL);
-
-							NSTask *task = [[NSTask alloc] init];
-							[task setLaunchPath: exe];
-							[task setArguments: @[launchSignal, bundleURL.path]];
-							[task launch];
-							[task waitUntilExit];
-
-							NSLog(@"New ShipIt exited");
-						} else {
-							NSLog(@"Attempting to launch app on lower than 11.0");
-							if (![NSWorkspace.sharedWorkspace launchApplicationAtURL:bundleURL options:NSWorkspaceLaunchDefault configuration:@{} error:&error]) {
-								NSLog(@"Could not launch application at %@: %@", bundleURL, error);
-								return;
-							}
-
-							NSLog(@"Application launched at %@", bundleURL);
-						}
-					}];
-			}
-
-			return action;
-		}]
-		subscribeError:^(NSError *error) {
-			NSLog(@"Installation error: %@", error);
-			exit(EXIT_FAILURE);
-		} completed:^{
-			exit(EXIT_SUCCESS);
-		}];
-}
-
 int main(int argc, const char * argv[]) {
 	@autoreleasepool {
 		atexit_b(^{
 			NSLog(@"ShipIt quitting");
 		});

-		if (argc < 3) {
-			NSLog(@"Missing launchd job label or state path for ShipIt");
+		if (argc < 2) {
+			NSLog(@"Missing launchd job label for ShipIt");
 			return EXIT_FAILURE;
 		}

-		char const *jobLabel = argv[1];
-		const char *statePath = argv[2];
-		NSURL *shipItStateURL = [NSURL fileURLWithPath:@(statePath)];
+		const char *jobLabel = argv[1];
+		SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:@(jobLabel)];
+		RACSignal *stateLocation = directoryManager.shipItStateURL;

-		if (strcmp(jobLabel, [launchSignal UTF8String]) == 0) {
-			NSLog(@"Detected this as a launch request");
-			NSError *error;
-			if (![NSWorkspace.sharedWorkspace launchApplicationAtURL:shipItStateURL options:NSWorkspaceLaunchDefault configuration:@{} error:&error]) {
-				NSLog(@"Could not launch application at %@: %@", shipItStateURL, error);
-			} else {
-				NSLog(@"Successfully launched application at %@", shipItStateURL);
-			}
-			exit(EXIT_SUCCESS);
-		} else {
-			NSLog(@"Detected this as an install request");
-			installRequest([SQRLShipItRequest readUsingURL:[RACSignal return:shipItStateURL]], @(jobLabel));
-			dispatch_main();
-		}
+		[[[[[[[SQRLShipItState
+			readUsingURL:stateLocation]
+			flattenMap:^(SQRLShipItState *state) {
+				return waitForTerminationIfNecessary(state);
+			}]
+			ignoreValues]
+			// Read the latest state, in case it was modified by the
+			// controlling application in the meantime.
+			concat:[SQRLShipItState readUsingURL:stateLocation]]
+			catch:^(NSError *error) {
+				NSLog(@"Error reading saved installer state: %@", error);
+
+				// Exit successfully so launchd doesn't restart us again.
+				return [RACSignal empty];
+			}]
+			flattenMap:^(SQRLShipItState *state) {
+				BOOL freshInstall = (state.installerState == SQRLInstallerStateNothingToDo);
+				SQRLInstaller *installer = [[SQRLInstaller alloc] initWithDirectoryManager:directoryManager];
+
+				NSUInteger attempt = (freshInstall ? 1 : state.installationStateAttempt + 1);
+				RACSignal *action;
+
+				if (attempt > SQRLShipItMaximumInstallationAttempts) {
+					action = [[RACSignal
+						defer:^{
+							NSLog(@"Too many attempts to install from state %i, aborting update", (int)state.installerState);
+
+							return [installer abortInstallationWithState:state];
+						}]
+						catch:^(NSError *error) {
+							NSLog(@"Error aborting installation: %@", error);
+
+							// Exit successfully so launchd doesn't restart us again.
+							return [RACSignal empty];
+						}];
+				} else {
+					action = [[[[RACSignal
+						defer:^{
+							if (freshInstall) {
+								NSLog(@"Beginning installation");
+								state.installerState = SQRLInstallerStateClearingQuarantine;
+							} else {
+								NSLog(@"Resuming installation from state %i", (int)state.installerState);
+							}
+
+							state.installationStateAttempt = attempt;
+
+							return [state writeUsingURL:stateLocation];
+						}]
+						concat:[installer installUpdateWithState:state]]
+						doCompleted:^{
+							NSLog(@"Installation completed successfully");
+						}]
+						sqrl_addTransactionWithName:NSLocalizedString(@"Updating", nil) description:NSLocalizedString(@"%@ is being updated, and interrupting the process could corrupt the application", nil), state.targetBundleURL.path];
+				}
+
+				if (state.relaunchAfterInstallation) {
+					// Relaunch regardless of whether installation succeeds or
+					// fails.
+					action = [[action
+						deliverOn:RACScheduler.mainThreadScheduler]
+						doFinished:^{
+							NSURL *bundleURL = state.targetBundleURL;
+							if (bundleURL == nil) {
+								NSLog(@"Missing target bundle URL, cannot relaunch application");
+								return;
+							}
+
+							NSError *error = nil;
+							if (![NSWorkspace.sharedWorkspace launchApplicationAtURL:bundleURL options:NSWorkspaceLaunchDefault configuration:nil error:&error]) {
+								NSLog(@"Could not relaunch application at %@: %@", bundleURL, error);
+								return;
+							}
+
+							NSLog(@"Application relaunched at %@", bundleURL);
+						}];
+				}
+
+				return action;
+			}]
+			subscribeError:^(NSError *error) {
+				NSLog(@"Installation error: %@", error);
+				exit(EXIT_FAILURE);
+			} completed:^{
+				exit(EXIT_SUCCESS);
+			}];
+
+		dispatch_main();
 	}

 	return EXIT_SUCCESS;
 }
+
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>com.github.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -0,0 +1,8 @@
+//
+// Prefix header for all source files of the 'Squirrel' target in the 'Squirrel' project
+//
+
+#ifdef __OBJC__
+	#import <Cocoa/Cocoa.h>
+    #import <SystemConfiguration/SystemConfiguration.h>
+#endif
@@ -6,14 +6,6 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Foundation/Foundation.h>
-
-//! Project version number for Squirrel.
-FOUNDATION_EXPORT double SquirrelVersionNumber;
-
-//! Project version string for Squirrel.
-FOUNDATION_EXPORT const unsigned char SquirrelVersionString[];
-
 #import <Squirrel/NSBundle+SQRLVersionExtensions.h>
 #import <Squirrel/NSProcessInfo+SQRLVersionExtensions.h>
 #import <Squirrel/SQRLDownloadedUpdate.h>
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
@@ -6,35 +6,30 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
-QuickSpecBegin(NSProcessInfoExtensions)
+SpecBegin(NSProcessInfoExtensions)

 describe(@"-sqrl_operatingSystemShortVersionString", ^{
 	__block NSString *versionString;

 	beforeEach(^{
 		versionString = NSProcessInfo.processInfo.sqrl_operatingSystemShortVersionString;
-		expect(versionString).notTo(beNil());
+		expect(versionString).notTo.beNil();
 	});

 	it(@"should follow major.minor.patch format", ^{
 		NSError *error = nil;
 		NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^[0-9]+(\\.[0-9]+)*$" options:0 error:&error];
-		expect(regex).notTo(beNil());
-		expect(error).to(beNil());
+		expect(regex).notTo.beNil();
+		expect(error).to.beNil();

 		NSRange fullRange = NSMakeRange(0, versionString.length);
 		NSRange matchRange = [regex rangeOfFirstMatchInString:versionString options:0 range:fullRange];
-		expect(@(NSEqualRanges(matchRange, fullRange))).to(beTruthy());
+		expect(NSEqualRanges(matchRange, fullRange)).to.beTruthy();
 	});

 	it(@"should be numerically comparable", ^{
-		expect(@([@"10.6.9" compare:versionString options:NSNumericSearch])).to(equal(@(NSOrderedAscending)));
+		expect([@"10.6.9" compare:versionString options:NSNumericSearch]).to.equal(NSOrderedAscending);
 	});
 });

-QuickSpecEnd
+SpecEnd
@@ -1,47 +0,0 @@
-
-***
-Test updates via release server or cdn-based updates
-***
-
-Control test behavior via env variables:
-
-SQUIRREL_TEST_LOCAL_SERVER=True
-SQUIRREL_LOCAL_SERVER_URL=http://localhost:8123/update/osx/1.0.1-stable/stable
-
-SQUIRREL_TEST_LOCAL_CDN=True
-SQUIRREL_CDN_URL=@"http://localhost/RELEASES.json"
-
-
-
-Test Setup:
-Create a fake dmg release file
-
-Release Server:
-git clone https://github.com/ArekSredzki/electron-release-server.git
-
-refer to their doc, here is a short summary:
- install a local PostgreSQL, any default setup will do it
- edit config/local.js to match your PostgreSQL setup
- npm start
-
-point your browser to the server and upload your release dmg file
-
-CDN:
-setup a local webserver such as apache or nginx and copy your dmg file there
-create a RELEASE.json file like this:
-
-{
-  "currentRelease" : "1.0.1",
-  "releases" : [
-    {
-      "version" : "1.0.1",
-      "updateTo" : {
-        "pub_date" : "2017-03-09T15:24:55-05:00",
-        "notes" : "the next release via CDN",
-        "name" : "TestApplication_1.0.1",
-        "url" : "http:\/\/localhost/TestApplication_1.0.1.dmg",
-        "version" : "0.0.145-alpha"
-      }
-    }
-  ]
-}
@@ -6,16 +6,9 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
 #import "SQRLCodeSignature.h"

-#import "QuickSpec+SQRLFixtures.h"
-
-QuickSpecBegin(SQRLCodeSignatureSpec)
+SpecBegin(SQRLCodeSignature)

 __block NSBundle *bundle;
 __block void (^corruptURL)(NSURL *URL);
@@ -24,26 +17,26 @@ beforeEach(^{
 	bundle = self.testApplicationBundle;

 	corruptURL = ^(NSURL *URL) {
-		expect(@([@"this bundle is corrupted, yo" writeToURL:bundle.executableURL atomically:YES encoding:NSUTF8StringEncoding error:NULL])).to(beTruthy());
+		expect([@"this bundle is corrupted, yo" writeToURL:bundle.executableURL atomically:YES encoding:NSUTF8StringEncoding error:NULL]).to.beTruthy();
 	};
 });

 it(@"should verify a valid bundle", ^{
 	NSError *error = nil;
 	BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();
 });

 it(@"should fail to verify with different code signing requirements", ^{
 	NSError *error = nil;
-	SQRLCodeSignature *signature = [SQRLCodeSignature currentApplicationSignature:&error];
-	expect(signature).notTo(beNil());
-	expect(error).to(beNil());
+	SQRLCodeSignature *verifier = [SQRLCodeSignature currentApplicationSignature:&error];
+	expect(verifier).notTo.beNil();
+	expect(error).to.beNil();

-	BOOL success = [[signature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-	expect(@(success)).to(beFalsy());
-	expect(error).notTo(beNil());
+	BOOL success = [[verifier verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
+	expect(success).to.beFalsy();
+	expect(error).notTo.beNil();
 });

 describe(@"code signature changes", ^{
@@ -54,15 +47,15 @@ describe(@"code signature changes", ^{
 	});

 	it(@"should fail to verify a bundle with a missing code signature", ^{
-		expect(@([NSFileManager.defaultManager removeItemAtURL:codeSignatureURL error:NULL])).to(beTruthy());
+		expect([NSFileManager.defaultManager removeItemAtURL:codeSignatureURL error:NULL]).to.beTruthy();

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});

 	it(@"should fail to verify a bundle with a corrupt code signature", ^{
@@ -70,25 +63,25 @@ describe(@"code signature changes", ^{

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});
 });

 describe(@"main executable changes", ^{
 	it(@"should fail to verify a bundle with a missing executable", ^{
-		expect(@([NSFileManager.defaultManager removeItemAtURL:bundle.executableURL error:NULL])).to(beTruthy());
+		expect([NSFileManager.defaultManager removeItemAtURL:bundle.executableURL error:NULL]).to.beTruthy();

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorCouldNotCreateStaticCode);
 	});

 	it(@"should fail to verify a bundle with a corrupt executable", ^{
@@ -96,11 +89,11 @@ describe(@"main executable changes", ^{

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});
 });

@@ -109,19 +102,19 @@ describe(@"helper executable changes", ^{

 	beforeEach(^{
 		helperURL = [bundle URLForAuxiliaryExecutable:@"unused-helper"];
-		expect(helperURL).notTo(beNil());
+		expect(helperURL).notTo.beNil();
 	});

 	it(@"should fail to verify a bundle with a missing helper", ^{
-		expect(@([NSFileManager.defaultManager removeItemAtURL:helperURL error:NULL])).to(beTruthy());
+		expect([NSFileManager.defaultManager removeItemAtURL:helperURL error:NULL]).to.beTruthy();

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});

 	it(@"should fail to verify a bundle with a corrupt helper", ^{
@@ -129,11 +122,11 @@ describe(@"helper executable changes", ^{

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});
 });

@@ -142,19 +135,19 @@ describe(@"resource changes", ^{

 	beforeEach(^{
 		resourceURL = [bundle URLForResource:@"MainMenu" withExtension:@"nib"];
-		expect(resourceURL).notTo(beNil());
+		expect(resourceURL).notTo.beNil();
 	});

 	it(@"should fail to verify a bundle with a missing resource", ^{
-		expect(@([NSFileManager.defaultManager removeItemAtURL:resourceURL error:NULL])).to(beTruthy());
+		expect([NSFileManager.defaultManager removeItemAtURL:resourceURL error:NULL]).to.beTruthy();

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});

 	it(@"should fail to verify a bundle with a corrupt resource", ^{
@@ -162,11 +155,11 @@ describe(@"resource changes", ^{

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});
 });

@@ -178,15 +171,15 @@ describe(@"framework changes", ^{
 	});

 	it(@"should fail to verify a bundle with a missing framework", ^{
-		expect(@([NSFileManager.defaultManager removeItemAtURL:frameworkURL error:NULL])).to(beTruthy());
+		expect([NSFileManager.defaultManager removeItemAtURL:frameworkURL error:NULL]).to.beTruthy();

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});

 	it(@"should fail to verify a bundle with a corrupt framework", ^{
@@ -194,12 +187,12 @@ describe(@"framework changes", ^{

 		NSError *error = nil;
 		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beFalsy());
+		expect(success).to.beFalsy();

-		expect(error).notTo(beNil());
-		expect(error.domain).to(equal(SQRLCodeSignatureErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLCodeSignatureErrorDidNotPass)));
+		expect(error).notTo.beNil();
+		expect(error.domain).to.equal(SQRLCodeSignatureErrorDomain);
+		expect(error.code).to.equal(SQRLCodeSignatureErrorDidNotPass);
 	});
 });

-QuickSpecEnd
+SpecEnd
@@ -0,0 +1,119 @@
+//
+//  SQRLDeepCodesignSpec.m
+//  Squirrel
+//
+//  Created by Keith Duncan on 2013-09-05.
+//  Copyright (c) 2013 GitHub. All rights reserved.
+//
+
+SpecBegin(SQRLDeepCodesign)
+
+NSMutableDictionary * (^environmentSuitableForChildProcess)(void) = ^ {
+	// Remove environment variables that configure the Obj-C runtime
+	// Specifically OBJC_DISABLE_GC so that child processes aren't forced to
+	// adopt the GC preference of the test suite
+	NSMutableDictionary *environment = [NSProcessInfo.processInfo.environment mutableCopy];
+	NSSet *objcEnvironmentVariables = [environment keysOfEntriesPassingTest:^(NSString *variable, id obj, BOOL *stop) {
+		return [variable hasPrefix:@"OBJC"];
+	}];
+	[environment removeObjectsForKeys:objcEnvironmentVariables.allObjects];
+	return environment;
+};
+
+NSTask * (^codesignTaskWithArguments)(NSArray *) = ^ (NSArray *arguments) {
+	NSTask *task = [[NSTask alloc] init];
+	task.launchPath = @"/usr/bin/xcrun";
+	task.arguments = [@[ @"codesign" ] arrayByAddingObjectsFromArray:arguments];
+	task.environment = environmentSuitableForChildProcess();
+	return task;
+};
+
+void (^resignTestApplicationPreserveEverythingButTheRequirements)(void) = ^{
+	NSURL *testApplicationLocation = self.testApplicationURL;
+
+	NSTask *resignCodesignTask = codesignTaskWithArguments(@[
+		@"--sign", @"-",
+		@"--force",
+		@"--verbose=4",
+		@"--preserve-metadata=identifier,entitlements,resource-rules",
+		testApplicationLocation.path,
+	]);
+
+	[resignCodesignTask launch];
+	[resignCodesignTask waitUntilExit];
+
+	expect(resignCodesignTask.terminationStatus).to.equal(0);
+};
+
+void (^deepCodesignTestApplication)(void) = ^{
+	NSURL *testApplicationLocation = self.testApplicationURL;
+
+	NSBundle *testsBundle = [NSBundle bundleForClass:self.class];
+	NSURL *deepCodesignLocation = [testsBundle URLForResource:@"deep-codesign" withExtension:nil];
+
+	NSNumber *executable = nil;
+	NSError *executableError = nil;
+	BOOL getExecutable = [deepCodesignLocation getResourceValue:&executable forKey:NSURLIsExecutableKey error:&executableError];
+	expect(getExecutable).to.beTruthy();
+	expect(executable.boolValue).to.beTruthy();
+	expect(executableError).to.beNil();
+
+	NSTask *deepCodesignTask = [[NSTask alloc] init];
+	deepCodesignTask.launchPath = deepCodesignLocation.path;
+	deepCodesignTask.standardError = [NSPipe pipe];
+	deepCodesignTask.standardOutput = [NSPipe pipe];
+
+	NSMutableDictionary *environment = environmentSuitableForChildProcess();
+	[environment addEntriesFromDictionary:@{
+		@"CODE_SIGN_IDENTITY": @"-",
+		@"CONFIGURATION_BUILD_DIR": testApplicationLocation.URLByDeletingLastPathComponent.path,
+		@"FULL_PRODUCT_NAME": testApplicationLocation.lastPathComponent,
+	}];
+
+	deepCodesignTask.environment = environment;
+
+	[deepCodesignTask launch];
+	[deepCodesignTask waitUntilExit];
+
+	expect(deepCodesignTask.terminationStatus).to.equal(0);
+
+	/*
+		By signing test application's contents, which are covered by test
+		application's ResourceRules it's signature becomes invalid. Usually,
+		Xcode would sign the application after deep-codesign has run so the
+		signature would include the _signed_ child resources which are covered
+		by test application's ResourceRules
+
+		test application is already signed, so we need to manually resign it
+
+		deep-codesign preserves the requirements, we can't use it to resign the
+		root target, the new signing identity wouldn't verify against the
+		original designated requirement
+	 */
+	resignTestApplicationPreserveEverythingButTheRequirements();
+};
+
+BOOL (^deepVerify)(void) = ^ BOOL {
+	NSTask *deepVerifyTask = codesignTaskWithArguments(@[
+		@"--deep-verify",
+		@"--verbose=4",
+		self.testApplicationURL.path
+	]);
+
+	[deepVerifyTask launch];
+	[deepVerifyTask waitUntilExit];
+
+	return deepVerifyTask.terminationStatus == 0;
+};
+
+it(@"should deep sign the test application", ^{
+	deepCodesignTestApplication();
+});
+
+xit(@"should deep verify after signing", ^{
+	expect(deepVerify()).to.beFalsy();
+	deepCodesignTestApplication();
+	expect(deepVerify()).to.beTruthy();
+});
+
+SpecEnd
@@ -6,44 +6,39 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
 #import "SQRLDirectoryManager.h"

-QuickSpecBegin(SQRLDirectoryManagerSpec)
+SpecBegin(SQRLDirectoryManager)

 __block NSString *otestIdentifier;

 beforeEach(^{
-	otestIdentifier = NSProcessInfo.processInfo.environment[@"FORCE_APP_IDENTIFIER"];
-	expect(otestIdentifier).notTo(beNil());
+	otestIdentifier = NSRunningApplication.currentApplication.localizedName;
+	expect(otestIdentifier).notTo.beNil();
 });

 it(@"should initialize", ^{
 	SQRLDirectoryManager *manager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:otestIdentifier];
-	expect(manager).notTo(beNil());
+	expect(manager).notTo.beNil();
 });

 it(@"should create a manager for the current app", ^{
 	SQRLDirectoryManager *manager = SQRLDirectoryManager.currentApplicationManager;
-	expect(manager).notTo(beNil());
-	expect(manager).to(equal([[SQRLDirectoryManager alloc] initWithApplicationIdentifier:otestIdentifier]));
+	expect(manager).notTo.beNil();
+	expect(manager).to.equal([[SQRLDirectoryManager alloc] initWithApplicationIdentifier:otestIdentifier]);
 });

 it(@"should send an Application Support URL", ^{
 	SQRLDirectoryManager *manager = SQRLDirectoryManager.currentApplicationManager;

 	NSError *error = nil;
-	NSURL *appSupportURL = [[manager storageURL] firstOrDefault:nil success:NULL error:&error];
-	expect(appSupportURL).notTo(beNil());
-	expect(error).to(beNil());
+	NSURL *appSupportURL = [[manager applicationSupportURL] firstOrDefault:nil success:NULL error:&error];
+	expect(appSupportURL).notTo.beNil();
+	expect(error).to.beNil();

 	__block BOOL directory = NO;
-	expect(@([NSFileManager.defaultManager fileExistsAtPath:appSupportURL.path isDirectory:&directory])).to(beTruthy());
-	expect(@(directory)).to(beTruthy());
+	expect([NSFileManager.defaultManager fileExistsAtPath:appSupportURL.path isDirectory:&directory]).to.beTruthy();
+	expect(directory).to.beTruthy();
 });

 it(@"should send a ShipIt state URL", ^{
@@ -51,8 +46,8 @@ it(@"should send a ShipIt state URL", ^{

 	NSError *error = nil;
 	NSURL *stateURL = [[manager shipItStateURL] firstOrDefault:nil success:NULL error:&error];
-	expect(stateURL).notTo(beNil());
-	expect(error).to(beNil());
+	expect(stateURL).notTo.beNil();
+	expect(error).to.beNil();
 });

-QuickSpecEnd
+SpecEnd
@@ -6,32 +6,13 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
 #import "SQRLCodeSignature.h"
 #import "SQRLDirectoryManager.h"
-#import "SQRLInstaller+Private.h"
-#import "SQRLInstallerOwnedBundle.h"
-#import "SQRLShipItRequest.h"
+#import "SQRLInstaller.h"
+#import "SQRLShipItLauncher.h"
+#import "SQRLShipItState.h"

-#import "QuickSpec+SQRLFixtures.h"
-
-QuickSpecBegin(SQRLInstallerSpec)
-
-mode_t (^modeOfURL)(NSURL *) = ^ mode_t (NSURL *fileURL) {
-	NSFileSecurity *fileSecurity = nil;
-	BOOL success = [fileURL getResourceValue:&fileSecurity forKey:NSURLFileSecurityKey error:NULL];
-	expect(@(success)).to(beTruthy());
-	expect(fileSecurity).notTo(beNil());
-
-	__block mode_t mode;
-	expect(@(CFFileSecurityGetMode((__bridge CFFileSecurityRef)fileSecurity, &mode))).to(beTruthy());
-
-	return mode & (S_IRWXU | S_IRWXG | S_IRWXO);
-};
+SpecBegin(SQRLInstaller)

 __block NSURL *updateURL;

@@ -39,148 +20,127 @@ beforeEach(^{
 	updateURL = [self createTestApplicationUpdate];
 });

-it(@"should install an update using ShipIt", ^{
-	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
+it(@"should install an update", ^{
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();

-	[self installWithRequest:request remote:YES];
+	[self launchShipIt];

-	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
-});
-
-it(@"should install an update in process", ^{
-	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
-
-	[self installWithRequest:request remote:NO];
-
-	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+	expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
 });

 it(@"should install an update and relaunch", ^{
 	NSString *bundleIdentifier = @"com.github.Squirrel.TestApplication";
 	NSArray *apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:bundleIdentifier];
-	expect(@(apps.count)).to(equal(@0));
+	expect(apps.count).to.equal(0);

-	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:YES useUpdateBundleName:NO];
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	state.relaunchAfterInstallation = YES;
+	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();

-	[self installWithRequest:request remote:YES];
+	[self launchShipIt];

-	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
-	expect(@([NSRunningApplication runningApplicationsWithBundleIdentifier:bundleIdentifier].count)).toEventually(equal(@1));
+	expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+	expect([NSRunningApplication runningApplicationsWithBundleIdentifier:bundleIdentifier].count).will.equal(1);
 });

 it(@"should install an update from another volume", ^{
 	NSURL *diskImageURL = [self createAndMountDiskImageNamed:@"TestApplication 2.1" fromDirectory:updateURL.URLByDeletingLastPathComponent];
 	updateURL = [diskImageURL URLByAppendingPathComponent:updateURL.lastPathComponent];

-	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();

-	[self installWithRequest:request remote:YES];
+	[self launchShipIt];

-	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+	expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
 });

 it(@"should install an update to another volume", ^{
 	NSURL *diskImageURL = [self createAndMountDiskImageNamed:@"TestApplication" fromDirectory:self.testApplicationURL.URLByDeletingLastPathComponent];
 	NSURL *targetURL = [diskImageURL URLByAppendingPathComponent:self.testApplicationURL.lastPathComponent];

-	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:targetURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:targetURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();

-	[self installWithRequest:request remote:YES];
+	[self launchShipIt];

 	NSURL *plistURL = [targetURL URLByAppendingPathComponent:@"Contents/Info.plist"];
-	expect([NSDictionary dictionaryWithContentsOfURL:plistURL][SQRLBundleShortVersionStringKey]).withTimeout(SQRLLongTimeout).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+	expect([NSDictionary dictionaryWithContentsOfURL:plistURL][SQRLBundleShortVersionStringKey]).will.equal(SQRLTestApplicationUpdatedShortVersionString);
 });

-describe(@"with backup restoration", ^{
-	__block NSURL *targetURL;
+it(@"should install an update in process", ^{
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	state.installerState = SQRLInstallerStateClearingQuarantine;

-	beforeEach(^{
-		targetURL = self.testApplicationURL;
+	SQRLInstaller *installer = [[SQRLInstaller alloc] initWithDirectoryManager:SQRLDirectoryManager.currentApplicationManager];
+	expect(installer).notTo.beNil();

-		NSURL *copiedTargetURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication Target.app"];
-		expect(@([NSFileManager.defaultManager moveItemAtURL:targetURL toURL:copiedTargetURL error:NULL])).to(beTruthy());
-
-		SQRLCodeSignature *codeSignature = self.testApplicationSignature;
-
-		SQRLInstallerOwnedBundle *ownedBundle = [[SQRLInstallerOwnedBundle alloc] initWithOriginalURL:targetURL temporaryURL:copiedTargetURL codeSignature:codeSignature];
-		NSData *ownedBundleArchive = [NSKeyedArchiver archivedDataWithRootObject:ownedBundle];
-		expect(ownedBundleArchive).notTo(beNil());
-
-		// Set up ShipIt's preferences like it paused in the middle of an
-		// installation.
-		NSString *applicationIdentifier = self.shipItDirectoryManager.applicationIdentifier;
-
-		CFPreferencesSetValue((__bridge CFStringRef)SQRLShipItInstallationAttemptsKey, (__bridge CFPropertyListRef)@(4), (__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-		CFPreferencesSetValue((__bridge CFStringRef)SQRLInstallerOwnedBundleKey, (__bridge CFDataRef)ownedBundleArchive, (__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-
-		BOOL synchronized = CFPreferencesSynchronize((__bridge CFStringRef)applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
-		expect(@(synchronized)).to(beTruthy());
-	});
-
-	it(@"should not install an update after too many attempts", ^{
-		SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:targetURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
-		[self installWithRequest:request remote:YES];
-
-		__block NSError *error;
-		expect(@([[self.testApplicationSignature verifyBundleAtURL:targetURL] waitUntilCompleted:&error])).toEventually(beTruthy());
-		expect(error).to(beNil());
-
-		expect(self.testApplicationBundleVersion).to(equal(SQRLTestApplicationOriginalShortVersionString));
-	});
-
-	it(@"should relaunch even after failing to install an update", ^{
-		SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:targetURL bundleIdentifier:nil launchAfterInstallation:YES useUpdateBundleName:NO];
-		[self installWithRequest:request remote:YES];
-
-		expect(@([NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.github.Squirrel.TestApplication"].count)).toEventually(equal(@1));
-
-		__block NSError *error;
-		expect(@([[self.testApplicationSignature verifyBundleAtURL:targetURL] waitUntilCompleted:&error])).to(beTruthy());
-		expect(error).to(beNil());
-
-		expect(self.testApplicationBundleVersion).to(equal(SQRLTestApplicationOriginalShortVersionString));
-	});
+	NSError *installError = nil;
+	BOOL install = [[installer installUpdateWithState:state] asynchronouslyWaitUntilCompleted:&installError];
+	expect(install).to.beTruthy();
+	expect(installError).to.beNil();
 });

-it(@"should disallow writing the updated application except by the owner", ^{
-	NSString *command = [NSString stringWithFormat:@"chmod -R 0777 '%@'", updateURL.path];
-	expect(@(system(command.UTF8String))).to(equal(@0));
+it(@"should not install an update after too many attempts", ^{
+	NSURL *targetURL = self.testApplicationURL;
+	NSURL *backupURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication.app.bak"];
+	expect([NSFileManager.defaultManager moveItemAtURL:targetURL toURL:backupURL error:NULL]).to.beTruthy();

-	expect(@(modeOfURL(updateURL))).to(equal(@0777));
-	expect(@(modeOfURL([updateURL URLByAppendingPathComponent:@"Contents/MacOS/TestApplication"]))).to(equal(@0777));
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:targetURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	state.backupBundleURL = backupURL;
+	state.installerState = SQRLInstallerStateInstalling;
+	state.installationStateAttempt = 4;
+	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();

-	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
+	[self launchShipIt];

-	[self installWithRequest:request remote:YES];
+	// No update should've been installed, and the application should be
+	// restored from the backup.
+	__block NSError *error = nil;
+	expect([[self.testApplicationSignature verifyBundleAtURL:targetURL] waitUntilCompleted:&error]).will.beTruthy();
+	expect(error).to.beNil();

-	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+	expect(self.testApplicationBundleVersion).to.equal(SQRLTestApplicationOriginalShortVersionString);
+});

-	expect(@(modeOfURL(self.testApplicationURL))).to(equal(@0755));
-	expect(@(modeOfURL([self.testApplicationURL URLByAppendingPathComponent:@"Contents/MacOS/TestApplication"]))).to(equal(@0755));
+it(@"should relaunch even after failing to install an update", ^{
+	NSURL *targetURL = self.testApplicationURL;
+	NSURL *backupURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication.app.bak"];
+	expect([NSFileManager.defaultManager moveItemAtURL:targetURL toURL:backupURL error:NULL]).to.beTruthy();
+
+	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:targetURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	state.backupBundleURL = backupURL;
+	state.installerState = SQRLInstallerStateInstalling;
+	state.installationStateAttempt = 4;
+	state.relaunchAfterInstallation = YES;
+	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();
+
+	[self launchShipIt];
+
+	__block NSError *error = nil;
+	expect([[self.testApplicationSignature verifyBundleAtURL:targetURL] waitUntilCompleted:&error]).will.beTruthy();
+	expect(error).to.beNil();
+
+	expect([NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.github.Squirrel.TestApplication"].count).will.equal(1);
+	expect(self.testApplicationBundleVersion).to.equal(SQRLTestApplicationOriginalShortVersionString);
 });

 describe(@"signal handling", ^{
 	__block NSURL *targetURL;

-	void (^verifyUpdate)(void) = ^{
-		// Wait up to the launchd throttle interval, then verify that ShipIt
-		// relaunched and finished installing the update.
-		expect(self.testApplicationBundleVersion).withTimeout(SQRLLongTimeout).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
-
-		NSError *error;
-		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:targetURL] waitUntilCompleted:&error];
-		expect(@(success)).to(beTruthy());
-		expect(error).to(beNil());
-	};
-
 	beforeEach(^{
 		// Copied so that we don't recreate the TestApplication bundle by
 		// accessing the property.
 		targetURL = self.testApplicationURL;

-		SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
+		SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+		expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();

-		[self installWithRequest:request remote:YES];
+		[self launchShipIt];
+
+		// Wait until ShipIt has transitioned by at least one state.
+		expect([[[SQRLShipItState readUsingURL:self.shipItDirectoryManager.shipItStateURL] asynchronousFirstOrDefault:nil success:NULL error:NULL] installerState]).willNot.equal(SQRLInstallerStateNothingToDo);

 		// Apply a random delay before sending the termination signal, to
 		// fuzz out race conditions.
@@ -188,42 +148,45 @@ describe(@"signal handling", ^{
 		[NSThread sleepForTimeInterval:delay];
 	});

+	afterEach(^{
+		// Wait up to the launchd throttle interval, then verify that ShipIt
+		// relaunched and finished installing the update.
+		Expecta.asynchronousTestTimeout = 5;
+		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+
+		NSError *error = nil;
+		BOOL success = [[self.testApplicationSignature verifyBundleAtURL:targetURL] waitUntilCompleted:&error];
+		expect(success).to.beTruthy();
+		expect(error).to.beNil();
+	});
+
 	it(@"should handle SIGHUP", ^{
 		system("killall -HUP ShipIt");
-		verifyUpdate();
 	});

 	it(@"should handle SIGTERM", ^{
 		system("killall -TERM ShipIt");
-		verifyUpdate();
 	});

 	it(@"should handle SIGINT", ^{
 		system("killall -INT ShipIt");
-		verifyUpdate();
 	});

 	it(@"should handle SIGQUIT", ^{
 		system("killall -QUIT ShipIt");
-		verifyUpdate();
 	});

 	it(@"should handle SIGKILL", ^{
 		// SIGKILL is unique in that it'll always terminate ShipIt, so send it
-		// a couple times to really test resumption.
-		//
-		// Two SIGKILL signals means that it'll be launched three times (which
-		// matches the maximum number of attempts per state).
-		for (int i = 0; i < 2; i++) {
+		// a few times to really test resumption.
+		for (int i = 0; i < 3; i++) {
 			system("killall -KILL ShipIt");

 			// Wait at least for the launchd throttle interval.
 			NSTimeInterval delay = 2 + (arc4random_uniform(100) / 1000.0);
 			[NSThread sleepForTimeInterval:delay];
 		}
-
-		verifyUpdate();
 	});
 });

-QuickSpecEnd
+SpecEnd
@@ -1,86 +0,0 @@
-//
-//  SQRLShipItStateSpec.m
-//  Squirrel
-//
-//  Created by Justin Spahr-Summers on 2013-10-09.
-//  Copyright (c) 2013 GitHub. All rights reserved.
-//
-
-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
-#import "SQRLDirectoryManager.h"
-#import "SQRLShipItRequest.h"
-
-#import "QuickSpec+SQRLFixtures.h"
-
-QuickSpecBegin(SQRLShipItRequestSpec)
-
-__block SQRLDirectoryManager *directoryManager;
-__block SQRLShipItRequest *request;
-
-beforeEach(^{
-	directoryManager = SQRLDirectoryManager.currentApplicationManager;
-
-	NSURL *updateURL = [self createTestApplicationUpdate];
-	request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO useUpdateBundleName:NO];
-	expect(request).notTo(beNil());
-
-	expect(request.targetBundleURL).to(equal(self.testApplicationURL));
-	expect(request.updateBundleURL).to(equal(updateURL));
-	expect(request.bundleIdentifier).to(beNil());
-	expect(@(request.launchAfterInstallation)).to(beFalsy());
-});
-
-afterEach(^{
-	NSURL *stateURL = [[directoryManager shipItStateURL] first];
-	expect(stateURL).notTo(beNil());
-
-	[NSFileManager.defaultManager removeItemAtURL:stateURL error:NULL];
-});
-
-it(@"should copy", ^{
-	SQRLShipItRequest *requestCopy = [request copy];
-	expect(requestCopy).to(equal(request));
-	expect(requestCopy).notTo(beIdenticalTo(request));
-});
-
-it(@"should fail to read state when no file exists yet", ^{
-	NSError *error;
-	BOOL success = [[SQRLShipItRequest readUsingURL:directoryManager.shipItStateURL] waitUntilCompleted:&error];
-	expect(@(success)).to(beFalsy());
-	expect(error).notTo(beNil());
-});
-
-it(@"should write and read state to disk", ^{
-	NSError *error;
-	BOOL success = [[request writeUsingURL:directoryManager.shipItStateURL] waitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
-
-	SQRLShipItRequest *readRequest = [[SQRLShipItRequest readUsingURL:directoryManager.shipItStateURL] firstOrDefault:nil success:&success error:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
-
-	expect(readRequest).to(equal(request));
-});
-
-it(@"should fail gracefully with archives encoding a different class", ^{
-	NSURL *archiveLocation = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"archive"];
-
-	NSError *error;
-	BOOL write = [[NSKeyedArchiver archivedDataWithRootObject:@"rogue object"] writeToURL:archiveLocation atomically:YES];
-	expect(@(write)).to(beTruthy());
-	expect(error).to(beNil());
-
-	BOOL success = NO;
-	SQRLShipItRequest *request = [[SQRLShipItRequest readUsingURL:[RACSignal return:archiveLocation]] firstOrDefault:nil success:&success error:&error];
-	expect(request).to(beNil());
-	expect(@(success)).to(beFalsy());
-	expect(error.domain).to(equal(SQRLShipItRequestErrorDomain));
-	expect(@(error.code)).to(equal(@(SQRLShipItRequestErrorUnarchiving)));
-});
-
-QuickSpecEnd
@@ -0,0 +1,63 @@
+//
+//  SQRLShipItStateSpec.m
+//  Squirrel
+//
+//  Created by Justin Spahr-Summers on 2013-10-09.
+//  Copyright (c) 2013 GitHub. All rights reserved.
+//
+
+#import "SQRLDirectoryManager.h"
+#import "SQRLShipItState.h"
+
+SpecBegin(SQRLShipItState)
+
+__block SQRLDirectoryManager *directoryManager;
+__block SQRLShipItState *state;
+
+beforeEach(^{
+	directoryManager = SQRLDirectoryManager.currentApplicationManager;
+
+	NSURL *updateURL = [self createTestApplicationUpdate];
+	state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
+	expect(state).notTo.beNil();
+
+	expect(state.targetBundleURL).to.equal(self.testApplicationURL);
+	expect(state.updateBundleURL).to.equal(updateURL);
+	expect(state.bundleIdentifier).to.beNil();
+	expect(state.codeSignature).to.equal(self.testApplicationSignature);
+});
+
+afterEach(^{
+	NSURL *stateURL = [[directoryManager shipItStateURL] firstOrDefault:nil success:NULL error:NULL];
+	expect(stateURL).notTo.beNil();
+	
+	[NSFileManager.defaultManager removeItemAtURL:stateURL error:NULL];
+});
+
+it(@"should copy", ^{
+	SQRLShipItState *stateCopy = [state copy];
+	expect(stateCopy).to.equal(state);
+	expect(stateCopy).notTo.beIdenticalTo(state);
+});
+
+it(@"should fail to read state when no file exists yet", ^{
+	NSError *error = nil;
+	BOOL success = [[SQRLShipItState readUsingURL:directoryManager.shipItStateURL] waitUntilCompleted:&error];
+	expect(success).to.beFalsy();
+	expect(error).notTo.beNil();
+});
+
+it(@"should write and read state", ^{
+	NSError *error = nil;
+	BOOL success = [[state writeUsingURL:directoryManager.shipItStateURL] waitUntilCompleted:&error];
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();
+
+	SQRLShipItState *readState = [[SQRLShipItState readUsingURL:directoryManager.shipItStateURL] firstOrDefault:nil success:&success error:&error];
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();
+
+	expect(readState).to.equal(state);
+});
+
+SpecEnd
@@ -6,22 +6,15 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
 #import "SQRLTerminationListener.h"

-#import "QuickSpec+SQRLFixtures.h"
-
-QuickSpecBegin(SQRLTerminationListenerSpec)
+SpecBegin(SQRLTerminationListener)

 __block SQRLTerminationListener *listener;

 beforeEach(^{
 	listener = [[SQRLTerminationListener alloc] initWithURL:self.testApplicationURL bundleIdentifier:self.testApplicationBundle.bundleIdentifier];
-	expect(listener).notTo(beNil());
+	expect(listener).notTo.beNil();
 });

 it(@"should complete immediately when the app is not running", ^{
@@ -30,12 +23,10 @@ it(@"should complete immediately when the app is not running", ^{
 		completed = YES;
 	}];

-	expect(@(completed)).to(beTruthy());
+	expect(completed).to.beTruthy();
 });

 it(@"should wait until one instance terminates", ^{
-	SKIP_IF_RUNNING_ON_TRAVIS
-
 	NSRunningApplication *app = [self launchTestApplicationWithEnvironment:nil];

 	__block NSRunningApplication *observedApp = nil;
@@ -46,17 +37,15 @@ it(@"should wait until one instance terminates", ^{
 		completed = YES;
 	}];

-	expect(observedApp).toEventually(equal(app));
-	expect(@(completed)).to(beFalsy());
+	expect(observedApp).will.equal(app);
+	expect(completed).to.beFalsy();

 	[app forceTerminate];
-	expect(@(app.terminated)).toEventually(beTruthy());
-	expect(@(completed)).toEventually(beTruthy());
+	expect(app.terminated).will.beTruthy();
+	expect(completed).will.beTruthy();
 });

 it(@"should wait until multiple instances terminate", ^{
-	SKIP_IF_RUNNING_ON_TRAVIS
-
 	NSRunningApplication *app1 = [self launchTestApplicationWithEnvironment:nil];
 	NSRunningApplication *app2 = [self launchTestApplicationWithEnvironment:nil];

@@ -65,15 +54,15 @@ it(@"should wait until multiple instances terminate", ^{
 		completed = YES;
 	}];

-	expect(@(completed)).to(beFalsy());
+	expect(completed).to.beFalsy();

 	[app1 forceTerminate];
-	expect(@(app1.terminated)).toEventually(beTruthy());
-	expect(@(completed)).to(beFalsy());
+	expect(app1.terminated).will.beTruthy();
+	expect(completed).to.beFalsy();

 	[app2 forceTerminate];
-	expect(@(app2.terminated)).toEventually(beTruthy());
-	expect(@(completed)).toEventually(beTruthy());
+	expect(app2.terminated).will.beTruthy();
+	expect(completed).will.beTruthy();
 });

-QuickSpecEnd
+SpecEnd
@@ -1,19 +1,11 @@
 //
-//  QuickSpec+SQRLFixtures.h
+//  SQRLTestCase.h
 //  Squirrel
 //
 //  Created by Justin Spahr-Summers on 2013-08-06.
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
-/// See https://github.com/Squirrel/Squirrel.Mac/pull/154#issuecomment-151287744
-#define SKIP_IF_RUNNING_ON_TRAVIS if (self.runningOnTravis) return;
-
 // The short version string for the `testApplicationBundle`.
 extern NSString * const SQRLTestApplicationOriginalShortVersionString;

@@ -24,15 +16,10 @@ extern NSString * const SQRLTestApplicationUpdatedShortVersionString;
 // The Info.plist key associated with a bundle's short version string.
 extern NSString * const SQRLBundleShortVersionStringKey;

-/// The longer timeout we should use for things that take a long time. This is
-/// especially needed on slower machines (e.g., Travis CI).
-extern const NSTimeInterval SQRLLongTimeout;
-
@class SQRLCodeSignature;
@class SQRLDirectoryManager;
-@class SQRLShipItRequest;

-@interface QuickSpec (SQRLFixtures)
+@interface SQRLTestCase : SPTSenTestCase

 // A URL to a temporary directory tests can use.
 //
@@ -58,12 +45,13 @@ extern const NSTimeInterval SQRLLongTimeout;
 // A code signature with requirements from TestApplication.app.
@property (nonatomic, strong, readonly) SQRLCodeSignature *testApplicationSignature;

+// A serialized `SecRequirementRef` representing the requirements from
+// TestApplication.app.
+@property (nonatomic, copy, readonly) NSData *testApplicationCodeSigningRequirementData;
+
 // A directory manager for finding URLs that apply to ShipIt.
@property (nonatomic, strong, readonly) SQRLDirectoryManager *shipItDirectoryManager;

-/// Are the tests currently being run on Travis?
-@property (nonatomic, readonly, assign, getter = isRunningOnTravis) BOOL runningOnTravis;
-
 // Launches a new copy of TestApplication.app from the `testApplicationBundle`.
 //
 // Invoking this method multiple times will result in multiple running instances
@@ -86,8 +74,8 @@ extern const NSTimeInterval SQRLLongTimeout;
 // deleted at the end of the example.
 - (NSURL *)createTestApplicationUpdate;

-// Runs the installer in process or submits ShipIt's launchd job to start it up.
- (void)installWithRequest:(SQRLShipItRequest *)request remote:(BOOL)remote;
+// Submits ShipIt's launchd job to start it up.
+- (void)launchShipIt;

 // Creates a disk image, then mounts it.
 //
@@ -1,20 +1,16 @@
 //
-//  QuickSpec+SQRLFixtures.m
+//  SQRLTestCase.m
 //  Squirrel
 //
 //  Created by Justin Spahr-Summers on 2013-08-06.
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import "QuickSpec+SQRLFixtures.h"
-
+#import "SQRLTestCase.h"
 #import "SQRLCodeSignature.h"
 #import "SQRLDirectoryManager.h"
-#import "SQRLInstaller.h"
 #import "SQRLShipItLauncher.h"
-#import "SQRLShipItRequest.h"
 #import <ServiceManagement/ServiceManagement.h>
-#import <objc/runtime.h>

 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-retain-cycles"
@@ -23,8 +19,6 @@ NSString * const SQRLTestApplicationOriginalShortVersionString = @"1.0";
 NSString * const SQRLTestApplicationUpdatedShortVersionString = @"2.1";
 NSString * const SQRLBundleShortVersionStringKey = @"CFBundleShortVersionString";

-const NSTimeInterval SQRLLongTimeout = 20;
-
 static void SQRLKillAllTestApplications(void) {
 	// Forcibly kill all copies of the TestApplication that may be running.
 	NSArray *apps = [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.github.Squirrel.TestApplication"];
@@ -45,98 +39,138 @@ static void SQRLSignalHandler(int sig) {
 	abort();
 }

-static NSBundle *SQRLTestBundle(void) {
-	return [NSBundle bundleWithIdentifier:@"com.github.SquirrelTests"];
-}
+@interface SQRLTestCase ()

-static NSMutableArray *cleanupBlocks = nil;
+// An array of dispatch_block_t values, for performing cleanup after the current
+// example finishes.
+//
+// This array will be emptied between each example.
+@property (nonatomic, strong, readonly) NSMutableArray *exampleCleanupBlocks;

 // The URL to the temporary directory which contains `temporaryDirectoryURL` and
 // all copied test data.
-static NSURL *baseTemporaryDirectoryURL = nil;
+@property (nonatomic, copy, readonly) NSURL *baseTemporaryDirectoryURL;

-QuickConfigurationBegin(Fixtures)
+// Returns an _unlaunched_ task that will follow log files at the given paths,
+// then pipe that output through this process.
+ (NSTask *)tailTaskWithPaths:(RACSignal *)paths;

-+ (void)configure:(Configuration *)configuration {
+@end
+
+@implementation SQRLTestCase
+
+#pragma mark Properties
+
+@synthesize baseTemporaryDirectoryURL = _baseTemporaryDirectoryURL;
+
+#pragma mark Lifecycle
+
+ (void)load {
 	NSURL *appSupportURL = [NSFileManager.defaultManager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
 	NSAssert(appSupportURL != nil, @"Could not find Application Support folder");

 	NSArray *folders = @[
 		@"com.github.Squirrel.TestApplication.ShipIt",
-		@"com.github.Squirrel.SquirrelTests.ShipIt",
+		@"otest.ShipIt",
+		@"otest-x86_64.ShipIt",
 	];

-	RACSequence *URLs = [folders.rac_sequence flattenMap:^(NSString *folder) {
-		NSURL *baseURL = [appSupportURL URLByAppendingPathComponent:folder];
-		return @[
-			[baseURL URLByAppendingPathComponent:@"ShipIt_stdout.log"],
-			[baseURL URLByAppendingPathComponent:@"ShipIt_stderr.log"]
-		].rac_sequence;
-	}];
+	RACSignal *logLocations = [[[[folders.rac_signal
+		flattenMap:^(NSString *folder) {
+			return [folder stringsByAppendingPaths:@[
+				@"ShipIt_stdout.log",
+				@"ShipIt_stderr.log",
+			]].rac_signal;
+		}]
+		map:^(NSString *path) {
+			return [appSupportURL URLByAppendingPathComponent:path];
+		}]
+		doNext:^(NSURL *location) {
+			[[NSData data] writeToURL:location atomically:YES];
+		}]
+		map:^(NSURL *location) {
+			return location.path;
+		}];

-	[configuration beforeSuite:^{
-		signal(SIGILL, &SQRLSignalHandler);
-		NSSetUncaughtExceptionHandler(&SQRLUncaughtExceptionHandler);
+	NSTask *readShipIt = [self tailTaskWithPaths:logLocations];
+	[readShipIt launch];

-		cleanupBlocks = [NSMutableArray array];
+	NSAssert([readShipIt isRunning], @"Could not start task %@", readShipIt);

-		for (NSURL *URL in URLs) {
-			[NSFileManager.defaultManager createDirectoryAtURL:URL.URLByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL];
-			if (![[NSData data] writeToURL:URL atomically:YES]) {
-				NSLog(@"Could not touch log file at %@", URL);
-			}
-		}
-	}];
-
-	// We want to run any enqueued cleanup blocks after _and before_ each spec,
-	// in case beforeSuites (for example) use the fixtures.
-	void (^runCleanupBlocks)(void) = ^{
-		// Enumerate backwards, so later resources are cleaned up first.
-		for (dispatch_block_t block in cleanupBlocks.reverseObjectEnumerator) {
-			block();
-		}
-
-		[cleanupBlocks removeAllObjects];
-	};
-
-	[configuration beforeEach:^{
-		runCleanupBlocks();
-	}];
-
-	[configuration afterEach:^{
-		runCleanupBlocks();
-		SQRLKillAllTestApplications();
-	}];
+	atexit_b(^{
+		[readShipIt terminate];
+	});
 }

-QuickConfigurationEnd
+- (void)setUp {
+	[super setUp];

-@implementation QuickSpec (SQRLFixtures)
+	signal(SIGILL, &SQRLSignalHandler);
+	NSSetUncaughtExceptionHandler(&SQRLUncaughtExceptionHandler);

-#pragma mark Lifecycle
+	Expecta.asynchronousTestTimeout = 3;
+}
+
+- (void)SPT_setUp {
+	_exampleCleanupBlocks = [[NSMutableArray alloc] init];
+}
+
+- (void)SPT_tearDown {
+	NSArray *cleanupBlocks = [self.exampleCleanupBlocks copy];
+	_exampleCleanupBlocks = nil;
+
+	// Enumerate backwards, so later resources are cleaned up first.
+	for (dispatch_block_t block in cleanupBlocks.reverseObjectEnumerator) {
+		block();
+	}
+}
+
+- (void)tearDown {
+	[super tearDown];
+
+	SQRLKillAllTestApplications();
+}

 - (void)addCleanupBlock:(dispatch_block_t)block {
-	[cleanupBlocks addObject:[block copy]];
+	[self.exampleCleanupBlocks addObject:[block copy]];
+}
+
+#pragma mark Logging
+
+ (NSTask *)tailTaskWithPaths:(RACSignal *)paths {
+	NSPipe *outputPipe = [NSPipe pipe];
+	NSFileHandle *outputHandle = outputPipe.fileHandleForReading;
+
+	outputHandle.readabilityHandler = ^(NSFileHandle *handle) {
+		NSString *output = [[NSString alloc] initWithData:handle.availableData encoding:NSUTF8StringEncoding];
+		NSLog(@"\n%@", output);
+	};
+
+	NSTask *task = [[NSTask alloc] init];
+	task.launchPath = @"/usr/bin/tail";
+	task.standardOutput = outputPipe;
+	task.arguments = [[paths startWith:@"-f"] array];
+	return task;
 }

 #pragma mark Temporary Directory

 - (NSURL *)baseTemporaryDirectoryURL {
-	if (baseTemporaryDirectoryURL == nil) {
+	if (_baseTemporaryDirectoryURL == nil) {
 		NSURL *globalTemporaryDirectory = [NSURL fileURLWithPath:NSTemporaryDirectory() isDirectory:YES];
-		baseTemporaryDirectoryURL = [[globalTemporaryDirectory URLByAppendingPathComponent:@"com.github.SquirrelTests"] URLByAppendingPathComponent:[NSProcessInfo.processInfo globallyUniqueString]];
-
+		_baseTemporaryDirectoryURL = [[globalTemporaryDirectory URLByAppendingPathComponent:@"com.github.SquirrelTests"] URLByAppendingPathComponent:[NSProcessInfo.processInfo globallyUniqueString]];
+		
 		NSError *error = nil;
-		BOOL success = [NSFileManager.defaultManager createDirectoryAtURL:baseTemporaryDirectoryURL withIntermediateDirectories:YES attributes:nil error:&error];
-		XCTAssertTrue(success, @"Couldn't create temporary directory at %@: %@", baseTemporaryDirectoryURL, error);
+		BOOL success = [NSFileManager.defaultManager createDirectoryAtURL:_baseTemporaryDirectoryURL withIntermediateDirectories:YES attributes:nil error:&error];
+		STAssertTrue(success, @"Couldn't create temporary directory at %@: %@", _baseTemporaryDirectoryURL, error);

 		[self addCleanupBlock:^{
-			[NSFileManager.defaultManager removeItemAtURL:baseTemporaryDirectoryURL error:NULL];
-			baseTemporaryDirectoryURL = nil;
+			[NSFileManager.defaultManager removeItemAtURL:_baseTemporaryDirectoryURL error:NULL];
+			_baseTemporaryDirectoryURL = nil;
 		}];
 	}

-	return baseTemporaryDirectoryURL;
+	return _baseTemporaryDirectoryURL;
 }

 - (NSURL *)temporaryDirectoryURL {
@@ -144,7 +178,7 @@ QuickConfigurationEnd

 	NSError *error = nil;
 	BOOL success = [NSFileManager.defaultManager createDirectoryAtURL:temporaryDirectoryURL withIntermediateDirectories:YES attributes:nil error:&error];
-	XCTAssertTrue(success, @"Couldn't create temporary directory at %@: %@", temporaryDirectoryURL, error);
+	STAssertTrue(success, @"Couldn't create temporary directory at %@: %@", temporaryDirectoryURL, error);

 	return temporaryDirectoryURL;
 }
@@ -154,15 +188,24 @@ QuickConfigurationEnd
 - (NSURL *)testApplicationURL {
 	NSURL *fixtureURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication.app" isDirectory:YES];
 	if (![NSFileManager.defaultManager fileExistsAtPath:fixtureURL.path]) {
-		NSURL *bundleURL = [SQRLTestBundle() URLForResource:@"TestApplication" withExtension:@"app"];
-		XCTAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
+		NSURL *bundleURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication" withExtension:@"app"];
+		STAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");

 		NSError *error = nil;
 		BOOL success = [NSFileManager.defaultManager copyItemAtURL:bundleURL toURL:fixtureURL error:&error];
-		XCTAssertTrue(success, @"Couldn't copy %@ to %@: %@", bundleURL, fixtureURL, error);
+		STAssertTrue(success, @"Couldn't copy %@ to %@: %@", bundleURL, fixtureURL, error);

 		NSURL *testAppLog = [fixtureURL.URLByDeletingLastPathComponent URLByAppendingPathComponent:@"TestApplication.log"];
 		[[NSData data] writeToURL:testAppLog atomically:YES];
+
+		NSTask *readTestApp = [self.class tailTaskWithPaths:[RACSignal return:testAppLog.path]];
+		[readTestApp launch];
+
+		STAssertTrue([readTestApp isRunning], @"Could not start task %@ to read %@", readTestApp, testAppLog);
+
+		[self addCleanupBlock:^{
+			[readTestApp terminate];
+		}];
 	}

 	return fixtureURL;
@@ -171,8 +214,8 @@ QuickConfigurationEnd
 - (NSBundle *)testApplicationBundle {
 	NSURL *fixtureURL = self.testApplicationURL;
 	NSBundle *bundle = [NSBundle bundleWithURL:fixtureURL];
-	XCTAssertNotNil(bundle, @"Couldn't open bundle at %@", fixtureURL);
-
+	STAssertNotNil(bundle, @"Couldn't open bundle at %@", fixtureURL);
+	
 	return bundle;
 }

@@ -191,7 +234,7 @@ QuickConfigurationEnd

 	NSError *error = nil;
 	NSRunningApplication *app = [NSWorkspace.sharedWorkspace launchApplicationAtURL:self.testApplicationURL options:NSWorkspaceLaunchWithoutAddingToRecents | NSWorkspaceLaunchWithoutActivation | NSWorkspaceLaunchNewInstance | NSWorkspaceLaunchAndHide configuration:configuration error:&error];
-	XCTAssertNotNil(app, @"Could not launch app at %@: %@", self.testApplicationURL, error);
+	STAssertNotNil(app, @"Could not launch app at %@: %@", self.testApplicationURL, error);

 	[self addCleanupBlock:^{
 		if (!app.terminated) {
@@ -211,12 +254,12 @@ QuickConfigurationEnd
 }

 - (NSURL *)createTestApplicationUpdate {
-	NSURL *originalURL = [SQRLTestBundle() URLForResource:@"TestApplication 2.1" withExtension:@"app"];
-	XCTAssertNotNil(originalURL, @"Couldn't find TestApplication update in test bundle");
+	NSURL *originalURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication 2.1" withExtension:@"app"];
+	STAssertNotNil(originalURL, @"Couldn't find TestApplication update in test bundle");

 	NSError *error = nil;
 	NSURL *updateParentURL = [NSFileManager.defaultManager URLForDirectory:NSItemReplacementDirectory inDomain:NSUserDomainMask appropriateForURL:self.baseTemporaryDirectoryURL create:YES error:&error];
-	XCTAssertNotNil(updateParentURL, @"Could not create temporary directory for updating: %@", error);
+	STAssertNotNil(updateParentURL, @"Could not create temporary directory for updating: %@", error);

 	[self addCleanupBlock:^{
 		[NSFileManager.defaultManager removeItemAtURL:updateParentURL error:NULL];
@@ -224,18 +267,18 @@ QuickConfigurationEnd

 	NSURL *updateURL = [updateParentURL URLByAppendingPathComponent:originalURL.lastPathComponent isDirectory:YES];
 	BOOL success = [NSFileManager.defaultManager copyItemAtURL:originalURL toURL:updateURL error:&error];
-	XCTAssertTrue(success, @"Couldn't copy %@ to %@: %@", originalURL, updateURL, error);
+	STAssertTrue(success, @"Couldn't copy %@ to %@: %@", originalURL, updateURL, error);

 	return updateURL;
 }

 - (id)performWithTestApplicationRequirement:(id (^)(SecRequirementRef requirement))block {
-	NSURL *bundleURL = [SQRLTestBundle() URLForResource:@"TestApplication" withExtension:@"app"];
-	XCTAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
+	NSURL *bundleURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication" withExtension:@"app"];
+	STAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");

 	SecStaticCodeRef staticCode = NULL;
 	OSStatus status = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
-	XCTAssertTrue(status == noErr, @"Error creating static code object for %@", bundleURL);
+	STAssertTrue(status == noErr, @"Error creating static code object for %@", bundleURL);

 	@onExit {
 		if (staticCode != NULL) CFRelease(staticCode);
@@ -243,7 +286,7 @@ QuickConfigurationEnd

 	SecRequirementRef requirement = NULL;
 	status = SecCodeCopyDesignatedRequirement(staticCode, kSecCSDefaultFlags, &requirement);
-	XCTAssertTrue(status == noErr, @"Error getting designated requirement of %@", staticCode);
+	STAssertTrue(status == noErr, @"Error getting designated requirement of %@", staticCode);

 	@onExit {
 		if (requirement != NULL) CFRelease(requirement);
@@ -253,57 +296,48 @@ QuickConfigurationEnd
 }

 - (SQRLCodeSignature *)testApplicationSignature {
-	NSURL *bundleURL = [SQRLTestBundle() URLForResource:@"TestApplication" withExtension:@"app"];
-	XCTAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
+	return [self performWithTestApplicationRequirement:^(SecRequirementRef requirement) {
+		return [[SQRLCodeSignature alloc] initWithRequirement:requirement];
+	}];
+}

-	NSError *error = nil;
-	SQRLCodeSignature *signature = [SQRLCodeSignature signatureWithBundle:bundleURL error:&error];
-	XCTAssertNotNil(signature, @"Error getting signature for bundle at %@: %@", bundleURL, error);
+- (NSData *)testApplicationCodeSigningRequirementData {
+	return [self performWithTestApplicationRequirement:^(SecRequirementRef requirement) {
+		CFDataRef data = NULL;
+		OSStatus status = SecRequirementCopyData(requirement, kSecCSDefaultFlags, &data);
+		STAssertTrue(status == noErr, @"Error copying data for requirement %@", requirement);

-	return signature;
+		return CFBridgingRelease(data);
+	}];
 }

 - (SQRLDirectoryManager *)shipItDirectoryManager {
 	NSString *identifier = SQRLShipItLauncher.shipItJobLabel;
 	SQRLDirectoryManager *manager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:identifier];
-	XCTAssertNotNil(manager, @"Could not create directory manager for %@", identifier);
+	STAssertNotNil(manager, @"Could not create directory manager for %@", identifier);

 	return manager;
 }

- (void)installWithRequest:(SQRLShipItRequest *)request remote:(BOOL)remote {
-	if (remote) {
-		expect(@([[request writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL])).to(beTruthy());
+- (void)launchShipIt {
+	NSError *error = nil;
+	STAssertTrue([[SQRLShipItLauncher launchPrivileged:NO] waitUntilCompleted:&error], @"Could not launch ShipIt: %@", error);

-		__block NSError *error = nil;
-		expect(@([[SQRLShipItLauncher launchPrivileged:NO] waitUntilCompleted:&error])).to(beTruthy());
-		expect(error).to(beNil());
+	[self addCleanupBlock:^{
+		// Remove ShipIt's launchd job so it doesn't relaunch itself.
+		SMJobRemove(kSMDomainUserLaunchd, (__bridge CFStringRef)SQRLShipItLauncher.shipItJobLabel, NULL, true, NULL);

-		[self addCleanupBlock:^{
-			// Remove ShipIt's launchd job so it doesn't relaunch itself.
-			SMJobRemove(kSMDomainUserLaunchd, (__bridge CFStringRef)SQRLShipItLauncher.shipItJobLabel, NULL, true, NULL);
-
-			NSError *lookupError;
-			NSURL *stateURL = [[self.shipItDirectoryManager shipItStateURL] firstOrDefault:nil success:NULL error:&lookupError];
-			expect(stateURL).notTo(beNil());
-			expect(lookupError).to(beNil());
-
-			[NSFileManager.defaultManager removeItemAtURL:stateURL error:NULL];
-		}];
-	} else {
-		SQRLInstaller *installer = [[SQRLInstaller alloc] initWithApplicationIdentifier:self.shipItDirectoryManager.applicationIdentifier];
-		expect(installer).notTo(beNil());
-
-		NSError *installedError = nil;
-		BOOL installed = [[installer.installUpdateCommand execute:request] asynchronouslyWaitUntilCompleted:&installedError];
-		expect(@(installed)).to(beTruthy());
-		expect(installedError).to(beNil());
-	}
+		NSError *lookupError = nil;
+		NSURL *stateURL = [[self.shipItDirectoryManager shipItStateURL] firstOrDefault:nil success:NULL error:&lookupError];
+		STAssertNotNil(stateURL, @"Could not find state URL from %@: %@", self.shipItDirectoryManager, lookupError);
+		
+		[NSFileManager.defaultManager removeItemAtURL:stateURL error:NULL];
+	}];
 }

 - (NSURL *)createAndMountDiskImageNamed:(NSString *)name fromDirectory:(NSURL *)directoryURL {
 	NSURL *destinationURL = [self.baseTemporaryDirectoryURL URLByAppendingPathComponent:name];
-	XCTAssertNotNil(destinationURL, @"Could not create disk image URL for %@", directoryURL);
+	STAssertNotNil(destinationURL, @"Could not create disk image URL for %@", directoryURL);

 	NSString *createInvocation;
 	if (directoryURL == nil) {
@@ -312,24 +346,20 @@ QuickConfigurationEnd
 		createInvocation = [NSString stringWithFormat:@"hdiutil create '%@' -fs 'HFS+' -volname '%@' -format UDSP -size 10m -srcfolder '%@' -quiet", destinationURL.path, name, directoryURL.path];
 	}

-	expect(@(system(createInvocation.UTF8String))).to(equal(@0));
+	expect(system(createInvocation.UTF8String)).to.equal(0);

 	NSString *mountInvocation = [NSString stringWithFormat:@"hdiutil attach '%@.sparseimage' -noverify -noautofsck -readwrite -quiet", destinationURL.path];
-	expect(@(system(mountInvocation.UTF8String))).to(equal(@0));
+	expect(system(mountInvocation.UTF8String)).to.equal(0);

 	NSString *path = [NSString stringWithFormat:@"/Volumes/%@", name];
 	[self addCleanupBlock:^{
 		NSString *detachInvocation = [NSString stringWithFormat:@"hdiutil detach '%@' -force -quiet", path];
-		expect(@(system(detachInvocation.UTF8String))).to(equal(@0));
+		expect(system(detachInvocation.UTF8String)).to.equal(0);
 	}];

 	return [NSURL fileURLWithPath:path isDirectory:YES];
 }

- (BOOL)isRunningOnTravis {
-	return NSProcessInfo.processInfo.environment[@"TRAVIS"] != nil;
-}
-
@end

 #pragma clang diagnostic pop
@@ -6,27 +6,22 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
-QuickSpecBegin(SQRLUpdateSpec)
+SpecBegin(SQRLUpdate)

 it(@"should return nil when initialised without a url", ^{
 	NSError *error = nil;
 	SQRLUpdate *update = [[SQRLUpdate alloc] initWithDictionary:@{} error:&error];
-	expect(update).to(beNil());
-	expect(error.domain).to(equal(NSCocoaErrorDomain));
-	expect(@(error.code)).to(equal(@(NSKeyValueValidationError)));
+	expect(update).to.beNil();
+	expect(error.domain).to.equal(NSCocoaErrorDomain);
+	expect(error.code).to.equal(NSKeyValueValidationError);
 });

 it(@"should return nil when initialised with a url not in URL syntax", ^{
 	NSError *error = nil;
 	SQRLUpdate *update = [[SQRLUpdate alloc] initWithDictionary:@{ @"updateURL": [NSURL URLWithString:@"test"] } error:&error];
-	expect(update).to(beNil());
-	expect(error.domain).to(equal(NSCocoaErrorDomain));
-	expect(@(error.code)).to(equal(@(NSKeyValueValidationError)));
+	expect(update).to.beNil();
+	expect(error.domain).to.equal(NSCocoaErrorDomain);
+	expect(error.code).to.equal(NSKeyValueValidationError);
 });

 it(@"should validate release name and notes", ^{
@@ -37,20 +32,20 @@ it(@"should validate release name and notes", ^{
 		@"releaseNotes": [[NSObject alloc] init]
 	} error:NULL];

-	expect(update).notTo(beNil());
-	expect(update.updateURL).to(equal(updateURL));
-	expect(update.releaseName).to(beNil());
-	expect(update.releaseNotes).to(beNil());
+	expect(update).notTo.beNil();
+	expect(update.updateURL).to.equal(updateURL);
+	expect(update.releaseName).to.beNil();
+	expect(update.releaseNotes).to.beNil();
 });

 it(@"should parse Central style dates", ^{
 	SQRLUpdate *update = [MTLJSONAdapter modelOfClass:SQRLUpdate.class fromJSONDictionary:@{ @"url": @"http://example.com/update", @"pub_date": @"Tue Sep 17 10:24:27 -0700 2013" } error:NULL];
-	expect(update.releaseDate).to(equal([NSDate dateWithTimeIntervalSince1970:1379438667]));
+	expect(update.releaseDate).notTo.beNil();
 });

 it(@"should parse ISO 8601 dates", ^{
 	SQRLUpdate *update = [MTLJSONAdapter modelOfClass:SQRLUpdate.class fromJSONDictionary:@{ @"url": @"http://example.com/update", @"pub_date": @"2013-09-18T13:17:07+01:00" } error:NULL];
-	expect(update.releaseDate).to(equal([NSDate dateWithTimeIntervalSince1970:1379506627]));
+	expect(update.releaseDate).notTo.beNil();
 });

-QuickSpecEnd
+SpecEnd
@@ -6,63 +6,37 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
 #import "SQRLDirectoryManager.h"
-#import "SQRLUpdater.h"
 #import "SQRLZipArchiver.h"

-#import "OHHTTPStubs/OHHTTPStubs.h"
-#import "QuickSpec+SQRLFixtures.h"
 #import "SQRLTestUpdate.h"
-#import "TestAppConstants.h"
-#import <objc/objc-class.h>
+#import "OHHTTPStubs/OHHTTPStubs.h"

-//! force Updater to believe we are not on readonly, to continue downloading the release
-bool isRunningOnReadOnlyVolumeImp(id self, SEL _cmd)
-{
-	return false;
-}
-
-//! we don't want updateFromJSONData to be executed. It is enough to know if it was called
-bool updateFromJSONDataIsCalled = false;
-RACSignal * updateFromJSONDataImp(id self, SEL _cmd, NSData * data)
-{
-	NSString* str = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-
-	NSLog(@"updateFromJSONDataImp called with %@", str);
-	updateFromJSONDataIsCalled = true;
-	return false;
-}
-
-QuickSpecBegin(SQRLUpdaterSpec)
+SpecBegin(SQRLUpdater)

 __block NSURL *JSONURL;

 void (^writeUpdate)(SQRLUpdate *) = ^(SQRLUpdate *update) {
 	NSDictionary *updateInfo = [MTLJSONAdapter JSONDictionaryFromModel:update];
-	expect(updateInfo).notTo(beNil());
+	expect(updateInfo).notTo.beNil();

 	NSError *error = nil;
 	NSData *JSON = [NSJSONSerialization dataWithJSONObject:updateInfo options:NSJSONWritingPrettyPrinted error:&error];
-	expect(JSON).notTo(beNil());
-	expect(error).to(beNil());
+	expect(JSON).notTo.beNil();
+	expect(error).to.beNil();

 	BOOL success = [JSON writeToURL:JSONURL options:NSDataWritingAtomic error:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();
 };

 NSURL * (^zipUpdate)(NSURL *) = ^(NSURL *updateURL) {
 	NSURL *zipFolderURL = [NSFileManager.defaultManager URLForDirectory:NSItemReplacementDirectory inDomain:NSUserDomainMask appropriateForURL:self.temporaryDirectoryURL create:YES error:NULL];
-	expect(zipFolderURL).notTo(beNil());
+	expect(zipFolderURL).notTo.beNil();

 	NSURL *zippedUpdateURL = [[zipFolderURL URLByAppendingPathComponent:updateURL.lastPathComponent] URLByAppendingPathExtension:@"zip"];
 	BOOL success = [[SQRLZipArchiver createZipArchiveAtURL:zippedUpdateURL fromDirectoryAtURL:updateURL] asynchronouslyWaitUntilCompleted:NULL];
-	expect(@(success)).to(beTruthy());
+	expect(success).to.beTruthy();

 	return zippedUpdateURL;
 };
@@ -78,164 +52,32 @@ beforeEach(^{
 	JSONURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"update.json"];
 });

-
-describe(@"checkForUpdatesCommand", ^{
-
-	/** 
-	 control test behavior via env variables:
-	 
-	 SQUIRREL_TEST_LOCAL_SERVER=True
-	 SQUIRREL_LOCAL_SERVER_URL=http://localhost:8123/update/osx/1.0.1-stable/stable
-	 SQUIRREL_TEST_LOCAL_CDN=True
-	 SQUIRREL_CDN_URL=@"http://localhost/RELEASES.json"
-
-	 */
-
-	OHHTTPStubs *stubsJson = [OHHTTPStubs shouldStubRequestsPassingTest:^(NSURLRequest *request) {
-		return [request.URL.absoluteString isEqualToString:@"http://localhost/RELEASES.json?method=Json"];
-	} withStubResponse:^(NSURLRequest *request) {
-		NSDictionary *newReleaseJSON = @{
-										 @"version": @"0.0.145",
-										 @"name": @"my-stub-release",
-										 @"notes": @"mock release for automated tests, json",
-										 @"pub_date": @"2017-03-09T15:24:55-05:00",
-										 @"url": @"http://localhost/myapp-0.0.145.zip"
-										 };
-
-		NSError * err;
-		NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:newReleaseJSON options:0 error:&err];
-
-		return [OHHTTPStubsResponse responseWithData:jsonData statusCode:200 responseTime:0 headers:nil];
-	}];
-
-	OHHTTPStubs *stubsReleaseServer = [OHHTTPStubs shouldStubRequestsPassingTest:^(NSURLRequest *request) {
-		return [request.URL.absoluteString isEqualToString:@"http://localhost:8123/update/osx/1.0.1-stable/stable?method=ReleaseServer"];
-	} withStubResponse:^(NSURLRequest *request) {
-		NSDictionary *newReleaseJSON = @{
-										 @"version": @"0.0.145",
-										 @"name": @"my-stub-release",
-										 @"notes": @"mock release for automated tests, release server",
-										 @"pub_date": @"2017-03-09T15:24:55-05:00",
-										 @"url": @"http://localmyappng-0.0.145.zip"
-										 };
-
-		NSError * err;
-		NSData * jsonData = [NSJSONSerialization  dataWithJSONObject:newReleaseJSON options:0 error:&err];
-
-		return [OHHTTPStubsResponse responseWithData:jsonData statusCode:200 responseTime:0 headers:nil];
-	}];
-
-	[self addCleanupBlock:^{
-		[OHHTTPStubs removeRequestHandler:stubsJson];
-		[OHHTTPStubs removeRequestHandler:stubsReleaseServer];
-	}];
-
-	BOOL testLocalServer = [[[[NSProcessInfo processInfo]environment]objectForKey:@"SQUIRREL_TEST_LOCAL_SERVER"] boolValue];
-	NSString* localServerURL = [[[NSProcessInfo processInfo]environment]objectForKey:@"SQUIRREL_LOCAL_SERVER_URL"];
-	if(!localServerURL) {
-		localServerURL = @"http://localhost:8123/update/osx/1.0.1-stable/stable?method=ReleaseServer";
-	}
-	BOOL testLocalCdn = [[[[NSProcessInfo processInfo]environment]objectForKey:@"SQUIRREL_TEST_LOCAL_CDN"] boolValue];
-	NSString* localCdnURL = [[[NSProcessInfo processInfo]environment]objectForKey:@"SQUIRREL_CDN_URL"];
-	if(!localCdnURL) {
-		localCdnURL = @"http://localhost/RELEASES.json?method=Json";
-	}
-
-	NSLog(@"testLocalServer %d %@", testLocalServer, localServerURL);
-	NSLog(@"testLocalCdn %d %@", testLocalCdn, localCdnURL);
-
-	__block SQRLUpdater *updater = nil;
-	__block NSURLRequest *localRequest = nil;
-
-	it(@"Squirrel should work with a release server", ^{
-		
-		if(testLocalServer) {
-
-			updateFromJSONDataIsCalled = false;
-			
-			//! setup the updater
-			localRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:localServerURL]];
-			updater = [[SQRLUpdater alloc] initWithUpdateRequest:localRequest];
-			
-			//! replace updateFromJSONData() and isRunningOnReadOnlyVolume() methods
-			method_setImplementation(class_getInstanceMethod([SQRLUpdater class]
-															 , @selector(updateFromJSONData:))
-									 , (IMP) updateFromJSONDataImp);
-			
-			method_setImplementation(class_getInstanceMethod([SQRLUpdater class]
-															 , @selector(isRunningOnReadOnlyVolume))
-									 , (IMP) isRunningOnReadOnlyVolumeImp);
-			
-			NSError *error = nil;
-			BOOL result = [[updater.checkForUpdatesCommand execute:nil] asynchronouslyWaitUntilCompleted:&error];
-			
-			//! now check the results
-			expect((int)updater.state).toEventually(equal((int)SQRLUpdaterStateIdle));
-			expect( (BOOL) updateFromJSONDataIsCalled ).to(beTrue());
-			expect( (BOOL) result ).to(beTrue());
-		}
-	});
-
-	it(@"Squirrel should work with a CDN", ^{
-
-		if(testLocalCdn) {
-			updateFromJSONDataIsCalled = false;
-			
-			//! setup the updater
-			localRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:localCdnURL]];
-			updater = [[SQRLUpdater alloc] initWithUpdateRequest:localRequest];
-			
-			//! replace updateFromJSONData() and isRunningOnReadOnlyVolume() methods
-			method_setImplementation(class_getInstanceMethod([SQRLUpdater class]
-															 , @selector(updateFromJSONData:))
-									 , (IMP) updateFromJSONDataImp);
-
-			method_setImplementation(class_getInstanceMethod([SQRLUpdater class]
-															 , @selector(isRunningOnReadOnlyVolume))
-									 , (IMP) isRunningOnReadOnlyVolumeImp);
-			
-			NSError *error = nil;
-			BOOL result = [[updater.checkForUpdatesCommand execute:nil] asynchronouslyWaitUntilCompleted:&error];
-			
-			//! now check the results
-			expect((int)updater.state).toEventually(equal((int)SQRLUpdaterStateIdle));
-			expect( (BOOL) updateFromJSONDataIsCalled ).to(beTrue());
-			expect( (BOOL) result ).to(beTrue());
-		}
-	});
-
-});
-
 describe(@"updating", ^{
 	__block NSURL *updateURL;
-
+	
 	beforeEach(^{
 		updateURL = [self createTestApplicationUpdate];
 	});

 	it(@"should use the application's bundled version of Squirrel and update in-place", ^{
-		SKIP_IF_RUNNING_ON_TRAVIS
-
 		NSError *error = nil;
 		SQRLTestUpdate *update = [SQRLTestUpdate modelWithDictionary:@{
 			@"updateURL": zipUpdate(updateURL),
 			@"final": @YES
 		} error:&error];
-		expect(update).notTo(beNil());
-		expect(error).to(beNil());
+		expect(update).notTo.beNil();
+		expect(error).to.beNil();

 		writeUpdate(update);

 		NSRunningApplication *app = launchWithEnvironment(nil);
-		expect(@(app.terminated)).withTimeout(SQRLLongTimeout).toEventually(beTruthy());
-		expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+		expect(app.terminated).will.beTruthy();
+		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
 	});

 	it(@"should not install a corrupt update", ^{
-		SKIP_IF_RUNNING_ON_TRAVIS
-
 		NSURL *codeSignatureURL = [updateURL URLByAppendingPathComponent:@"Contents/_CodeSignature"];
-		expect(@([NSFileManager.defaultManager removeItemAtURL:codeSignatureURL error:NULL])).to(beTruthy());
+		expect([NSFileManager.defaultManager removeItemAtURL:codeSignatureURL error:NULL]).to.beTruthy();

 		SQRLTestUpdate *update = [SQRLTestUpdate modelWithDictionary:@{
 			@"updateURL": zipUpdate(updateURL),
@@ -245,16 +87,14 @@ describe(@"updating", ^{
 		writeUpdate(update);

 		NSRunningApplication *app = launchWithEnvironment(nil);
-		expect(@(app.terminated)).withTimeout(SQRLLongTimeout).toEventually(beTruthy());
+		expect(app.terminated).will.beTruthy();

 		// Give the update some time to finish installing.
 		[NSThread sleepForTimeInterval:0.2];
-		expect(self.testApplicationBundleVersion).to(equal(SQRLTestApplicationOriginalShortVersionString));
+		expect(self.testApplicationBundleVersion).to.equal(SQRLTestApplicationOriginalShortVersionString);
 	});

 	it(@"should update to the most recently enqueued job", ^{
-		SKIP_IF_RUNNING_ON_TRAVIS
-
 		SQRLTestUpdate *update = [SQRLTestUpdate modelWithDictionary:@{
 			@"updateURL": zipUpdate(self.testApplicationURL)
 		} error:NULL];
@@ -278,13 +118,11 @@ describe(@"updating", ^{

 		writeUpdate(update);

-		expect(@(app.terminated)).withTimeout(SQRLLongTimeout).toEventually(beTruthy());
-		expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+		expect(app.terminated).will.beTruthy();
+		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
 	});

 	it(@"should use the application's bundled version of Squirrel and update in-place after a significant delay", ^{
-		SKIP_IF_RUNNING_ON_TRAVIS
-		
 		SQRLTestUpdate *update = [SQRLTestUpdate modelWithDictionary:@{
 			@"updateURL": zipUpdate(updateURL),
 			@"final": @YES
@@ -292,29 +130,31 @@ describe(@"updating", ^{

 		writeUpdate(update);

-		NSTimeInterval delay = 15;
+		NSTimeInterval delay = 30;
 		NSRunningApplication *app = launchWithEnvironment(@{ @"SQRLUpdateDelay": [NSString stringWithFormat:@"%f", delay] });

-		expect(@(app.terminated)).withTimeout(delay + SQRLLongTimeout).toEventually(beTruthy());
-		expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+		Expecta.asynchronousTestTimeout = delay + 3;
+		expect(app.terminated).will.beTruthy();
+
+		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
 	});

 	describe(@"cleaning up", ^{
 		__block NSURL *appSupportURL;
 		__block RACSignal *updateDirectoryURLs;
-
+		
 		beforeEach(^{
 			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:@"com.github.Squirrel.TestApplication.ShipIt"];

-			appSupportURL = [[directoryManager storageURL] first];
-			expect(appSupportURL).notTo(beNil());
+			appSupportURL = [[directoryManager applicationSupportURL] first];
+			expect(appSupportURL).notTo.beNil();

 			updateDirectoryURLs = [[RACSignal
 				defer:^{
 					NSArray *contents = [NSFileManager.defaultManager contentsOfDirectoryAtURL:appSupportURL includingPropertiesForKeys:nil options:0 error:NULL];
 					if (contents == nil) return [RACSignal empty];

-					return contents.rac_sequence.signal;
+					return contents.rac_signal;
 				}]
 				filter:^(NSURL *directoryURL) {
 					return [directoryURL.lastPathComponent hasPrefix:@"update."];
@@ -322,25 +162,28 @@ describe(@"updating", ^{
 		});

 		it(@"should remove downloaded archives after updating", ^{
-			SKIP_IF_RUNNING_ON_TRAVIS
-
 			NSError *error = nil;
 			SQRLTestUpdate *update = [SQRLTestUpdate modelWithDictionary:@{
 				@"updateURL": zipUpdate(updateURL),
 				@"final": @YES
 			} error:&error];

-			expect(update).notTo(beNil());
-			expect(error).to(beNil());
+			expect(update).notTo.beNil();
+			expect(error).to.beNil();

 			writeUpdate(update);

-			NSRunningApplication *app = launchWithEnvironment(@{ @"SQRLUpdateRequestCount": @2 });
-			expect([updateDirectoryURLs toArray]).toEventuallyNot(equal(@[]));
-			expect(@(app.terminated)).withTimeout(SQRLLongTimeout).toEventually(beTruthy());
-			expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+			NSRunningApplication *app = launchWithEnvironment(nil);
+			expect(app.terminated).will.beTruthy();
+			expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);

-			expect([updateDirectoryURLs toArray]).toEventually(equal(@[]));
+			// Also test that this is the only update directory (any others
+			// should've been removed).
+			NSArray *directoryURLs = [updateDirectoryURLs array];
+			expect(directoryURLs.count).to.equal(1);
+
+			NSArray *contents = [NSFileManager.defaultManager contentsOfDirectoryAtURL:directoryURLs[0] includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles error:NULL];
+			expect(contents).to.equal(@[]);
 		});
 	});
 });
@@ -349,7 +192,7 @@ describe(@"response handling", ^{
 	__block NSURLRequest *localRequest = nil;
 	__block SQRLUpdater *updater = nil;

-	beforeEach(^{
+	before(^{
 		localRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"fake://host/path"]];
 		updater = [[SQRLUpdater alloc] initWithUpdateRequest:localRequest];
 	});
@@ -365,10 +208,10 @@ describe(@"response handling", ^{
 		}];

 		NSError *error = nil;
-		BOOL result = [[updater.checkForUpdatesCommand execute:nil] asynchronouslyWaitUntilCompleted:&error];
-		expect(@(result)).to(beFalsy());
-		expect(error.domain).to(equal(SQRLUpdaterErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLUpdaterErrorInvalidServerResponse)));
+		BOOL result = [[updater.checkForUpdatesAction signalWithValue:nil] asynchronouslyWaitUntilCompleted:&error];
+		expect(result).to.beFalsy();
+		expect(error.domain).to.equal(SQRLUpdaterErrorDomain);
+		expect(error.code).to.equal(SQRLUpdaterErrorInvalidServerResponse);
 	});

 	it(@"should return an error for non JSON data", ^{
@@ -382,73 +225,11 @@ describe(@"response handling", ^{
 		}];

 		NSError *error = nil;
-		BOOL result = [[updater.checkForUpdatesCommand execute:nil] asynchronouslyWaitUntilCompleted:&error];
-		expect(@(result)).to(beFalsy());
-		expect(error.domain).to(equal(SQRLUpdaterErrorDomain));
-		expect(@(error.code)).to(equal(@(SQRLUpdaterErrorInvalidServerBody)));
+		BOOL result = [[updater.checkForUpdatesAction signalWithValue:nil] asynchronouslyWaitUntilCompleted:&error];
+		expect(result).to.beFalsy();
+		expect(error.domain).to.equal(SQRLUpdaterErrorDomain);
+		expect(error.code).to.equal(SQRLUpdaterErrorInvalidServerBody);
 	});
 });

-static RACSignal * (^stateNotificationListener)(void) = ^ {
-	return [[[NSDistributedNotificationCenter.defaultCenter
-		rac_addObserverForName:SQRLTestAppUpdaterStateTransitionNotificationName object:nil]
-		map:^(NSNotification *notification) {
-			return notification.userInfo[SQRLTestAppUpdaterStateKey];
-		}]
-		setNameWithFormat:@"stateNotificationListener"];
-};
-
-describe(@"state", ^{
-	it(@"should transition through idle, checking and idle, when there is no update", ^{
-		SKIP_IF_RUNNING_ON_TRAVIS
-
-		NSMutableArray *states = [NSMutableArray array];
-		[stateNotificationListener() subscribeNext:^(NSNumber *state) {
-			[states addObject:state];
-		}];
-
-		NSRunningApplication *testApplication = launchWithEnvironment(nil);
-
-		NSArray *expectedStates = @[
-			@(SQRLUpdaterStateIdle),
-			@(SQRLUpdaterStateCheckingForUpdate),
-			@(SQRLUpdaterStateIdle),
-		];
-		expect(states).toEventually(equal(expectedStates));
-
-		expect(@(testApplication.terminated)).withTimeout(SQRLLongTimeout).toEventually(beTruthy());
-	});
-
-	it(@"should transition through idle, checking, downloading and awaiting relaunch, when there is an update", ^{
-		SKIP_IF_RUNNING_ON_TRAVIS
-
-		NSMutableArray *states = [NSMutableArray array];
-		[stateNotificationListener() subscribeNext:^(NSNumber *state) {
-			[states addObject:state];
-		}];
-
-		NSError *error;
-		SQRLTestUpdate *update = [SQRLTestUpdate modelWithDictionary:@{
-			@"updateURL": zipUpdate([self createTestApplicationUpdate]),
-			@"final": @YES,
-		} error:&error];
-		expect(update).notTo(beNil());
-		expect(error).to(beNil());
-
-		writeUpdate(update);
-
-		NSRunningApplication *testApplication = launchWithEnvironment(nil);
-
-		NSArray *expectedStates = @[
-			@(SQRLUpdaterStateIdle),
-			@(SQRLUpdaterStateCheckingForUpdate),
-			@(SQRLUpdaterStateDownloadingUpdate),
-			@(SQRLUpdaterStateAwaitingRelaunch),
-		];
-		expect(states).withTimeout(SQRLLongTimeout).toEventually(equal(expectedStates));
-
-		expect(@(testApplication.terminated)).withTimeout(SQRLLongTimeout).toEventually(beTruthy());
-	});
-});
-
-QuickSpecEnd
+SpecEnd
@@ -6,44 +6,38 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //

-#import <Nimble/Nimble.h>
-#import <Quick/Quick.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <Squirrel/Squirrel.h>
-
-#import "QuickSpec+SQRLFixtures.h"
 #import "SQRLCodeSignature.h"
 #import "SQRLZipArchiver.h"

-QuickSpecBegin(SQRLZipArchiverSpec)
+SpecBegin(SQRLZipArchiver)

 it(@"should extract a zip archive created by the Finder", ^{
 	NSURL *zipURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication.app" withExtension:@"zip"];

 	NSError *error = nil;
 	BOOL success = [[SQRLZipArchiver unzipArchiveAtURL:zipURL intoDirectoryAtURL:self.temporaryDirectoryURL] asynchronouslyWaitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();

 	NSURL *extractedAppURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication 2.1.app"];
-	expect(@([NSFileManager.defaultManager fileExistsAtPath:extractedAppURL.path])).to(beTruthy());
+	expect([NSFileManager.defaultManager fileExistsAtPath:extractedAppURL.path]).to.beTruthy();

 	success = [[self.testApplicationSignature verifyBundleAtURL:extractedAppURL] waitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();
 });

 it(@"should fail to extract a nonexistent zip archive", ^{
 	NSError *error = nil;
 	BOOL success = [[SQRLZipArchiver unzipArchiveAtURL:[self.temporaryDirectoryURL URLByAppendingPathComponent:@"foo.zip"] intoDirectoryAtURL:self.temporaryDirectoryURL] asynchronouslyWaitUntilCompleted:&error];
-	expect(@(success)).to(beFalsy());
+	expect(success).to.beFalsy();

 	NSLog(@"%@", error);

-	expect(error).notTo(beNil());
-	expect(error.domain).to(equal(SQRLZipArchiverErrorDomain));
-	expect(@(error.code)).to(equal(@(SQRLZipArchiverShellTaskFailed)));
-	expect(error.userInfo[SQRLZipArchiverExitCodeErrorKey]).notTo(equal(0));
+	expect(error).notTo.beNil();
+	expect(error.domain).to.equal(SQRLZipArchiverErrorDomain);
+	expect(error.code).to.equal(SQRLZipArchiverShellTaskFailed);
+	expect(error.userInfo[SQRLZipArchiverExitCodeErrorKey]).notTo.equal(0);
 });

 it(@"should create a zip archive readable by itself", ^{
@@ -51,21 +45,21 @@ it(@"should create a zip archive readable by itself", ^{

 	NSError *error = nil;
 	BOOL success = [[SQRLZipArchiver createZipArchiveAtURL:zipURL fromDirectoryAtURL:self.testApplicationURL] asynchronouslyWaitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();

-	expect(@([NSFileManager.defaultManager fileExistsAtPath:zipURL.path])).to(beTruthy());
+	expect([NSFileManager.defaultManager fileExistsAtPath:zipURL.path]).to.beTruthy();

 	success = [[SQRLZipArchiver unzipArchiveAtURL:zipURL intoDirectoryAtURL:self.temporaryDirectoryURL] asynchronouslyWaitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();

 	NSURL *extractedAppURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication.app"];
-	expect(@([NSFileManager.defaultManager fileExistsAtPath:extractedAppURL.path])).to(beTruthy());
+	expect([NSFileManager.defaultManager fileExistsAtPath:extractedAppURL.path]).to.beTruthy();

 	success = [[self.testApplicationSignature verifyBundleAtURL:extractedAppURL] waitUntilCompleted:&error];
-	expect(@(success)).to(beTruthy());
-	expect(error).to(beNil());
+	expect(success).to.beTruthy();
+	expect(error).to.beNil();
 });

-QuickSpecEnd
+SpecEnd
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>com.github.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -0,0 +1,25 @@
+//
+//  SquirrelTests-Prefix.pch
+//  Squirrel
+//
+//  Created by Justin Spahr-Summers on 2013-07-21.
+//  Copyright (c) 2013 GitHub. All rights reserved.
+//
+
+#ifdef __OBJC__
+	#import <Cocoa/Cocoa.h>
+	#import <SenTestingKit/SenTestingKit.h>
+
+	#import <Mantle/Mantle.h>
+	#import <ReactiveCocoa/ReactiveCocoa.h>
+	#import <ReactiveCocoa/EXTScope.h>
+	#import <Squirrel/Squirrel.h>
+
+	#define SPT_SUBCLASS SQRLTestCase
+	#import "Specta.h"
+
+	#define EXP_SHORTHAND
+	#import "Expecta.h"
+
+	#import "SQRLTestCase.h"
+#endif
@@ -1,19 +0,0 @@
-//
-//  SwiftSpec.swift
-//  ReactiveCocoa
-//
-//  Created by Justin Spahr-Summers on 2014-10-14.
-//  Copyright (c) 2014 GitHub. All rights reserved.
-//
-
-import Foundation
-import Nimble
-import Quick
-
-// Without this, the Swift stdlib won't be linked into the test target (even if
-// “Embedded Content Contains Swift Code” is enabled).
-class SwiftSpec: QuickSpec {
-	override func spec() {
-		expect(true).to(beTruthy())
-	}
-}
@@ -1 +0,0 @@
-Versions/Current/Headers
@@ -1 +0,0 @@
-Versions/Current/Mantle
@@ -1 +0,0 @@
-Versions/Current/Modules
@@ -1 +0,0 @@
-Versions/Current/Resources
@@ -1,172 +0,0 @@
-//
-//  MTLJSONAdapter.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2013-02-12.
-//  Copyright (c) 2013 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class MTLModel;
-
-// A MTLModel object that supports being parsed from and serialized to JSON.
-@protocol MTLJSONSerializing
-@required
-
-// Specifies how to map property keys to different key paths in JSON.
-//
-// Subclasses overriding this method should combine their values with those of
-// `super`.
-//
-// Any property keys not present in the dictionary are assumed to match the JSON
-// key that should be used. Any keys associated with NSNull will not participate
-// in JSON serialization.
-//
-// Returns a dictionary mapping property keys to JSON key paths (as strings) or
-// NSNull values.
-+ (NSDictionary *)JSONKeyPathsByPropertyKey;
-
-@optional
-
-// Specifies how to convert a JSON value to the given property key. If
-// reversible, the transformer will also be used to convert the property value
-// back to JSON.
-//
-// If the receiver implements a `+<key>JSONTransformer` method, MTLJSONAdapter
-// will use the result of that method instead.
-//
-// Returns a value transformer, or nil if no transformation should be performed.
-+ (NSValueTransformer *)JSONTransformerForKey:(NSString *)key;
-
-// Overridden to parse the receiver as a different class, based on information
-// in the provided dictionary.
-//
-// This is mostly useful for class clusters, where the abstract base class would
-// be passed into -[MTLJSONAdapter initWithJSONDictionary:modelClass:], but
-// a subclass should be instantiated instead.
-//
-// JSONDictionary - The JSON dictionary that will be parsed.
-//
-// Returns the class that should be parsed (which may be the receiver), or nil
-// to abort parsing (e.g., if the data is invalid).
-+ (Class)classForParsingJSONDictionary:(NSDictionary *)JSONDictionary;
-
-@end
-
-// The domain for errors originating from MTLJSONAdapter.
-extern NSString * const MTLJSONAdapterErrorDomain;
-
-// +classForParsingJSONDictionary: returned nil for the given dictionary.
-extern const NSInteger MTLJSONAdapterErrorNoClassFound;
-
-// The provided JSONDictionary is not valid.
-extern const NSInteger MTLJSONAdapterErrorInvalidJSONDictionary;
-
-// The model's implementation of +JSONKeyPathsByPropertyKey included a key which
-// does not actually exist in +propertyKeys.
-extern const NSInteger MTLJSONAdapterErrorInvalidJSONMapping;
-
-// Converts a MTLModel object to and from a JSON dictionary.
-@interface MTLJSONAdapter : NSObject
-
-// The model object that the receiver was initialized with, or that the receiver
-// parsed from a JSON dictionary.
-@property (nonatomic, strong, readonly) MTLModel<MTLJSONSerializing> *model;
-
-// Attempts to parse a JSON dictionary into a model object.
-//
-// modelClass     - The MTLModel subclass to attempt to parse from the JSON.
-//                  This class must conform to <MTLJSONSerializing>. This
-//                  argument must not be nil.
-// JSONDictionary - A dictionary representing JSON data. This should match the
-//                  format returned by NSJSONSerialization. If this argument is
-//                  nil, the method returns nil.
-// error          - If not NULL, this may be set to an error that occurs during
-//                  parsing or initializing an instance of `modelClass`.
-//
-// Returns an instance of `modelClass` upon success, or nil if a parsing error
-// occurred.
-+ (id)modelOfClass:(Class)modelClass fromJSONDictionary:(NSDictionary *)JSONDictionary error:(NSError **)error;
-
-// Attempts to parse an array of JSON dictionary objects into a model objects
-// of a specific class.
-//
-// modelClass - The MTLModel subclass to attempt to parse from the JSON. This
-//              class must conform to <MTLJSONSerializing>. This argument must
-//              not be nil.
-// JSONArray  - A array of dictionaries representing JSON data. This should
-//              match the format returned by NSJSONSerialization. If this
-//              argument is nil, the method returns nil.
-// error      - If not NULL, this may be set to an error that occurs during
-//              parsing or initializing an any of the instances of
-//              `modelClass`.
-//
-// Returns an array of `modelClass` instances upon success, or nil if a parsing
-// error occurred.
-+ (NSArray *)modelsOfClass:(Class)modelClass fromJSONArray:(NSArray *)JSONArray error:(NSError **)error;
-
-// Converts a model into a JSON representation.
-//
-// model - The model to use for JSON serialization. This argument must not be
-//         nil.
-//
-// Returns a JSON dictionary, or nil if a serialization error occurred.
-+ (NSDictionary *)JSONDictionaryFromModel:(MTLModel<MTLJSONSerializing> *)model;
-
-// Converts a array of models into a JSON representation.
-//
-// models - The array of models to use for JSON serialization. This argument
-//          must not be nil.
-//
-// Returns a JSON array, or nil if a serialization error occurred for any
-// model.
-+ (NSArray *)JSONArrayFromModels:(NSArray *)models;
-
-// Initializes the receiver by attempting to parse a JSON dictionary into
-// a model object.
-//
-// JSONDictionary - A dictionary representing JSON data. This should match the
-//                  format returned by NSJSONSerialization. If this argument is
-//                  nil, the method returns nil and an error with code
-//                  MTLJSONAdapterErrorInvalidJSONDictionary.
-// modelClass     - The MTLModel subclass to attempt to parse from the JSON.
-//                  This class must conform to <MTLJSONSerializing>. This
-//                  argument must not be nil.
-// error          - If not NULL, this may be set to an error that occurs during
-//                  parsing or initializing an instance of `modelClass`.
-//
-// Returns an initialized adapter upon success, or nil if a parsing error
-// occurred.
- (id)initWithJSONDictionary:(NSDictionary *)JSONDictionary modelClass:(Class)modelClass error:(NSError **)error;
-
-// Initializes the receiver with an existing model.
-//
-// model - The model to use for JSON serialization. This argument must not be
-//         nil.
- (id)initWithModel:(MTLModel<MTLJSONSerializing> *)model;
-
-// Serializes the receiver's `model` into JSON.
-//
-// Returns a JSON dictionary, or nil if a serialization error occurred.
- (NSDictionary *)JSONDictionary;
-
-// Looks up the JSON key path in the model's +propertyKeys.
-//
-// Subclasses may override this method to customize the adapter's seralizing
-// behavior. You should not call this method directly.
-//
-// key - The property key to retrieve the corresponding JSON key path for. This
-//       argument must not be nil.
-//
-// Returns a key path to use, or nil to omit the property from JSON.
- (NSString *)JSONKeyPathForPropertyKey:(NSString *)key;
-
-@end
-
-@interface MTLJSONAdapter (Deprecated)
-
-+ (id)modelOfClass:(Class)modelClass fromJSONDictionary:(NSDictionary *)JSONDictionary __attribute__((deprecated("Replaced by +modelOfClass:fromJSONDictionary:error:")));
- (id)initWithJSONDictionary:(NSDictionary *)JSONDictionary modelClass:(Class)modelClass __attribute__((deprecated("Replaced by -initWithJSONDictionary:modelClass:error:")));
-
-@end
@@ -1,215 +0,0 @@
-//
-//  MTLManagedObjectAdapter.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2013-03-29.
-//  Copyright (c) 2013 GitHub. All rights reserved.
-//
-
-#import <CoreData/CoreData.h>
-
-@class MTLModel;
-
-// A MTLModel object that supports being serialized to and from Core Data as an
-// NSManagedObject.
-@protocol MTLManagedObjectSerializing
-@required
-
-// The name of the Core Data entity that the receiver serializes to and
-// deserializes from.
-//
-// This method must not return nil.
-+ (NSString *)managedObjectEntityName;
-
-// Specifies how to map property keys to different keys on the receiver's
-// +managedObjectEntity.
-//
-// Entity attributes will be mapped to and from the receiver's properties using
-// +entityAttributeTransformerForKey:. Entity relationships will be mapped to
-// and from MTLModel objects using +relationshipModelClassesByPropertyKey.
-// Fetched properties are not supported.
-//
-// Subclasses overriding this method should combine their values with those of
-// `super`.
-//
-// Any property keys not present in the dictionary are assumed to match the
-// entity key that should be used. Any keys associated with NSNull will not
-// participate in managed object serialization.
-//
-// Returns a dictionary mapping property keys to entity keys (as strings) or
-// NSNull values.
-+ (NSDictionary *)managedObjectKeysByPropertyKey;
-
-@optional
-
-// Specifies a set of property keys used by the adapter to check for an already
-// existing managed object when converting the MTLModel to its related
-// NSManagedObject.
-//
-// The adapter will first map any keys provided by this method to the correct
-// keys in managedObjectKeysByPropertyKey.
-//
-// The adapter will then perform a fetch request in the provided context for a
-// managed object that matches the MTLModel's managedObjectEntityName and has
-// equal values set for the property keys on the MTLModel.
-//
-// The managed object returned by the fetch request will then be set with all
-// values from the MTLModel that the managed object is being converted from.
-//
-// If a property value of our MTLModel is yet another MTLModel which needs to be
-// converted to a managed object, the class for that MTLModel can also implement
-// this method to perform its own uniqing.
-//
-// For example:
-// 1. An MTLModel subclass has id_number = 10.
-// 2. An NSManagedObject accessible to the adapter's context has idnumber = 10.
-// 3. managedObjectKeysByPropertyKey returns @{@"id_number" : @"idnumber"}
-// 4. propertyKeysForManagedObjectUniquing returns
-//    [NSSet setWithObject:@"id_number"];
-// 5. Then our fetch request may return this managed object (or another managed
-//    object with idnumber = 10).
-//
-// NOTE: If multiple managed objects follow the same uniquing criteria only one
-// of them will be set with our MTLModel's values.
-+ (NSSet *)propertyKeysForManagedObjectUniquing;
-
-// Specifies how to convert the given property key to a managed object
-// attribute. If reversible, the transformer will also be used to convert the
-// managed object attribute back to the property.
-//
-// If the receiver implements a `+<key>EntityAttributeTransformer` method,
-// MTLManagedObjectAdapter will use the result of that method instead.
-//
-// Returns a value transformer, or nil if no transformation should be performed.
-+ (NSValueTransformer *)entityAttributeTransformerForKey:(NSString *)key;
-
-// Specifies the MTLModel subclasses that should be deserialized to the
-// receiver's property keys when a property key corresponds to an entity
-// relationship.
-//
-// In other words, the dictionary returned by this method is used to decode
-// managed object relationships into MTLModels (or NSArrays or NSSets thereof)
-// set on the receiver.
-//
-// If a property key is omitted from the returned dictionary, but present in
-// +managedObjectKeysByPropertyKey, and the receiver's +managedObjectEntity has
-// a relationship at the corresponding key, an exception will be thrown during
-// deserialization.
-//
-// Subclasses overriding this method should combine their values with those of
-// `super`.
-//
-// Returns a dictionary mapping property keys to the Class objects that should
-// be used.
-+ (NSDictionary *)relationshipModelClassesByPropertyKey;
-
-// Overridden to deserialize a different class instead of the receiver, based on
-// information in the provided object.
-//
-// This is mostly useful for class clusters, where the abstract base class would
-// be passed into +[MTLManagedObjectAdapter
-// modelOfClass:fromManagedObject:error:], but a subclass should be instantiated
-// instead.
-//
-// managedObject - The object that will be deserialized.
-//
-// Returns the class that should be instantiated (which may be the receiver), or
-// nil to abort parsing (e.g., if the data is invalid).
-+ (Class)classForDeserializingManagedObject:(NSManagedObject *)managedObject;
-
-// Overriden when merging the value of the given key on the receiver with the
-// value of the same key from the given `NSManagedObject` requires custom
-// handling.
-//
-// By default, this method is not implemented, and precedence will be given to
-// the value of the receiving model implicitly.
-//
-// When implemented, this method is called when an existing `NSManagedObject`
-// is found for the receiving model, before updating the `NSManagedObject`'s
-// properties.
-//
-// When implementing, you should use `+managedObjectKeysByPropertyKey` to map
-// the given `key` to the appropriate `NSManagedObject` property.
- (void)mergeValueForKey:(NSString *)key fromManagedObject:(NSManagedObject *)managedObject;
-
-// Overriden when merging values on the receiver with the given
-// `NSManagedObject` requires custom handling.
-//
-// By default, this method is not implemented, and precedence will be given to
-// the values of the receiving model implicitly.
-//
-// When implemented, this method is called when an existing `NSManagedObject`
-// is found for the receiving model, before updating the `NSManagedObject`'s
-// properties.
-//
-// When implementing, you should use `+managedObjectKeysByPropertyKey` to map
-// the given `key` to the appropriate `NSManagedObject` property.
-//
-// If you have also implemented `mergeValueForKey:fromManagedObject:` you have
-// to make sure to call `mergeValueForKey:fromManagedObject:` from this method
-// when appropriate.
- (void)mergeValuesForKeysFromManagedObject:(NSManagedObject *)managedObject;
-
-@end
-
-// The domain for errors originating from MTLManagedObjectAdapter.
-extern NSString * const MTLManagedObjectAdapterErrorDomain;
-
-// +classForDeserializingManagedObject: returned nil for the given object.
-extern const NSInteger MTLManagedObjectAdapterErrorNoClassFound;
-
-// An NSManagedObject failed to initialize.
-extern const NSInteger MTLManagedObjectAdapterErrorInitializationFailed;
-
-// The managed object key specified by +managedObjectKeysByPropertyKey does not
-// exist in the NSEntityDescription.
-extern const NSInteger MTLManagedObjectAdapterErrorInvalidManagedObjectKey;
-
-// The managed object property specified has a type that isn't supported by
-// MTLManagedObjectAdapter.
-extern const NSInteger MTLManagedObjectAdapterErrorUnsupportedManagedObjectPropertyType;
-
-// The fetch request to find an existing managed object based on
-// `+propertyKeysForManagedObjectUniquing` failed.
-extern const NSInteger MTLManagedObjectAdapterErrorUniqueFetchRequestFailed;
-
-// A MTLModel property cannot be serialized to or deserialized from an
-// NSManagedObject relationship.
-//
-// For a to-one relationship, this means that the property does not contain
-// a MTLModel, or the MTLModel does not conform to <MTLManagedObjectSerializing>.
-//
-// For a to-many relationship, this means that the property does not contain an
-// NSArray or NSSet of MTLModel<MTLManagedObjectSerializing> instances.
-extern const NSInteger MTLManagedObjectAdapterErrorUnsupportedRelationshipClass;
-
-// The model's implementation of +managedObjectKeysByPropertyKey included a key
-// which does not actually exist in +propertyKeys.
-extern const NSInteger MTLManagedObjectAdapterErrorInvalidManagedObjectMapping;
-
-// Converts a MTLModel object to and from an NSManagedObject.
-@interface MTLManagedObjectAdapter : NSObject
-
-// Attempts to deserialize an NSManagedObject into a MTLModel object.
-//
-// modelClass    - The MTLModel subclass to return. This class must conform to
-//                 <MTLManagedObjectSerializing>. This argument must not be nil.
-// managedObject - The managed object to deserialize. If this argument is nil,
-//                 the method returns nil.
-// error         - If not NULL, this may be set to an error that occurs during
-//                 deserialization or initializing an instance of `modelClass`.
-//
-// Returns an instance of `modelClass` upon success, or nil if an error
-// occurred.
-+ (id)modelOfClass:(Class)modelClass fromManagedObject:(NSManagedObject *)managedObject error:(NSError **)error;
-
-// Serializes a MTLModel into an NSManagedObject.
-//
-// model   - The model object to serialize. This argument must not be nil.
-// context - The context into which to insert the created managed object. This
-//           argument must not be nil.
-// error   - If not NULL, this may be set to an error that occurs during
-//           serialization or insertion.
-+ (id)managedObjectFromModel:(MTLModel<MTLManagedObjectSerializing> *)model insertingIntoContext:(NSManagedObjectContext *)context error:(NSError **)error;
-
-@end
@@ -1,128 +0,0 @@
-//
-//  MTLModel+NSCoding.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2013-02-12.
-//  Copyright (c) 2013 GitHub. All rights reserved.
-//
-
-#import "MTLModel.h"
-
-// Defines how a MTLModel property key should be encoded into an archive.
-//
-// MTLModelEncodingBehaviorExcluded      - The property should never be encoded.
-// MTLModelEncodingBehaviorUnconditional - The property should always be
-//                                         encoded.
-// MTLModelEncodingBehaviorConditional   - The object should be encoded only
-//                                         if unconditionally encoded elsewhere.
-//                                         This should only be used for object
-//                                         properties.
-typedef enum : NSUInteger {
-    MTLModelEncodingBehaviorExcluded = 0,
-    MTLModelEncodingBehaviorUnconditional,
-    MTLModelEncodingBehaviorConditional,
-} MTLModelEncodingBehavior;
-
-// Implements default archiving and unarchiving behaviors for MTLModel.
-@interface MTLModel (NSCoding) <NSCoding>
-
-// Initializes the receiver from an archive.
-//
-// This will decode the original +modelVersion of the archived object, then
-// invoke -decodeValueForKey:withCoder:modelVersion: for each of the receiver's
-// +propertyKeys.
-//
-// Returns an initialized model object, or nil if a decoding error occurred.
- (id)initWithCoder:(NSCoder *)coder;
-
-// Archives the receiver using the given coder.
-//
-// This will encode the receiver's +modelVersion, then the receiver's properties
-// according to the behaviors specified in +encodingBehaviorsByPropertyKey.
- (void)encodeWithCoder:(NSCoder *)coder;
-
-// Determines how the +propertyKeys of the class are encoded into an archive.
-// The values of this dictionary should be boxed MTLModelEncodingBehavior
-// values.
-//
-// Any keys not present in the dictionary will be excluded from the archive.
-//
-// Subclasses overriding this method should combine their values with those of
-// `super`.
-//
-// Returns a dictionary mapping the receiver's +propertyKeys to default encoding
-// behaviors. If a property is an object with `weak` semantics, the default
-// behavior is MTLModelEncodingBehaviorConditional; otherwise, the default is
-// MTLModelEncodingBehaviorUnconditional.
-+ (NSDictionary *)encodingBehaviorsByPropertyKey;
-
-// Determines the classes that are allowed to be decoded for each of the
-// receiver's properties when using <NSSecureCoding>. The values of this
-// dictionary should be NSArrays of Class objects.
-//
-// If any encodable keys (as determined by +encodingBehaviorsByPropertyKey) are
-// not present in the dictionary, an exception will be thrown during secure
-// encoding or decoding.
-//
-// Subclasses overriding this method should combine their values with those of
-// `super`.
-//
-// Returns a dictionary mapping the receiver's encodable keys (as determined by
-// +encodingBehaviorsByPropertyKey) to default allowed classes, based on the
-// type that each property is declared as. If type of an encodable property
-// cannot be determined (e.g., it is declared as `id`), it will be omitted from
-// the dictionary, and subclasses must provide a valid value to prevent an
-// exception being thrown during encoding/decoding.
-+ (NSDictionary *)allowedSecureCodingClassesByPropertyKey;
-
-// Decodes the value of the given property key from an archive.
-//
-// By default, this method looks for a `-decode<Key>WithCoder:modelVersion:`
-// method on the receiver, and invokes it if found.
-//
-// If the custom method is not implemented and `coder` does not require secure
-// coding, `-[NSCoder decodeObjectForKey:]` will be invoked with the given
-// `key`.
-//
-// If the custom method is not implemented and `coder` requires secure coding,
-// `-[NSCoder decodeObjectOfClasses:forKey:]` will be invoked with the
-// information from +allowedSecureCodingClassesByPropertyKey and the given `key`. The
-// receiver must conform to <NSSecureCoding> for this to work correctly.
-//
-// key          - The property key to decode the value for. This argument cannot
-//                be nil.
-// coder        - The NSCoder representing the archive being decoded. This
-//                argument cannot be nil.
-// modelVersion - The version of the original model object that was encoded.
-//
-// Returns the decoded and boxed value, or nil if the key was not present.
- (id)decodeValueForKey:(NSString *)key withCoder:(NSCoder *)coder modelVersion:(NSUInteger)modelVersion;
-
-// The version of this MTLModel subclass.
-//
-// This version number is saved in archives so that later model changes can be
-// made backwards-compatible with old versions.
-//
-// Subclasses should override this method to return a higher version number
-// whenever a breaking change is made to the model.
-//
-// Returns 0.
-+ (NSUInteger)modelVersion;
-
-@end
-
-// This method must be overridden to support archives created by older versions
-// of Mantle (before the `MTLModel+NSCoding` interface existed).
-@interface MTLModel (OldArchiveSupport)
-
-// Converts an archived external representation to a dictionary suitable for
-// passing to -initWithDictionary:.
-//
-// externalRepresentation - The decoded external representation of the receiver.
-// fromVersion            - The model version at the time the external
-//                          representation was encoded.
-//
-// Returns nil by default, indicating that conversion failed.
-+ (NSDictionary *)dictionaryValueFromArchivedExternalRepresentation:(NSDictionary *)externalRepresentation version:(NSUInteger)fromVersion;
-
-@end
@@ -1,125 +0,0 @@
-//
-//  MTLModel.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2012-09-11.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-// An abstract base class for model objects, using reflection to provide
-// sensible default behaviors.
-//
-// The default implementations of <NSCopying>, -hash, and -isEqual: make use of
-// the +propertyKeys method.
-@interface MTLModel : NSObject <NSCopying>
-
-// Returns a new instance of the receiver initialized using
-// -initWithDictionary:error:.
-+ (instancetype)modelWithDictionary:(NSDictionary *)dictionaryValue error:(NSError **)error;
-
-// Initializes the receiver with default values.
-//
-// This is the designated initializer for this class.
- (instancetype)init;
-
-// Initializes the receiver using key-value coding, setting the keys and values
-// in the given dictionary.
-//
-// Subclass implementations may override this method, calling the super
-// implementation, in order to perform further processing and initialization
-// after deserialization.
-//
-// dictionaryValue - Property keys and values to set on the receiver. Any NSNull
-//                   values will be converted to nil before being used. KVC
-//                   validation methods will automatically be invoked for all of
-//                   the properties given. If nil, this method is equivalent to
-//                   -init.
-// error           - If not NULL, this may be set to any error that occurs
-//                   (like a KVC validation error).
-//
-// Returns an initialized model object, or nil if validation failed.
- (instancetype)initWithDictionary:(NSDictionary *)dictionaryValue error:(NSError **)error;
-
-// Returns the keys for all @property declarations, except for `readonly`
-// properties without ivars, or properties on MTLModel itself.
-+ (NSSet *)propertyKeys;
-
-// A dictionary representing the properties of the receiver.
-//
-// The default implementation combines the values corresponding to all
-// +propertyKeys into a dictionary, with any nil values represented by NSNull.
-//
-// This property must never be nil.
-@property (nonatomic, copy, readonly) NSDictionary *dictionaryValue;
-
-// Merges the value of the given key on the receiver with the value of the same
-// key from the given model object, giving precedence to the other model object.
-//
-// By default, this method looks for a `-merge<Key>FromModel:` method on the
-// receiver, and invokes it if found. If not found, and `model` is not nil, the
-// value for the given key is taken from `model`.
- (void)mergeValueForKey:(NSString *)key fromModel:(MTLModel *)model;
-
-// Merges the values of the given model object into the receiver, using
-// -mergeValueForKey:fromModel: for each key in +propertyKeys.
-//
-// `model` must be an instance of the receiver's class or a subclass thereof.
- (void)mergeValuesForKeysFromModel:(MTLModel *)model;
-
-// Compares the receiver with another object for equality.
-//
-// The default implementation is equivalent to comparing both models'
-// -dictionaryValue.
-//
-// Note that this may lead to infinite loops if the receiver holds a circular
-// reference to another MTLModel and both use the default behavior.
-// It is recommended to override -isEqual: in this scenario.
- (BOOL)isEqual:(id)object;
-
-// A string that describes the contents of the receiver.
-//
-// The default implementation is based on the receiver's class and its
-// -dictionaryValue.
-//
-// Note that this may lead to infinite loops if the receiver holds a circular
-// reference to another MTLModel and both use the default behavior.
-// It is recommended to override -description in this scenario.
- (NSString *)description;
-
-@end
-
-// Implements validation logic for MTLModel.
-@interface MTLModel (Validation)
-
-// Validates the model.
-//
-// The default implementation simply invokes -validateValue:forKey:error: with
-// all +propertyKeys and their current value. If -validateValue:forKey:error:
-// returns a new value, the property is set to that new value.
-//
-// error - If not NULL, this may be set to any error that occurs during
-//         validation
-//
-// Returns YES if the model is valid, or NO if the validation failed.
- (BOOL)validate:(NSError **)error;
-
-@end
-
-@interface MTLModel (Unavailable)
-
-+ (instancetype)modelWithDictionary:(NSDictionary *)dictionaryValue __attribute__((deprecated("Replaced by +modelWithDictionary:error:")));
- (instancetype)initWithDictionary:(NSDictionary *)dictionaryValue __attribute__((deprecated("Replaced by -initWithDictionary:error:")));
-
-+ (instancetype)modelWithExternalRepresentation:(NSDictionary *)externalRepresentation __attribute__((deprecated("Replaced by -[MTLJSONAdapter initWithJSONDictionary:modelClass:]")));
- (instancetype)initWithExternalRepresentation:(NSDictionary *)externalRepresentation __attribute__((deprecated("Replaced by -[MTLJSONAdapter initWithJSONDictionary:modelClass:]")));
-
-@property (nonatomic, copy, readonly) NSDictionary *externalRepresentation __attribute__((deprecated("Replaced by MTLJSONAdapter.JSONDictionary")));
-
-+ (NSDictionary *)externalRepresentationKeyPathsByPropertyKey __attribute__((deprecated("Replaced by +JSONKeyPathsByPropertyKey in <MTLJSONSerializing>")));
-+ (NSValueTransformer *)transformerForKey:(NSString *)key __attribute__((deprecated("Replaced by +JSONTransformerForKey: in <MTLJSONSerializing>")));
-
-+ (NSDictionary *)migrateExternalRepresentation:(NSDictionary *)externalRepresentation fromVersion:(NSUInteger)fromVersion __attribute__((deprecated("Replaced by -decodeValueForKey:withCoder:modelVersion:")));
-
-@end
@@ -1,29 +0,0 @@
-//
-//  MTLValueTransformer.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2012-09-11.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef id (^MTLValueTransformerBlock)(id);
-
-//
-// A value transformer supporting block-based transformation.
-//
-@interface MTLValueTransformer : NSValueTransformer
-
-// Returns a transformer which transforms values using the given block. Reverse
-// transformations will not be allowed.
-+ (instancetype)transformerWithBlock:(MTLValueTransformerBlock)transformationBlock;
-
-// Returns a transformer which transforms values using the given block, for
-// forward or reverse transformations.
-+ (instancetype)reversibleTransformerWithBlock:(MTLValueTransformerBlock)transformationBlock;
-
-// Returns a transformer which transforms values using the given blocks.
-+ (instancetype)reversibleTransformerWithForwardBlock:(MTLValueTransformerBlock)forwardBlock reverseBlock:(MTLValueTransformerBlock)reverseBlock;
-
-@end
@@ -1,26 +0,0 @@
-//
-//  Mantle.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2012-09-04.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for Mantle.
-FOUNDATION_EXPORT double MantleVersionNumber;
-
-//! Project version string for Mantle.
-FOUNDATION_EXPORT const unsigned char MantleVersionString[];
-
-#import <Mantle/MTLJSONAdapter.h>
-#import <Mantle/MTLManagedObjectAdapter.h>
-#import <Mantle/MTLModel.h>
-#import <Mantle/MTLModel+NSCoding.h>
-#import <Mantle/MTLValueTransformer.h>
-#import <Mantle/NSArray+MTLManipulationAdditions.h>
-#import <Mantle/NSDictionary+MTLManipulationAdditions.h>
-#import <Mantle/NSObject+MTLComparisonAdditions.h>
-#import <Mantle/NSValueTransformer+MTLInversionAdditions.h>
-#import <Mantle/NSValueTransformer+MTLPredefinedTransformerAdditions.h>
@@ -1,28 +0,0 @@
-//
-//  NSArray+MTLManipulationAdditions.h
-//  Mantle
-//
-//  Created by Josh Abernathy on 9/19/12.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface NSArray (MTLManipulationAdditions)
-
-// The first object in the array or nil if the array is empty.
-// Forwards to `firstObject` which has been first declared in iOS7, but works with iOS4/10.6.
-@property (nonatomic, readonly, strong) id mtl_firstObject;
-
-// Returns a new array without all instances of the given object.
- (NSArray *)mtl_arrayByRemovingObject:(id)object;
-
-// Returns a new array without the first object. If the array is empty, it
-// returns the empty array.
- (NSArray *)mtl_arrayByRemovingFirstObject;
-
-// Returns a new array without the last object. If the array is empty, it
-// returns the empty array.
- (NSArray *)mtl_arrayByRemovingLastObject;
-
-@end
@@ -1,25 +0,0 @@
-//
-//  NSDictionary+MTLManipulationAdditions.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2012-09-24.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface NSDictionary (MTLManipulationAdditions)
-
-// Merges the keys and values from the given dictionary into the receiver. If
-// both the receiver and `dictionary` have a given key, the value from
-// `dictionary` is used.
-//
-// Returns a new dictionary containing the entries of the receiver combined with
-// those of `dictionary`.
- (NSDictionary *)mtl_dictionaryByAddingEntriesFromDictionary:(NSDictionary *)dictionary;
-
-// Creates a new dictionary with all the entries for the given keys removed from
-// the receiver.
- (NSDictionary *)mtl_dictionaryByRemovingEntriesWithKeys:(NSSet *)keys;
-
-@end
@@ -1,15 +0,0 @@
-//
-//  NSObject+MTLComparisonAdditions.h
-//  Mantle
-//
-//  Created by Josh Vera on 10/26/12.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-//  Portions copyright (c) 2011 Bitswift. All rights reserved.
-//  See the LICENSE file for more information.
-//
-
-#import <Foundation/Foundation.h>
-
-// Returns whether both objects are identical or equal via -isEqual:
-BOOL MTLEqualObjects(id obj1, id obj2);
@@ -1,21 +0,0 @@
-//
-//  NSValueTransformer+MTLInversionAdditions.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2013-05-18.
-//  Copyright (c) 2013 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface NSValueTransformer (MTLInversionAdditions)
-
-// Flips the direction of the receiver's transformation, such that
-// -transformedValue: will become -reverseTransformedValue:, and vice-versa.
-//
-// The receiver must allow reverse transformation.
-//
-// Returns an inverted transformer.
- (NSValueTransformer *)mtl_invertedTransformer;
-
-@end
@@ -1,84 +0,0 @@
-//
-//  NSValueTransformer+MTLPredefinedTransformerAdditions.h
-//  Mantle
-//
-//  Created by Justin Spahr-Summers on 2012-09-27.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-// The name for a value transformer that converts strings into URLs and back.
-extern NSString * const MTLURLValueTransformerName;
-
-// Ensure an NSNumber is backed by __NSCFBoolean/CFBooleanRef
-//
-// NSJSONSerialization, and likely other serialization libraries, ordinarily
-// serialize NSNumbers as numbers, and thus booleans would be serialized as
-// 0/1. The exception is when the NSNumber is backed by __NSCFBoolean, which,
-// though very much an implementation detail, is detected and serialized as a
-// proper boolean.
-extern NSString * const MTLBooleanValueTransformerName;
-
-@interface NSValueTransformer (MTLPredefinedTransformerAdditions)
-
-// Creates a reversible transformer to convert a JSON dictionary into a MTLModel
-// object, and vice-versa.
-//
-// modelClass - The MTLModel subclass to attempt to parse from the JSON. This
-//              class must conform to <MTLJSONSerializing>. This argument must
-//              not be nil.
-//
-// Returns a reversible transformer which uses MTLJSONAdapter for transforming
-// values back and forth.
-+ (NSValueTransformer *)mtl_JSONDictionaryTransformerWithModelClass:(Class)modelClass;
-
-// Creates a reversible transformer to convert an array of JSON dictionaries
-// into an array of MTLModel objects, and vice-versa.
-//
-// modelClass - The MTLModel subclass to attempt to parse from each JSON
-//              dictionary. This class must conform to <MTLJSONSerializing>.
-//              This argument must not be nil.
-//
-// Returns a reversible transformer which uses MTLJSONAdapter for transforming
-// array elements back and forth.
-+ (NSValueTransformer *)mtl_JSONArrayTransformerWithModelClass:(Class)modelClass;
-
-// A reversible value transformer to transform between the keys and objects of a
-// dictionary.
-//
-// dictionary          - The dictionary whose keys and values should be
-//                       transformed between. This argument must not be nil.
-// defaultValue        - The result to fall back to, in case no key matching the
-//                       input value was found during a forward transformation.
-// reverseDefaultValue - The result to fall back to, in case no value matching
-//                       the input value was found during a reverse
-//                       transformation.
-//
-// Can for example be used for transforming between enum values and their string
-// representation.
-//
-//   NSValueTransformer *valueTransformer = [NSValueTransformer mtl_valueMappingTransformerWithDictionary:@{
-//     @"foo": @(EnumDataTypeFoo),
-//     @"bar": @(EnumDataTypeBar),
-//   } defaultValue: @(EnumDataTypeUndefined) reverseDefaultValue: @"undefined"];
-//
-// Returns a transformer that will map from keys to values in dictionary
-// for forward transformation, and from values to keys for reverse
-// transformations. If no matching key or value can be found, the respective
-// default value is returned.
-+ (NSValueTransformer *)mtl_valueMappingTransformerWithDictionary:(NSDictionary *)dictionary defaultValue:(id)defaultValue reverseDefaultValue:(id)reverseDefaultValue;
-
-// Returns a value transformer created by calling
-// `+mtl_valueMappingTransformerWithDictionary:defaultValue:reverseDefaultValue:`
-// with a default value of `nil` and a reverse default value of `nil`.
-+ (NSValueTransformer *)mtl_valueMappingTransformerWithDictionary:(NSDictionary *)dictionary;
-
-@end
-
-@interface NSValueTransformer (UnavailableMTLPredefinedTransformerAdditions)
-
-+ (NSValueTransformer *)mtl_externalRepresentationTransformerWithModelClass:(Class)modelClass __attribute__((deprecated("Replaced by +mtl_JSONDictionaryTransformerWithModelClass:")));
-+ (NSValueTransformer *)mtl_externalRepresentationArrayTransformerWithModelClass:(Class)modelClass __attribute__((deprecated("Replaced by +mtl_JSONArrayTransformerWithModelClass:")));
-
-@end
@@ -1,6 +0,0 @@
-framework module Mantle {
-  umbrella header "Mantle.h"
-
-  export *
-  module * { export * }
-}
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>16F2104</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Mantle</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.mantle.Mantle</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Mantle</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string></string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>8E3004b</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>16E185</string>
-	<key>DTSDKName</key>
-	<string>macosx10.12</string>
-	<key>DTXcode</key>
-	<string>0833</string>
-	<key>DTXcodeBuild</key>
-	<string>8E3004b</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>
@@ -1,264 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/Info.plist</key>
-		<data>
-		5gOxsGY3VGVvebnR8eP1z3BDrls=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/MTLJSONAdapter.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			HIypP9pGI7Wk97RKy3thGsC7LSg=
-			</data>
-			<key>hash2</key>
-			<data>
-			YhksDrIzFk7TQllZD4eF2qEubtCfFlDrddfBeJEvpoc=
-			</data>
-		</dict>
-		<key>Headers/MTLManagedObjectAdapter.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			tjTyEh7TlZBAXcyaY1I1SmXHbE4=
-			</data>
-			<key>hash2</key>
-			<data>
-			WxYp7uqr+H3R5UnwMpDSHlxSt7MaAPhQob/BDXlWbVI=
-			</data>
-		</dict>
-		<key>Headers/MTLModel+NSCoding.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			2tdybjH/C8ZU8VcZrX4oliXkuM8=
-			</data>
-			<key>hash2</key>
-			<data>
-			QuzPKm76puk2/uZN0s9Jqn7g5AFF6xFbnBsN450IXfc=
-			</data>
-		</dict>
-		<key>Headers/MTLModel.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			9c2w4hZo7o/vLu/3TaZ2vXXjwxc=
-			</data>
-			<key>hash2</key>
-			<data>
-			2JEc6fCePU0odH+dDY8947O0/wS1Ey96Vuun1HCP564=
-			</data>
-		</dict>
-		<key>Headers/MTLValueTransformer.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			m6veNGSL5/Kif8yDXH5zU+2CaK8=
-			</data>
-			<key>hash2</key>
-			<data>
-			AnO4t0Ur5lBz44l14XRXgB3g6JEiUE1JBfPdvV+H7fA=
-			</data>
-		</dict>
-		<key>Headers/Mantle.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			TYIHtg+qqzl8yG0InqTB7Oyr63A=
-			</data>
-			<key>hash2</key>
-			<data>
-			YKN3UxwC4VdZ19A/VN8Ndpdf5PVHbZlYMb9K1etJKKg=
-			</data>
-		</dict>
-		<key>Headers/NSArray+MTLManipulationAdditions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			JkGLHSSIKlmCin6flems7m4llvE=
-			</data>
-			<key>hash2</key>
-			<data>
-			fQTG4WuuoxdNhgn6wDU29iy18nNqFwlK9F45NRbpD6w=
-			</data>
-		</dict>
-		<key>Headers/NSDictionary+MTLManipulationAdditions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			bqGP1ngOZeJ16AY5Vi/2ObZCmlw=
-			</data>
-			<key>hash2</key>
-			<data>
-			0Jf2Da8WIPOoV0BkwF1D69nsUwbgypRDMVoedgtuJ24=
-			</data>
-		</dict>
-		<key>Headers/NSObject+MTLComparisonAdditions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			2oBONz9+tBIWVjYGxYBIBT0b0n8=
-			</data>
-			<key>hash2</key>
-			<data>
-			86zL7jX96Spa7xT5HQJ+aYmtXD1oKLUrU4JtlO2cIqU=
-			</data>
-		</dict>
-		<key>Headers/NSValueTransformer+MTLInversionAdditions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			sxXToKdUH8yMt45aTwPeM3hKmjs=
-			</data>
-			<key>hash2</key>
-			<data>
-			6xpkrCw6Z2B3EOFKGMBi6o78Hau0v0zsfGJeQMAk354=
-			</data>
-		</dict>
-		<key>Headers/NSValueTransformer+MTLPredefinedTransformerAdditions.h</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			HhBKFxBsCIBfvD6Rm6d3yjVk540=
-			</data>
-			<key>hash2</key>
-			<data>
-			QAg6gyiNeq39mqhxZ/OttPualO+F1x2E99sNuyNE1ZE=
-			</data>
-		</dict>
-		<key>Modules/module.modulemap</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Bey/HDj6mfWAMaHrd42tLo2G6HA=
-			</data>
-			<key>hash2</key>
-			<data>
-			kjfaRu6wmQ32w9Db79wuDbkttAjOMC2jrLbtCbIzrSM=
-			</data>
-		</dict>
-		<key>Resources/Info.plist</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			5gOxsGY3VGVvebnR8eP1z3BDrls=
-			</data>
-			<key>hash2</key>
-			<data>
-			e6zwAZD1Y0oZhr5vq5p/9RM9J6llqdDsogAev9b3loI=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^[^/]+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
@@ -1 +0,0 @@
-A
@@ -1 +0,0 @@
-Versions/Current/Headers
@@ -1 +0,0 @@
-Versions/Current/Modules
@@ -1 +0,0 @@
-Versions/Current/ReactiveCocoa
@@ -1 +0,0 @@
-Versions/Current/Resources
@@ -1,68 +0,0 @@
-//
-//  EXTKeyPathCoding.h
-//  extobjc
-//
-//  Created by Justin Spahr-Summers on 19.06.12.
-//  Copyright (C) 2012 Justin Spahr-Summers.
-//  Released under the MIT license.
-//
-
-#import <Foundation/Foundation.h>
-#import "metamacros.h"
-
-/**
- * \@keypath allows compile-time verification of key paths. Given a real object
- * receiver and key path:
- *
- * @code
-
-NSString *UTF8StringPath = @keypath(str.lowercaseString.UTF8String);
-// => @"lowercaseString.UTF8String"
-
-NSString *versionPath = @keypath(NSObject, version);
-// => @"version"
-
-NSString *lowercaseStringPath = @keypath(NSString.new, lowercaseString);
-// => @"lowercaseString"
-
- * @endcode
- *
- * ... the macro returns an \c NSString containing all but the first path
- * component or argument (e.g., @"lowercaseString.UTF8String", @"version").
- *
- * In addition to simply creating a key path, this macro ensures that the key
- * path is valid at compile-time (causing a syntax error if not), and supports
- * refactoring, such that changing the name of the property will also update any
- * uses of \@keypath.
- */
-#define keypath(...) \
-    metamacro_if_eq(1, metamacro_argcount(__VA_ARGS__))(keypath1(__VA_ARGS__))(keypath2(__VA_ARGS__))
-
-#define keypath1(PATH) \
-    (((void)(NO && ((void)PATH, NO)), strchr(# PATH, '.') + 1))
-
-#define keypath2(OBJ, PATH) \
-    (((void)(NO && ((void)OBJ.PATH, NO)), # PATH))
-
-/**
- * \@collectionKeypath allows compile-time verification of key paths across collections NSArray/NSSet etc. Given a real object
- * receiver, collection object receiver and related keypaths:
- *
- * @code
- 
- NSString *employessFirstNamePath = @collectionKeypath(department.employees, Employee.new, firstName)
- // => @"employees.firstName"
- 
- NSString *employessFirstNamePath = @collectionKeypath(Department.new, employees, Employee.new, firstName)
- // => @"employees.firstName"
-
- * @endcode
- *
- */
-#define collectionKeypath(...) \
-    metamacro_if_eq(3, metamacro_argcount(__VA_ARGS__))(collectionKeypath3(__VA_ARGS__))(collectionKeypath4(__VA_ARGS__))
-
-#define collectionKeypath3(PATH, COLLECTION_OBJECT, COLLECTION_PATH) ([[NSString stringWithFormat:@"%s.%s",keypath(PATH), keypath(COLLECTION_OBJECT, COLLECTION_PATH)] UTF8String])
-
-#define collectionKeypath4(OBJ, PATH, COLLECTION_OBJECT, COLLECTION_PATH) ([[NSString stringWithFormat:@"%s.%s",keypath(OBJ, PATH), keypath(COLLECTION_OBJECT, COLLECTION_PATH)] UTF8String])
-
@@ -1,118 +0,0 @@
-//
-//  EXTScope.h
-//  extobjc
-//
-//  Created by Justin Spahr-Summers on 2011-05-04.
-//  Copyright (C) 2012 Justin Spahr-Summers.
-//  Released under the MIT license.
-//
-
-#import "metamacros.h"
-
-/**
- * \@onExit defines some code to be executed when the current scope exits. The
- * code must be enclosed in braces and terminated with a semicolon, and will be
- * executed regardless of how the scope is exited, including from exceptions,
- * \c goto, \c return, \c break, and \c continue.
- *
- * Provided code will go into a block to be executed later. Keep this in mind as
- * it pertains to memory management, restrictions on assignment, etc. Because
- * the code is used within a block, \c return is a legal (though perhaps
- * confusing) way to exit the cleanup block early.
- *
- * Multiple \@onExit statements in the same scope are executed in reverse
- * lexical order. This helps when pairing resource acquisition with \@onExit
- * statements, as it guarantees teardown in the opposite order of acquisition.
- *
- * @note This statement cannot be used within scopes defined without braces
- * (like a one line \c if). In practice, this is not an issue, since \@onExit is
- * a useless construct in such a case anyways.
- */
-#define onExit \
-    rac_keywordify \
-    __strong rac_cleanupBlock_t metamacro_concat(rac_exitBlock_, __LINE__) __attribute__((cleanup(rac_executeCleanupBlock), unused)) = ^
-
-/**
- * Creates \c __weak shadow variables for each of the variables provided as
- * arguments, which can later be made strong again with #strongify.
- *
- * This is typically used to weakly reference variables in a block, but then
- * ensure that the variables stay alive during the actual execution of the block
- * (if they were live upon entry).
- *
- * See #strongify for an example of usage.
- */
-#define weakify(...) \
-    rac_keywordify \
-    metamacro_foreach_cxt(rac_weakify_,, __weak, __VA_ARGS__)
-
-/**
- * Like #weakify, but uses \c __unsafe_unretained instead, for targets or
- * classes that do not support weak references.
- */
-#define unsafeify(...) \
-    rac_keywordify \
-    metamacro_foreach_cxt(rac_weakify_,, __unsafe_unretained, __VA_ARGS__)
-
-/**
- * Strongly references each of the variables provided as arguments, which must
- * have previously been passed to #weakify.
- *
- * The strong references created will shadow the original variable names, such
- * that the original names can be used without issue (and a significantly
- * reduced risk of retain cycles) in the current scope.
- *
- * @code
-
-    id foo = [[NSObject alloc] init];
-    id bar = [[NSObject alloc] init];
-
-    @weakify(foo, bar);
-
-    // this block will not keep 'foo' or 'bar' alive
-    BOOL (^matchesFooOrBar)(id) = ^ BOOL (id obj){
-        // but now, upon entry, 'foo' and 'bar' will stay alive until the block has
-        // finished executing
-        @strongify(foo, bar);
-
-        return [foo isEqual:obj] || [bar isEqual:obj];
-    };
-
- * @endcode
- */
-#define strongify(...) \
-    rac_keywordify \
-    _Pragma("clang diagnostic push") \
-    _Pragma("clang diagnostic ignored \"-Wshadow\"") \
-    metamacro_foreach(rac_strongify_,, __VA_ARGS__) \
-    _Pragma("clang diagnostic pop")
-
-/*** implementation details follow ***/
-typedef void (^rac_cleanupBlock_t)();
-
-static inline void rac_executeCleanupBlock (__strong rac_cleanupBlock_t *block) {
-    (*block)();
-}
-
-#define rac_weakify_(INDEX, CONTEXT, VAR) \
-    CONTEXT __typeof__(VAR) metamacro_concat(VAR, _weak_) = (VAR);
-
-#define rac_strongify_(INDEX, VAR) \
-    __strong __typeof__(VAR) VAR = metamacro_concat(VAR, _weak_);
-
-// Details about the choice of backing keyword:
-//
-// The use of @try/@catch/@finally can cause the compiler to suppress
-// return-type warnings.
-// The use of @autoreleasepool {} is not optimized away by the compiler,
-// resulting in superfluous creation of autorelease pools.
-//
-// Since neither option is perfect, and with no other alternatives, the
-// compromise is to use @autorelease in DEBUG builds to maintain compiler
-// analysis, and to use @try/@catch otherwise to avoid insertion of unnecessary
-// autorelease pools.
-#if DEBUG
-#define rac_keywordify autoreleasepool {}
-#else
-#define rac_keywordify try {} @catch (...) {}
-#endif
@@ -1,20 +0,0 @@
-//
-//  NSArray+RACSequenceAdditions.h
-//  ReactiveCocoa
-//
-//  Created by Justin Spahr-Summers on 2012-10-29.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class RACSequence;
-
-@interface NSArray (RACSequenceAdditions)
-
-/// Creates and returns a sequence corresponding to the receiver.
-///
-/// Mutating the receiver will not affect the sequence after it's been created.
-@property (nonatomic, copy, readonly) RACSequence *rac_sequence;
-
-@end
@@ -1,22 +0,0 @@
-//
-//  NSControl+RACCommandSupport.h
-//  ReactiveCocoa
-//
-//  Created by Josh Abernathy on 3/3/12.
-//  Copyright (c) 2012 GitHub, Inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@class RACCommand;
-
-@interface NSControl (RACCommandSupport)
-
-/// Sets the control's command. When the control is clicked, the command is
-/// executed with the sender of the event. The control's enabledness is bound
-/// to the command's `canExecute`.
-///
-/// Note: this will reset the control's target and action.
-@property (nonatomic, strong) RACCommand *rac_command;
-
-@end
@@ -1,24 +0,0 @@
-//
-//  NSControl+RACTextSignalSupport.h
-//  ReactiveCocoa
-//
-//  Created by Justin Spahr-Summers on 2013-03-08.
-//  Copyright (c) 2013 GitHub, Inc. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-@class RACSignal;
-
-@interface NSControl (RACTextSignalSupport)
-
-/// Observes a text-based control for changes.
-///
-/// Using this method on a control without editable text is considered undefined
-/// behavior.
-///
-/// Returns a signal which sends the current string value of the receiver, then
-/// the new value any time it changes.
- (RACSignal *)rac_textSignal;
-
-@end
@@ -1,22 +0,0 @@
-//
-//  NSData+RACSupport.h
-//  ReactiveCocoa
-//
-//  Created by Josh Abernathy on 5/11/12.
-//  Copyright (c) 2012 GitHub, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class RACScheduler;
-@class RACSignal;
-
-@interface NSData (RACSupport)
-
-// Read the data at the URL using -[NSData initWithContentsOfURL:options:error:].
-// Sends the data or the error.
-//
-// scheduler - cannot be nil.
-+ (RACSignal *)rac_readContentsOfURL:(NSURL *)URL options:(NSDataReadingOptions)options scheduler:(RACScheduler *)scheduler;
-
-@end
@@ -1,31 +0,0 @@
-//
-//  NSDictionary+RACSequenceAdditions.h
-//  ReactiveCocoa
-//
-//  Created by Justin Spahr-Summers on 2012-10-29.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class RACSequence;
-
-@interface NSDictionary (RACSequenceAdditions)
-
-/// Creates and returns a sequence of RACTuple key/value pairs. The key will be
-/// the first element in the tuple, and the value will be the second.
-///
-/// Mutating the receiver will not affect the sequence after it's been created.
-@property (nonatomic, copy, readonly) RACSequence *rac_sequence;
-
-/// Creates and returns a sequence corresponding to the keys in the receiver.
-///
-/// Mutating the receiver will not affect the sequence after it's been created.
-@property (nonatomic, copy, readonly) RACSequence *rac_keySequence;
-
-/// Creates and returns a sequence corresponding to the values in the receiver.
-///
-/// Mutating the receiver will not affect the sequence after it's been created.
-@property (nonatomic, copy, readonly) RACSequence *rac_valueSequence;
-
-@end
@@ -1,20 +0,0 @@
-//
-//  NSEnumerator+RACSequenceAdditions.h
-//  ReactiveCocoa
-//
-//  Created by Uri Baghin on 07/01/2013.
-//  Copyright (c) 2013 GitHub, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class RACSequence;
-
-@interface NSEnumerator (RACSequenceAdditions)
-
-/// Creates and returns a sequence corresponding to the receiver.
-///
-/// The receiver is exhausted lazily as the sequence is enumerated.
-@property (nonatomic, copy, readonly) RACSequence *rac_sequence;
-
-@end
@@ -1,19 +0,0 @@
-//
-//  NSFileHandle+RACSupport.h
-//  ReactiveCocoa
-//
-//  Created by Josh Abernathy on 5/10/12.
-//  Copyright (c) 2012 GitHub. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class RACSignal;
-
-@interface NSFileHandle (RACSupport)
-
-// Read any available data in the background and send it. Completes when data
-// length is <= 0.
- (RACSignal *)rac_readInBackground;
-
-@end
@@ -1,21 +0,0 @@
-//
-//  NSIndexSet+RACSequenceAdditions.h
-//  ReactiveCocoa
-//
-//  Created by Sergey Gavrilyuk on 12/17/13.
-//  Copyright (c) 2013 GitHub, Inc. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@class RACSequence;
-
-@interface NSIndexSet (RACSequenceAdditions)
-
-/// Creates and returns a sequence of indexes (as `NSNumber`s) corresponding to
-/// the receiver.
-///
-/// Mutating the receiver will not affect the sequence after it's been created.
-@property (nonatomic, copy, readonly) RACSequence *rac_sequence;
-
-@end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Justin Spahr-Summers	33137bcae6	Fix update directories not being pruned (bad merge)	2014-01-24 23:09:33 -08:00
Justin Spahr-Summers	532c565b2a	Need to -flattenMap: to the list of directories	2014-01-24 23:07:24 -08:00
Justin Spahr-Summers	9f5a0761ae	Ignore the RACUnit we use to hack lazy memoization	2014-01-24 23:03:48 -08:00
Justin Spahr-Summers	572ef9aa9b	Update RACAction usage, remove RACPromises	2014-01-24 23:01:00 -08:00
Justin Spahr-Summers	b8aef91738	Merge branch 'master' into rac-3.0 Conflicts: External/ReactiveCocoa Squirrel/SQRLShipItLauncher.m Squirrel/SQRLUpdater.m	2014-01-24 22:48:31 -08:00
Justin Spahr-Summers	edb4aafa31	Merge pull request #93 from Squirrel/replace-then Remove uses of -then: and -skipUntilBlock:	2013-12-23 20:58:01 -08:00
Justin Spahr-Summers	de276d73a6	Remove uses of -then: and -skipUntilBlock:	2013-12-06 23:48:06 -08:00
Justin Spahr-Summers	7655bd0a90	++RAC	2013-12-06 23:40:17 -08:00
Justin Spahr-Summers	e9a5874339	Merge pull request #89 from Squirrel/rac-3.0++ More RAC 3.0 support	2013-12-06 10:04:49 -08:00
Keith Duncan	1ac9c4ddc1	Separate the capturing of the current request from the issuing	2013-12-06 12:40:47 +00:00
Keith Duncan	9907d44f40	Complete the updates subject in dealloc	2013-12-06 12:36:03 +00:00
Keith Duncan	b5bbdfbed0	Don’t use dot syntax for deferred	2013-12-05 12:58:21 +00:00
Keith Duncan	28079454dc	Don’t eagerly start the relaunch promise	2013-12-05 12:49:49 +00:00
Keith Duncan	210e09e079	Use the action signal to connect if needed, rather than `execute:`	2013-12-05 12:43:43 +00:00
Keith Duncan	f0161a51d9	Name the updater `updates` subject	2013-12-05 12:42:11 +00:00
Keith Duncan	d121f4cf7f	Remove temporary variable	2013-12-05 12:41:45 +00:00
Keith Duncan	02bb683cf7	Hoist the `NSURLConnection` signal chain out of `+defer:` The defer signal now takes the updateRequest at time of subscribe and passes it to the new method.	2013-12-05 12:40:20 +00:00
Keith Duncan	d64a09bb2b	Fix scoped instance variable access for @strong/@weak modifications	2013-12-05 12:32:29 +00:00
Keith Duncan	5f201f833e	Remove comment	2013-12-05 12:29:03 +00:00
Keith Duncan	6e1b3c9ded	Complete the updates signal when the updater is dealloc’d	2013-12-05 12:28:38 +00:00
Keith Duncan	656decb128	Fix interval checks, the API is a subscription not a signal	2013-12-03 12:39:54 +00:00
Keith Duncan	4ef110e84b	Update to new RACAction API	2013-12-03 12:39:27 +00:00
Keith Duncan	a22ebbfdb9	Use `RACAction` for `checkForUpdates`	2013-12-03 12:34:56 +00:00
Keith Duncan	8cdf3d0666	Fix installer test with new RAC 3.0 API changes	2013-12-03 12:34:42 +00:00
Keith Duncan	ff6a2e1cb7	Remove `RACSequence` for the log locations	2013-12-02 16:57:14 +00:00
Keith Duncan	c3a41e9032	Build the tests when building ShipIt	2013-12-02 16:11:10 +00:00
Keith Duncan	27eb479de4	Remove `RACSequence`, `multicast` and `replay` uses	2013-12-02 16:10:03 +00:00
Keith Duncan	aab4ca3efb	Remove `-initially:`	2013-12-02 15:54:03 +00:00
Keith Duncan	6bc3b0d466	Replace the commands with methods I’m not sure if this is a match for `RACAction` because it needs the argument from the caller/subscriber.	2013-12-02 15:45:07 +00:00
Keith Duncan	ef83ed3175	Rename `-finally:` to `-doFinished:`	2013-12-02 15:09:57 +00:00
Keith Duncan	c382fbce40	Remove `NSEnumerator.rac_sequence`	2013-12-02 15:09:22 +00:00
Keith Duncan	d0498c528e	ReactiveCocoa++ Pin to working ReactiveCocoa-Mac target	2013-12-02 15:09:04 +00:00
Justin Spahr-Summers	cb2502510b	Update SQRLShipItLauncher	2013-11-26 12:49:25 -08:00
Justin Spahr-Summers	49a8f3b624	Update SQRLZipArchiver	2013-11-26 12:48:28 -08:00
Justin Spahr-Summers	36e3b17abb	Update SQRLTerminationListener	2013-11-26 12:47:55 -08:00
Justin Spahr-Summers	eb49de653b	Update SQRLCodeSignature	2013-11-26 12:46:53 -08:00
Justin Spahr-Summers	35e5a03130	Update RACSignal transaction extensions	2013-11-26 12:45:17 -08:00
Justin Spahr-Summers	b4387c312a	++RAC to 3.0-development	2013-11-26 12:42:40 -08:00
				`@@ -0,0 +1,2 @@`
				`/* Localized versions of Info.plist keys */`