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

Merge pull request #90 from shurastik/master

Browse source 
added some configuration options
This commit is contained in:
Dan Cryer 2013-07-25 04:13:43 -07:00
parent d46e28c7f7 2a0e6d2401
commit 65770c8fe2
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PHPCI/Command/InstallCommand.php
View file

@ -50,6 +50,7 @@ class InstallCommand extends Command
$conf['phpci']['email_settings']['smtp_address'] = $this->ask('(Optional) Smtp server address: ', true); $conf['phpci']['email_settings']['smtp_address'] = $this->ask('(Optional) Smtp server address: ', true);
$conf['phpci']['email_settings']['smtp_port'] = $this->ask('(Optional) Smtp port: ', true); $conf['phpci']['email_settings']['smtp_port'] = $this->ask('(Optional) Smtp port: ', true);
$conf['phpci']['email_settings']['smtp_encryption'] = $this->ask('(Optional) Smtp encryption: ', true);
$conf['phpci']['email_settings']['smtp_username'] = $this->ask('(Optional) Smtp Username: ', true); $conf['phpci']['email_settings']['smtp_username'] = $this->ask('(Optional) Smtp Username: ', true);
$conf['phpci']['email_settings']['smtp_password'] = $this->ask('(Optional) Smtp Password: ', true); $conf['phpci']['email_settings']['smtp_password'] = $this->ask('(Optional) Smtp Password: ', true);
$conf['phpci']['email_settings']['from_address'] = $this->ask('(Optional) Email address to send from: ', true); $conf['phpci']['email_settings']['from_address'] = $this->ask('(Optional) Email address to send from: ', true);

4
PHPCI/Plugin/Composer.php
View file

@ -19,6 +19,7 @@ class Composer implements \PHPCI\Plugin
{ {
protected $directory; protected $directory;
protected $action; protected $action;
protected $preferDist;
protected $phpci; protected $phpci;
public function __construct(\PHPCI\Builder $phpci, array $options = array()) public function __construct(\PHPCI\Builder $phpci, array $options = array())
@ -27,6 +28,7 @@ class Composer implements \PHPCI\Plugin
$this->phpci = $phpci; $this->phpci = $phpci;
$this->directory = isset($options['directory']) ? $path . '/' . $options['directory'] : $path; $this->directory = isset($options['directory']) ? $path . '/' . $options['directory'] : $path;
$this->action = isset($options['action']) ? $options['action'] : 'update'; $this->action = isset($options['action']) ? $options['action'] : 'update';
$this->preferDist = isset($options['prefer_dist']) ? $options['prefer_dist'] : true;
} }
/** /**
@ -34,7 +36,7 @@ class Composer implements \PHPCI\Plugin
*/ */
public function execute() public function execute()
{ {
$cmd = PHPCI_DIR . 'composer.phar --prefer-dist --working-dir="%s" %s'; $cmd = PHPCI_DIR . 'composer.phar '. ($this->preferDist ? '--prefer-dist' : null) .' --working-dir="%s" %s';
return $this->phpci->executeCommand($cmd, $this->directory, $this->action); return $this->phpci->executeCommand($cmd, $this->directory, $this->action);
} }
} }

5
PHPCI/Plugin/Email.php
View file

@ -140,7 +140,8 @@ class Email implements \PHPCI\Plugin
/** @var \Swift_SmtpTransport $transport */ /** @var \Swift_SmtpTransport $transport */
$transport = \Swift_SmtpTransport::newInstance( $transport = \Swift_SmtpTransport::newInstance(
$this->getMailConfig('smtp_address'), $this->getMailConfig('smtp_address'),
$this->getMailConfig('smtp_port') $this->getMailConfig('smtp_port'),
$this->getMailConfig('smtp_encryption')
); );
$transport->setUsername($this->getMailConfig('smtp_username')); $transport->setUsername($this->getMailConfig('smtp_username'));
$transport->setPassword($this->getMailConfig('smtp_password')); $transport->setPassword($this->getMailConfig('smtp_password'));
@ -164,6 +165,8 @@ class Email implements \PHPCI\Plugin
return null; return null;
case 'smtp_port': case 'smtp_port':
return '25'; return '25';
case 'smtp_encryption':
return null;
case 'from_address': case 'from_address':
return "notifications-ci@phptesting.org"; return "notifications-ci@phptesting.org";
default: default:

10
PHPCI/Plugin/PhpMessDetector.php
View file

@ -18,10 +18,16 @@ namespace PHPCI\Plugin;
class PhpMessDetector implements \PHPCI\Plugin class PhpMessDetector implements \PHPCI\Plugin
{ {
protected $directory; protected $directory;
/**
* Array of PHPMD rules. Possible values: codesize, unusedcode, naming, design, controversial
* @var array
*/
protected $rules;
public function __construct(\PHPCI\Builder $phpci, array $options = array()) public function __construct(\PHPCI\Builder $phpci, array $options = array())
{ {
$this->phpci = $phpci; $this->phpci = $phpci;
$this->rules = isset($options['rules']) ? (array)$options['rules'] : array('codesize', 'unusedcode', 'naming');
} }
/** /**
@ -35,7 +41,7 @@ class PhpMessDetector implements \PHPCI\Plugin
$ignore = ' --exclude ' . implode(',', $this->phpci->ignore); $ignore = ' --exclude ' . implode(',', $this->phpci->ignore);
} }
$cmd = PHPCI_BIN_DIR . 'phpmd "%s" text codesize,unusedcode,naming %s'; $cmd = PHPCI_BIN_DIR . 'phpmd "%s" text %s %s';
return $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $ignore); return $this->phpci->executeCommand($cmd, $this->phpci->buildPath, implode(',', $this->rules), $ignore);
} }
} }