From 1bc2117c69e1d833688113a650038c89a5ff05cb Mon Sep 17 00:00:00 2001 From: meadsteve Date: Fri, 13 Dec 2013 15:57:56 +0000 Subject: [PATCH 01/74] extracted build logging logic from the Builder class. --- PHPCI/BuildLogger.php | 31 ------ PHPCI/Builder.php | 115 ++++++++------------- PHPCI/Helper/CommandExecutor.php | 4 +- PHPCI/Logging/BuildLogger.php | 96 +++++++++++++++++ Tests/PHPCI/Helper/CommandExecutorTest.php | 2 +- 5 files changed, 141 insertions(+), 107 deletions(-) delete mode 100644 PHPCI/BuildLogger.php create mode 100644 PHPCI/Logging/BuildLogger.php diff --git a/PHPCI/BuildLogger.php b/PHPCI/BuildLogger.php deleted file mode 100644 index ccb6288a..00000000 --- a/PHPCI/BuildLogger.php +++ /dev/null @@ -1,31 +0,0 @@ - */ -class Builder implements LoggerAwareInterface, BuildLogger +class Builder implements LoggerAwareInterface { /** * @var string @@ -102,21 +103,32 @@ class Builder implements LoggerAwareInterface, BuildLogger */ protected $commandExecutor; + /** + * @var Logging\BuildLogger + */ + protected $buildLogger; + /** * Set up the builder. * @param \PHPCI\Model\Build $build * @param LoggerInterface $logger */ - public function __construct(Build $build, $logger = null) + public function __construct(Build $build, LoggerInterface $logger = null) { - if ($logger) { - $this->setLogger($logger); - } $this->build = $build; $this->store = Store\Factory::getStore('Build'); + + $this->buildLogger = new BuildLogger($logger, $build); + $this->pluginExecutor = new Plugin\Util\Executor($this->buildPluginFactory($build), $this); - $this->commandExecutor = new CommandExecutor($this, PHPCI_DIR, $this->quiet, $this->verbose); + $this->commandExecutor = new CommandExecutor( + $this->buildLogger, + PHPCI_DIR, + $this->quiet, + $this->verbose + ); + } /** @@ -195,15 +207,15 @@ class Builder implements LoggerAwareInterface, BuildLogger if ($this->success) { $this->pluginExecutor->executePlugins($this->config, 'success'); - $this->logSuccess('BUILD SUCCESSFUL!'); + $this->buildLogger->logSuccess('BUILD SUCCESSFUL!'); } else { $this->pluginExecutor->executePlugins($this->config, 'failure'); - $this->logFailure("BUILD FAILURE"); + $this->buildLogger->logFailure("BUILD FAILURE"); } // Clean up: - $this->log('Removing build.'); + $this->buildLogger->log('Removing build.'); shell_exec(sprintf('rm -Rf "%s"', $this->buildPath)); // Update the build in the database, ping any external services, etc. @@ -238,63 +250,6 @@ class Builder implements LoggerAwareInterface, BuildLogger return $this->commandExecutor->findBinary($binary); } - /** - * Add an entry to the build log. - * @param string|string[] $message - * @param string $level - * @param mixed[] $context - */ - public function log($message, $level = LogLevel::INFO, $context = array()) - { - // Skip if no logger has been loaded. - if (!$this->logger) { - return; - } - - if (!is_array($message)) { - $message = array($message); - } - - // The build is added to the context so the logger can use - // details from it if required. - $context['build'] = $this->build; - - foreach ($message as $item) { - $this->logger->log($level, $item, $context); - } - } - - /** - * Add a success-coloured message to the log. - * @param string - */ - public function logSuccess($message) - { - $this->log("\033[0;32m" . $message . "\033[0m"); - } - - /** - * Add a failure-coloured message to the log. - * @param string $message - * @param \Exception $exception The exception that caused the error. - */ - public function logFailure($message, \Exception $exception = null) - { - $context = array(); - - // The psr3 log interface stipulates that exceptions should be passed - // as the exception key in the context array. - if ($exception) { - $context['exception'] = $exception; - } - - $this->log( - "\033[0;31m" . $message . "\033[0m", - LogLevel::ERROR, - $context - ); - } - /** * Replace every occurance of the interpolation vars in the given string * Example: "This is build %PHPCI_BUILD%" => "This is build 182" @@ -369,7 +324,7 @@ class Builder implements LoggerAwareInterface, BuildLogger $this->ignore = $this->config['build_settings']['ignore']; } - $this->logSuccess('Working copy created: ' . $this->buildPath); + $this->buildLogger->logSuccess('Working copy created: ' . $this->buildPath); return true; } @@ -381,17 +336,31 @@ class Builder implements LoggerAwareInterface, BuildLogger */ public function setLogger(LoggerInterface $logger) { - $this->logger = $logger; + $this->buildLogger->setLogger($logger); + } + + public function log($message, $level = LogLevel::INFO, $context = array()) + { + $this->buildLogger->log($message, $level, $context); + } + + /** + * Add a success-coloured message to the log. + * @param string + */ + public function logSuccess($message) + { + $this->buildLogger->logSuccess($message); } /** - * returns the logger attached to this builder. - * - * @return LoggerInterface + * Add a failure-coloured message to the log. + * @param string $message + * @param \Exception $exception The exception that caused the error. */ - public function getLogger() + public function logFailure($message, \Exception $exception = null) { - return $this->logger; + $this->buildLogger->logFailure($message, $exception); } private function buildPluginFactory(Build $build) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 43813924..60061404 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -3,12 +3,12 @@ namespace PHPCI\Helper; -use PHPCI\BuildLogger; +use \PHPCI\Logging\BuildLogger; class CommandExecutor { /** - * @var \PHPCI\BuildLogger + * @var \PHPCI\Logging\BuildLogger */ protected $logger; diff --git a/PHPCI/Logging/BuildLogger.php b/PHPCI/Logging/BuildLogger.php new file mode 100644 index 00000000..f3f5ebce --- /dev/null +++ b/PHPCI/Logging/BuildLogger.php @@ -0,0 +1,96 @@ +logger = $logger; + $this->build = $build; + } + + /** + * Add an entry to the build log. + * @param string|string[] $message + * @param string $level + * @param mixed[] $context + */ + public function log($message, $level = LogLevel::INFO, $context = array()) + { + // Skip if no logger has been loaded. + if (!$this->logger) { + return; + } + + if (!is_array($message)) { + $message = array($message); + } + + // The build is added to the context so the logger can use + // details from it if required. + $context['build'] = $this->build; + + foreach ($message as $item) { + $this->logger->log($level, $item, $context); + } + } + + /** + * Add a success-coloured message to the log. + * @param string + */ + public function logSuccess($message) + { + $this->log("\033[0;32m" . $message . "\033[0m"); + } + + /** + * Add a failure-coloured message to the log. + * @param string $message + * @param \Exception $exception The exception that caused the error. + */ + public function logFailure($message, \Exception $exception = null) + { + $context = array(); + + // The psr3 log interface stipulates that exceptions should be passed + // as the exception key in the context array. + if ($exception) { + $context['exception'] = $exception; + } + + $this->log( + "\033[0;31m" . $message . "\033[0m", + LogLevel::ERROR, + $context + ); + } + + /** + * Sets a logger instance on the object + * + * @param LoggerInterface $logger + * @return null + */ + public function setLogger(LoggerInterface $logger) + { + $this->logger = $logger; + } +} \ No newline at end of file diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index 008443e9..f394c9f9 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -15,7 +15,7 @@ class CommandExecutorTest extends ProphecyTestCase protected function setUp() { parent::setUp(); - $mockBuildLogger = $this->prophesize('\PHPCI\BuildLogger'); + $mockBuildLogger = $this->prophesize('\PHPCI\Logging\BuildLogger'); $this->testedExecutor = new CommandExecutor($mockBuildLogger->reveal(), __DIR__ . "/"); } From f05ffb308132909e32c04daaeb8e0994ece17668 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Fri, 13 Dec 2013 16:07:11 +0000 Subject: [PATCH 02/74] update executor test --- Tests/PHPCI/Plugin/Util/ExecutorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/PHPCI/Plugin/Util/ExecutorTest.php b/Tests/PHPCI/Plugin/Util/ExecutorTest.php index ec640e95..01267217 100644 --- a/Tests/PHPCI/Plugin/Util/ExecutorTest.php +++ b/Tests/PHPCI/Plugin/Util/ExecutorTest.php @@ -22,7 +22,7 @@ class ExecutorTest extends ProphecyTestCase protected function setUp() { parent::setUp(); - $this->mockBuildLogger = $this->prophesize('\PHPCI\BuildLogger'); + $this->mockBuildLogger = $this->prophesize('\PHPCI\Logging\BuildLogger'); $this->mockFactory = $this->prophesize('\PHPCI\Plugin\Util\Factory'); $this->testedExecutor = new Executor($this->mockFactory->reveal(), $this->mockBuildLogger->reveal()); } From 356a2293a1bb0e6985a3c3379595f1f4d6bf7632 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Fri, 13 Dec 2013 16:10:54 +0000 Subject: [PATCH 03/74] move logging related classes to appropriate namespace. --- PHPCI/Command/RunCommand.php | 6 +++--- PHPCI/{Helper => Logging}/BuildDBLogHandler.php | 2 +- PHPCI/{Helper => Logging}/LoggedBuildContextTidier.php | 2 +- PHPCI/{Helper => Logging}/LoggerConfig.php | 2 +- PHPCI/{Helper => Logging}/OutputLogHandler.php | 2 +- PHPCI/Plugin/Util/Executor.php | 4 ++-- Tests/PHPCI/Helper/CommandExecutorTest.php | 2 +- Tests/PHPCI/Helper/LoggerConfigTest.php | 2 +- console | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename PHPCI/{Helper => Logging}/BuildDBLogHandler.php (96%) rename PHPCI/{Helper => Logging}/LoggedBuildContextTidier.php (96%) rename PHPCI/{Helper => Logging}/LoggerConfig.php (98%) rename PHPCI/{Helper => Logging}/OutputLogHandler.php (95%) diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php index d635b8a2..d95455ce 100644 --- a/PHPCI/Command/RunCommand.php +++ b/PHPCI/Command/RunCommand.php @@ -10,9 +10,9 @@ namespace PHPCI\Command; use Monolog\Logger; -use PHPCI\Helper\BuildDBLogHandler; -use PHPCI\Helper\LoggedBuildContextTidier; -use PHPCI\Helper\OutputLogHandler; +use PHPCI\Logging\BuildDBLogHandler; +use PHPCI\Logging\LoggedBuildContextTidier; +use PHPCI\Logging\OutputLogHandler; use Psr\Log\LoggerAwareInterface; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; diff --git a/PHPCI/Helper/BuildDBLogHandler.php b/PHPCI/Logging/BuildDBLogHandler.php similarity index 96% rename from PHPCI/Helper/BuildDBLogHandler.php rename to PHPCI/Logging/BuildDBLogHandler.php index 6ae34379..60cf48d3 100644 --- a/PHPCI/Helper/BuildDBLogHandler.php +++ b/PHPCI/Logging/BuildDBLogHandler.php @@ -1,6 +1,6 @@ pluginFactory = $pluginFactory; $this->logger = $logger; diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php index f394c9f9..047f4258 100644 --- a/Tests/PHPCI/Helper/CommandExecutorTest.php +++ b/Tests/PHPCI/Helper/CommandExecutorTest.php @@ -15,7 +15,7 @@ class CommandExecutorTest extends ProphecyTestCase protected function setUp() { parent::setUp(); - $mockBuildLogger = $this->prophesize('\PHPCI\Logging\BuildLogger'); + $mockBuildLogger = $this->prophesize('PHPCI\Logging\BuildLogger'); $this->testedExecutor = new CommandExecutor($mockBuildLogger->reveal(), __DIR__ . "/"); } diff --git a/Tests/PHPCI/Helper/LoggerConfigTest.php b/Tests/PHPCI/Helper/LoggerConfigTest.php index 95ea3d62..e19fb736 100644 --- a/Tests/PHPCI/Helper/LoggerConfigTest.php +++ b/Tests/PHPCI/Helper/LoggerConfigTest.php @@ -1,6 +1,6 @@ Date: Sat, 14 Dec 2013 10:41:21 +0000 Subject: [PATCH 04/74] move logging test --- Tests/PHPCI/{Helper => Logging}/LoggerConfigTest.php | 2 ++ 1 file changed, 2 insertions(+) rename Tests/PHPCI/{Helper => Logging}/LoggerConfigTest.php (98%) diff --git a/Tests/PHPCI/Helper/LoggerConfigTest.php b/Tests/PHPCI/Logging/LoggerConfigTest.php similarity index 98% rename from Tests/PHPCI/Helper/LoggerConfigTest.php rename to Tests/PHPCI/Logging/LoggerConfigTest.php index e19fb736..699f9384 100644 --- a/Tests/PHPCI/Helper/LoggerConfigTest.php +++ b/Tests/PHPCI/Logging/LoggerConfigTest.php @@ -1,5 +1,7 @@ Date: Sat, 14 Dec 2013 11:07:04 +0000 Subject: [PATCH 05/74] add tests for BuildLogger --- Tests/PHPCI/Logging/BuildLoggerTest.php | 107 ++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 Tests/PHPCI/Logging/BuildLoggerTest.php diff --git a/Tests/PHPCI/Logging/BuildLoggerTest.php b/Tests/PHPCI/Logging/BuildLoggerTest.php new file mode 100644 index 00000000..ed0e7341 --- /dev/null +++ b/Tests/PHPCI/Logging/BuildLoggerTest.php @@ -0,0 +1,107 @@ +mockLogger = $this->prophesize('\Psr\Log\LoggerInterface'); + $this->mockBuild = $this->prophesize('\PHPCI\Model\Build'); + + $this->testedBuildLogger = new BuildLogger( + $this->mockLogger->reveal(), + $this->mockBuild->reveal() + ); + } + + public function testLog_CallsWrappedLogger() + { + $level = LogLevel::NOTICE; + $message = "Testing"; + $contextIn = array(); + + $this->mockLogger->log($level, $message, Argument::type('array')) + ->shouldBeCalledTimes(1); + + $this->testedBuildLogger->log($message, $level, $contextIn); + } + + public function testLog_CallsWrappedLoggerForEachMessage() + { + $level = LogLevel::NOTICE; + $message = array("One", "Two", "Three"); + $contextIn = array(); + + $this->mockLogger->log($level, "One", Argument::type('array')) + ->shouldBeCalledTimes(1); + + $this->mockLogger->log($level, "Two", Argument::type('array')) + ->shouldBeCalledTimes(1); + + $this->mockLogger->log($level, "Three", Argument::type('array')) + ->shouldBeCalledTimes(1); + + $this->testedBuildLogger->log($message, $level, $contextIn); + } + + public function testLog_AddsBuildToContext() + { + $level = LogLevel::NOTICE; + $message = "Testing"; + $contextIn = array(); + + $expectedContext = array( + 'build' => $this->mockBuild->reveal() + ); + + $this->mockLogger->log($level, $message, $expectedContext) + ->shouldBeCalledTimes(1); + + $this->testedBuildLogger->log($message, $level, $contextIn); + } + + public function testLogFailure_LogsAsErrorLevel() + { + $message = "Testing"; + $expectedLevel = LogLevel::ERROR; + + $this->mockLogger->log($expectedLevel, + Argument::type('string'), + Argument::type('array')) + ->shouldBeCalledTimes(1); + + $this->testedBuildLogger->logFailure($message); + } + + public function testLogFailure_AddsExceptionContext() + { + $message = "Testing"; + + $exception = new \Exception("Expected Exception"); + + + $this->mockLogger->log(Argument::type('string'), + Argument::type('string'), + Argument::withEntry('exception', $exception)) + ->shouldBeCalledTimes(1); + + $this->testedBuildLogger->logFailure($message, $exception); + } +} + \ No newline at end of file From 30bd11f0dde248e8b9ca3c2f84c5c75726ecad77 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:03:48 +0000 Subject: [PATCH 06/74] fix testing namespace --- Tests/PHPCI/Logging/LoggerConfigTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/PHPCI/Logging/LoggerConfigTest.php b/Tests/PHPCI/Logging/LoggerConfigTest.php index 699f9384..a8954c82 100644 --- a/Tests/PHPCI/Logging/LoggerConfigTest.php +++ b/Tests/PHPCI/Logging/LoggerConfigTest.php @@ -4,7 +4,7 @@ namespace PHPCI\Plugin\Tests\Helper; use \PHPCI\Logging\LoggerConfig; -class LoggerConfigTest extends PHPUnit_Framework_TestCase +class LoggerConfigTest extends \PHPUnit_Framework_TestCase { public function testGetFor_ReturnsPSRLogger() { From 0c12f0b98d9a7ebbf505e7335f02bdd02fea80c2 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:05:08 +0000 Subject: [PATCH 07/74] fix monolog name spacing in tests. --- Tests/PHPCI/Logging/LoggerConfigTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/PHPCI/Logging/LoggerConfigTest.php b/Tests/PHPCI/Logging/LoggerConfigTest.php index a8954c82..68f28f3a 100644 --- a/Tests/PHPCI/Logging/LoggerConfigTest.php +++ b/Tests/PHPCI/Logging/LoggerConfigTest.php @@ -22,7 +22,7 @@ class LoggerConfigTest extends \PHPUnit_Framework_TestCase public function testGetFor_AttachesAlwaysPresentHandlers() { - $expectedHandler = new Monolog\Handler\NullHandler(); + $expectedHandler = new \Monolog\Handler\NullHandler(); $config = new LoggerConfig(array( LoggerConfig::KEY_AlwaysLoaded => function() use ($expectedHandler) { return array($expectedHandler); @@ -38,7 +38,7 @@ class LoggerConfigTest extends \PHPUnit_Framework_TestCase public function testGetFor_AttachesSpecificHandlers() { - $expectedHandler = new Monolog\Handler\NullHandler(); + $expectedHandler = new \Monolog\Handler\NullHandler(); $config = new LoggerConfig(array( "Specific" => function() use ($expectedHandler) { return array($expectedHandler); @@ -54,8 +54,8 @@ class LoggerConfigTest extends \PHPUnit_Framework_TestCase public function testGetFor_IgnoresAlternativeHandlers() { - $expectedHandler = new Monolog\Handler\NullHandler(); - $alternativeHandler = new Monolog\Handler\NullHandler(); + $expectedHandler = new \Monolog\Handler\NullHandler(); + $alternativeHandler = new \Monolog\Handler\NullHandler(); $config = new LoggerConfig(array( "Specific" => function() use ($expectedHandler) { From 248579f67dd67eb4d2ce525f98bb4584ac60365a Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:14:26 +0000 Subject: [PATCH 08/74] add getProjectTitle() to buildBase as shorthand for getProject()->getTitle() --- PHPCI/Model/Base/BuildBase.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php index 52a549d5..de423590 100644 --- a/PHPCI/Model/Base/BuildBase.php +++ b/PHPCI/Model/Base/BuildBase.php @@ -550,6 +550,17 @@ class BuildBase extends Model return $rtn; } + /** + * Get the value of the project's Title / title. + * + * @return string + */ + public function getProjectTitle() + { + return $this->getProject()->getTitle(); + } + + /** * Set Project - Accepts an ID, an array representing a Project or a Project model. * From f0d224ce3c8b15ff3e3ccbcdb34c06a4bc7e6829 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:23:17 +0000 Subject: [PATCH 09/74] copy code from Builder to create BuildInterpolator. --- PHPCI/Helper/BuildInterpolator.php | 61 ++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 PHPCI/Helper/BuildInterpolator.php diff --git a/PHPCI/Helper/BuildInterpolator.php b/PHPCI/Helper/BuildInterpolator.php new file mode 100644 index 00000000..d4609793 --- /dev/null +++ b/PHPCI/Helper/BuildInterpolator.php @@ -0,0 +1,61 @@ + value pairs that will be used for + * interpolation and environment variables + * @var mixed[] + * @see setupInterpolationVars() + */ + protected $interpolation_vars = array(); + + /** + * Sets the variables that will be used for interpolation. + * @param Build $build + * @param string $buildPath + * @param string $phpCiUrl + */ + public function setupInterpolationVars(Build $build, $buildPath, $phpCiUrl) + { + $this->interpolation_vars = array(); + $this->interpolation_vars['%PHPCI%'] = 1; + $this->interpolation_vars['%COMMIT%'] = $build->getCommitId(); + $this->interpolation_vars['%PROJECT%'] = $build->getProjectId(); + $this->interpolation_vars['%BUILD%'] = $build->getId(); + $this->interpolation_vars['%PROJECT_TITLE%'] = $build->getProjectTitle(); + $this->interpolation_vars['%BUILD_PATH%'] = $buildPath; + $this->interpolation_vars['%BUILD_URI%'] = $phpCiUrl . "build/view/" . $build->getId(); + $this->interpolation_vars['%PHPCI_COMMIT%'] = $this->interpolation_vars['%COMMIT%']; + $this->interpolation_vars['%PHPCI_PROJECT%'] = $this->interpolation_vars['%PROJECT%']; + $this->interpolation_vars['%PHPCI_BUILD%'] = $this->interpolation_vars['%BUILD%']; + $this->interpolation_vars['%PHPCI_PROJECT_TITLE%'] = $this->interpolation_vars['%PROJECT_TITLE%']; + $this->interpolation_vars['%PHPCI_BUILD_PATH%'] = $this->interpolation_vars['%BUILD_PATH%']; + $this->interpolation_vars['%PHPCI_BUILD_URI%'] = $this->interpolation_vars['%BUILD_URI%']; + + putenv('PHPCI=1'); + putenv('PHPCI_COMMIT=' . $this->interpolation_vars['%COMMIT%']); + putenv('PHPCI_PROJECT=' . $this->interpolation_vars['%PROJECT%']); + putenv('PHPCI_BUILD=' . $this->interpolation_vars['%BUILD%']); + putenv('PHPCI_PROJECT_TITLE=' . $this->interpolation_vars['%PROJECT_TITLE%']); + putenv('PHPCI_BUILD_PATH=' . $this->interpolation_vars['%BUILD_PATH%']); + putenv('PHPCI_BUILD_URI=' . $this->interpolation_vars['%BUILD_URI%']); + } + + /** + * Replace every occurrence of the interpolation vars in the given string + * Example: "This is build %PHPCI_BUILD%" => "This is build 182" + * @param string $input + * @return string + */ + public function interpolate($input) + { + $keys = array_keys($this->interpolation_vars); + $values = array_values($this->interpolation_vars); + return str_replace($keys, $values, $input); + } +} \ No newline at end of file From 1b2f19c81f48c7f059fe8e41cd2dac7bccceead5 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:24:13 +0000 Subject: [PATCH 10/74] remove interopolation code from builder and make use of BuildInterpolator object. --- PHPCI/Builder.php | 56 ++++++++++------------------------------------- 1 file changed, 12 insertions(+), 44 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index d47ec3ee..dcf59f8e 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -9,6 +9,7 @@ namespace PHPCI; +use PHPCI\Helper\BuildInterpolator; use PHPCI\Helper\CommandExecutor; use PHPCI\Helper\MailerFactory; use PHPCI\Logging\BuildLogger; @@ -76,12 +77,9 @@ class Builder implements LoggerAwareInterface protected $lastOutput; /** - * An array of key => value pairs that will be used for - * interpolation and environment variables - * @var array - * @see setInterpolationVars() + * @var BuildInterpolator */ - protected $interpolation_vars = array(); + protected $interpolator; /** * @var \PHPCI\Store\BuildStore @@ -129,6 +127,8 @@ class Builder implements LoggerAwareInterface $this->verbose ); + $this->interpolator = new BuildInterpolator(); + } /** @@ -251,50 +251,14 @@ class Builder implements LoggerAwareInterface } /** - * Replace every occurance of the interpolation vars in the given string + * Replace every occurrence of the interpolation vars in the given string * Example: "This is build %PHPCI_BUILD%" => "This is build 182" * @param string $input * @return string */ public function interpolate($input) { - $keys = array_keys($this->interpolation_vars); - $values = array_values($this->interpolation_vars); - return str_replace($keys, $values, $input); - } - - /** - * Sets the variables that will be used for interpolation. This must be run - * from setupBuild() because prior to that, we don't know the buildPath - */ - protected function setInterpolationVars() - { - $this->interpolation_vars = array(); - $this->interpolation_vars['%PHPCI%'] = 1; - $this->interpolation_vars['%COMMIT%'] = $this->build->getCommitId(); - $this->interpolation_vars['%PROJECT%'] = $this->build->getProjectId(); - $this->interpolation_vars['%BUILD%'] = $this->build->getId(); - $this->interpolation_vars['%PROJECT_TITLE%'] = $this->getBuildProjectTitle( - ); - $this->interpolation_vars['%BUILD_PATH%'] = $this->buildPath; - $this->interpolation_vars['%BUILD_URI%'] = PHPCI_URL . "build/view/" . $this->build->getId( - ); - $this->interpolation_vars['%PHPCI_COMMIT%'] = $this->interpolation_vars['%COMMIT%']; - $this->interpolation_vars['%PHPCI_PROJECT%'] = $this->interpolation_vars['%PROJECT%']; - $this->interpolation_vars['%PHPCI_BUILD%'] = $this->interpolation_vars['%BUILD%']; - $this->interpolation_vars['%PHPCI_PROJECT_TITLE%'] = $this->interpolation_vars['%PROJECT_TITLE%']; - $this->interpolation_vars['%PHPCI_BUILD_PATH%'] = $this->interpolation_vars['%BUILD_PATH%']; - $this->interpolation_vars['%PHPCI_BUILD_URI%'] = $this->interpolation_vars['%BUILD_URI%']; - - putenv('PHPCI=1'); - putenv('PHPCI_COMMIT=' . $this->interpolation_vars['%COMMIT%']); - putenv('PHPCI_PROJECT=' . $this->interpolation_vars['%PROJECT%']); - putenv('PHPCI_BUILD=' . $this->interpolation_vars['%BUILD%']); - putenv( - 'PHPCI_PROJECT_TITLE=' . $this->interpolation_vars['%PROJECT_TITLE%'] - ); - putenv('PHPCI_BUILD_PATH=' . $this->interpolation_vars['%BUILD_PATH%']); - putenv('PHPCI_BUILD_URI=' . $this->interpolation_vars['%BUILD_URI%']); + return $this->interpolator->interpolate($input); } /** @@ -307,7 +271,11 @@ class Builder implements LoggerAwareInterface $this->ciDir = dirname(__FILE__) . '/../'; $this->buildPath = $this->ciDir . 'build/' . $buildId . '/'; - $this->setInterpolationVars(); + $this->interpolator->setupInterpolationVars( + $this->build, + $this->buildPath, + PHPCI_URL + ); // Create a working copy of the project: if (!$this->build->createWorkingCopy($this, $this->buildPath)) { From e32635c4747bc696f1a53aef7c33345003a0c031 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:35:18 +0000 Subject: [PATCH 11/74] add very basic tests for BuildInterpolator --- Tests/PHPCI/Helper/BuildInterpolatorTest.php | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Tests/PHPCI/Helper/BuildInterpolatorTest.php diff --git a/Tests/PHPCI/Helper/BuildInterpolatorTest.php b/Tests/PHPCI/Helper/BuildInterpolatorTest.php new file mode 100644 index 00000000..c45e1b8c --- /dev/null +++ b/Tests/PHPCI/Helper/BuildInterpolatorTest.php @@ -0,0 +1,49 @@ +testedInterpolator = new BuildInterpolator(); + } + + public function testInterpolate_LeavesStringsUnchangedByDefault() + { + $string = "Hello World"; + $expectedOutput = "Hello World"; + + $actualOutput = $this->testedInterpolator->interpolate($string); + + $this->assertEquals($expectedOutput, $actualOutput); + } + + public function testInterpolate_LeavesStringsUnchangedWhenBuildIsSet() + { + $build = $this->prophesize('PHPCI\\Model\\Build')->reveal(); + + $string = "Hello World"; + $expectedOutput = "Hello World"; + + $this->testedInterpolator->setupInterpolationVars( + $build, + "/buildpath/", + "phpci.com" + ); + + $actualOutput = $this->testedInterpolator->interpolate($string); + + $this->assertEquals($expectedOutput, $actualOutput); + } +} + \ No newline at end of file From cfb0db5b81a778aba8f6f323c2103cb3bcb0f325 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Tue, 17 Dec 2013 15:44:49 +0000 Subject: [PATCH 12/74] fixing builder so that PluginExecutor receives BuildLogger instance --- PHPCI/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index dcf59f8e..738f7bf3 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -118,7 +118,7 @@ class Builder implements LoggerAwareInterface $this->buildLogger = new BuildLogger($logger, $build); - $this->pluginExecutor = new Plugin\Util\Executor($this->buildPluginFactory($build), $this); + $this->pluginExecutor = new Plugin\Util\Executor($this->buildPluginFactory($build), $this->buildLogger); $this->commandExecutor = new CommandExecutor( $this->buildLogger, From 71588cd8e1e53d55553efeb79e1049d3ae742519 Mon Sep 17 00:00:00 2001 From: meadsteve Date: Sun, 29 Dec 2013 17:34:41 +0000 Subject: [PATCH 13/74] add LoadedPluginInformation class to process composer's installed.json file and pull out information about phpci plugins. --- PHPCI/Plugin/Util/LoadedPluginInformation.php | 147 ++++++++++++++++++ .../Util/LoadedPluginInformationTest.php | 51 ++++++ 2 files changed, 198 insertions(+) create mode 100644 PHPCI/Plugin/Util/LoadedPluginInformation.php create mode 100644 Tests/PHPCI/Plugin/Util/LoadedPluginInformationTest.php diff --git a/PHPCI/Plugin/Util/LoadedPluginInformation.php b/PHPCI/Plugin/Util/LoadedPluginInformation.php new file mode 100644 index 00000000..89107129 --- /dev/null +++ b/PHPCI/Plugin/Util/LoadedPluginInformation.php @@ -0,0 +1,147 @@ +composerPackages = $composerPackages; + } + + /** + * Returns an array of objects. Each one represents an available plugin + * and will have the following properties: + * name - The friendly name of the plugin (may be an empty string) + * class - The class of the plugin (will include namespace) + * @return \stdClass[] + */ + public function getInstalledPlugins() + { + $this->loadPluginInfo(); + return $this->pluginInfo; + } + + /** + * Returns an array of all the class names of plugins that have been + * loaded. + * + * @return string[] + */ + public function getPluginClasses() + { + return array_map( + function($plugin) { + return $plugin->class; + }, + $this->getInstalledPlugins() + ); + } + + protected function loadPluginInfo() + { + if ($this->pluginInfo !== null) { + return; + } + $this->pluginInfo = array(); + foreach($this->composerPackages as $package) { + $this->addPluginsFromPackage($package); + } + } + + /** + * @param \stdClass $package + */ + protected function addPluginsFromPackage($package) + { + if (isset($package->extra->phpci)) { + $phpciData = $package->extra->phpci; + + if (isset($phpciData->pluginNamespace)) { + $rootNamespace = $phpciData->pluginNamespace; + } + else { + $rootNamespace = ""; + } + + if (is_array($phpciData->suppliedPlugins)) { + $this->addPlugins( + $phpciData->suppliedPlugins, + $package->name, + $rootNamespace + ); + } + } + } + + /** + * @param \stdClass[] $plugins + * @param string $sourcePackageName + * @param string $rootNamespace + */ + protected function addPlugins( + array $plugins, + $sourcePackageName, + $rootNamespace = "") + { + foreach($plugins as $plugin) { + if (!isset($plugin->class)) { + continue; + } + $this->addPlugin($plugin, $sourcePackageName, $rootNamespace); + } + } + + /** + * @param \stdClass $plugin + * @param string $sourcePackageName + * @param string $rootNamespace + */ + protected function addPlugin( + $plugin, + $sourcePackageName, + $rootNamespace = "") + { + $newPlugin = clone $plugin; + + $newPlugin->class = $rootNamespace . $newPlugin->class; + + if (!isset($newPlugin->name)) { + $newPlugin->name = ""; + } + + $newPlugin->source = $sourcePackageName; + + $this->pluginInfo[] = $newPlugin; + } +} \ No newline at end of file diff --git a/Tests/PHPCI/Plugin/Util/LoadedPluginInformationTest.php b/Tests/PHPCI/Plugin/Util/LoadedPluginInformationTest.php new file mode 100644 index 00000000..a5c6c02f --- /dev/null +++ b/Tests/PHPCI/Plugin/Util/LoadedPluginInformationTest.php @@ -0,0 +1,51 @@ +testedInformation = LoadedPluginInformation::buildFromYaml($file); + } + + protected function phpciSetup() + { + $this->setUpFromFile( + __DIR__ . "/../../../../vendor/composer/installed.json" + ); + } + + public function testBuildFromYaml_ReturnsInstance() + { + $this->phpciSetup(); + $this->assertInstanceOf( + '\PHPCI\Plugin\Util\LoadedPluginInformation', + $this->testedInformation + ); + } + + public function testGetInstalledPlugins_ReturnsStdClassArray() + { + $this->phpciSetup(); + $plugins = $this->testedInformation->getInstalledPlugins(); + $this->assertInternalType("array", $plugins); + $this->assertContainsOnly("stdClass", $plugins); + } + + public function testGetPluginClasses_ReturnsStringArray() + { + $this->phpciSetup(); + $classes = $this->testedInformation->getPluginClasses(); + $this->assertInternalType("array", $classes); + $this->assertContainsOnly("string", $classes); + } +} + \ No newline at end of file From 4b9207e05f5826fe64b8f60a56211ad281d2c5fc Mon Sep 17 00:00:00 2001 From: meadsteve Date: Sun, 29 Dec 2013 17:35:33 +0000 Subject: [PATCH 14/74] update plugin controller to display plugin information as well as composer package information. --- PHPCI/Controller/PluginController.php | 10 ++++++-- PHPCI/View/Plugin/index.phtml | 37 ++++++++++++++++++++++----- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index 56d01f3e..c0654a7d 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -11,6 +11,7 @@ namespace PHPCI\Controller; use b8; use PHPCI\Model\Build; +use PHPCI\Plugin\Util\LoadedPluginInformation; /** * Plugin Controller - Provides support for installing Composer packages. @@ -59,8 +60,13 @@ class PluginController extends \PHPCI\Controller $this->view->required = $this->required; $json = $this->getComposerJson(); - $this->view->installed = $json['require']; - $this->view->suggested = $json['suggest']; + $this->view->installedPackages = $json['require']; + $this->view->suggestedPackages = $json['suggest']; + + $pluginInfo = LoadedPluginInformation::buildFromYaml( + PHPCI_DIR . "vendor/composer/installed.json" + ); + $this->view->plugins = $pluginInfo->getInstalledPlugins(); return $this->view->render(); } diff --git a/PHPCI/View/Plugin/index.phtml b/PHPCI/View/Plugin/index.phtml index f9170032..d2731f2f 100644 --- a/PHPCI/View/Plugin/index.phtml +++ b/PHPCI/View/Plugin/index.phtml @@ -1,4 +1,4 @@ -

Plugins

+

Packages and Provided Plugins

PHPCI cannot automatically install/remove plugins for you, as either the shell_exec() function is disabled or PHPCI could not find Composer. PHPCI will update composer.json for you, but you will need to run Composer manually to make the changes.

@@ -21,7 +21,30 @@
-

Installed Plugins

+

Available Plugins

+ + + + + + + + + + + + + + + + + + +
NameClassProvided by Package
name; ?>class; ?>source; ?>
+
+ +
+

Installed Packages

@@ -32,7 +55,7 @@ - $version): ?> + $version): ?> @@ -48,7 +71,7 @@
-

