Merge pull request #152 from Squirrel/fix-pruning

Fix pruning

Cartfile.private

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

Cartfile.resolved

@@ -1,5 +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"
+github "Mantle/Mantle" "1.5.4"
+github "Quick/Nimble" "v0.4.2"
+github "Quick/Quick" "v0.3.1"
+github "ReactiveCocoa/ReactiveCocoa" "v2.4.7"
+github "jspahrsummers/xcconfigs" "0.7.2"

Squirrel.xcodeproj/project.pbxproj

@@ -55,6 +55,7 @@
 		D06B58B518032B1500656D97 /* RACSignal+SQRLTransactionExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D06B58B318032B1500656D97 /* RACSignal+SQRLTransactionExtensions.m */; };
 		D06B58B618032B1500656D97 /* RACSignal+SQRLTransactionExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D06B58B318032B1500656D97 /* RACSignal+SQRLTransactionExtensions.m */; };
 		D06B58D118035B5A00656D97 /* SQRLTerminationListenerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = D06B58D018035B5A00656D97 /* SQRLTerminationListenerSpec.m */; };
+		D06F7B101AD72DD30009A3BC /* RACKVOProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = D06F7B0F1AD72DD30009A3BC /* RACKVOProxy.m */; };
 		D08D4E0D17B451500012B22D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C22BDA179CC00E00158214 /* Cocoa.framework */; };
 		D08D4E1317B451500012B22D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D08D4E1117B451500012B22D /* InfoPlist.strings */; };
 		D08D4E1517B451500012B22D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D08D4E1417B451500012B22D /* main.m */; };
@@ -314,6 +315,7 @@
 		D06B58B218032B1500656D97 /* RACSignal+SQRLTransactionExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RACSignal+SQRLTransactionExtensions.h"; sourceTree = "<group>"; };
 		D06B58B318032B1500656D97 /* RACSignal+SQRLTransactionExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "RACSignal+SQRLTransactionExtensions.m"; sourceTree = "<group>"; };
 		D06B58D018035B5A00656D97 /* SQRLTerminationListenerSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SQRLTerminationListenerSpec.m; sourceTree = "<group>"; };
+		D06F7B0F1AD72DD30009A3BC /* RACKVOProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RACKVOProxy.m; path = Carthage/Checkouts/ReactiveCocoa/ReactiveCocoa/RACKVOProxy.m; sourceTree = SOURCE_ROOT; };
 		D08D4E0C17B451500012B22D /* TestApplication.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestApplication.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D08D4E1017B451500012B22D /* TestApplication-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestApplication-Info.plist"; sourceTree = "<group>"; };
 		D08D4E1217B451500012B22D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -722,6 +724,7 @@
 				D0AFE3551A0028A400C6048F /* RACEvent.m */,
 				D0AFE3561A0028A400C6048F /* RACGroupedSignal.m */,
 				D0AFE3571A0028A400C6048F /* RACImmediateScheduler.m */,
+				D06F7B0F1AD72DD30009A3BC /* RACKVOProxy.m */,
 				D09C66341A00535B007D7ED0 /* RACKVOTrampoline.m */,
 				D0AFE3581A0028A400C6048F /* RACMulticastConnection.m */,
 				D09C663A1A00538D007D7ED0 /* RACObjCRuntime.m */,
@@ -1164,6 +1167,7 @@
 				D0AFE37C1A0028B000C6048F /* RACCompoundDisposableProvider.d in Sources */,
 				D0AFE3441A00285000C6048F /* NSValueTransformer+MTLPredefinedTransformerAdditions.m in Sources */,
 				D0AFE38B1A0028EC00C6048F /* RACArraySequence.m in Sources */,
+				D06F7B101AD72DD30009A3BC /* RACKVOProxy.m in Sources */,
 				D0AFE3751A0028A400C6048F /* RACSubject.m in Sources */,
 				D014AC0517B97885007D79D0 /* ShipIt-main.m in Sources */,
 				D0AFE3431A00285000C6048F /* MTLReflection.m in Sources */,

Squirrel/SQRLDownloadedUpdate.m

@@ -40,9 +40,9 @@
 #pragma mark MTLJSONSerializing
 
 + (NSDictionary *)JSONKeyPathsByPropertyKey {
-	return [super.JSONKeyPathsByPropertyKey mtl_dictionaryByAddingEntriesFromDictionary:@{
+	return @{
 		@keypath(SQRLDownloadedUpdate.new, bundleURL): NSNull.null
-	}];
+	};
 }
 
 @end

Squirrel/SQRLUpdater.m

@@ -49,16 +49,6 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 // Sends completed or error.
 @property (nonatomic, strong, readonly) RACSignal *shipItLauncher;
 
-// Lazily removes outdated temporary directories (used for previous updates)
-// upon first subscription.
-//
-// Pruning directories while an update is pending or in progress will result in
-// undefined behavior.
-//
-// Sends each removed directory then completes, or errors, on an unspecified
-// thread.
-@property (nonatomic, strong, readonly) RACSignal *prunedUpdateDirectories;
-
 // Parses an update model from downloaded data.
 //
 // data - JSON data representing an update manifest. This must not be nil.
@@ -169,33 +159,6 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 	BOOL updatesDisabled = (getenv("DISABLE_UPDATE_CHECK") != NULL);
 	@weakify(self);
 
