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

Updating PHPCI to use Composer-installed copies of the plugin requirements

Browse source
This commit is contained in:
Dan Cryer 2013-05-10 15:00:24 +01:00
parent 2cd60e0524
commit 14f40e9b0f
8 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Plugin/Composer.php
View file

@ -17,6 +17,6 @@ class Composer implements \PHPCI\Plugin
public function execute()
{
return $this->phpci->executeCommand('composer --working-dir=' . $this->directory . ' ' . $this->action);
return $this->phpci->executeCommand(PHPCI_DIR . 'composer.phar --working-dir=' . $this->directory . ' ' . $this->action);
}
}

4
PHPCI/Plugin/Mysql.php
View file

@ -17,9 +17,11 @@ class Mysql implements \PHPCI\Plugin
{
$rtn = true;
$db = \b8\Database::getConnection('write')->getDetails();
foreach($this->queries as $query)
{
$rtn = !$this->phpci->executeCommand('mysql -uroot -e "'.$query.'"') ? false : $rtn;
$rtn = !$this->phpci->executeCommand('mysql -h'.PHPCI_DB_HOST.' -u'.$db['user'].(!empty($db['pass']) ? ' -p' . $db['pass'] : '').' -e "'.$query.'"') ? false : $rtn;
}
return $rtn;

2
PHPCI/Plugin/PhpCodeSniffer.php
View file

@ -27,6 +27,6 @@ class PhpCodeSniffer implements \PHPCI\Plugin
$ignore = ' --ignore=' . implode(',', $ignore);
}
return $this->phpci->executeCommand('phpcs --standard=' . $this->standard . $ignore. ' ' . $this->phpci->buildPath);
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpcs --standard=' . $this->standard . $ignore. ' ' . $this->phpci->buildPath);
}
}

2
PHPCI/Plugin/PhpCpd.php
View file

@ -27,6 +27,6 @@ class PhpCpd implements \PHPCI\Plugin
$ignore = ' ' . implode('', $ignore);
}
return $this->phpci->executeCommand('phpcpd ' . $ignore . ' ' . $this->phpci->buildPath);
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpcpd ' . $ignore . ' ' . $this->phpci->buildPath);
}
}

2
PHPCI/Plugin/PhpMessDetector.php
View file

@ -23,6 +23,6 @@ class PhpMessDetector implements \PHPCI\Plugin
$ignore = ' --exclude ' . implode(',', $ignore);
}
return $this->phpci->executeCommand('phpmd ' . $this->phpci->buildPath . ' text codesize,unusedcode,naming' . $ignore);
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpmd ' . $this->phpci->buildPath . ' text codesize,unusedcode,naming' . $ignore);
}
}

2
PHPCI/Plugin/PhpUnit.php
View file

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

8
composer.json
View file

@ -1,6 +1,7 @@
{
"name": "block8/phpci",
"description": "Simple continuous integration for PHP projects.",
"minimum-stability": "dev",
"authors": [
{
@ -10,6 +11,11 @@
],
"require": {
"block8/b8framework": "dev-master"
"block8/b8framework": "dev-master",
"phpunit/phpunit": "3.*",
"phpmd/phpmd" : "1.*",
"sebastian/phpcpd": "1.*",
"squizlabs/php_codesniffer": "1.*",
"ext-yaml": "*"
}
}

3
cron.php
View file

@ -5,6 +5,9 @@ ini_set('display_errors', 'on');
require_once('bootstrap.php');
define('PHPCI_BIN_DIR', dirname(__FILE__) . '/vendor/bin/');
define('PHPCI_DIR', dirname(__FILE__) . '/');
$store = b8\Store\Factory::getStore('Build');
$result = $store->getByStatus(0);