Suggested Plugins

+

Suggested Packages

@@ -59,8 +82,8 @@ - $version): ?> - + $version): ?> + @@ -76,7 +99,7 @@
-

Search Packagist for More Plugins

+

Search Packagist for More Packages

From df2a8aeac2d23321dba5fe4fe1e8fba533b6330e Mon Sep 17 00:00:00 2001 From: Pavel Pavlov Date: Tue, 31 Dec 2013 04:15:34 +0400 Subject: [PATCH 15/74] Fixes #236 Javascript bug, delete build error --- PHPCI/View/BuildsTable.phtml | 2 +- PHPCI/View/Home/index.phtml | 4 +++- PHPCI/View/User/index.phtml | 2 +- PHPCI/View/layout.phtml | 1 + public/assets/js/init.js | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 public/assets/js/init.js diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index 09cdd09b..d2cdc736 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -73,7 +73,7 @@ switch($build->getStatus())
diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index 5e48573c..791888ea 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -60,7 +60,9 @@ +
diff --git a/public/assets/js/init.js b/public/assets/js/init.js new file mode 100644 index 00000000..c851f648 --- /dev/null +++ b/public/assets/js/init.js @@ -0,0 +1,36 @@ +/** + * @file init.js + * Initialization of frontend of the application goes here + * + * @author Pavel Pavlov + * @date 12/31/13 + * @time 3:44 AM + * @license LICENSE.md + * + * @package PHPCI + */ + +$(function () { + $('#latest-builds').on('latest-builds:reload', bindAppDeleteEvents); + $('#latest-builds').trigger('latest-builds:reload'); +}); + +function bindAppDeleteEvents () { + $('.phpci-app-delete-build').on('click', function (e) { + e.preventDefault(); + + confirmDelete(e.target.href, 'Build').onClose = function () { + refreshBuildsTable(); + }; + + return false; + }); + + $('.phpci-app-delete-user').on('click', function (e) { + e.preventDefault(); + + confirmDelete(e.target.href, 'User', true); + + return false; + }); +} From 8bc043065a8d7d50861cb2d2dcf15cf10297a7c4 Mon Sep 17 00:00:00 2001 From: Raul Ferriz Date: Sat, 4 Jan 2014 10:17:24 +0100 Subject: [PATCH 16/74] Check for option verbose instead of get it. This avoid crashing when called by daemonise command. --- PHPCI/Command/RunCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php index d635b8a2..8415fafe 100644 --- a/PHPCI/Command/RunCommand.php +++ b/PHPCI/Command/RunCommand.php @@ -68,7 +68,7 @@ class RunCommand extends Command // For verbose mode we want to output all informational and above // messages to the symphony output interface. - if ($input->getOption('verbose')) { + if ($input->hasOption('verbose')) { $this->logger->pushHandler( new OutputLogHandler($this->output, Logger::INFO) ); From 4b50b9eb77d53d8e25d48733e8a0a25e92d02222 Mon Sep 17 00:00:00 2001 From: Raul Ferriz Date: Sat, 4 Jan 2014 10:19:55 +0100 Subject: [PATCH 17/74] Fix daemonise crash. --- PHPCI/Command/DaemoniseCommand.php | 31 ++++++++++++++++++++++++++++-- daemonise | 4 +++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index 3c490d75..999404d0 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -10,7 +10,9 @@ namespace PHPCI\Command; +use Monolog\Logger; use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -27,6 +29,26 @@ use PHPCI\BuildFactory; */ class DaemoniseCommand extends Command { + /** + * @var Logger + */ + protected $logger; + + /** + * @var OutputInterface + */ + protected $output; + + /** + * @param \Monolog\Logger $logger + * @param string $name + */ + public function __construct(Logger $logger, $name = null) + { + parent::__construct($name); + $this->logger = $logger; + } + protected function configure() { $this @@ -43,14 +65,19 @@ class DaemoniseCommand extends Command $command = sprintf($cmd, getmypid(), PHPCI_DIR); exec($command); + $this->output = $output; $this->run = true; $this->sleep = 0; - $runner = new RunCommand; + $runner = new RunCommand($this->logger); + + $in = new ArgvInput(array()); while ($this->run) { + $buildCount = 0; + try { - $buildCount = $runner->execute($input, $output); + $buildCount = $runner->run($in, $output); } catch (\Exception $e) { var_dump($e); } diff --git a/daemonise b/daemonise index 0f1a6d1d..45751190 100755 --- a/daemonise +++ b/daemonise @@ -15,6 +15,8 @@ require('bootstrap.php'); use PHPCI\Command\DaemoniseCommand; use Symfony\Component\Console\Application; +$loggerConfig = \PHPCI\Helper\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); + $application = new Application(); -$application->add(new DaemoniseCommand); +$application->add(new DaemoniseCommand($loggerConfig->getFor('DaemoniseCommand'))); $application->run(); From 1ac77fd26803939068212bd315d73fde50c0f98c Mon Sep 17 00:00:00 2001 From: Raul Ferriz Date: Sat, 4 Jan 2014 10:20:20 +0100 Subject: [PATCH 18/74] Removed unused use clauses. --- PHPCI/Command/DaemoniseCommand.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index 999404d0..5d2f003a 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -17,9 +17,6 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use b8\Store\Factory; -use PHPCI\Builder; -use PHPCI\BuildFactory; /** * Daemon that loops and call the run-command. From a1f0b93861f496d8f929c6f1efff087e2f5cb4e8 Mon Sep 17 00:00:00 2001 From: "a.cianfarani" Date: Fri, 10 Jan 2014 10:58:14 +0100 Subject: [PATCH 19/74] Added executable option for behat plugin --- PHPCI/Plugin/Behat.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Behat.php b/PHPCI/Plugin/Behat.php index 704d76cf..e4b72155 100644 --- a/PHPCI/Plugin/Behat.php +++ b/PHPCI/Plugin/Behat.php @@ -28,6 +28,12 @@ class Behat implements \PHPCI\Plugin $this->phpci = $phpci; $this->features = ''; + if (isset($options['executable'])) { + $this->executable = $options['executable']; + } else { + $this->executable = $this->phpci->findBinary('atoum'); + } + if (!empty($options['features'])) { $this->features = $options['features']; } @@ -41,7 +47,7 @@ class Behat implements \PHPCI\Plugin $curdir = getcwd(); chdir($this->phpci->buildPath); - $behat = $this->phpci->findBinary('behat'); + $behat = $this->executable; if (!$behat) { $this->phpci->logFailure('Could not find behat.'); From f6f5a6e111dc2adf6587915071326f964ff1673d Mon Sep 17 00:00:00 2001 From: Wogan May Date: Tue, 14 Jan 2014 23:03:23 +0200 Subject: [PATCH 20/74] Create an admin user New console command to add an admin user without trying to reinstall the whole app. --- PHPCI/Command/CreateAdminCommand.php | 130 +++++++++++++++++++++++++++ console | 2 + 2 files changed, 132 insertions(+) create mode 100644 PHPCI/Command/CreateAdminCommand.php diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php new file mode 100644 index 00000000..6122a108 --- /dev/null +++ b/PHPCI/Command/CreateAdminCommand.php @@ -0,0 +1,130 @@ +setName('phpci:create-admin') + ->setDescription('Create an admin user'); + } + + /** + * Creates an admin user in the existing PHPCI database + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + + require(PHPCI_DIR . 'bootstrap.php'); + + // Try to create a user account: + $adminEmail = $this->ask('Admin email address: ', true, FILTER_VALIDATE_EMAIL); + + if (empty($adminEmail)) { + return; + } + + $adminPass = $this->ask('Admin password: '); + $adminName = $this->ask('Admin name: '); + + try { + $user = new \PHPCI\Model\User(); + $user->setEmail($adminEmail); + $user->setName($adminName); + $user->setIsAdmin(1); + $user->setHash(password_hash($adminPass, PASSWORD_DEFAULT)); + + $store = \b8\Store\Factory::getStore('User'); + $store->save($user); + + print 'User account created!' . PHP_EOL; + } catch (\Exception $ex) { + print 'There was a problem creating your account. :(' . PHP_EOL; + print $ex->getMessage(); + print PHP_EOL; + } + } + + protected function ask($question, $emptyOk = false, $validationFilter = null) + { + print $question . ' '; + + $rtn = ''; + $stdin = fopen('php://stdin', 'r'); + $rtn = fgets($stdin); + fclose($stdin); + + $rtn = trim($rtn); + + if (!$emptyOk && empty($rtn)) { + $rtn = $this->ask($question, $emptyOk, $validationFilter); + } elseif ($validationFilter != null && ! empty($rtn)) { + if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) { + print $statusMessage; + $rtn = $this->ask($question, $emptyOk, $validationFilter); + } + } + + return $rtn; + } + protected function controlFormat($valueToInspect, $filter, &$statusMessage) + { + $filters = !(is_array($filter))? array($filter) : $filter; + $statusMessage = ''; + $status = true; + $options = array(); + + foreach ($filters as $filter) { + if (! is_int($filter)) { + $regexp = $filter; + $filter = FILTER_VALIDATE_REGEXP; + $options = array( + 'options' => array( + 'regexp' => $regexp, + ) + ); + } + if (! filter_var($valueToInspect, $filter, $options)) { + $status = false; + + switch ($filter) + { + case FILTER_VALIDATE_URL: + $statusMessage = 'Incorrect url format.' . PHP_EOL; + break; + case FILTER_VALIDATE_EMAIL: + $statusMessage = 'Incorrect e-mail format.' . PHP_EOL; + break; + case FILTER_VALIDATE_REGEXP: + $statusMessage = 'Incorrect format.' . PHP_EOL; + break; + } + } + } + + return $status; + } +} diff --git a/console b/console index f855f5ab..74490f33 100644 --- a/console +++ b/console @@ -18,6 +18,7 @@ use PHPCI\Command\UpdateCommand; use PHPCI\Command\InstallCommand; use PHPCI\Command\DaemonCommand; use PHPCI\Command\PollCommand; +use PHPCI\Command\CreateAdminCommand; use Symfony\Component\Console\Application; $loggerConfig = \PHPCI\Helper\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); @@ -30,5 +31,6 @@ $application->add(new UpdateCommand($loggerConfig->getFor('UpdateCommand'))); $application->add(new GenerateCommand); $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand'))); $application->add(new PollCommand($loggerConfig->getFor('PollCommand'))); +$application->add(new CreateAdminCommand); $application->run(); From 89931d01b53f68063af06497102db93f1a1f5e40 Mon Sep 17 00:00:00 2001 From: Wogan May Date: Tue, 14 Jan 2014 23:07:12 +0200 Subject: [PATCH 21/74] Revert "Create an admin user" This reverts commit f6f5a6e111dc2adf6587915071326f964ff1673d. --- PHPCI/Command/CreateAdminCommand.php | 130 --------------------------- console | 2 - 2 files changed, 132 deletions(-) delete mode 100644 PHPCI/Command/CreateAdminCommand.php diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php deleted file mode 100644 index 6122a108..00000000 --- a/PHPCI/Command/CreateAdminCommand.php +++ /dev/null @@ -1,130 +0,0 @@ -setName('phpci:create-admin') - ->setDescription('Create an admin user'); - } - - /** - * Creates an admin user in the existing PHPCI database - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - - require(PHPCI_DIR . 'bootstrap.php'); - - // Try to create a user account: - $adminEmail = $this->ask('Admin email address: ', true, FILTER_VALIDATE_EMAIL); - - if (empty($adminEmail)) { - return; - } - - $adminPass = $this->ask('Admin password: '); - $adminName = $this->ask('Admin name: '); - - try { - $user = new \PHPCI\Model\User(); - $user->setEmail($adminEmail); - $user->setName($adminName); - $user->setIsAdmin(1); - $user->setHash(password_hash($adminPass, PASSWORD_DEFAULT)); - - $store = \b8\Store\Factory::getStore('User'); - $store->save($user); - - print 'User account created!' . PHP_EOL; - } catch (\Exception $ex) { - print 'There was a problem creating your account. :(' . PHP_EOL; - print $ex->getMessage(); - print PHP_EOL; - } - } - - protected function ask($question, $emptyOk = false, $validationFilter = null) - { - print $question . ' '; - - $rtn = ''; - $stdin = fopen('php://stdin', 'r'); - $rtn = fgets($stdin); - fclose($stdin); - - $rtn = trim($rtn); - - if (!$emptyOk && empty($rtn)) { - $rtn = $this->ask($question, $emptyOk, $validationFilter); - } elseif ($validationFilter != null && ! empty($rtn)) { - if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) { - print $statusMessage; - $rtn = $this->ask($question, $emptyOk, $validationFilter); - } - } - - return $rtn; - } - protected function controlFormat($valueToInspect, $filter, &$statusMessage) - { - $filters = !(is_array($filter))? array($filter) : $filter; - $statusMessage = ''; - $status = true; - $options = array(); - - foreach ($filters as $filter) { - if (! is_int($filter)) { - $regexp = $filter; - $filter = FILTER_VALIDATE_REGEXP; - $options = array( - 'options' => array( - 'regexp' => $regexp, - ) - ); - } - if (! filter_var($valueToInspect, $filter, $options)) { - $status = false; - - switch ($filter) - { - case FILTER_VALIDATE_URL: - $statusMessage = 'Incorrect url format.' . PHP_EOL; - break; - case FILTER_VALIDATE_EMAIL: - $statusMessage = 'Incorrect e-mail format.' . PHP_EOL; - break; - case FILTER_VALIDATE_REGEXP: - $statusMessage = 'Incorrect format.' . PHP_EOL; - break; - } - } - } - - return $status; - } -} diff --git a/console b/console index 74490f33..f855f5ab 100644 --- a/console +++ b/console @@ -18,7 +18,6 @@ use PHPCI\Command\UpdateCommand; use PHPCI\Command\InstallCommand; use PHPCI\Command\DaemonCommand; use PHPCI\Command\PollCommand; -use PHPCI\Command\CreateAdminCommand; use Symfony\Component\Console\Application; $loggerConfig = \PHPCI\Helper\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); @@ -31,6 +30,5 @@ $application->add(new UpdateCommand($loggerConfig->getFor('UpdateCommand'))); $application->add(new GenerateCommand); $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand'))); $application->add(new PollCommand($loggerConfig->getFor('PollCommand'))); -$application->add(new CreateAdminCommand); $application->run(); From cd3a18d73cce5ec78545f31c9b8adc064266075b Mon Sep 17 00:00:00 2001 From: Wogan May Date: Tue, 14 Jan 2014 23:09:40 +0200 Subject: [PATCH 22/74] Create admin user New console command just to create an admin user --- PHPCI/Command/CreateAdminCommand.php | 130 +++++++++++++++++++++++++++ console | 2 + 2 files changed, 132 insertions(+) create mode 100644 PHPCI/Command/CreateAdminCommand.php diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php new file mode 100644 index 00000000..6122a108 --- /dev/null +++ b/PHPCI/Command/CreateAdminCommand.php @@ -0,0 +1,130 @@ +setName('phpci:create-admin') + ->setDescription('Create an admin user'); + } + + /** + * Creates an admin user in the existing PHPCI database + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + + require(PHPCI_DIR . 'bootstrap.php'); + + // Try to create a user account: + $adminEmail = $this->ask('Admin email address: ', true, FILTER_VALIDATE_EMAIL); + + if (empty($adminEmail)) { + return; + } + + $adminPass = $this->ask('Admin password: '); + $adminName = $this->ask('Admin name: '); + + try { + $user = new \PHPCI\Model\User(); + $user->setEmail($adminEmail); + $user->setName($adminName); + $user->setIsAdmin(1); + $user->setHash(password_hash($adminPass, PASSWORD_DEFAULT)); + + $store = \b8\Store\Factory::getStore('User'); + $store->save($user); + + print 'User account created!' . PHP_EOL; + } catch (\Exception $ex) { + print 'There was a problem creating your account. :(' . PHP_EOL; + print $ex->getMessage(); + print PHP_EOL; + } + } + + protected function ask($question, $emptyOk = false, $validationFilter = null) + { + print $question . ' '; + + $rtn = ''; + $stdin = fopen('php://stdin', 'r'); + $rtn = fgets($stdin); + fclose($stdin); + + $rtn = trim($rtn); + + if (!$emptyOk && empty($rtn)) { + $rtn = $this->ask($question, $emptyOk, $validationFilter); + } elseif ($validationFilter != null && ! empty($rtn)) { + if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) { + print $statusMessage; + $rtn = $this->ask($question, $emptyOk, $validationFilter); + } + } + + return $rtn; + } + protected function controlFormat($valueToInspect, $filter, &$statusMessage) + { + $filters = !(is_array($filter))? array($filter) : $filter; + $statusMessage = ''; + $status = true; + $options = array(); + + foreach ($filters as $filter) { + if (! is_int($filter)) { + $regexp = $filter; + $filter = FILTER_VALIDATE_REGEXP; + $options = array( + 'options' => array( + 'regexp' => $regexp, + ) + ); + } + if (! filter_var($valueToInspect, $filter, $options)) { + $status = false; + + switch ($filter) + { + case FILTER_VALIDATE_URL: + $statusMessage = 'Incorrect url format.' . PHP_EOL; + break; + case FILTER_VALIDATE_EMAIL: + $statusMessage = 'Incorrect e-mail format.' . PHP_EOL; + break; + case FILTER_VALIDATE_REGEXP: + $statusMessage = 'Incorrect format.' . PHP_EOL; + break; + } + } + } + + return $status; + } +} diff --git a/console b/console index f855f5ab..74490f33 100644 --- a/console +++ b/console @@ -18,6 +18,7 @@ use PHPCI\Command\UpdateCommand; use PHPCI\Command\InstallCommand; use PHPCI\Command\DaemonCommand; use PHPCI\Command\PollCommand; +use PHPCI\Command\CreateAdminCommand; use Symfony\Component\Console\Application; $loggerConfig = \PHPCI\Helper\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php"); @@ -30,5 +31,6 @@ $application->add(new UpdateCommand($loggerConfig->getFor('UpdateCommand'))); $application->add(new GenerateCommand); $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand'))); $application->add(new PollCommand($loggerConfig->getFor('PollCommand'))); +$application->add(new CreateAdminCommand); $application->run(); From 37248fcd5b7baea0c2ac1c244fed1e54587d6434 Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Sat, 25 Jan 2014 14:22:15 +0100 Subject: [PATCH 23/74] When phpci is default, it should be used. The installer displays `phpci` as placeholders for the database settings (database and username). When I do not change them the installer fails with this error: `Fatal error: Uncaught exception 'PDOException' with message 'SQLSTATE[3D000]: Invalid catalog name: 1046 No database selected' in /Users/tobias/Sites/PHPCI/vendor/block8/b8framework/b8/Database/Map.php on line 40` I assume it is simply because they are not set. This pull requests uses the given values, or phpci as default. In theory I would assume all the configuration values should be checked somehow. Is this just not implemented, or is it not desired? --- public/install.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/install.php b/public/install.php index 1d900800..9bb19fff 100644 --- a/public/install.php +++ b/public/install.php @@ -101,8 +101,8 @@ if ($installOK && strtoupper($_SERVER['REQUEST_METHOD']) == 'POST') { * Create database: */ $dbhost = $config['b8']['database']['servers']['write'][0]; - $dbname = $config['b8']['database']['name']; - $dbuser = $config['b8']['database']['username']; + $dbname = $config['b8']['database']['name'] ?: 'phpci'; + $dbuser = $config['b8']['database']['username'] ?: 'phpci'; $dbpass = $config['b8']['database']['password']; $pdo = new PDO('mysql:host=' . $dbhost, $dbuser, $dbpass); From c7de384750b456604b774aedfd185a16ee11f206 Mon Sep 17 00:00:00 2001 From: Tobias Tom Date: Sat, 25 Jan 2014 14:26:47 +0100 Subject: [PATCH 24/74] Redirect after installation is broken Currently the form just redirects to `/session/login`, which is wrong if PHPCI was installed into a subdirectory. This pull request fixes the URL that is used in the last form step. --- public/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/install.php b/public/install.php index 1d900800..4c4e628a 100644 --- a/public/install.php +++ b/public/install.php @@ -139,7 +139,7 @@ if ($installOK && strtoupper($_SERVER['REQUEST_METHOD']) == 'POST') { $store->save($user); } - $formAction = '/session/login'; + $formAction = rtrim( $config['phpci']['url'], '/' ) . '/session/login'; } } From 37f06defc791fbeff35e21029a3e39dcc1064c5f Mon Sep 17 00:00:00 2001 From: Wogan May Date: Tue, 28 Jan 2014 23:27:39 +0200 Subject: [PATCH 25/74] Fixing short tags --- PHPCI/View/Build/view.phtml | 8 ++++---- PHPCI/View/BuildsTable.phtml | 12 ++++++------ PHPCI/View/Home/index.phtml | 8 ++++---- PHPCI/View/Plugin/index.phtml | 18 +++++++++--------- PHPCI/View/Project/view.phtml | 12 ++++++------ PHPCI/View/ProjectForm.phtml | 2 +- PHPCI/View/Session/login.phtml | 6 +++--- PHPCI/View/Settings/index.phtml | 4 ++-- PHPCI/View/SummaryTable.phtml | 8 ++++---- PHPCI/View/User/index.phtml | 12 ++++++------ PHPCI/View/UserForm.phtml | 2 +- PHPCI/View/layout.phtml | 22 +++++++++++----------- 12 files changed, 57 insertions(+), 57 deletions(-) diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml index aa18e591..022979f3 100644 --- a/PHPCI/View/Build/view.phtml +++ b/PHPCI/View/Build/view.phtml @@ -6,12 +6,12 @@
Options
    -
  • Rebuild
    • +
  • Rebuild
    • User()->getIsAdmin()): ?>
  • Delete Build
    • @@ -39,4 +39,4 @@ foreach ($plugins as $plugin) { $(document).ready(function() { PHPCI.renderPlugins(); }); - \ No newline at end of file + diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index d2cdc736..a9351353 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -37,8 +37,8 @@ switch($build->getStatus()) } ?>
