Merge ec47a93e23 into 6053f0f748

PHPCI/Builder.php

@@ -121,14 +121,26 @@ 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);
 
+		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:
@@ -143,6 +155,8 @@ class Builder
 					// Do an HTTP clone:
 					$this->executeCommand('git clone -b ' .$this->build->getBranch() . ' ' .$url.' '.$this->buildPath);
 				}
+				break;
+		}
 
 		if(!is_file($this->buildPath . 'phpci.yml'))
 		{
@@ -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('');

PHPCI/Controller/ProjectController.php

@@ -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);
 

PHPCI/Model/Base/BuildBase.php

@@ -67,65 +67,43 @@ class BuildBase extends Model
 			'type' => 'int',
 			'length' => '11',
 
-
-
-
 		),
 		'commit_id'    =>    array(
 			'type' => 'varchar',
 			'length' => '50',
 
-
-
-
 		),
 		'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,
-
-
-
 		),
 	);
 	public $indexes         = array(
@@ -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;
 		}

PHPCI/Model/Base/ProjectBase.php

@@ -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;
 		}

PHPCI/Plugin/PhpUnit.php

@@ -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;
 	}
 }

composer.json

@@ -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.*",