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

Switching executeCommand() to use sprintf for parameters, and all the plugins to pass params separately. See #12, closes #24

Browse source
This commit is contained in:
Dan Cryer 2013-05-16 00:17:57 +01:00
parent be37a5e821
commit a5a03e1f07
8 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PHPCI/Builder.php
View file

@ -86,8 +86,10 @@ class Builder
$this->store->save($this->build); $this->store->save($this->build);
} }
public function executeCommand($command) public function executeCommand()
{ {
$command = call_user_func_array('sprintf', func_get_args());
$this->log('Executing: ' . $command, ' '); $this->log('Executing: ' . $command, ' ');
$output = ''; $output = '';
@ -179,7 +181,7 @@ class Builder
protected function removeBuild() protected function removeBuild()
{ {
$this->log('Removing build.'); $this->log('Removing build.');
shell_exec('rm -Rf ' . $this->buildPath); shell_exec(sprintf('rm -Rf "%s"', $this->buildPath));
} }
protected function executePlugins($stage) protected function executePlugins($stage)

2
PHPCI/Model/Build/LocalBuild.php
View file

@ -44,7 +44,7 @@ class LocalBuild extends Build
} }
} }
else { else {
$builder->executeCommand(sprintf("cp -Rf %s %s/", $reference, $buildPath)); $builder->executeCommand('cp -Rf "%s" "%s/"', $reference, $buildPath);
} }
return true; return true;

4
PHPCI/Model/Build/RemoteGitBuild.php
View file

@ -48,7 +48,7 @@ abstract class RemoteGitBuild extends Build
protected function cloneByHttp(Builder $builder, $to) protected function cloneByHttp(Builder $builder, $to)
{ {
return $builder->executeCommand('git clone -b ' .$this->getBranch() . ' ' .$this->getCloneUrl().' '.$to); return $builder->executeCommand('git clone -b %s %s "%s"', $this->getBranch(), $this->getCloneUrl(), $to);
} }
protected function cloneBySsh(Builder $builder, $to) protected function cloneBySsh(Builder $builder, $to)
@ -59,7 +59,7 @@ abstract class RemoteGitBuild extends Build
chmod($keyFile, 0600); chmod($keyFile, 0600);
// Use the key file to do an SSH clone: // Use the key file to do an SSH clone:
$success = $builder->executeCommand('ssh-agent ssh-add '.$keyFile.' && git clone -b ' .$build->getBranch() . ' ' .$this->getCloneUrl().' '.$to.' && ssh-agent -k'); $success = $builder->executeCommand('ssh-agent ssh-add "%s" && git clone -b %s %s "%s" && ssh-agent -k', $keyFile, $build->getBranch(), $this->getCloneUrl(), $to);
// Remove the key file: // Remove the key file:
unlink($keyFile); unlink($keyFile);

2
PHPCI/Plugin/Composer.php
View file

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

7
PHPCI/Plugin/PhpCodeSniffer.php
View file

@ -17,8 +17,9 @@ class PhpCodeSniffer implements \PHPCI\Plugin
public function execute() public function execute()
{ {
if(count($this->phpci->ignore)) $ignore = '';
{
if(count($this->phpci->ignore)) {
$ignore = array_map(function($item) $ignore = array_map(function($item)
{ {
return substr($item, -1) == '/' ? $item . '*' : $item . '/*'; return substr($item, -1) == '/' ? $item . '*' : $item . '/*';
@ -27,6 +28,6 @@ class PhpCodeSniffer implements \PHPCI\Plugin
$ignore = ' --ignore=' . implode(',', $ignore); $ignore = ' --ignore=' . implode(',', $ignore);
} }
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpcs --standard=' . $this->standard . $ignore. ' ' . $this->phpci->buildPath); return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpcs --standard=%s %s "%s"', $this->standard, $ignore, $this->phpci->buildPath);
} }
} }

3
PHPCI/Plugin/PhpCpd.php
View file

@ -17,6 +17,7 @@ class PhpCpd implements \PHPCI\Plugin
public function execute() public function execute()
{ {
$ignore = '';
if(count($this->phpci->ignore)) if(count($this->phpci->ignore))
{ {
$ignore = array_map(function($item) $ignore = array_map(function($item)
@ -27,6 +28,6 @@ class PhpCpd implements \PHPCI\Plugin
$ignore = implode('', $ignore); $ignore = implode('', $ignore);
} }
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpcpd' . $ignore . ' ' . $this->phpci->buildPath); return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpcpd %s "%s"', $ignore, $this->phpci->buildPath);
} }
} }

4
PHPCI/Plugin/PhpMessDetector.php
View file

@ -13,6 +13,8 @@ class PhpMessDetector implements \PHPCI\Plugin
public function execute() public function execute()
{ {
$ignore = '';
if(count($this->phpci->ignore)) if(count($this->phpci->ignore))
{ {
$ignore = array_map(function($item) $ignore = array_map(function($item)
@ -23,6 +25,6 @@ class PhpMessDetector implements \PHPCI\Plugin
$ignore = ' --exclude ' . implode(',', $ignore); $ignore = ' --exclude ' . implode(',', $ignore);
} }
return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpmd ' . $this->phpci->buildPath . ' text codesize,unusedcode,naming' . $ignore); return $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpmd "%s" text codesize,unusedcode,naming %s', $this->phpci->buildPath, $ignore);
} }
} }

4
PHPCI/Plugin/PhpUnit.php
View file

@ -62,7 +62,7 @@ class PhpUnit implements \PHPCI\Plugin
$curdir = getcwd(); $curdir = getcwd();
chdir($this->phpci->buildPath.'/'.$this->runFrom); chdir($this->phpci->buildPath.'/'.$this->runFrom);
} }
$success = $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpunit ' . $this->args . ' -c ' . $this->phpci->buildPath . $configPath); $success = $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpunit %s -c "%s"', $this->args, $this->phpci->buildPath . $configPath);
if ($this->runFrom) { if ($this->runFrom) {
chdir($curdir); chdir($curdir);
} }
@ -78,7 +78,7 @@ class PhpUnit implements \PHPCI\Plugin
else { else {
$curdir = getcwd(); $curdir = getcwd();
chdir($this->phpci->buildPath); chdir($this->phpci->buildPath);
$success = $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpunit ' . $this->args . ' ' . $this->phpci->buildPath . $dirPath); $success = $this->phpci->executeCommand(PHPCI_BIN_DIR . 'phpunit %s "%s"', $this->args, $this->phpci->buildPath . $dirPath);
chdir($curdir); chdir($curdir);
return $success; return $success;
} }