Merge pull request #142 from Squirrel/pacify-xcode

Pacify Xcode

.gitmodules

@@ -1,9 +1,22 @@
-[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

Cartfile

@@ -0,0 +1,2 @@
+github "Mantle/Mantle" ~> 1.5.3
+github "ReactiveCocoa/ReactiveCocoa" ~> 2.4.3

Cartfile.private

@@ -0,0 +1,3 @@
+github "jspahrsummers/xcconfigs" >= 0.7.1
+github "Quick/Quick" ~> 0.2
+github "Quick/Nimble" ~> 0.2

Cartfile.resolved

@@ -0,0 +1,5 @@
+github "Mantle/Mantle" "1.5.3"
+github "Quick/Nimble" "v0.2.0"
+github "Quick/Quick" "v0.2.2"
+github "ReactiveCocoa/ReactiveCocoa" "v2.4.3"
+github "jspahrsummers/xcconfigs" "0.7.1"

README.md

@@ -13,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) below.
+on server side support for determining whether an update is required, see
+[Server Support](#server-support).
 
-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)
@@ -26,17 +26,20 @@ 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 a reference to Squirrel.xcodeproj to your project
+1. Add references to Squirrel.xcodeproj and its [dependencies](#dependencies) 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/MantleFramework/Mantle).
+and [Mantle](https://github.com/Mantle/Mantle).
 
 If your application is already using ReactiveCocoa, ensure it is using the same
 version as Squirrel.
@@ -60,7 +63,16 @@ Once Squirrel is added to your project, you need to configure and start it.
 #import <Squirrel/Squirrel.h>
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
-	self.updater = [[SQRLUpdater alloc] initWithUpdateRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://mycompany.com/myapp/latest"]]];
+	NSURLComponents *components = [[NSURLComponents alloc] init];
+
+	components.scheme = @"http";
+	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]];
 
 	// Check for updates every 4 hours.
 	[self.updater startAutomaticChecksWithInterval:60 * 60 * 4];
@@ -71,7 +83,26 @@ Squirrel will periodically request and automatically download any updates. When
 your application terminates, any downloaded update will be automatically
 installed.
 
-## Update Notifications
+## 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
 
 To know when an update is ready to be installed, you can subscribe to the
 `updates` signal on `SQRLUpdater`:
@@ -82,12 +113,18 @@ To know when an update is ready to be installed, you can subscribe to the
 }];
 ```
 
-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.
+## Installing Updates
 
-If you want to install a downloaded update and automatically relaunch afterward,
-`SQRLUpdater` can do that:
+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`:
 
 ```objc
 [[self.updater relaunchToInstallUpdate] subscribeError:^(NSError *error) {
@@ -95,10 +132,26 @@ If you want to install a downloaded update and automatically relaunch afterward,
 }];
 ```
 
-# Update JSON Format
+# Server Support
 
-Squirrel requests the URL you provide with `Accept: application/json` and
-expects the following schema in response:
+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-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 JSON Format
+
+When an update is available, Squirrel expects the following schema in response
+to the update request provided:
 
 ```json
 {
@@ -116,23 +169,10 @@ 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
-
-# Server Support
-
-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.
-
-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.
+"pub_date" if present must be formatted according to ISO 8601.
 
 # 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-notifications).
+updates](#update-available-notifications).

Squirrel.xcodeproj/xcshareddata/xcschemes/Squirrel.xcscheme

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
-   version = "1.3">
+   LastUpgradeVersion = "0620"
+   version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -22,14 +22,14 @@
          </BuildActionEntry>
          <BuildActionEntry
             buildForTesting = "YES"
-            buildForRunning = "YES"
+            buildForRunning = "NO"
             buildForProfiling = "NO"
             buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
+            buildForAnalyzing = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D0C22BEE179CC00E00158214"
-               BuildableName = "SquirrelTests.octest"
+               BuildableName = "SquirrelTests.xctest"
                BlueprintName = "SquirrelTests"
                ReferencedContainer = "container:Squirrel.xcodeproj">
             </BuildableReference>
@@ -39,30 +39,56 @@
    <TestAction
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Test">
+      shouldUseLaunchSchemeArgsEnv = "NO"
+      buildConfiguration = "Debug">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "D0C22BEE179CC00E00158214"
-               BuildableName = "SquirrelTests.octest"
+               BuildableName = "SquirrelTests.xctest"
                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>
+      </EnvironmentVariables>
    </TestAction>
    <LaunchAction
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugXPCServices = "NO"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0C22BD6179CC00E00158214"
+            BuildableName = "Squirrel.framework"
+            BlueprintName = "Squirrel"
+            ReferencedContainer = "container:Squirrel.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "SQRLUpdateFromURL"
@@ -79,6 +105,15 @@
       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">

Squirrel.xcodeproj/xcshareddata/xcschemes/TestApplication.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -48,7 +48,8 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D08D4E0B17B451500012B22D"
@@ -66,7 +67,8 @@
       useCustomWorkingDirectory = "NO"
       buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "D08D4E0B17B451500012B22D"

Squirrel.xcodeproj/xcshareddata/xcschemes/shipit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -39,6 +39,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D014AC0017B97885007D79D0"
+            BuildableName = "ShipIt"
+            BlueprintName = "ShipIt"
+            ReferencedContainer = "container:Squirrel.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

Squirrel.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,22 @@
+<?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>

Squirrel/RACSignal+SQRLTransactionExtensions.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <ReactiveCocoa/RACSignal.h>
 
 @interface RACSignal (SQRLTransactionExtensions)
 

Squirrel/RACSignal+SQRLTransactionExtensions.m

@@ -7,6 +7,8 @@
 //
 
 #import "RACSignal+SQRLTransactionExtensions.h"
+
+#import <ReactiveCocoa/RACDisposable.h>
 #import <IOKit/pwr_mgt/IOPMLib.h>
 
 // How long before power assertions time out.

Squirrel/SQRLCodeSignature.h

@@ -21,32 +21,44 @@ extern const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode;
 
 @class RACSignal;
 
-// Implements the verification of Apple code signatures.
+// Implements the verification of Apple code signatures and requirements.
 @interface SQRLCodeSignature : MTLModel
 
 // A serialized version of the `SecRequirementRef` that the receiver was
 // initialized with.
 @property (nonatomic, copy, readonly) NSData *requirementData;
 
-// Determines the code signature of the currently-executing application.
+// 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.
 //
 // error - If not NULL, set to any error that occurs.
 //
 // Returns a `SQRLCodeSignature`, or nil if an error occurs retrieving the
-// signature for the running code.
+// designated requirement for the running code.
 + (instancetype)currentApplicationSignature:(NSError **)error;
 
-// Initializes the receiver with the given requirement.
+// 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`.
 //
-// requirement - The code requirement for tested bundles. This must not be NULL.
-- (id)initWithRequirement:(SecRequirementRef)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;
 
-// Verifies that the code signature of the specified bundle matches the receiver.
+// Verifies the code signature of the specified bundle and verifies that the
+// bundle meets the receiver's requirement.
 //
 // 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 code signature was not verified successfully.