-	_prunedUpdateDirectories = [[[[RACSignal
-		defer:^{
-			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:SQRLShipItLauncher.shipItJobLabel];
-			return [directoryManager applicationSupportURL];
-		}]
-		flattenMap:^(NSURL *appSupportURL) {
-			NSFileManager *manager = [[NSFileManager alloc] init];
-			NSDirectoryEnumerator *enumerator = [manager enumeratorAtURL:appSupportURL includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsSubdirectoryDescendants errorHandler:^(NSURL *URL, NSError *error) {
-				NSLog(@"Error enumerating item %@ within directory %@: %@", URL, appSupportURL, error);
-				return YES;
-			}];
-
-			return [[enumerator.rac_sequence.signal
-				filter:^(NSURL *enumeratedURL) {
-					NSString *name = enumeratedURL.lastPathComponent;
-					return [name hasPrefix:SQRLUpdaterUniqueTemporaryDirectoryPrefix];
-				}]
-				doNext:^(NSURL *directoryURL) {
-					NSError *error = nil;
-					if (![manager removeItemAtURL:directoryURL error:&error]) {
-						NSLog(@"Error removing old update directory at %@: %@", directoryURL, error.sqrl_verboseDescription);
-					}
-				}];
-		}]
-		replayLazily]
-		setNameWithFormat:@"%@ -prunedUpdateDirectories", self];
-
 	_checkForUpdatesCommand = [[RACCommand alloc] initWithEnabled:[RACSignal return:@(!updatesDisabled)] signalBlock:^(id _) {
 		@strongify(self);
 		NSParameterAssert(self.updateRequest != nil);
@@ -205,7 +168,8 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 		[request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
 
 		// Prune old updates before the first update check.
-		return [[[[[[[[self.prunedUpdateDirectories
+		return [[[[[[[[[self
+			pruneUpdateDirectories]
 			catch:^(NSError *error) {
 				NSLog(@"Error pruning old updates: %@", error);
 				return [RACSignal empty];
@@ -502,6 +466,42 @@ static NSString * const SQRLUpdaterUniqueTemporaryDirectoryPrefix = @"update.";
 		setNameWithFormat:@"%@ -shipItStateURL", self];
 }
 
+/// Lazily removes outdated temporary directories (used for previous updates)
+/// upon subscription.
+///
+/// Pruning directories while an update is pending or in progress will result in
+/// undefined behavior.
+///
+/// Sends each removed directory then completes, or errors, on an unspecified
+/// thread.
+- (RACSignal *)pruneUpdateDirectories {
+	return [[[RACSignal
+		defer:^{
+			SQRLDirectoryManager *directoryManager = [[SQRLDirectoryManager alloc] initWithApplicationIdentifier:SQRLShipItLauncher.shipItJobLabel];
+			return [directoryManager applicationSupportURL];
+		}]
+		flattenMap:^(NSURL *appSupportURL) {
+			NSFileManager *manager = [[NSFileManager alloc] init];
+			NSDirectoryEnumerator *enumerator = [manager enumeratorAtURL:appSupportURL includingPropertiesForKeys:nil options:NSDirectoryEnumerationSkipsSubdirectoryDescendants errorHandler:^(NSURL *URL, NSError *error) {
+				NSLog(@"Error enumerating item %@ within directory %@: %@", URL, appSupportURL, error);
+				return YES;
+			}];
+
+			return [[enumerator.rac_sequence.signal
+				filter:^(NSURL *enumeratedURL) {
+					NSString *name = enumeratedURL.lastPathComponent;
+					return [name hasPrefix:SQRLUpdaterUniqueTemporaryDirectoryPrefix];
+				}]
+				doNext:^(NSURL *directoryURL) {
+					NSError *error = nil;
+					if (![manager removeItemAtURL:directoryURL error:&error]) {
+						NSLog(@"Error removing old update directory at %@: %@", directoryURL, error.sqrl_verboseDescription);
+					}
+				}];
+		}]
+		setNameWithFormat:@"%@ -prunedUpdateDirectories", self];
+}
+
 #pragma mark Installing Updates
 
 - (RACSignal *)verifyAndPrepareUpdate:(SQRLUpdate *)update fromBundle:(NSBundle *)updateBundle {

SquirrelTests/SQRLUpdaterSpec.m

@@ -178,7 +178,8 @@ describe(@"updating", ^{
 
 			writeUpdate(update);
 
-			NSRunningApplication *app = launchWithEnvironment(nil);
+			NSRunningApplication *app = launchWithEnvironment(@{ @"SQRLUpdateRequestCount": @2 });
+			expect([updateDirectoryURLs toArray]).toEventuallyNot(equal(@[]));
 			expect(@(app.terminated)).withTimeout(5).toEventually(beTruthy());
 			expect(self.testApplicationBundleVersion).toEventually(equal(SQRLTestApplicationUpdatedShortVersionString));
 

TestApplication/TestAppDelegate.m

@@ -72,6 +72,8 @@
 
 	__block NSUInteger updateCheckCount = 1;
 
+	NSInteger updateRequestCount = [NSProcessInfo.processInfo.environment[@"SQRLUpdateRequestCount"] integerValue];
+
 	[[[[[[[[[[RACSignal
 		defer:^{
 			NSLog(@"***** UPDATE CHECK %lu *****", (unsigned long)updateCheckCount);
@@ -90,7 +92,7 @@
 
 			return testUpdate.final;
 		}]
-		take:1]
+		take:updateRequestCount]
 		doNext:^(id _) {
 			NSLog(@"***** READY TO INSTALL UPDATE *****");
 		}]

script/deep-codesign

@@ -95,7 +95,7 @@ module Targets
 
 			# Look for an __TEXT,__info_plist section
 			# This contains the CFBundleIdentifier necessary for signing
-			`otool -l #{path}` =~ /__info_plist/
+			`otool -l "#{path}"` =~ /__info_plist/
 		end
 	end