joomla/patchtester
33
0
Fork 0
mirror of https://github.com/joomla-extensions/patchtester.git synced 2024-12-22 19:09:00 +00:00
Code Issues Releases Activity

Enhanced patch application and reverting ability

Browse Source
This commit is contained in:
Ian MacLennan 2011-10-11 16:51:12 -04:00
parent 59ff677545
commit 74de0e012c
2 changed files with 101 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
administrator/components/com_patchtester/models/pull.php
View File

@ -37,6 +37,53 @@ class PatchtesterModelPull extends JModel
}
protected function parsePatch($patch)
{
$state = 0;
$files = array();
foreach ($patch AS $line) {
switch ($state)
{
case 0:
if (strpos($line, 'diff --git') === 0) {
$state = 1;
}
$file = new stdClass;
$file->action = 'modified';
break;
case 1:
if (strpos($line, 'index') === 0) {
$file->index = substr($line, 6);
}
if (strpos($line, '---') === 0) {
$file->old = substr($line, 6);
}
if (strpos($line, '+++') === 0) {
$file->new = substr($line, 6);
}
if (strpos($line, 'new file mode') === 0) {
$file->action = 'added';
}
if (strpos($line, 'deleted file mode') === 0) {
$file->action = 'deleted';
}
if (strpos($line, '@@') === 0) {
$state = 0;
$files[] = $file;
}
break;
}
}
return $files;
}
public function apply($id)
{
jimport('joomla.client.github');
@ -45,50 +92,68 @@ class PatchtesterModelPull extends JModel
$table = JTable::getInstance('tests', 'PatchTesterTable');
$github = new JGithub();
$pull = $github->pulls->get($this->getState('github_user'), $this->getState('github_repo'), $id);
$patchUrl = $pull->patch_url;
$patchUrl = $pull->diff_url;
$http = new JHttp;
$patch = $http->get($patchUrl)->body;
$patch = explode("\n", $patch);
$files = array();
foreach ($patch AS $line)
{
if (is_null($pull->head->repo)) {
$this->setError(JText::_('COM_PATCHTESTER_REPO_IS_GONE'));
return false;
}
if (is_null($pull->head->repo)) {
$this->setError(JText::_('COM_PATCHTESTER_REPO_IS_GONE'));
return false;
}
$files = $this->parsePatch($patch);
foreach($files AS $file) {
if ($file->action == 'added' || $file->action == 'modified') {
$http = new JHttp;
$url = 'https://raw.github.com/' . $pull->head->user->login . '/' . $pull->head->repo->name . '/' .
$pull->head->ref . '/' . $file->new;
if (strpos($line, '--- a/') === 0) {
$file = substr($line, 6);
// if the backup file already exists, we can't apply the patch
if (file_exists(JPATH_COMPONENT . '/backups/' . md5($file) . '.txt')) {
if ($file->action != 'deleted' && file_exists(JPATH_COMPONENT . '/backups/' . md5($file->new) . '.txt')) {
$this->setError(JText::_('COM_PATCHTESTER_CONFLICT'));
return false;
}
$files[] = $file;
if (($file->action == 'deleted' || $file->action == 'modified') && !file_exists(JPATH_ROOT . '/' . $file->old)) {
$this->setError(JText::_('COM_PATCHTESTER_FILE_DELETED_MODIFIED_DOES_NOT_EXIST'));
return false;
}
try {
$file->body = $http->get($url)->body;
} catch (Exception $e) {
$this->setError(JText::_('COM_PATCHTESTER_APPLY_FAILED_ERROR_RETRIEVING_FILE'));
return false;
}
}
}
// at this point, we have ensured that we have all the new files and there are no conflicts
foreach ($files AS $file)
{
$http = new JHttp;
// we only create a backup if the file already exists
if (file_exists(JPATH_ROOT . '/' . $file)) {
JFile::copy(JPath::clean(JPATH_ROOT . '/' . $file), JPATH_COMPONENT . '/backups/' . md5($file) . '.txt');
if (file_exists(JPATH_ROOT . '/' . $file->new) && ($file->action == 'modified' || $file->action == 'deleted')) {
JFile::copy(JPath::clean(JPATH_ROOT . '/' . $file->old), JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt');
}
$url = 'https://raw.github.com/' . $pull->head->user->login . '/' . $pull->head->repo->name . '/' .
$pull->head->ref . '/' . $file;
try {
$newFile = $http->get($url);
JFile::write(JPath::clean(JPATH_ROOT . '/' . $file), $newFile->body);
} catch (Exception $e) {
echo $e->getMessage();
echo $url;
switch ($file->action)
{
case 'modified':
case 'added':
JFile::write(JPath::clean(JPATH_ROOT . '/' . $file->new), $file->body);
break;
case 'deleted':
JFile::delete(JPATH::clean(JPATH_ROOT . '/' . $file->old));
break;
}
}
$table->pull_id = $pull->number;
@ -124,8 +189,17 @@ class PatchtesterModelPull extends JModel
$files = json_decode($table->data);
foreach ($files AS $file) {
JFile::copy(JPATH_COMPONENT . '/backups/' . md5($file) . '.txt', JPATH_ROOT . '/' . $file);
JFile::delete(JPATH_COMPONENT . '/backups/' . md5($file) . '.txt');
switch ($file->action) {
case 'deleted':
case 'modified':
JFile::copy(JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt', JPATH_ROOT . '/' . $file->old);
JFile::delete(JPATH_COMPONENT . '/backups/' . md5($file->old) . '.txt');
break;
case 'added':
JFile::delete(JPath::clean(JPATH_ROOT . '/' . $file->new));
break;
}
}
$table->applied_version = '';

2
administrator/components/com_patchtester/views/pulls/tmpl/default.php
View File

@ -56,7 +56,7 @@ JHtml::_('behavior.tooltip');
<?php echo JHtml::_('grid.id', $i, $item->id); ?>
</td>
<td>
<a href="<?php echo JRoute::_('index.php?option=com_patchtester&view=pull&id='.(int)$item->id); ?>"><?php echo $item->title; ?></a>
<a href="<?php echo $item->html_url; ?>" title="<?php echo htmlspecialchars($item->body); ?>"><?php echo $item->title; ?></a>
</td>
<td class="center">
<?php