+// if the requirement was not verified successfully.
 - (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL;
 
 @end

Squirrel/SQRLCodeSignature.m

@@ -7,8 +7,11 @@
 //
 
 #import "SQRLCodeSignature.h"
-#import <ReactiveCocoa/EXTScope.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
+
+#import "EXTKeyPathCoding.h"
+#import "EXTScope.h"
+#import <ReactiveCocoa/RACSignal+Operations.h>
+#import <ReactiveCocoa/RACSubscriber.h>
 #import <Security/Security.h>
 
 NSString * const SQRLCodeSignatureErrorDomain = @"SQRLCodeSignatureErrorDomain";
@@ -19,9 +22,14 @@ 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 property is automatically retained.
-@property (atomic) id 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;
 
 @end
 
@@ -37,8 +45,49 @@ const NSInteger SQRLCodeSignatureErrorCouldNotCreateStaticCode = -2;
 
 #pragma mark Lifecycle
 
-+ (instancetype)currentApplicationSignature:(NSError **)error {
-	return [self modelWithDictionary:nil error:error];
++ (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];
 }
 
 - (id)initWithRequirement:(SecRequirementRef)requirement {
@@ -49,35 +98,6 @@ 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 {

Squirrel/SQRLDirectoryManager.h

@@ -6,13 +6,16 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.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;

Squirrel/SQRLDirectoryManager.m

@@ -7,14 +7,8 @@
 //
 
 #import "SQRLDirectoryManager.h"
-#import <ReactiveCocoa/ReactiveCocoa.h>
 
-@interface SQRLDirectoryManager ()
-
-// The application identifier to use in file locations.
-@property (nonatomic, copy, readonly) NSString *applicationIdentifier;
-
-@end
+#import <ReactiveCocoa/RACSignal+Operations.h>
 
 @implementation SQRLDirectoryManager
 
@@ -30,7 +24,7 @@
 		// Should only fallback to when running under otest, where
 		// NSBundle.mainBundle doesn't return useful data.
 		if (identifier == nil) {
-			identifier = NSRunningApplication.currentApplication.localizedName;
+			identifier = NSProcessInfo.processInfo.environment[@"FORCE_APP_IDENTIFIER"];
 		}
 
 		NSAssert(identifier != nil, @"Could not automatically determine the current application's identifier");

Squirrel/SQRLInstaller+Private.h

@@ -0,0 +1,17 @@
+//
+//  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;

Squirrel/SQRLInstaller.h

@@ -11,7 +11,7 @@
 // The domain for errors originating within SQRLInstaller.
 extern NSString * const SQRLInstallerErrorDomain;
 
-// There was an error copying the target bundle to the backup location.
+// There was an error copying the target or update bundle to a backup location.
 extern const NSInteger SQRLInstallerErrorBackupFailed;
 
 // There was an error replacing the target bundle with the update.
@@ -34,25 +34,34 @@ extern const NSInteger SQRLInstallerErrorInvalidState;
 // There was an error moving a bundle across volumes.
 extern const NSInteger SQRLInstallerErrorMovingAcrossVolumes;
 
-@class RACCommand;
-@class SQRLDirectoryManager;
+// There was an error changing the file permissions of the update.
+extern const NSInteger SQRLInstallerErrorChangingPermissions;
 
-// Performs the installation of an update, using the `SQRLShipItState` on disk,
-// as located by `SQRLDirectoryManager`.
+@class RACCommand;
+
+// Performs the installation of an update, saving its intermediate state to user
+// defaults.
 //
 // This class is meant to be used only after the app that will be updated has
 // terminated.
 @interface SQRLInstaller : NSObject
 
-// When executed with a `SQRLShipItState`, attempts to install the update or
+// Initializes an installer using the given application identifier, which is
+// used to scope resumable state stored to user defaults.
+//
+// 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
 // installation has completed or failed.
 @property (nonatomic, strong, readonly) RACCommand *installUpdateCommand;
 
-// When executed with a `SQRLShipItState`, aborts an installation, and attempts
-// to restore the old version of the application if necessary.
+// When executed with a `SQRLShipItRequest`, aborts an installation, and
+// attempts to restore the old version of the application if necessary.
 //
 // This must not be executed while `installUpdateCommand` is executing.
 //
@@ -60,8 +69,4 @@ extern const NSInteger SQRLInstallerErrorMovingAcrossVolumes;
 // aborting/recovery has finished.
 @property (nonatomic, strong, readonly) RACCommand *abortInstallationCommand;
 
-// Initializes an installer using the given directory manager to read and write the
-// state of the installation.
-- (id)initWithDirectoryManager:(SQRLDirectoryManager *)directoryManager;
-
 @end

Squirrel/SQRLInstaller.m

@@ -7,17 +7,25 @@
 //
 
 #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 "SQRLDirectoryManager.h"
-#import "SQRLShipItState.h"
+#import "SQRLShipItRequest.h"
 #import "SQRLTerminationListener.h"
-#import <libkern/OSAtomic.h>
-#import <ReactiveCocoa/EXTScope.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
-#import <sys/xattr.h>
+#import "SQRLInstallerOwnedBundle.h"
 
 NSString * const SQRLInstallerErrorDomain = @"SQRLInstallerErrorDomain";
 
@@ -28,85 +36,58 @@ const NSInteger SQRLInstallerErrorInvalidBundleVersion = -4;
 const NSInteger SQRLInstallerErrorMissingInstallationData = -5;
 const NSInteger SQRLInstallerErrorInvalidState = -6;
 const NSInteger SQRLInstallerErrorMovingAcrossVolumes = -7;
+const NSInteger SQRLInstallerErrorChangingPermissions = -8;
 
-// 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;
+NSString * const SQRLShipItInstallationAttemptsKey = @"SQRLShipItInstallationAttempts";
+NSString * const SQRLInstallerOwnedBundleKey = @"SQRLInstallerOwnedBundle";
 
 @interface SQRLInstaller ()
 
-// Finds the state file to read and write from.
-@property (nonatomic, strong, readonly) SQRLDirectoryManager *directoryManager;
+// The defaults domain to store all resumable state in.
+@property (nonatomic, copy, readonly) NSString *applicationIdentifier;
 
-// Reads the given key from `state`, failing if it's not set.
+// The bundle currently owned by this installer.
 //
-// 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.
+// 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.
 //
 // Returns a signal which synchronously sends the non-nil read value then
 // completes, or errors.
-- (RACSignal *)getRequiredKey:(NSString *)key fromState:(SQRLShipItState *)state;
+- (RACSignal *)getRequiredKey:(NSString *)key fromRequest:(SQRLShipItRequest *)request;
 
-// Performs the remaining stages of installation, as specified by `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.
 //
-// state - The installation state. This must not be nil.
+// request - The request whose update should be prepared and validated.
 //
-// Returns a signal which will complete or error on an unspecified thread.
-- (RACSignal *)resumeInstallationFromState:(SQRLShipItState *)state;
+// Returns a signal which sends the owned & validated bundle URL then completes,
+// or errors.
+- (RACSignal *)prepareAndValidateUpdateBundleURLForRequest:(SQRLShipItRequest *)request;
 
-// Moves the specified bundle to a backup location.
+// Saves a `SQRLInstallerOwnedBundle` for the targetBundleURL to the
+// preferences, then moves the targetBundleURL to an owned directory.
 //
-// bundleURL - The URL to the bundle that should be backed up. This must not be
-//             nil.
+// request - The request whose target should be removed in preparation of an
+//           update being installed.
 //
-// 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;
+// Returns a signal which completes, or errors.
+- (RACSignal *)acquireTargetBundleURLForRequest:(SQRLShipItRequest *)request;
 
-// Deletes a bundle that was backed up using -backUpBundleAtURL:.
+// Deletes a bundle that was moved into place using -moveAndTakeOwnershipOfBundleAtURL:.
 //
-// backupURL - The URL to the backup bundle, as sent from -backUpBundleAtURL:.
+// bundleURL - The URL to the backup bundle, as sent from -moveAndTakeOwnershipOfBundleAtURL:.
 //             This must not be nil.
 //
 // Returns a signal which will synchronously complete or error.
-- (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;
+- (RACSignal *)deleteOwnedBundleAtURL:(NSURL *)bundleURL;
 
 // Moves `sourceURL` to `targetURL`.
 //
@@ -118,7 +99,7 @@ typedef struct {
 // sourceURL - The URL to move from. This must not be nil.
 //
 // Retruns a signal which will synchronously complete or error.
-- (RACSignal *)installItemAtURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL;
+- (RACSignal *)installItemToURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL;
 
 // Recursively clears the quarantine extended attribute from the given
 // directory.
@@ -132,19 +113,28 @@ typedef struct {
 // 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)initWithDirectoryManager:(SQRLDirectoryManager *)directoryManager {
-	NSParameterAssert(directoryManager != nil);
+- (id)initWithApplicationIdentifier:(NSString *)applicationIdentifier {
+	NSParameterAssert(applicationIdentifier != nil);
 
 	self = [super init];
 	if (self == nil) return nil;
 
-	_directoryManager = directoryManager;
+	_applicationIdentifier = [applicationIdentifier copy];
 
 	@weakify(self);
 
@@ -156,42 +146,63 @@ typedef struct {
 		switchToLatest]
 		setNameWithFormat:@"aborting"];
 
-	_installUpdateCommand = [[RACCommand alloc] initWithEnabled:[aborting not] signalBlock:^(SQRLShipItState *state) {
+	_installUpdateCommand = [[RACCommand alloc] initWithEnabled:[aborting not] signalBlock:^(SQRLShipItRequest *request) {
 		@strongify(self);
-		NSParameterAssert(state != nil);
+		NSParameterAssert(request != nil);
 
-		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];
-	}];
+		// 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.
 
-	_abortInstallationCommand = [[RACCommand alloc] initWithEnabled:[self.installUpdateCommand.executing not] signalBlock:^(SQRLShipItState *state) {
-		@strongify(self);
-		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];
+		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);
 			}]
-			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];
+			catchTo:[RACSignal empty]]
+			then:^{
+				return [self installRequest:request];
+			}];
 	}];
-	
+
+	_abortInstallationCommand = [[RACCommand alloc] initWithEnabled:[self.installUpdateCommand.executing not] signalBlock:^(SQRLShipItRequest *request) {
+		@strongify(self);
+
+		return [self abortInstall];
+	}];
+
 	return self;
 }
 
-#pragma mark Installer State
+#pragma mark Preferences
 
-- (RACSignal *)getRequiredKey:(NSString *)key fromState:(SQRLShipItState *)state {
+- (SQRLInstallerOwnedBundle *)ownedBundle {
+	id archiveData = CFBridgingRelease(CFPreferencesCopyValue((__bridge CFStringRef)SQRLInstallerOwnedBundleKey, (__bridge CFStringRef)self.applicationIdentifier, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost));
+	if (![archiveData isKindOfClass:NSData.class]) return nil;
+
+	SQRLInstallerOwnedBundle *ownedBundle = [NSKeyedUnarchiver unarchiveObjectWithData:archiveData];
+	if (![ownedBundle isKindOfClass:SQRLInstallerOwnedBundle.class]) return nil;
+
+	return ownedBundle;
+}
+
+- (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);
+}
+
+#pragma mark Properties
+
+- (RACSignal *)getRequiredKey:(NSString *)key fromRequest:(SQRLShipItRequest *)request {
 	NSParameterAssert(key != nil);
-	NSParameterAssert(state != nil);
+	NSParameterAssert(request != nil);
 
 	return [[RACSignal
 		defer:^{
-			id value = [state valueForKey:key];
+			id value = [request valueForKey:key];
 			if (value == nil) {
 				NSString *errorDescription = [NSString stringWithFormat:NSLocalizedString(@"Missing %@", nil), key];
 				return [RACSignal error:[self missingDataErrorWithDescription:errorDescription]];
@@ -199,249 +210,162 @@ typedef struct {
 				return [RACSignal return:value];
 			}
 		}]
-		setNameWithFormat:@"%@ -getRequiredKey: %@ fromState: %@", self, key, state];
+		setNameWithFormat:@"%@ -getRequiredKey: %@ fromRequest: %@", self, key, request];
 }
 