- - + $version): ?> - - + + @@ -62,11 +62,11 @@ $version): ?> - - + + diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml index 036f9837..b5957260 100644 --- a/PHPCI/View/Project/view.phtml +++ b/PHPCI/View/Project/view.phtml @@ -5,15 +5,15 @@
Options
@@ -86,14 +86,14 @@ \ No newline at end of file + diff --git a/PHPCI/View/Session/login.phtml b/PHPCI/View/Session/login.phtml index 59027b0e..2314a639 100644 --- a/PHPCI/View/Session/login.phtml +++ b/PHPCI/View/Session/login.phtml @@ -5,9 +5,9 @@ - + - +
#getId(), 6, '0', STR_PAD_LEFT); ?> + #getId(), 6, '0', STR_PAD_LEFT); ?> getProject())) { print htmlspecialchars($build->getProject()->getTitle()); @@ -56,24 +56,24 @@ switch($build->getStatus()) $plugins = array(); } if ( 0 === count($plugins) ) { - ?> $pluginstatus): $subcls = $pluginstatus?'label label-success':'label label-danger'; - ?> Build()->formatPluginName($plugin); ?> + ?> Build()->formatPluginName($plugin); ?>
- View + View User()->getIsAdmin()): ?>
diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index 791888ea..44c5af1d 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -4,14 +4,14 @@
Projects
@@ -60,10 +60,10 @@ \ No newline at end of file + diff --git a/PHPCI/View/Plugin/index.phtml b/PHPCI/View/Plugin/index.phtml index f9170032..134cf260 100644 --- a/PHPCI/View/Plugin/index.phtml +++ b/PHPCI/View/Plugin/index.phtml @@ -9,15 +9,15 @@ -

has been removed.

+

has been removed.

-

has been installed.

+

has been installed.

-

has been added to composer.json and will be installed next time you run composer update.

+

has been added to composer.json and will be installed next time you run composer update.

@@ -34,11 +34,11 @@
- Remove » + Remove »
- +