colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-28 22:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

New: updating Cappuccino from xCodeCapp

Browse Source 
This PR add the possibility to update cappuccino from xCodeCapp. How does it work :

- Create a temporary file for cappuccino
- Download Cappuccino. The downloaded Cappuccino will be either the last release or the last version of the master branch (option in the preference)
- Make a jake clean
- Make a jake install

There is a small window to follow the progress of the install (3 steps ; download - clean - install).
If there is a issue with the install, the developer will be notify with which step failed (xCodeCapp internally log everything).
The environment var CAPP_NOSUDO is set to 1. It means, if a developer did a bootstrap or a previous jake install in sudo, the update of cappuccino will fail.

Changed the credit of xCodeCapp and pass it to the version 3.1
This commit is contained in:
Alexandre Wilhelm
2014-05-01 18:52:28 -07:00
parent 86d186e279
commit 4806c52ba6
7 changed files with 885 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/XcodeCapp/XcodeCapp/XcodeCapp.m
+251 -4
View File
@@ -230,7 +230,8 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
@"/usr/local/bin",
@"/usr/local/narwhal/bin",
@"~/narwhal/bin",
@"~/bin"
@"~/bin",
@"/usr/bin"
];
NSMutableArray *paths = [self.environmentPaths mutableCopy];
@@ -242,8 +243,11 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
// Make sure we are using jsc as the narwhal engine!
self.environment[@"NARWHAL_ENGINE"] = @"jsc";
// Make sure to not do something in sudo
self.environment[@"CAPP_NOSUDO"] = @"1";
self.executables = @[@"python", @"narwhal-jsc", @"objj", @"nib2cib", @"capp", @"capp_lint"];
self.executables = @[@"python", @"narwhal-jsc", @"objj", @"nib2cib", @"capp", @"capp_lint", @"jake", @"curl", @"unzip", @"rm"];
// This is used to get the env var of $CAPP_BUILD
NSDictionary *processEnvironment = [[NSProcessInfo processInfo] environment];
@@ -1265,15 +1269,29 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
#pragma mark - Shell Helpers
/*!
Run an NSTask with the given arguments
@param launchPath The executable to launch
@param arguments NSArray containing the NSTask arguments
@param returnType Determines whether to return stdout, stderr, either, or nothing in the response
@return NSDictionary containing the return status (NSNumber) and the response (NSString)
*/
- (NSDictionary *)runTaskWithLaunchPath:(NSString *)launchPath arguments:(NSArray *)arguments returnType:(XCCTaskReturnType)returnType
{
return [self runTaskWithLaunchPath:launchPath arguments:arguments returnType:returnType currentDirectoryPath:nil];
}
/*!
Run an NSTask with the given arguments
@param launchPath The executable to launch
@param arguments NSArray containing the NSTask arguments
@param returnType Determines whether to return stdout, stderr, either, or nothing in the response
@param the currentDirectoryPath for the task
@return NSDictionary containing the return status (NSNumber) and the response (NSString)
*/
- (NSDictionary *)runTaskWithLaunchPath:(NSString *)launchPath arguments:(NSArray *)arguments returnType:(XCCTaskReturnType)returnType
- (NSDictionary *)runTaskWithLaunchPath:(NSString *)launchPath arguments:(NSArray *)arguments returnType:(XCCTaskReturnType)returnType currentDirectoryPath:(NSString*)aCurrentDirectoryPath
{
NSTask *task = [NSTask new];
@@ -1282,7 +1300,10 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
task.environment = self.environment;
task.standardOutput = [NSPipe pipe];
task.standardError = [NSPipe pipe];
if (aCurrentDirectoryPath)
task.currentDirectoryPath = aCurrentDirectoryPath;
[task launch];
DDLogVerbose(@"Task launched: %@\n%@", launchPath, arguments);
@@ -1336,6 +1357,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
return YES;
}
#pragma mark - Source Files Management
- (BOOL)isObjjFile:(NSString *)path
@@ -1843,6 +1865,231 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
[self.errorListController addObjects:errors];
}
#pragma mark - Cappuccino update
- (void)updateCappuccino
{
[[NSNotificationCenter defaultCenter] postNotificationName:XCCBatchDidStartNotification object:self];
[[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
[self.updatingCappuccinoPanel makeKeyAndOrderFront:self];
self.isCappuccinoUpdating = YES;
[self.progressIndicator startAnimation:self];
[self.progressIndicator setMaxValue:4];
[self.progressIndicator setDoubleValue:0];
NSString *temporaryFolder = NSTemporaryDirectory();
if(![self _hasInitializedUpdateCappuccinoFromFolder:temporaryFolder] ||
![self _hasCleanedInstallOfCappuccinoFromFolder:temporaryFolder] ||
![self _hasInstalledCappuccinoFromFolder:temporaryFolder])
return;
[self notifyUserWithTitle:@"Update Cappuccino" message:@"Updating of Cappuccino completed"];
[self _incrementeProgressBarAndUpdateInformationFieldWithMessage:@"Updating completed"];
[self.progressIndicator stopAnimation:self];
self.isCappuccinoUpdating = NO;
[[NSNotificationCenter defaultCenter] postNotificationName:XCCBatchDidEndNotification object:self];
}
- (BOOL)_hasInitializedUpdateCappuccinoFromFolder:(NSString*)aFolder
{
//Be sure to remove an old install
NSMutableArray *rmArguments = [NSMutableArray arrayWithObjects:@"-r", @"cappuccino", nil];
[self runTaskWithLaunchPath:self.executablePaths[@"rm"]
arguments:rmArguments
returnType:kTaskReturnTypeAny
currentDirectoryPath:aFolder];
[self _incrementeProgressBarAndUpdateInformationFieldWithMessage:@"Downloading Cappuccino"];
// Download the file
NSString *cappuccinoURL;
if ([[NSUserDefaults standardUserDefaults] boolForKey:kDefaultUpdateCappuccinoWithLastVersionOfMasterBranch])
cappuccinoURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"XCCLastCappuccinoMasterBranchURL"];
else
cappuccinoURL = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"XCCLastCappuccinoReleaseURL"];
NSString *destination = [NSString stringWithFormat:@"%@cappuccino.zip", aFolder];
NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"-Lk", cappuccinoURL, @"-o", destination, nil];
NSDictionary *taskResult = [self runTaskWithLaunchPath:self.executablePaths[@"curl"]
arguments:arguments
returnType:kTaskReturnTypeStdOut];
NSInteger status = [taskResult[@"status"] intValue];
if (status > 1)
{
[self _updatingCappuccinoFailedWithMessage:@"Unable to download Cappuccino"];
return NO;
}
//Unzip the file
NSMutableArray *unzipArguments = [NSMutableArray arrayWithObjects:@"-u", @"-o", @"-q", @"-d", @"cappuccino", @"cappuccino.zip", nil];
NSDictionary *unzipTaskResult = [self runTaskWithLaunchPath:self.executablePaths[@"unzip"]
arguments:unzipArguments
returnType:kTaskReturnTypeAny
currentDirectoryPath:aFolder];
NSInteger unzipStatus = [unzipTaskResult[@"status"] intValue];
if (unzipStatus >= 1)
{
DDLogVerbose(@"Unable to unzip Cappuccino");
[self _updatingCappuccinoFailedWithMessage:@"Unable to unzip Cappuccino"];
return NO;
}
return YES;
}
- (BOOL)_hasCleanedInstallOfCappuccinoFromFolder:(NSString*)aFolder
{
NSString* path = [self _cappuccinoPathForFolder:aFolder];
[self _incrementeProgressBarAndUpdateInformationFieldWithMessage:@"Jake clean"];
//Jake clean
NSMutableArray *jakeCleanArguments = [NSMutableArray arrayWithObjects:@"clean", nil];
NSDictionary *jakeCleanTaskResult = [self runJakeTaskWithArguments:jakeCleanArguments currentDirectoryPath:path];
NSInteger jakeInstallStatus = [jakeCleanTaskResult[@"status"] intValue];
if (jakeInstallStatus == 1)
{
DDLogVerbose(@"Jake clean failed: %@", jakeCleanTaskResult[@"response"]);
[self _updatingCappuccinoFailedWithMessage:@"Jake clean failed"];
return NO;
}
return YES;
}
- (BOOL)_hasInstalledCappuccinoFromFolder:(NSString*)aFolder
{
NSString* path = [self _cappuccinoPathForFolder:aFolder];
[self _incrementeProgressBarAndUpdateInformationFieldWithMessage:@"Jake install"];
//Jake install
NSMutableArray *jakeInstallArguments = [NSMutableArray arrayWithObjects:@"install", nil];
NSDictionary *jakeInstallTaskResult = [self runJakeTaskWithArguments:jakeInstallArguments currentDirectoryPath:path];
NSInteger jakeInstallStatus = [jakeInstallTaskResult[@"status"] intValue];
if (jakeInstallStatus == 1)
{
DDLogVerbose(@"Jake install failed: %@", jakeInstallTaskResult[@"response"]);
[self _updatingCappuccinoFailedWithMessage:@"Jake install failed"];
return NO;
}
return YES;
}
- (NSDictionary*)runJakeTaskWithArguments:(NSMutableArray*)arguments currentDirectoryPath:(NSString*)aCurrentDirectoryPath
{
NSString *launchPath = self.executablePaths[@"jake"];
NSTask *task = [NSTask new];
task.launchPath = launchPath;
task.arguments = arguments;
task.environment = self.environment;
task.standardOutput = [NSPipe new];
task.standardError = [NSPipe new];
if (aCurrentDirectoryPath)
task.currentDirectoryPath = aCurrentDirectoryPath;
// This is needed to log the jake
NSFileHandle* fhOut = [task.standardOutput fileHandleForReading];
[fhOut readInBackgroundAndNotify];
NSFileHandle* fhErr = [task.standardError fileHandleForReading];
[fhErr readInBackgroundAndNotify];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jakeReceivedData:) name:NSFileHandleReadCompletionNotification object:fhOut];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jakeReceivedError:) name:NSFileHandleReadCompletionNotification object:fhErr];
[task launch];
DDLogVerbose(@"Task launched: %@\n%@", launchPath, arguments);
[task waitUntilExit];
DDLogVerbose(@"Task exited: %@:%d", launchPath, task.terminationStatus);
NSNumber *status = [NSNumber numberWithInt:task.terminationStatus];
NSData *data = nil;
if ([status intValue] == 0)
data = [[task.standardOutput fileHandleForReading] availableData];
else
data = [[task.standardError fileHandleForReading] availableData];
NSString *response = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadCompletionNotification object:fhOut];
[[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadCompletionNotification object:fhErr];
return @{@"status" : status, @"response" : response};
}
-(void)jakeReceivedData:(NSNotification*)notification
{
NSData *data = [[notification userInfo] objectForKey:NSFileHandleNotificationDataItem];
NSString *string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
DDLogVerbose(@"%@", string);
[[notification object] readInBackgroundAndNotify];
}
-(void)jakeReceivedError:(NSNotification*)notification
{
NSData *data = [[notification userInfo] objectForKey:NSFileHandleNotificationDataItem];
NSString *string = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding];
DDLogVerbose(@"%@", string);
}
/*!
This return the current path where the tmp cappuccino was downloaded
*/
- (NSString*)_cappuccinoPathForFolder:(NSString*)aFolder
{
NSFileManager *fileManger = [NSFileManager defaultManager];
NSString *contentOfCappuccinoFolder = [[fileManger contentsOfDirectoryAtPath:[NSString stringWithFormat:@"%@cappuccino", aFolder] error:nil] firstObject];
return [NSString stringWithFormat:@"%@cappuccino/%@", aFolder, contentOfCappuccinoFolder];
}
- (void)_incrementeProgressBarAndUpdateInformationFieldWithMessage:(NSString*)aString
{
double currentValue = [self.progressIndicator doubleValue];
[self.progressIndicator setDoubleValue:++currentValue];
[self.fieldCurrentTask setStringValue:[NSString stringWithFormat:@"Step %.0f/%.0f : %@", [self.progressIndicator doubleValue], [self.progressIndicator maxValue], aString]];
}
- (void)_updatingCappuccinoFailedWithMessage:(NSString*)aMessage
{
[self.progressIndicator stopAnimation:self];
[self.progressIndicator setDoubleValue:0];
[self.fieldCurrentTask setStringValue:[NSString stringWithFormat:@"Issue : %@", aMessage]];
[self notifyUserWithTitle:@"Error updating Cappuccino" message:aMessage];
self.isCappuccinoUpdating = NO;
[[NSNotificationCenter defaultCenter] postNotificationName:XCCBatchDidEndNotification object:self];
}
#pragma mark - User notifications
- (NSString *)applicationNameForGrowl