-- (RACSignal *)resumeInstallationFromState:(SQRLShipItState *)state {
-	NSParameterAssert(state != nil);
+#pragma mark Installer States
 
-	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:) },
-	};
+- (RACSignal *)prepareAndValidateUpdateBundleURLForRequest:(SQRLShipItRequest *)request {
+	NSParameterAssert(request != nil);
 
-	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);
-			}]
-			then:^{
-				return [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];
+	return [[[[[[[self
+		ownedTemporaryDirectoryURL]
+		flattenMap:^(NSURL *directoryURL) {
+			return [self copyBundleAtURL:request.updateBundleURL toDirectory:directoryURL];
 		}]
-		setNameWithFormat:@"%@ -clearQuarantineWithState: %@", self, state];
+		flattenMap:^(NSURL *bundleURL) {
+			return [[[self
+				clearQuarantineForDirectory:bundleURL]
+				ignoreValues]
+				concat:[RACSignal return: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];
 }
 
-- (RACSignal *)backUpWithState:(SQRLShipItState *)state {
-	NSParameterAssert(state != nil);
+- (RACSignal *)acquireTargetBundleURLForRequest:(SQRLShipItRequest *)request {
+	NSParameterAssert(request != nil);
 
 	return [[[[RACSignal
 		zip:@[
-			[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];
-			}
+			[self ownedTemporaryDirectoryURL],
+			[self codeSignatureForBundleAtURL:request.targetBundleURL],
+		] reduce:^(NSURL *directoryURL, SQRLCodeSignature *codeSignature) {
+			NSURL *targetBundleURL = request.targetBundleURL;
+			NSURL *newBundleURL = [directoryURL URLByAppendingPathComponent:targetBundleURL.lastPathComponent];
 
-			return [skipBackup flattenMap:^(NSNumber *skip) {
-				if (skip.boolValue) {
-					return [RACSignal empty];
-				} else {
-					return [self backUpBundleAtURL:bundleURL];
-				}
-			}];
+			return [[SQRLInstallerOwnedBundle alloc] initWithOriginalURL:request.targetBundleURL temporaryURL:newBundleURL codeSignature:codeSignature];
 		}]
-		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];
+		doNext:^(SQRLInstallerOwnedBundle *ownedBundle) {
+			self.ownedBundle = ownedBundle;
 		}]
-		setNameWithFormat:@"%@ -backUpWithState: %@", self, state];
+		flattenMap:^(SQRLInstallerOwnedBundle *ownedBundle) {
+			return [self installItemToURL:ownedBundle.temporaryURL fromURL:ownedBundle.originalURL];
+		}]
+		setNameWithFormat:@"%@ -acquireTargetBundleURLForRequest: %@", self, request];
 }
 
-- (RACSignal *)installWithState:(SQRLShipItState *)state {
-	NSParameterAssert(state != nil);
+- (RACSignal *)installRequest:(SQRLShipItRequest *)request {
+	NSParameterAssert(request != nil);
 
-	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
-				checkWhetherBundlePreviouslyAtURL:updateBundleURL wasInstalledAtURL:targetBundleURL usingSignature:codeSignature]
-				flattenMap:^(NSNumber *skip) {
-					if (skip.boolValue) {
-						return [RACSignal empty];
-					} else {
-						return [self installItemAtURL:targetBundleURL fromURL:updateBundleURL];
-					}
-				}]
-				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]];
-				}]
-				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]
-						then:^{
-							// Recovery succeeded, but we still want to pass
-							// through the original error.
-							return [RACSignal error:error];
-						}];
-				}];
-		}]
-		flatten]
-		setNameWithFormat:@"%@ -installWithState: %@", self, state];
-}
-
-- (RACSignal *)verifyInPlaceWithState:(SQRLShipItState *)state {
-	NSParameterAssert(state != nil);
-
-	return [[[RACSignal
-		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]
-				then:^{
-					return [[self
-						deleteBackupAtURL:backupBundleURL]
+	return [[[[self
+		prepareAndValidateUpdateBundleURLForRequest:request]
+		flattenMap:^(NSURL *updateBundleURL) {
+			return [[[[[[[self
+				acquireTargetBundleURLForRequest:request]
+				concat:[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]];
+				}]
+				doCompleted:^{
+					self.ownedBundle = nil;
 				}];
 		}]
-		flatten]
-		setNameWithFormat:@"%@ -verifyInPlaceWithState: %@", self, state];
+		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];
 }
 
-#pragma mark Backing Up
+- (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.
 
-- (RACSignal *)backUpBundleAtURL:(NSURL *)targetBundleURL {
-	NSParameterAssert(targetBundleURL != nil);
+	SQRLInstallerOwnedBundle *ownedBundle = self.ownedBundle;
+	if (ownedBundle == nil) return [RACSignal empty];
 
-	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 [[[[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]];
 			}
 
-			return [RACSignal return:temporaryDirectoryURL];
+			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 backup folder", nil)];
+			NSString *description = [NSString stringWithFormat:NSLocalizedString(@"Could not create temporary 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];
+		setNameWithFormat:@"%@ -ownedDirectoryURL", self];
 }
 
-- (RACSignal *)deleteBackupAtURL:(NSURL *)backupURL {
-	NSParameterAssert(backupURL != nil);
+- (RACSignal *)copyBundleAtURL:(NSURL *)bundleURL toDirectory:(NSURL *)directoryURL {
+	NSParameterAssert(bundleURL != nil);
+	NSParameterAssert(directoryURL != nil);
+
+	NSURL *newBundleURL = [directoryURL URLByAppendingPathComponent:bundleURL.lastPathComponent];
 
 	return [[[RACSignal
 		defer:^{
-			NSError *error = nil;
-			if ([NSFileManager.defaultManager removeItemAtURL:backupURL error:&error]) {
+			NSError *error;
+			BOOL copy = [NSFileManager.defaultManager copyItemAtURL:bundleURL toURL:newBundleURL error:&error];
+			if (!copy) return [RACSignal error:error];
+
+			return [RACSignal return:newBundleURL];
+		}]
+		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];
+}
+
+- (RACSignal *)deleteOwnedBundleAtURL:(NSURL *)bundleURL {
+	NSParameterAssert(bundleURL != nil);
+
+	return [[[RACSignal
+		defer:^{
+			NSError *error;
+			if ([NSFileManager.defaultManager removeItemAtURL:bundleURL error:&error]) {
 				return [RACSignal empty];
 			} else {
 				return [RACSignal error:error];
@@ -449,7 +373,7 @@ typedef struct {
 		}]
 		then:^{
 			// Also remove the temporary directory that the backup lived in.
-			NSURL *temporaryDirectoryURL = backupURL.URLByDeletingLastPathComponent;
+			NSURL *temporaryDirectoryURL = bundleURL.URLByDeletingLastPathComponent;
 
 			// However, use rmdir() to skip it in case there are other files
 			// contained within (for whatever reason).
@@ -459,58 +383,37 @@ typedef struct {
 				return [RACSignal error:[NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil]];
 			}
 		}]
-		setNameWithFormat:@"%@ -deleteBackupAtURL: %@", self, backupURL];
+		setNameWithFormat:@"%@ -deleteOwnedBundleAtURL: %@", self, bundleURL];
 }
 
-- (RACSignal *)verifyBundleAtURL:(NSURL *)bundleURL usingSignature:(SQRLCodeSignature *)signature recoveringUsingBackupAtURL:(NSURL *)backupBundleURL {
+#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 {
 	NSParameterAssert(bundleURL != nil);
 	NSParameterAssert(signature != nil);
 
-	return [[[signature
-		verifyBundleAtURL:bundleURL]
-		catch:^(NSError *error) {
-			if (backupBundleURL == nil) return [RACSignal error:error];
-
-			return [[[[self
-				installItemAtURL:bundleURL fromURL:backupBundleURL]
-				initially:^{
-					[NSFileManager.defaultManager removeItemAtURL:bundleURL error:NULL];
-				}]
-				doCompleted:^{
-					NSLog(@"Restored backup bundle to %@", bundleURL);
-				}]
-				doError:^(NSError *recoveryError) {
-					NSLog(@"Could not restore backup bundle %@ to %@: %@", backupBundleURL, bundleURL, recoveryError.sqrl_verboseDescription);
-				}];
+	return [[[self
+		takeOwnershipOfDirectory:bundleURL]
+		then:^{
+			return [signature verifyBundleAtURL:bundleURL];
 		}]
-		setNameWithFormat:@"%@ -verifyBundleAtURL: %@ usingSignature: %@ recoveringUsingBackupAtURL: %@", self, bundleURL, signature, backupBundleURL];
+		setNameWithFormat:@"%@ -verifyBundleAtURL: %@ usingSignature: %@", self, bundleURL, signature];
 }
 
 #pragma mark Installation
 
-- (RACSignal *)checkWhetherBundlePreviouslyAtURL:(NSURL *)sourceURL wasInstalledAtURL:(NSURL *)targetURL usingSignature:(SQRLCodeSignature *)signature {
-	NSParameterAssert(targetURL != nil);
-	NSParameterAssert(sourceURL != nil);
-	NSParameterAssert(signature != nil);
-
-	return [[[[self
-		verifyBundleAtURL:targetURL usingSignature:signature recoveringUsingBackupAtURL:nil]
-		then:^{
-			return [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 *)installItemAtURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL {
+- (RACSignal *)installItemToURL:(NSURL *)targetURL fromURL:(NSURL *)sourceURL {
 	NSParameterAssert(targetURL != nil);
 	NSParameterAssert(sourceURL != nil);
 
@@ -522,7 +425,7 @@ typedef struct {
 			} else {
 				int code = errno;
 				NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-				
+
 				const char *desc = strerror(code);
 				if (desc != NULL) userInfo[NSLocalizedDescriptionKey] = @(desc);
 
@@ -574,7 +477,7 @@ typedef struct {
 				// file to begin with.
 				if (code != ENOATTR) {
 					NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
-					
+
 					const char *desc = strerror(code);
 					if (desc != NULL) userInfo[NSLocalizedDescriptionKey] = @(desc);
 
@@ -587,6 +490,97 @@ typedef struct {
 		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 {

Squirrel/SQRLInstallerOwnedBundle.h

@@ -0,0 +1,37 @@
+//
+//  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

Squirrel/SQRLInstallerOwnedBundle.m

@@ -0,0 +1,23 @@
+//
+//  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

Squirrel/SQRLShipItLauncher.m

@@ -22,8 +22,7 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
 @implementation SQRLShipItLauncher
 
 + (NSString *)shipItJobLabel {
-	NSString *currentAppIdentifier = NSBundle.mainBundle.bundleIdentifier ?: [NSString stringWithFormat:@"%@:%d", NSProcessInfo.processInfo.processName, NSProcessInfo.processInfo.processIdentifier];
-	return [currentAppIdentifier stringByAppendingString:@".ShipIt"];
+	return [SQRLDirectoryManager.currentApplicationManager.applicationIdentifier stringByAppendingString:@".ShipIt"];
 }
 
 + (RACSignal *)shipItJobDictionary {
@@ -61,10 +60,6 @@ const NSInteger SQRLShipItLauncherErrorCouldNotStartService = 1;
 			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"];

Squirrel/SQRLShipItRequest.h

@@ -0,0 +1,96 @@
+//
+//  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.
+//
+// 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;
+
+// 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;
+
+@end

Squirrel/SQRLShipItRequest.m

@@ -0,0 +1,193 @@
+//
+//  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 {
+	return [self initWithDictionary:@{
+		@keypath(self.updateBundleURL): updateBundleURL,
+		@keypath(self.targetBundleURL): targetBundleURL,
+		@keypath(self.bundleIdentifier): bundleIdentifier ?: NSNull.null,
+		@keypath(self.launchAfterInstallation): @(launchAfterInstallation),
+	} 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

Squirrel/SQRLShipItState.h

@@ -1,117 +0,0 @@
-//
-//  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

Squirrel/SQRLShipItState.m

@@ -1,122 +0,0 @@
-//
-//  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

Squirrel/SQRLTerminationListener.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 
 @class RACSignal;
 

Squirrel/SQRLTerminationListener.m

@@ -7,7 +7,14 @@
 //
 
 #import "SQRLTerminationListener.h"
-#import <ReactiveCocoa/ReactiveCocoa.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>
 
 @interface SQRLTerminationListener ()
 
@@ -74,7 +81,6 @@
 			dispatch_resume(source);
 			return [RACDisposable disposableWithBlock:^{
 				dispatch_source_cancel(source);
-				dispatch_release(source);
 			}];
 		}]
 		setNameWithFormat:@"%@ -waitForTerminationOfProcessIdentifier: %i", self, (int)processIdentifier];

Squirrel/SQRLUpdater.h

@@ -6,6 +6,23 @@
 //  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;
+
 // The domain for errors originating within SQRLUpdater.
 extern NSString * const SQRLUpdaterErrorDomain;
 
@@ -55,6 +72,11 @@ extern NSString * const SQRLUpdaterJSONObjectErrorKey;
 // 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;
+
 // Sends an `SQRLDownloadedUpdate` object on the main thread whenever a new
 // update is available.
 //

Squirrel/SQRLUpdater.m

@@ -15,9 +15,9 @@
 #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>
 
@@ -38,6 +38,8 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 
 @interface SQRLUpdater ()
 
+@property (atomic, readwrite) SQRLUpdaterState state;
+
 // The code signature for the running application, used to check updates before
 // sending them to ShipIt.
 @property (nonatomic, strong, readonly) SQRLCodeSignature *signature;
@@ -124,16 +126,6 @@ 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
@@ -213,12 +205,14 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 		[request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
 
 		// Prune old updates before the first update check.
-		return [[[[[[[self.prunedUpdateDirectories
+		return [[[[[[[[self.prunedUpdateDirectories
 			catch:^(NSError *error) {
 				NSLog(@"Error pruning old updates: %@", error);
 				return [RACSignal empty];
 			}]
 			then:^{
+				self.state = SQRLUpdaterStateCheckingForUpdate;
+
 				return [NSURLConnection rac_sendAsynchronousRequest:request];
 			}]
 			reduceEach:^(NSURLResponse *response, NSData *bodyData) {
@@ -246,7 +240,19 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 				return [self updateFromJSONData:data];
 			}]
 			flattenMap:^(SQRLUpdate *update) {
-				return [self downloadAndPrepareUpdate: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];
 	}];
@@ -516,37 +522,14 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 		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 [[[[[[[SQRLShipItState
-		readUsingURL:self.shipItStateURL]
-		catchTo:[RACSignal empty]]
-		flattenMap:^(SQRLShipItState *existingState) {
-			return [self validateExistingState:existingState];
-		}]
-		then:^{
-			SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:NSRunningApplication.currentApplication.bundleURL updateBundleURL:update.bundle.bundleURL bundleIdentifier:NSRunningApplication.currentApplication.bundleIdentifier codeSignature:self.signature];
-			return [state writeUsingURL:self.shipItStateURL];
+	return [[[[RACSignal
+		defer:^{
+			NSRunningApplication *currentApplication = NSRunningApplication.currentApplication;
+			SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:update.bundle.bundleURL targetBundleURL:currentApplication.bundleURL bundleIdentifier:currentApplication.bundleIdentifier launchAfterInstallation:NO];
+			return [request writeUsingURL:self.shipItStateURL];
 		}]
 		then:^{
 			return self.shipItLauncher;
@@ -556,14 +539,13 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 }
 
 - (RACSignal *)relaunchToInstallUpdate {
-	return [[[[[[[[SQRLShipItState
+	return [[[[[[[[SQRLShipItRequest
 		readUsingURL:self.shipItStateURL]
-		flattenMap:^(SQRLShipItState *existingState) {
-			return [self validateExistingState:existingState];
+		map:^(SQRLShipItRequest *request) {
+			return [[SQRLShipItRequest alloc] initWithUpdateBundleURL:request.updateBundleURL targetBundleURL:request.targetBundleURL bundleIdentifier:request.bundleIdentifier launchAfterInstallation:YES];
 		}]
-		flattenMap:^(SQRLShipItState *state) {
-			state.relaunchAfterInstallation = YES;
-			return [[state
+		flattenMap:^(SQRLShipItRequest *request) {
+			return [[request
 				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];
 		}]

Squirrel/ShipIt-main.m

@@ -7,15 +7,19 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <ReactiveCocoa/EXTScope.h>
-#import <ReactiveCocoa/ReactiveCocoa.h>
+
+#import "EXTScope.h"
+#import <ReactiveCocoa/RACCommand.h>
+#import <ReactiveCocoa/RACSignal+Operations.h>
+#import <ReactiveCocoa/RACScheduler.h>
+
 #import "NSError+SQRLVerbosityExtensions.h"
 #import "RACSignal+SQRLTransactionExtensions.h"
-#import "SQRLCodeSignature.h"
 #import "SQRLDirectoryManager.h"
 #import "SQRLInstaller.h"
-#import "SQRLShipItState.h"
+#import "SQRLInstaller+Private.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,19 +31,116 @@ static const NSUInteger SQRLShipItMaximumInstallationAttempts = 3;
 // 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
-// `state`) to exit, then sends completed.
-static RACSignal *waitForTerminationIfNecessary(SQRLShipItState *state) {
+// `request`) to exit, then sends completed.
+static RACSignal *waitForTerminationIfNecessary(SQRLShipItRequest *request) {
 	return [[RACSignal
 		defer:^{
-			if (state.bundleIdentifier == nil) return [RACSignal empty];
+			if (request.bundleIdentifier == nil) return [RACSignal empty];
 
-			SQRLTerminationListener *listener = [[SQRLTerminationListener alloc] initWithURL:state.targetBundleURL bundleIdentifier:state.bundleIdentifier];
+			SQRLTerminationListener *listener = [[SQRLTerminationListener alloc] initWithURL:request.targetBundleURL bundleIdentifier:request.bundleIdentifier];
 			return [listener waitForTermination];
 		}]
 		setNameWithFormat:@"waitForTerminationIfNecessary"];
 }
 
+static void installRequest(RACSignal *readRequestSignal, SQRLDirectoryManager *directoryManager) {
+	NSString *applicationIdentifier = directoryManager.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];
+					}];
+			} 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]
+					finally:^{
+						NSURL *bundleURL = request.targetBundleURL;
+						if (bundleURL == nil) {
+							NSLog(@"Missing target bundle URL, cannot launch application");
+							return;
+						}
+
+						NSError *error;
+						if (![NSWorkspace.sharedWorkspace launchApplicationAtURL:bundleURL options:NSWorkspaceLaunchDefault configuration:nil 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(^{
@@ -51,101 +152,13 @@ int main(int argc, const char * argv[]) {
 			return EXIT_FAILURE;
 		}
 
-		const char *jobLabel = argv[1];
+		char const *jobLabel = argv[1];
 		SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:@(jobLabel)];
-		RACSignal *stateLocation = directoryManager.shipItStateURL;
 
-		[[[[[[SQRLShipItState
-			readUsingURL:stateLocation]
-			flattenMap:^(SQRLShipItState *state) {
-				return waitForTerminationIfNecessary(state);
-			}]
-			then:^{
-				// Read the latest state, in case it was modified by the
-				// controlling application in the meantime.
-				return [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 = [[[installer.abortInstallationCommand
-						execute:state]
-						initially:^{
-							NSLog(@"Too many attempts to install from state %i, aborting update", (int)state.installerState);
-						}]
-						catch:^(NSError *error) {
-							NSLog(@"Error aborting installation: %@", error);
-
-							// Exit successfully so launchd doesn't restart us again.
-							return [RACSignal empty];
-						}];
-				} else {
-					action = [[[[[state
-						writeUsingURL:stateLocation]
-						initially:^{
-							if (freshInstall) {
-								NSLog(@"Beginning installation");
-								state.installerState = SQRLInstallerStateClearingQuarantine;
-							} else {
-								NSLog(@"Resuming installation from state %i", (int)state.installerState);
-							}
-
-							state.installationStateAttempt = attempt;
-						}]
-						then:^{
-							return [installer.installUpdateCommand execute: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]
-						finally:^{
-							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);
-			}];
+		installRequest([SQRLShipItRequest readUsingURL:directoryManager.shipItStateURL], directoryManager);
 
 		dispatch_main();
 	}
 
 	return EXIT_SUCCESS;
 }
-

Squirrel/Squirrel-Prefix.pch

@@ -1,8 +0,0 @@
-//
-// 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

Squirrel/Squirrel.h

@@ -6,6 +6,14 @@
 //  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>

Squirrel/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

SquirrelTests/NSProcessInfoExtensionsSpec.m

@@ -6,30 +6,35 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-SpecBegin(NSProcessInfoExtensions)
+#import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <Squirrel/Squirrel.h>
+
+QuickSpecBegin(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)));
 	});
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/QuickSpec+SQRLFixtures.h

@@ -1,11 +1,16 @@
 //
-//  SQRLTestCase.h
+//  QuickSpec+SQRLFixtures.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>
+
 // The short version string for the `testApplicationBundle`.
 extern NSString * const SQRLTestApplicationOriginalShortVersionString;
 
@@ -18,8 +23,9 @@ extern NSString * const SQRLBundleShortVersionStringKey;
 
 @class SQRLCodeSignature;
 @class SQRLDirectoryManager;
+@class SQRLShipItRequest;
 
-@interface SQRLTestCase : SPTSenTestCase
+@interface QuickSpec (SQRLFixtures)
 
 // A URL to a temporary directory tests can use.
 //
@@ -45,10 +51,6 @@ extern NSString * const SQRLBundleShortVersionStringKey;
 // 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;
 
@@ -74,8 +76,8 @@ extern NSString * const SQRLBundleShortVersionStringKey;
 // deleted at the end of the example.
 - (NSURL *)createTestApplicationUpdate;
 
-// Submits ShipIt's launchd job to start it up.
-- (void)launchShipIt;
+// Runs the installer in process or submits ShipIt's launchd job to start it up.
+- (void)installWithRequest:(SQRLShipItRequest *)request remote:(BOOL)remote;
 
 // Creates a disk image, then mounts it.
 //

SquirrelTests/QuickSpec+SQRLFixtures.m

@@ -1,16 +1,20 @@
 //
-//  SQRLTestCase.m
+//  QuickSpec+SQRLFixtures.m
 //  Squirrel
 //
 //  Created by Justin Spahr-Summers on 2013-08-06.
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-#import "SQRLTestCase.h"
+#import "QuickSpec+SQRLFixtures.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"
@@ -39,104 +43,9 @@ static void SQRLSignalHandler(int sig) {
 	abort();
 }
 
-@interface SQRLTestCase ()
-
-// 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.
-@property (nonatomic, copy, readonly) NSURL *baseTemporaryDirectoryURL;
-
 // Returns an _unlaunched_ task that will follow log files at the given paths,
 // then pipe that output through this process.
-+ (NSTask *)tailTaskWithPaths:(RACSequence *)paths;
-
-@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",
-		@"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;
-	}];
-
-	for (NSURL *URL in URLs) {
-		[[NSData data] writeToURL:URL atomically:YES];
-	}
-
-	RACSequence *paths = [URLs map:^(NSURL *URL) {
-		return URL.path;
-	}];
-
-	NSTask *readShipIt = [self tailTaskWithPaths:paths];
-	[readShipIt launch];
-
-	NSAssert([readShipIt isRunning], @"Could not start task %@", readShipIt);
-
-	atexit_b(^{
-		[readShipIt terminate];
-	});
-}
-
-- (void)setUp {
-	[super setUp];
-
-	signal(SIGILL, &SQRLSignalHandler);
-	NSSetUncaughtExceptionHandler(&SQRLUncaughtExceptionHandler);
-
-	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 {
-	[self.exampleCleanupBlocks addObject:[block copy]];
-}
-
-#pragma mark Logging
-
-+ (NSTask *)tailTaskWithPaths:(RACSequence *)paths {
+static NSTask *SQRLTailTaskWithPaths(RACSequence *paths) {
 	NSPipe *outputPipe = [NSPipe pipe];
 	NSFileHandle *outputHandle = outputPipe.fileHandleForReading;
 
@@ -152,24 +61,112 @@ static void SQRLSignalHandler(int sig) {
 	return task;
 }
 
+static NSBundle *SQRLTestBundle(void) {
+	return [NSBundle bundleWithIdentifier:@"com.github.SquirrelTests"];
+}
+
+static NSMutableArray *cleanupBlocks = nil;
+
+// The URL to the temporary directory which contains `temporaryDirectoryURL` and
+// all copied test data.
+static NSURL *baseTemporaryDirectoryURL = nil;
+
+QuickConfigurationBegin(Fixtures)
+
++ (void)configure:(Configuration *)configuration {
+	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",
+	];
+
+	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;
+	}];
+
+	RACSequence *paths = [URLs map:^(NSURL *URL) {
+		return URL.path;
+	}];
+
+	NSTask *readShipIt = SQRLTailTaskWithPaths(paths);
+
+	[configuration beforeSuite:^{
+		signal(SIGILL, &SQRLSignalHandler);
+		NSSetUncaughtExceptionHandler(&SQRLUncaughtExceptionHandler);
+
+		cleanupBlocks = [NSMutableArray array];
+
+		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);
+			}
+		}
+
+		[readShipIt launch];
+
+		NSAssert([readShipIt isRunning], @"Could not start task %@", readShipIt);
+	}];
+
+	[configuration afterSuite:^{
+		[readShipIt terminate];
+	}];
+
+	// 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();
+	}];
+}
+
+QuickConfigurationEnd
+
+@implementation QuickSpec (SQRLFixtures)
+
+#pragma mark Lifecycle
+
+- (void)addCleanupBlock:(dispatch_block_t)block {
+	[cleanupBlocks addObject:[block copy]];
+}
+
 #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];
-		STAssertTrue(success, @"Couldn't create temporary directory at %@: %@", _baseTemporaryDirectoryURL, error);
+		BOOL success = [NSFileManager.defaultManager createDirectoryAtURL:baseTemporaryDirectoryURL withIntermediateDirectories:YES attributes:nil error:&error];
+		XCTAssertTrue(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 {
@@ -177,7 +174,7 @@ static void SQRLSignalHandler(int sig) {
 
 	NSError *error = nil;
 	BOOL success = [NSFileManager.defaultManager createDirectoryAtURL:temporaryDirectoryURL withIntermediateDirectories:YES attributes:nil error:&error];
-	STAssertTrue(success, @"Couldn't create temporary directory at %@: %@", temporaryDirectoryURL, error);
+	XCTAssertTrue(success, @"Couldn't create temporary directory at %@: %@", temporaryDirectoryURL, error);
 
 	return temporaryDirectoryURL;
 }
@@ -187,20 +184,20 @@ static void SQRLSignalHandler(int sig) {
 - (NSURL *)testApplicationURL {
 	NSURL *fixtureURL = [self.temporaryDirectoryURL URLByAppendingPathComponent:@"TestApplication.app" isDirectory:YES];
 	if (![NSFileManager.defaultManager fileExistsAtPath:fixtureURL.path]) {
-		NSURL *bundleURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication" withExtension:@"app"];
-		STAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
+		NSURL *bundleURL = [SQRLTestBundle() URLForResource:@"TestApplication" withExtension:@"app"];
+		XCTAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
 
 		NSError *error = nil;
 		BOOL success = [NSFileManager.defaultManager copyItemAtURL:bundleURL toURL:fixtureURL error:&error];
-		STAssertTrue(success, @"Couldn't copy %@ to %@: %@", bundleURL, fixtureURL, error);
+		XCTAssertTrue(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:[RACSequence return:testAppLog.path]];
+		NSTask *readTestApp = SQRLTailTaskWithPaths([RACSequence return:testAppLog.path]);
 		[readTestApp launch];
 
-		STAssertTrue([readTestApp isRunning], @"Could not start task %@ to read %@", readTestApp, testAppLog);
+		XCTAssertTrue([readTestApp isRunning], @"Could not start task %@ to read %@", readTestApp, testAppLog);
 
 		[self addCleanupBlock:^{
 			[readTestApp terminate];
@@ -213,8 +210,8 @@ static void SQRLSignalHandler(int sig) {
 - (NSBundle *)testApplicationBundle {
 	NSURL *fixtureURL = self.testApplicationURL;
 	NSBundle *bundle = [NSBundle bundleWithURL:fixtureURL];
-	STAssertNotNil(bundle, @"Couldn't open bundle at %@", fixtureURL);
-	
+	XCTAssertNotNil(bundle, @"Couldn't open bundle at %@", fixtureURL);
+
 	return bundle;
 }
 
@@ -233,7 +230,7 @@ static void SQRLSignalHandler(int sig) {
 
 	NSError *error = nil;
 	NSRunningApplication *app = [NSWorkspace.sharedWorkspace launchApplicationAtURL:self.testApplicationURL options:NSWorkspaceLaunchWithoutAddingToRecents | NSWorkspaceLaunchWithoutActivation | NSWorkspaceLaunchNewInstance | NSWorkspaceLaunchAndHide configuration:configuration error:&error];
-	STAssertNotNil(app, @"Could not launch app at %@: %@", self.testApplicationURL, error);
+	XCTAssertNotNil(app, @"Could not launch app at %@: %@", self.testApplicationURL, error);
 
 	[self addCleanupBlock:^{
 		if (!app.terminated) {
@@ -253,12 +250,12 @@ static void SQRLSignalHandler(int sig) {
 }
 
 - (NSURL *)createTestApplicationUpdate {
-	NSURL *originalURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication 2.1" withExtension:@"app"];
-	STAssertNotNil(originalURL, @"Couldn't find TestApplication update in test bundle");
+	NSURL *originalURL = [SQRLTestBundle() URLForResource:@"TestApplication 2.1" withExtension:@"app"];
+	XCTAssertNotNil(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];
-	STAssertNotNil(updateParentURL, @"Could not create temporary directory for updating: %@", error);
+	XCTAssertNotNil(updateParentURL, @"Could not create temporary directory for updating: %@", error);
 
 	[self addCleanupBlock:^{
 		[NSFileManager.defaultManager removeItemAtURL:updateParentURL error:NULL];
@@ -266,18 +263,18 @@ static void SQRLSignalHandler(int sig) {
 
 	NSURL *updateURL = [updateParentURL URLByAppendingPathComponent:originalURL.lastPathComponent isDirectory:YES];
 	BOOL success = [NSFileManager.defaultManager copyItemAtURL:originalURL toURL:updateURL error:&error];
-	STAssertTrue(success, @"Couldn't copy %@ to %@: %@", originalURL, updateURL, error);
+	XCTAssertTrue(success, @"Couldn't copy %@ to %@: %@", originalURL, updateURL, error);
 
 	return updateURL;
 }
 
 - (id)performWithTestApplicationRequirement:(id (^)(SecRequirementRef requirement))block {
-	NSURL *bundleURL = [[NSBundle bundleForClass:self.class] URLForResource:@"TestApplication" withExtension:@"app"];
-	STAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
+	NSURL *bundleURL = [SQRLTestBundle() URLForResource:@"TestApplication" withExtension:@"app"];
+	XCTAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
 
 	SecStaticCodeRef staticCode = NULL;
 	OSStatus status = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
-	STAssertTrue(status == noErr, @"Error creating static code object for %@", bundleURL);
+	XCTAssertTrue(status == noErr, @"Error creating static code object for %@", bundleURL);
 
 	@onExit {
 		if (staticCode != NULL) CFRelease(staticCode);
@@ -285,7 +282,7 @@ static void SQRLSignalHandler(int sig) {
 
 	SecRequirementRef requirement = NULL;
 	status = SecCodeCopyDesignatedRequirement(staticCode, kSecCSDefaultFlags, &requirement);
-	STAssertTrue(status == noErr, @"Error getting designated requirement of %@", staticCode);
+	XCTAssertTrue(status == noErr, @"Error getting designated requirement of %@", staticCode);
 
 	@onExit {
 		if (requirement != NULL) CFRelease(requirement);
@@ -295,48 +292,57 @@ static void SQRLSignalHandler(int sig) {
 }
 
 - (SQRLCodeSignature *)testApplicationSignature {
-	return [self performWithTestApplicationRequirement:^(SecRequirementRef requirement) {
-		return [[SQRLCodeSignature alloc] initWithRequirement:requirement];
-	}];
-}
+	NSURL *bundleURL = [SQRLTestBundle() URLForResource:@"TestApplication" withExtension:@"app"];
+	XCTAssertNotNil(bundleURL, @"Couldn't find TestApplication.app in test bundle");
 
-- (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);
+	NSError *error = nil;
+	SQRLCodeSignature *signature = [SQRLCodeSignature signatureWithBundle:bundleURL error:&error];
+	XCTAssertNotNil(signature, @"Error getting signature for bundle at %@: %@", bundleURL, error);
 
-		return CFBridgingRelease(data);
-	}];
+	return signature;
 }
 
 - (SQRLDirectoryManager *)shipItDirectoryManager {
 	NSString *identifier = SQRLShipItLauncher.shipItJobLabel;
 	SQRLDirectoryManager *manager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:identifier];
-	STAssertNotNil(manager, @"Could not create directory manager for %@", identifier);
+	XCTAssertNotNil(manager, @"Could not create directory manager for %@", identifier);
 
 	return manager;
 }
 
-- (void)launchShipIt {
-	NSError *error = nil;
-	STAssertTrue([[SQRLShipItLauncher launchPrivileged:NO] waitUntilCompleted:&error], @"Could not launch ShipIt: %@", error);
+- (void)installWithRequest:(SQRLShipItRequest *)request remote:(BOOL)remote {
+	if (remote) {
+		expect(@([[request writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL])).to(beTruthy());
 
-	[self addCleanupBlock:^{
-		// Remove ShipIt's launchd job so it doesn't relaunch itself.
-		SMJobRemove(kSMDomainUserLaunchd, (__bridge CFStringRef)SQRLShipItLauncher.shipItJobLabel, NULL, true, NULL);
+		__block NSError *error = nil;
+		expect(@([[SQRLShipItLauncher launchPrivileged:NO] waitUntilCompleted:&error])).to(beTruthy());
+		expect(error).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];
-	}];
+		[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());
+	}
 }
 
 - (NSURL *)createAndMountDiskImageNamed:(NSString *)name fromDirectory:(NSURL *)directoryURL {
 	NSURL *destinationURL = [self.baseTemporaryDirectoryURL URLByAppendingPathComponent:name];
-	STAssertNotNil(destinationURL, @"Could not create disk image URL for %@", directoryURL);
+	XCTAssertNotNil(destinationURL, @"Could not create disk image URL for %@", directoryURL);
 
 	NSString *createInvocation;
 	if (directoryURL == nil) {
@@ -345,15 +351,15 @@ static void SQRLSignalHandler(int sig) {
 		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];

SquirrelTests/SQRLCodeSignatureSpec.m

@@ -6,9 +6,16 @@
 //  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"
 
-SpecBegin(SQRLCodeSignature)
+#import "QuickSpec+SQRLFixtures.h"
+
+QuickSpecBegin(SQRLCodeSignatureSpec)
 
 __block NSBundle *bundle;
 __block void (^corruptURL)(NSURL *URL);
@@ -17,26 +24,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 *verifier = [SQRLCodeSignature currentApplicationSignature:&error];
-	expect(verifier).notTo.beNil();
-	expect(error).to.beNil();
+	SQRLCodeSignature *signature = [SQRLCodeSignature currentApplicationSignature:&error];
+	expect(signature).notTo(beNil());
+	expect(error).to(beNil());
 
-	BOOL success = [[verifier verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
-	expect(success).to.beFalsy();
-	expect(error).notTo.beNil();
+	BOOL success = [[signature verifyBundleAtURL:bundle.bundleURL] waitUntilCompleted:&error];
+	expect(@(success)).to(beFalsy());
+	expect(error).notTo(beNil());
 });
 
 describe(@"code signature changes", ^{
@@ -47,15 +54,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", ^{
@@ -63,25 +70,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(SQRLCodeSignatureErrorCouldNotCreateStaticCode);
+		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", ^{
@@ -89,11 +96,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)));
 	});
 });
 
@@ -102,19 +109,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", ^{
@@ -122,11 +129,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)));
 	});
 });
 
@@ -135,19 +142,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", ^{
@@ -155,11 +162,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)));
 	});
 });
 
@@ -171,15 +178,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", ^{
@@ -187,12 +194,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)));
 	});
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SQRLDeepCodesignSpec.m

@@ -6,7 +6,14 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-SpecBegin(SQRLDeepCodesign)
+#import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <Squirrel/Squirrel.h>
+
+#import "QuickSpec+SQRLFixtures.h"
+
+QuickSpecBegin(SQRLDeepCodesign)
 
 NSMutableDictionary * (^environmentSuitableForChildProcess)(void) = ^ {
 	// Remove environment variables that configure the Obj-C runtime
@@ -42,7 +49,7 @@ void (^resignTestApplicationPreserveEverythingButTheRequirements)(void) = ^{
 	[resignCodesignTask launch];
 	[resignCodesignTask waitUntilExit];
 
-	expect(resignCodesignTask.terminationStatus).to.equal(0);
+	expect(@(resignCodesignTask.terminationStatus)).to(equal(@0));
 };
 
 void (^deepCodesignTestApplication)(void) = ^{
@@ -54,9 +61,9 @@ void (^deepCodesignTestApplication)(void) = ^{
 	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();
+	expect(@(getExecutable)).to(beTruthy());
+	expect(@(executable.boolValue)).to(beTruthy());
+	expect(executableError).to(beNil());
 
 	NSTask *deepCodesignTask = [[NSTask alloc] init];
 	deepCodesignTask.launchPath = deepCodesignLocation.path;
@@ -75,7 +82,7 @@ void (^deepCodesignTestApplication)(void) = ^{
 	[deepCodesignTask launch];
 	[deepCodesignTask waitUntilExit];
 
-	expect(deepCodesignTask.terminationStatus).to.equal(0);
+	expect(@(deepCodesignTask.terminationStatus)).to(equal(@0));
 
 	/*
 		By signing test application's contents, which are covered by test
@@ -111,9 +118,9 @@ it(@"should deep sign the test application", ^{
 });
 
 xit(@"should deep verify after signing", ^{
-	expect(deepVerify()).to.beFalsy();
+	expect(@(deepVerify())).to(beFalsy());
 	deepCodesignTestApplication();
-	expect(deepVerify()).to.beTruthy();
+	expect(@(deepVerify())).to(beTruthy());
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SQRLDirectoryManagerSpec.m

@@ -6,26 +6,31 @@
 //  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"
 
-SpecBegin(SQRLDirectoryManager)
+QuickSpecBegin(SQRLDirectoryManagerSpec)
 
 __block NSString *otestIdentifier;
 
 beforeEach(^{
-	otestIdentifier = NSRunningApplication.currentApplication.localizedName;
-	expect(otestIdentifier).notTo.beNil();
+	otestIdentifier = NSProcessInfo.processInfo.environment[@"FORCE_APP_IDENTIFIER"];
+	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", ^{
@@ -33,12 +38,12 @@ it(@"should send an Application Support URL", ^{
 
 	NSError *error = nil;
 	NSURL *appSupportURL = [[manager applicationSupportURL] firstOrDefault:nil success:NULL error:&error];
-	expect(appSupportURL).notTo.beNil();
-	expect(error).to.beNil();
+	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", ^{
@@ -46,8 +51,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());
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SQRLInstallerSpec.m

@@ -6,13 +6,32 @@
 //  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.h"
-#import "SQRLShipItLauncher.h"
-#import "SQRLShipItState.h"
+#import "SQRLInstaller+Private.h"
+#import "SQRLInstallerOwnedBundle.h"
+#import "SQRLShipItRequest.h"
 
-SpecBegin(SQRLInstaller)
+#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);
+};
 
 __block NSURL *updateURL;
 
@@ -20,127 +39,148 @@ beforeEach(^{
 	updateURL = [self createTestApplicationUpdate];
 });
 
-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();
+it(@"should install an update using ShipIt", ^{
+	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO];
 
-	[self launchShipIt];
+	[self installWithRequest:request remote:YES];
 
-	expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+	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];
+
+	[self installWithRequest:request remote:NO];
+
+	expect(self.testApplicationBundleVersion).toEventually(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));
 
-	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();
+	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:YES];
 
-	[self launchShipIt];
+	[self installWithRequest:request remote:YES];
 
-	expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
-	expect([NSRunningApplication runningApplicationsWithBundleIdentifier:bundleIdentifier].count).will.equal(1);
+	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
+	expect(@([NSRunningApplication runningApplicationsWithBundleIdentifier:bundleIdentifier].count)).toEventually(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];
 
-	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
-	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();
+	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO];
 
-	[self launchShipIt];
+	[self installWithRequest:request remote:YES];
 
-	expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+	expect(self.testApplicationBundleVersion).toEventually(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];
 
-	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:targetURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
-	expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();
+	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:targetURL bundleIdentifier:nil launchAfterInstallation:NO];
 
-	[self launchShipIt];
+	[self installWithRequest:request remote:YES];
 
 	NSURL *plistURL = [targetURL URLByAppendingPathComponent:@"Contents/Info.plist"];
-	expect([NSDictionary dictionaryWithContentsOfURL:plistURL][SQRLBundleShortVersionStringKey]).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+	expect([NSDictionary dictionaryWithContentsOfURL:plistURL][SQRLBundleShortVersionStringKey]).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 });
 
-it(@"should install an update in process", ^{
-	SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
-	state.installerState = SQRLInstallerStateClearingQuarantine;
+describe(@"with backup restoration", ^{
+	__block NSURL *targetURL;
 
-	SQRLInstaller *installer = [[SQRLInstaller alloc] initWithDirectoryManager:SQRLDirectoryManager.currentApplicationManager];
-	expect(installer).notTo.beNil();
+	beforeEach(^{
+		targetURL = self.testApplicationURL;
 
-	NSError *installError = nil;
-	BOOL install = [[installer.installUpdateCommand execute:state] asynchronouslyWaitUntilCompleted:&installError];
-	expect(install).to.beTruthy();
-	expect(installError).to.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];
+		[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];
+		[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));
+	});
 });
 
-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();
+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));
 
-	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();
+	expect(@(modeOfURL(updateURL))).to(equal(@0777));
+	expect(@(modeOfURL([updateURL URLByAppendingPathComponent:@"Contents/MacOS/TestApplication"]))).to(equal(@0777));
 
-	[self launchShipIt];
+	SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO];
 
-	// 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();
+	[self installWithRequest:request remote:YES];
 
-	expect(self.testApplicationBundleVersion).to.equal(SQRLTestApplicationOriginalShortVersionString);
-});
+	expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 
-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);
+	expect(@(modeOfURL(self.testApplicationURL))).to(equal(@0755));
+	expect(@(modeOfURL([self.testApplicationURL URLByAppendingPathComponent:@"Contents/MacOS/TestApplication"]))).to(equal(@0755));
 });
 
 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(5).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;
 
-		SQRLShipItState *state = [[SQRLShipItState alloc] initWithTargetBundleURL:self.testApplicationURL updateBundleURL:updateURL bundleIdentifier:nil codeSignature:self.testApplicationSignature];
-		expect([[state writeUsingURL:self.shipItDirectoryManager.shipItStateURL] waitUntilCompleted:NULL]).to.beTruthy();
+		SQRLShipItRequest *request = [[SQRLShipItRequest alloc] initWithUpdateBundleURL:updateURL targetBundleURL:self.testApplicationURL bundleIdentifier:nil launchAfterInstallation:NO];
 
-		[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);
+		[self installWithRequest:request remote:YES];
 
 		// Apply a random delay before sending the termination signal, to
 		// fuzz out race conditions.
@@ -148,45 +188,42 @@ 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 few times to really test resumption.
-		for (int i = 0; i < 3; i++) {
+		// 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++) {
 			system("killall -KILL ShipIt");
 
 			// Wait at least for the launchd throttle interval.
 			NSTimeInterval delay = 2 + (arc4random_uniform(100) / 1000.0);
 			[NSThread sleepForTimeInterval:delay];
 		}
+
+		verifyUpdate();
 	});
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SQRLShipItRequestSpec.m

@@ -0,0 +1,86 @@
+//
+//  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];
+	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

SquirrelTests/SQRLShipItStateSpec.m

@@ -1,63 +0,0 @@
-//
-//  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

SquirrelTests/SQRLTerminationListenerSpec.m

@@ -6,15 +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>
+
 #import "SQRLTerminationListener.h"
 
-SpecBegin(SQRLTerminationListener)
+#import "QuickSpec+SQRLFixtures.h"
+
+QuickSpecBegin(SQRLTerminationListenerSpec)
 
 __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", ^{
@@ -23,7 +30,7 @@ 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", ^{
@@ -37,12 +44,12 @@ it(@"should wait until one instance terminates", ^{
 		completed = YES;
 	}];
 
-	expect(observedApp).will.equal(app);
-	expect(completed).to.beFalsy();
+	expect(observedApp).toEventually(equal(app));
+	expect(@(completed)).to(beFalsy());
 
 	[app forceTerminate];
-	expect(app.terminated).will.beTruthy();
-	expect(completed).will.beTruthy();
+	expect(@(app.terminated)).toEventually(beTruthy());
+	expect(@(completed)).toEventually(beTruthy());
 });
 
 it(@"should wait until multiple instances terminate", ^{
@@ -54,15 +61,15 @@ it(@"should wait until multiple instances terminate", ^{
 		completed = YES;
 	}];
 
-	expect(completed).to.beFalsy();
+	expect(@(completed)).to(beFalsy());
 
 	[app1 forceTerminate];
-	expect(app1.terminated).will.beTruthy();
-	expect(completed).to.beFalsy();
+	expect(@(app1.terminated)).toEventually(beTruthy());
+	expect(@(completed)).to(beFalsy());
 
 	[app2 forceTerminate];
-	expect(app2.terminated).will.beTruthy();
-	expect(completed).will.beTruthy();
+	expect(@(app2.terminated)).toEventually(beTruthy());
+	expect(@(completed)).toEventually(beTruthy());
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SQRLUpdateSpec.m

@@ -6,22 +6,27 @@
 //  Copyright (c) 2013 GitHub. All rights reserved.
 //
 
-SpecBegin(SQRLUpdate)
+#import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
+#import <ReactiveCocoa/ReactiveCocoa.h>
+#import <Squirrel/Squirrel.h>
+
+QuickSpecBegin(SQRLUpdateSpec)
 
 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", ^{
@@ -32,20 +37,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).notTo.beNil();
+	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).notTo.beNil();
+	expect(update.releaseDate).notTo(beNil());
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SQRLUpdaterSpec.m

@@ -6,37 +6,44 @@
 //  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 "SQRLZipArchiver.h"
 
-#import "SQRLTestUpdate.h"
 #import "OHHTTPStubs/OHHTTPStubs.h"
+#import "QuickSpec+SQRLFixtures.h"
+#import "SQRLTestUpdate.h"
+#import "TestAppConstants.h"
 
-SpecBegin(SQRLUpdater)
+QuickSpecBegin(SQRLUpdaterSpec)
 
 __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;
 };
@@ -54,7 +61,7 @@ beforeEach(^{
 
 describe(@"updating", ^{
 	__block NSURL *updateURL;
-	
+
 	beforeEach(^{
 		updateURL = [self createTestApplicationUpdate];
 	});
@@ -65,19 +72,19 @@ describe(@"updating", ^{
 			@"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).will.beTruthy();
-		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+		expect(@(app.terminated)).toEventually(beTruthy());
+		expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 	});
 
 	it(@"should not install a corrupt update", ^{
 		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),
@@ -87,11 +94,11 @@ describe(@"updating", ^{
 		writeUpdate(update);
 
 		NSRunningApplication *app = launchWithEnvironment(nil);
-		expect(app.terminated).will.beTruthy();
+		expect(@(app.terminated)).withTimeout(5).toEventually(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", ^{
@@ -118,8 +125,8 @@ describe(@"updating", ^{
 
 		writeUpdate(update);
 
-		expect(app.terminated).will.beTruthy();
-		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+		expect(@(app.terminated)).withTimeout(5).toEventually(beTruthy());
+		expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 	});
 
 	it(@"should use the application's bundled version of Squirrel and update in-place after a significant delay", ^{
@@ -130,24 +137,22 @@ describe(@"updating", ^{
 
 		writeUpdate(update);
 
-		NSTimeInterval delay = 30;
+		NSTimeInterval delay = 15;
 		NSRunningApplication *app = launchWithEnvironment(@{ @"SQRLUpdateDelay": [NSString stringWithFormat:@"%f", delay] });
 
-		Expecta.asynchronousTestTimeout = delay + 3;
-		expect(app.terminated).will.beTruthy();
-
-		expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+		expect(@(app.terminated)).withTimeout(delay + 5).toEventually(beTruthy());
+		expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 	});
 
 	describe(@"cleaning up", ^{
 		__block NSURL *appSupportURL;
 		__block RACSignal *updateDirectoryURLs;
-		
+
 		beforeEach(^{
 			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:@"com.github.Squirrel.TestApplication.ShipIt"];
 
 			appSupportURL = [[directoryManager applicationSupportURL] first];
-			expect(appSupportURL).notTo.beNil();
+			expect(appSupportURL).notTo(beNil());
 
 			updateDirectoryURLs = [[RACSignal
 				defer:^{
@@ -168,22 +173,16 @@ describe(@"updating", ^{
 				@"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).will.beTruthy();
-			expect(self.testApplicationBundleVersion).will.equal(SQRLTestApplicationUpdatedShortVersionString);
+			expect(@(app.terminated)).withTimeout(5).toEventually(beTruthy());
+			expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 
-			// Also test that this is the only update directory (any others
-			// should've been removed).
-			NSArray *directoryURLs = [updateDirectoryURLs toArray];
-			expect(directoryURLs.count).to.equal(1);
-
-			NSArray *contents = [NSFileManager.defaultManager contentsOfDirectoryAtURL:directoryURLs[0] includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsHiddenFiles error:NULL];
-			expect(contents).to.equal(@[]);
+			expect([updateDirectoryURLs toArray]).toEventually(equal(@[]));
 		});
 	});
 });
@@ -192,7 +191,7 @@ describe(@"response handling", ^{
 	__block NSURLRequest *localRequest = nil;
 	__block SQRLUpdater *updater = nil;
 
-	before(^{
+	beforeEach(^{
 		localRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"fake://host/path"]];
 		updater = [[SQRLUpdater alloc] initWithUpdateRequest:localRequest];
 	});
@@ -209,9 +208,9 @@ 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);
+		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", ^{
@@ -226,10 +225,68 @@ 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);
+		expect(@(result)).to(beFalsy());
+		expect(error.domain).to(equal(SQRLUpdaterErrorDomain));
+		expect(@(error.code)).to(equal(@(SQRLUpdaterErrorInvalidServerBody)));
 	});
 });
 
-SpecEnd
+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", ^{
+		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(5).toEventually(beTruthy());
+	});
+
+	it(@"should transition through idle, checking, downloading and awaiting relaunch, when there is an update", ^{
+		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).toEventually(equal(expectedStates));
+
+		expect(@(testApplication.terminated)).withTimeout(5).toEventually(beTruthy());
+	});
+});
+
+QuickSpecEnd

SquirrelTests/SQRLZipArchiverSpec.m

@@ -6,38 +6,44 @@
 //  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"
 
-SpecBegin(SQRLZipArchiver)
+QuickSpecBegin(SQRLZipArchiverSpec)
 
 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", ^{
@@ -45,21 +51,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());
 });
 
-SpecEnd
+QuickSpecEnd

SquirrelTests/SquirrelTests-Prefix.pch

@@ -1,25 +0,0 @@
-//
-//  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

SquirrelTests/SwiftSpec.swift

@@ -0,0 +1,19 @@
+//
+//  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())
+	}
+}

SquirrelTests/en.lproj/InfoPlist.strings

@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

TestApplication/TestAppConstants.h

@@ -0,0 +1,22 @@
+//
+//  TestAppConstants.h
+//  Squirrel
+//
+//  Created by Keith Duncan on 05/02/2014.
+//  Copyright (c) 2014 GitHub. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+// This notification is posted to the distributed notification center when a
+// change to the `SQRLUpdater.state` property is observed.
+//
+// It is posted once on launch with the initial idle state, and then for any
+// transition thereafter.
+//
+// Yhe user info dictionary includes the new state value under the
+// `SQRLTestAppUpdaterStateKey` key.
+extern NSString * const SQRLTestAppUpdaterStateTransitionNotificationName;
+
+// The state of the updater, an NSNumber.
+extern NSString * const SQRLTestAppUpdaterStateKey;

TestApplication/TestAppConstants.m

@@ -0,0 +1,13 @@
+//
+//  TestAppConstants.m
+//  Squirrel
+//
+//  Created by Keith Duncan on 05/02/2014.
+//  Copyright (c) 2014 GitHub. All rights reserved.
+//
+
+#import "TestAppConstants.h"
+
+NSString * const SQRLTestAppUpdaterStateTransitionNotificationName = @"com.github.Squirrel.TestApplication.state-changed";
+
+NSString * const SQRLTestAppUpdaterStateKey = @"state";

TestApplication/TestAppDelegate.m

@@ -12,6 +12,7 @@
 #import "SQRLTestUpdate.h"
 #import <ReactiveCocoa/EXTScope.h>
 #import <ReactiveCocoa/ReactiveCocoa.h>
+#import "TestAppConstants.h"
 
 @interface TestAppDelegate ()
 
@@ -63,6 +64,12 @@
 	self.updater = [[SQRLUpdater alloc] initWithUpdateRequest:request];
 	self.updater.updateClass = SQRLTestUpdate.class;
 
+	[RACObserve(self.updater, state) subscribeNext:^(NSNumber *state) {
+		NSLog(@"State transition: %@", state);
+
+		[NSDistributedNotificationCenter.defaultCenter postNotificationName:SQRLTestAppUpdaterStateTransitionNotificationName object:nil userInfo:@{ SQRLTestAppUpdaterStateKey: state }];
+	}];
+
 	__block NSUInteger updateCheckCount = 1;
 
 	[[[[[[[[[[RACSignal

script/bootstrap

@@ -10,7 +10,7 @@ config ()
 {
     # A whitespace-separated list of executables that must be present and locatable.
     : ${REQUIRED_TOOLS="xctool"}
-    
+
     export REQUIRED_TOOLS
 }
 
@@ -28,7 +28,14 @@ main ()
         check_deps
     fi
 
-    local submodules=$(git submodule status 2>/dev/null)
+    local submodules=$(git submodule status)
+    local result=$?
+
+    if [ "$result" -ne "0" ]
+    then
+        exit $result
+    fi
+
     if [ -n "$submodules" ]
     then
         echo "*** Updating submodules..."

script/cibuild

@@ -44,7 +44,7 @@ config ()
     # A source-able file with information about the Keychain, containing our
     # code-signing certificate.
     : ${KEYCHAIN_INFO:=/var/lib/jenkins/config/xcodekeychain}
-    
+
     export XCWORKSPACE
     export XCODEPROJ
     export BOOTSTRAP
@@ -140,18 +140,29 @@ build_scheme ()
 
     local awkstatus=$?
 
+    if [ "$awkstatus" -eq "1" ]
+    then
+        # SDK not found, try for iphonesimulator.
+        sdkflag="-sdk iphonesimulator"
+
+        # Determine whether the unit tests will run with iphonesimulator
+        run_xctool $sdkflag -scheme "$scheme" run-tests | parse_build
+
+        awkstatus=$?
+
+        if [ "$awkstatus" -ne "0" ]
+        then
+            # Unit tests will not run on iphonesimulator.
+            sdkflag=""
+        fi
+    fi
+
     if [ "$awkstatus" -ne "0" ]
     then
         # Unit tests aren't supported.
         action=build
     fi
 
-    if [ "$awkstatus" -eq "1" ]
-    then
-        # Build for iOS.
-        sdkflag="-sdk iphonesimulator"
-    fi
-
     run_xctool $sdkflag -scheme "$scheme" $action
 }
 

script/deep-codesign

@@ -106,8 +106,10 @@ end
 
 module Codesign
 	class Task
-		def self.sign(target, identity)
-			codesign_with_arguments([ "--sign", identity, "--force", "--preserve-metadata=identifier,entitlements,resource-rules,requirements", "--verbose", target.path ])
+		def self.sign(target, identity, timestamp)
+			arguments = [ "--sign", identity, "--force", "--preserve-metadata=identifier,entitlements,requirements", "--verbose", target.path ]
+			arguments.unshift("--timestamp=none") if not timestamp
+			codesign_with_arguments(arguments)
 		end
 
 		protected
@@ -137,7 +139,7 @@ unless build_dir && product_name
 	exit_error("Path to built product not provided")
 end
 
-input_path = File.join(build_dir, product_name)
+input_path = File.realpath(File.join(build_dir, product_name))
 unless File.exists?(input_path)
 	exit_error("Built product doesn't exist at path provided")
 end
@@ -168,6 +170,7 @@ while paths_to_search.size > 0
 
 		Dir.foreach(search_path) do |current_directory_entry|
 			next if current_directory_entry.start_with?(".")
+			File.delete(File.join(search_path, current_directory_entry)) if current_directory_entry.end_with?(".cstemp")
 
 			target = match_path(File.join(search_path, current_directory_entry))
 			next if target.nil?
@@ -193,7 +196,8 @@ targets = targets.sort_by do |target|
 end
 targets.reverse!
 
+use_timestamp = ENV["CONFIGURATION"] == "Release"
 targets.each do |target|
 	puts "=> #{target.path}"
-	Codesign::Task.sign(target, codesign_identity)
+	Codesign::Task.sign(target, codesign_identity, use_timestamp)
 end

script/schemes.awk

@@ -2,10 +2,8 @@ BEGIN {
     FS = "\n";
 }
 
-/Targets:/ {
+/Schemes:/ {
     while (getline && $0 != "") {
-        if ($0 ~ /Test/) continue;
-
         sub(/^ +/, "");
         print "'" $0 "'";
     }