deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge ec47a93e23 into 6053f0f748

Browse source
This commit is contained in:
Gabriel Baker 2013-05-14 04:08:26 -07:00
parent 6053f0f748 ec47a93e23
commit 5d7ab2a2d9
7 changed files with 149 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
PHPCI/Builder.php
View file

@ -121,29 +121,43 @@ class Builder
$commitId = $this->build->getCommitId();
$url = $this->build->getProject()->getGitUrl();
$key = $this->build->getProject()->getGitKey();
$type = $this->build->getProject()->getType();
$buildId = 'project' . $this->build->getProject()->getId() . '-build' . $this->build->getId();
$this->ciDir = realpath(dirname(__FILE__) . '/../') . '/';
$this->buildPath = $this->ciDir . 'build/' . $buildId . '/';
mkdir($this->buildPath, 0777, true);
if(!empty($key))
{
// Do an SSH clone:
$keyFile = $this->ciDir . 'build/' . $buildId . '.key';
file_put_contents($keyFile, $key);
chmod($keyFile, 0600);
$this->executeCommand('ssh-agent ssh-add '.$keyFile.' && git clone -b ' .$this->build->getBranch() . ' ' .$url.' '.$this->buildPath.' && ssh-agent -k');
unlink($keyFile);
switch ($type) {
case 'local':
$reference = $this->build->getProject()->getReference();
$this->buildPath = $this->ciDir . 'build/' . $buildId;
if(is_link($this->buildPath) && is_file($this->buildPath)) {
} else {
symlink($reference, $this->buildPath);
}
$this->buildPath .= '/';
break;
default:
mkdir($this->buildPath, 0777, true);
if(!empty($key))
{
// Do an SSH clone:
$keyFile = $this->ciDir . 'build/' . $buildId . '.key';
file_put_contents($keyFile, $key);
chmod($keyFile, 0600);
$this->executeCommand('ssh-agent ssh-add '.$keyFile.' && git clone -b ' .$this->build->getBranch() . ' ' .$url.' '.$this->buildPath.' && ssh-agent -k');
unlink($keyFile);
}
else
{
// Do an HTTP clone:
$this->executeCommand('git clone -b ' .$this->build->getBranch() . ' ' .$url.' '.$this->buildPath);
}
break;
}
else
{
// Do an HTTP clone:
$this->executeCommand('git clone -b ' .$this->build->getBranch() . ' ' .$url.' '.$this->buildPath);
}
if(!is_file($this->buildPath . 'phpci.yml'))
{
$this->logFailure('Project does not contain a phpci.yml file.');
@ -179,6 +193,11 @@ class Builder
protected function executePlugins($stage)
{
if ( !array_key_exists($stage, $this->config) || !is_array($this->config[$stage]) )
{
return;
}
foreach($this->config[$stage] as $plugin => $options)
{
$this->log('');
@ -202,7 +221,7 @@ class Builder
{
$this->success = false;
}
continue;
}
@ -216,7 +235,7 @@ class Builder
{
$this->success = false;
}
$this->logFailure('PLUGIN STATUS: FAILED');
continue;
}

8
PHPCI/Controller/ProjectController.php
View file

@ -128,7 +128,7 @@ class ProjectController extends b8\Controller
{
throw new \Exception('You do not have permission to do that.');
}
$method = Registry::getInstance()->get('requestMethod');
$project = $this->_projectStore->getById($id);
@ -180,15 +180,15 @@ class ProjectController extends b8\Controller
$field = new Form\Element\Select('type');
$field->setRequired(true);
$field->setOptions(array('github' => 'Github', 'bitbucket' => 'Bitbucket'));
$field->setOptions(array('github' => 'Github', 'bitbucket' => 'Bitbucket', 'local' => 'Local FS'));
$field->setLabel('Where is your project hosted?');
$field->setClass('span4');
$form->addField($field);
$field = new Form\Element\Text('reference');
$field->setRequired(true);
$field->setPattern('[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+');
$field->setLabel('Repository Name on Github / Bitbucket (e.g. block8/phpci)');
// $field->setPattern('[a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+');
$field->setLabel('Repository Name on Github / Bitbucket (e.g. block8/phpci) or directory location');
$field->setClass('span4');
$form->addField($field);

210
PHPCI/Model/Base/BuildBase.php
View file

@ -16,126 +16,104 @@ class BuildBase extends Model
protected $_tableName = 'build';
protected $_modelName = 'Build';
protected $_data = array(
'id' => null,
'project_id' => null,
'commit_id' => null,
'status' => null,
'log' => null,
'branch' => null,
'created' => null,
'started' => null,
'finished' => null,
);
'id' => null,
'project_id' => null,
'commit_id' => null,
'status' => null,
'log' => null,
'branch' => null,
'created' => null,
'started' => null,
'finished' => null,
);
protected $_getters = array(
'id' => 'getId',
'project_id' => 'getProjectId',
'commit_id' => 'getCommitId',
'status' => 'getStatus',
'log' => 'getLog',
'branch' => 'getBranch',
'created' => 'getCreated',
'started' => 'getStarted',
'finished' => 'getFinished',
'id' => 'getId',
'project_id' => 'getProjectId',
'commit_id' => 'getCommitId',
'status' => 'getStatus',
'log' => 'getLog',
'branch' => 'getBranch',
'created' => 'getCreated',
'started' => 'getStarted',
'finished' => 'getFinished',
'Project' => 'getProject',
'Project' => 'getProject',
);
);
protected $_setters = array(
'id' => 'setId',
'project_id' => 'setProjectId',
'commit_id' => 'setCommitId',
'status' => 'setStatus',
'log' => 'setLog',
'branch' => 'setBranch',
'created' => 'setCreated',
'started' => 'setStarted',
'finished' => 'setFinished',
'id' => 'setId',
'project_id' => 'setProjectId',
'commit_id' => 'setCommitId',
'status' => 'setStatus',
'log' => 'setLog',
'branch' => 'setBranch',
'created' => 'setCreated',
'started' => 'setStarted',
'finished' => 'setFinished',
'Project' => 'setProject',
);
'Project' => 'setProject',
);
public $columns = array(
'id' => array(
'type' => 'int',
'length' => '11',
'id' => array(
'type' => 'int',
'length' => '11',
'primary_key' => true,
'auto_increment' => true,
'primary_key' => true,
'auto_increment' => true,
),
'project_id' => array(
'type' => 'int',
'length' => '11',
),
'project_id' => array(
'type' => 'int',
'length' => '11',
),
'commit_id' => array(
'type' => 'varchar',
'length' => '50',
),
'status' => array(
'type' => 'tinyint',
'length' => '4',
),
'log' => array(
'type' => 'text',
'length' => '',
'nullable' => true,
),
'commit_id' => array(
'type' => 'varchar',
'length' => '50',
),
'branch' => array(
'type' => 'varchar',
'length' => '50',
),
'created' => array(
'type' => 'datetime',
'length' => '',
'nullable' => true,
),
'status' => array(
'type' => 'tinyint',
'length' => '4',
),
'log' => array(
'type' => 'text',
'length' => '',
'nullable' => true,
),
'branch' => array(
'type' => 'varchar',
'length' => '50',
),
'created' => array(
'type' => 'datetime',
'length' => '',
'nullable' => true,
),
'started' => array(
'type' => 'datetime',
'length' => '',
'nullable' => true,
),
'finished' => array(
'type' => 'datetime',
'length' => '',
'nullable' => true,
),
);
),
'started' => array(
'type' => 'datetime',
'length' => '',
'nullable' => true,
),
'finished' => array(
'type' => 'datetime',
'length' => '',
'nullable' => true,
),
);
public $indexes = array(
'PRIMARY' => array('unique' => true, 'columns' => 'id'),
'project_id' => array('columns' => 'project_id'),
'idx_status' => array('columns' => 'status'),
);
'PRIMARY' => array('unique' => true, 'columns' => 'id'),
'project_id' => array('columns' => 'project_id'),
'idx_status' => array('columns' => 'status'),
);
public $foreignKeys = array(
'build_ibfk_1' => array('local_col' => 'project_id', 'update' => 'CASCADE', 'delete' => 'CASCADE', 'table' => 'project', 'col' => 'id'),
);
'build_ibfk_1' => array('local_col' => 'project_id', 'update' => 'CASCADE', 'delete' => 'CASCADE', 'table' => 'project', 'col' => 'id'),
);
@ -143,7 +121,7 @@ class BuildBase extends Model
{
$rtn = $this->_data['id'];
return $rtn;
}
@ -151,7 +129,7 @@ class BuildBase extends Model
{
$rtn = $this->_data['project_id'];
return $rtn;
}
@ -159,7 +137,7 @@ class BuildBase extends Model
{
$rtn = $this->_data['commit_id'];
return $rtn;
}
@ -167,7 +145,7 @@ class BuildBase extends Model
{
$rtn = $this->_data['status'];
return $rtn;
}
@ -175,7 +153,7 @@ class BuildBase extends Model
{
$rtn = $this->_data['log'];
return $rtn;
}
@ -183,7 +161,7 @@ class BuildBase extends Model
{
$rtn = $this->_data['branch'];
return $rtn;
}
@ -191,13 +169,13 @@ class BuildBase extends Model
{
$rtn = $this->_data['created'];
if(!empty($rtn))
{
$rtn = new \DateTime($rtn);
}
return $rtn;
}
@ -205,13 +183,13 @@ class BuildBase extends Model
{
$rtn = $this->_data['started'];
if(!empty($rtn))
{
$rtn = new \DateTime($rtn);
}
return $rtn;
}
@ -219,13 +197,13 @@ class BuildBase extends Model
{
$rtn = $this->_data['finished'];
if(!empty($rtn))
{
$rtn = new \DateTime($rtn);
}
return $rtn;
}
@ -277,7 +255,7 @@ class BuildBase extends Model
{
$this->_validateNotNull('Status', $value);
$this->_validateInt('Status', $value);
if($this->_data['status'] == $value)
if($this->_data['status'] === $value)
{
return;
}

18
PHPCI/Model/Base/ProjectBase.php
View file

@ -94,7 +94,7 @@ class ProjectBase extends Model
{
$rtn = $this->_data['id'];
return $rtn;
}
@ -102,7 +102,7 @@ class ProjectBase extends Model
{
$rtn = $this->_data['title'];
return $rtn;
}
@ -110,7 +110,7 @@ class ProjectBase extends Model
{
$rtn = $this->_data['reference'];
return $rtn;
}
@ -118,7 +118,7 @@ class ProjectBase extends Model
{
$rtn = $this->_data['git_key'];
return $rtn;
}
@ -126,7 +126,7 @@ class ProjectBase extends Model
{
$rtn = $this->_data['type'];
return $rtn;
}
@ -150,7 +150,7 @@ class ProjectBase extends Model
{
$this->_validateNotNull('Title', $value);
$this->_validateString('Title', $value);
if($this->_data['title'] == $value)
if($this->_data['title'] === $value)
{
return;
}
@ -164,7 +164,7 @@ class ProjectBase extends Model
{
$this->_validateNotNull('Reference', $value);
$this->_validateString('Reference', $value);
if($this->_data['reference'] == $value)
if($this->_data['reference'] === $value)
{
return;
}
@ -178,7 +178,7 @@ class ProjectBase extends Model
{
$this->_validateNotNull('GitKey', $value);
$this->_validateString('GitKey', $value);
if($this->_data['git_key'] == $value)
if($this->_data['git_key'] === $value)
{
return;
}
@ -192,7 +192,7 @@ class ProjectBase extends Model
{
$this->_validateNotNull('Type', $value);
$this->_validateString('Type', $value);
if($this->_data['type'] == $value)
if($this->_data['type'] === $value)
{
return;
}

6
PHPCI/Plugin/PhpUnit.php
View file

@ -17,6 +17,10 @@ class PhpUnit implements \PHPCI\Plugin
public function execute()
{
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpunit ' . $this->args . ' ' . $this->phpci->buildPath . $this->directory);
$curdir = getcwd();
chdir($this->phpci->buildPath);
$success = $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpunit ' . $this->args . ' ' . $this->phpci->buildPath . $this->directory);
chdir($curdir);
return $success;
}
}

1
composer.json
View file

@ -25,6 +25,7 @@
"require": {
"block8/b8framework": "dev-master",
"phpunit/phpunit": "3.*",
"phpunit/php-code-coverage": "1.2.x",
"phpmd/phpmd" : "1.*",
"sebastian/phpcpd": "1.*",
"squizlabs/php_codesniffer": "1.*",

BIN
favicon.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 198 B