From 83110941eb8c9630654f7f2c8c127f65e1e011c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= Date: Sat, 31 Mar 2018 04:28:35 -0300 Subject: [PATCH] [Discovery One] Add Cache Pool Task for Symfony, remove Assetic task --- CHANGELOG.md | 42 ++--------- ...ticDumpTask.php => CachePoolClearTask.php} | 29 ++++---- .../BuiltIn/Symfony/CachePoolPruneTask.php | 42 +++++++++++ .../BuiltIn/DeployCommandMiscTasksTest.php | 4 +- .../Command/BuiltIn/DeployCommandMiscTest.php | 6 +- .../BuiltIn/DeployCommandWithReleasesTest.php | 10 +-- .../DeployCommandWithoutReleasesTest.php | 6 +- tests/Resources/basic.yml | 2 +- tests/Resources/invalid-log.yml | 2 +- tests/Resources/no-hosts.yml | 2 +- tests/Resources/symfony-envconf.yml | 4 +- tests/Resources/testhost-skipping.yml | 2 +- tests/Resources/testhost-sudo.yml | 2 +- tests/Resources/testhost-with-from.yml | 2 +- tests/Resources/testhost-with-port.yml | 2 +- .../testhost-without-releases-with-from.yml | 2 +- .../testhost-without-releases-with-port.yml | 2 +- tests/Resources/testhost-without-releases.yml | 2 +- tests/Resources/testhost.yml | 2 +- .../BuiltIn/Symfony/AsseticDumpTaskTest.php | 71 ------------------- 20 files changed, 89 insertions(+), 147 deletions(-) rename src/Task/BuiltIn/Symfony/{AsseticDumpTask.php => CachePoolClearTask.php} (50%) create mode 100644 src/Task/BuiltIn/Symfony/CachePoolPruneTask.php delete mode 100644 tests/Task/BuiltIn/Symfony/AsseticDumpTaskTest.php diff --git a/CHANGELOG.md b/CHANGELOG.md index 785091b..24938e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,37 +1,9 @@ -CHANGELOG for 3.X +CHANGELOG for 4.X ================= -* 3.4.0 (2018-03-29) - * [Issue#380] Throw exception if log_dir is defined but directory doesn't exists - * [BUGFIX] [Issue#405] Malformed ssh command when defining host:port notation - * [Issue#415] Remove timeout on Deploy with Tar or Rsync tasks - - -* 3.3.0 (2017-07-22) - * [PR#386] Allow to define timeout (default 120s) for symfony/assetic-dump task. - * [PR#392] Allow to define Host Port in Host configuration. - * Allow to specify the binary path of tar on for create and extract - -* 3.2.0 (2017-04-14) - * Allow to pre-register Custom Tasks - * [PR#365] New option "from" to define deployment start point - * Allow to define excludes in the global scope. - * Improve code quality, remove duplications on Symfony Tasks. - * Improve code quality, remove duplications on Composer Tasks. - * [PR#364] Allow to define custom timeout to Composer:Install - -* 3.1.0 (2017-02-25) - * Add new Exec task to execute arbitrary shell commands - * Add new Composer task, to update phar (composer/self-update) - * [#344] Allow to flag Filesystem tasks - * [PR#346] Add new File System task, to change file's modes (fs/chmod) - * [BUGFIX] [PR#342] Ignore empty exclude lines - * [PR#330] Allow Composer task options to be overwritten at environment level - * [PR#330] Add new method Runtime::getMergedOption to merge ConfigOption and EnvOption - * [Documentation] [PR#333] Improve example config file - -* 3.0.1 (2017-01-10) - * [BUGFIX] [#350] [#353] Fix escape issue when commands are sent through SSH - -* 3.0.0 (2017-01-31) - * v3 series release +* 4.0.0 (2018-04-02) + * v4 series release + * Refactored for Symfony 4 and PHP 7.1 + * Symfony Pool Clear task added + * Symfony Pool Prune task added + * Symfony Assetic task removed diff --git a/src/Task/BuiltIn/Symfony/AsseticDumpTask.php b/src/Task/BuiltIn/Symfony/CachePoolClearTask.php similarity index 50% rename from src/Task/BuiltIn/Symfony/AsseticDumpTask.php rename to src/Task/BuiltIn/Symfony/CachePoolClearTask.php index 8d1400c..699f8cb 100644 --- a/src/Task/BuiltIn/Symfony/AsseticDumpTask.php +++ b/src/Task/BuiltIn/Symfony/CachePoolClearTask.php @@ -10,45 +10,44 @@ namespace Mage\Task\BuiltIn\Symfony; +use Mage\Task\Exception\ErrorException; use Symfony\Component\Process\Process; -use Mage\Task\AbstractTask; /** - * Symfony Task - Dump Assetics + * Symfony Task - Cache Pool Clear * * @author Andrés Montañez */ -class AsseticDumpTask extends AbstractTask +class CachePoolClearTask extends AbstractSymfonyTask { public function getName() { - return 'symfony/assetic-dump'; + return 'symfony/cache-pool-clear'; } public function getDescription() { - return '[Symfony] Assetic Dump'; + return '[Symfony] Cache Pool Clear'; } public function execute() { $options = $this->getOptions(); - $command = sprintf('%s assetic:dump --env=%s %s', $options['console'], $options['env'], $options['flags']); + + if (!$options['pools']) { + throw new ErrorException('Parameter "pools" is not defined'); + } + + $command = $options['console'] . ' cache:pool:clear --env=' . $options['env'] . ' ' . $options['flags'] . ' ' . $options['pools']; /** @var Process $process */ - $process = $this->runtime->runCommand(trim($command), $options['timeout']); + $process = $this->runtime->runCommand(trim($command)); return $process->isSuccessful(); } - protected function getOptions() + protected function getSymfonyOptions() { - $options = array_merge( - ['console' => 'bin/console', 'env' => 'dev', 'flags' => '', 'timeout' => 120], - $this->runtime->getMergedOption('symfony'), - $this->options - ); - - return $options; + return ['pools' => null]; } } diff --git a/src/Task/BuiltIn/Symfony/CachePoolPruneTask.php b/src/Task/BuiltIn/Symfony/CachePoolPruneTask.php new file mode 100644 index 0000000..f8c07ac --- /dev/null +++ b/src/Task/BuiltIn/Symfony/CachePoolPruneTask.php @@ -0,0 +1,42 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Mage\Task\BuiltIn\Symfony; + +use Symfony\Component\Process\Process; + +/** + * Symfony Task - Cache Pool Prune + * + * @author Andrés Montañez + */ +class CachePoolPruneTask extends AbstractSymfonyTask +{ + public function getName() + { + return 'symfony/cache-pool-prune'; + } + + public function getDescription() + { + return '[Symfony] Cache Pool Prune'; + } + + public function execute() + { + $options = $this->getOptions(); + $command = $options['console'] . ' cache:pool:prune --env=' . $options['env'] . ' ' . $options['flags']; + + /** @var Process $process */ + $process = $this->runtime->runCommand(trim($command)); + + return $process->isSuccessful(); + } +} diff --git a/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php b/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php index 07cc2a2..3555b75 100644 --- a/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php +++ b/tests/Command/BuiltIn/DeployCommandMiscTasksTest.php @@ -35,8 +35,8 @@ class DeployCommandMiscTasksTest extends TestCase 0 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test', 1 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=testenv"', 2 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=testenv --symlink --relative"', - 3 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=testenv"', - 4 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=prod"', + 3 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=testenv"', + 4 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=prod"', ); // Check total of Executed Commands diff --git a/tests/Command/BuiltIn/DeployCommandMiscTest.php b/tests/Command/BuiltIn/DeployCommandMiscTest.php index 0a757b4..4b4cec3 100644 --- a/tests/Command/BuiltIn/DeployCommandMiscTest.php +++ b/tests/Command/BuiltIn/DeployCommandMiscTest.php @@ -78,7 +78,7 @@ class DeployCommandMiscTest extends TestCase 6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console cache:clear --env=dev"', 7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console cache:warmup --env=dev"', 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console assets:install web --env=dev --symlink --relative"', - 9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console assetic:dump --env=dev"', + 9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && sudo bin/console cache:pool:prune --env=dev"', 10 => 'git checkout master', ); @@ -115,7 +115,7 @@ class DeployCommandMiscTest extends TestCase 5 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test', 6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"', 7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"', - 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"', + 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"', 9 => 'git checkout master', ); @@ -259,7 +259,7 @@ class DeployCommandMiscTest extends TestCase 4 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test', 5 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"', 6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"', - 7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"', + 7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"', 8 => 'git branch | grep "*"', ); diff --git a/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php b/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php index bef4919..366e38d 100644 --- a/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php +++ b/tests/Command/BuiltIn/DeployCommandWithReleasesTest.php @@ -46,7 +46,7 @@ class DeployCommandWithReleasesTest extends TestCase 9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"', 10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"', 11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"', - 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"', + 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"', 13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"', 14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"', 15 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"', @@ -96,7 +96,7 @@ class DeployCommandWithReleasesTest extends TestCase 9 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"', 10 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=prod"', 11 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=prod --symlink --relative"', - 12 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=prod"', + 12 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=prod"', 13 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"', 14 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"', 15 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"', @@ -146,7 +146,7 @@ class DeployCommandWithReleasesTest extends TestCase 9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"', 10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"', 11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"', - 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"', + 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"', 13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"', 14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"', 15 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"', @@ -356,7 +356,7 @@ class DeployCommandWithReleasesTest extends TestCase 9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"', 10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"', 11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"', - 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"', + 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"', 13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"', 14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"', 15 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"', @@ -409,7 +409,7 @@ class DeployCommandWithReleasesTest extends TestCase 9 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"', 10 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"', 11 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"', - 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"', + 12 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:pool:prune --env=dev"', 13 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"', 14 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"', ); diff --git a/tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php b/tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php index 76262c2..4674096 100644 --- a/tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php +++ b/tests/Command/BuiltIn/DeployCommandWithoutReleasesTest.php @@ -40,7 +40,7 @@ class DeployCommandWithoutReleasesTest extends TestCase 5 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test', 6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"', 7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"', - 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"', + 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"', 9 => 'git checkout master', ); @@ -77,7 +77,7 @@ class DeployCommandWithoutReleasesTest extends TestCase 5 => 'rsync -e "ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test', 6 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"', 7 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"', - 8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"', + 8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"', 9 => 'git checkout master', ); @@ -114,7 +114,7 @@ class DeployCommandWithoutReleasesTest extends TestCase 5 => 'rsync -e "ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./dist tester@testhost:/var/www/test', 6 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"', 7 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"', - 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"', + 8 => 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:pool:prune --env=dev"', 9 => 'git checkout master', ); diff --git a/tests/Resources/basic.yml b/tests/Resources/basic.yml index a916c32..28c7978 100644 --- a/tests/Resources/basic.yml +++ b/tests/Resources/basic.yml @@ -21,7 +21,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/invalid-log.yml b/tests/Resources/invalid-log.yml index d6321c5..96416a9 100644 --- a/tests/Resources/invalid-log.yml +++ b/tests/Resources/invalid-log.yml @@ -21,7 +21,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/no-hosts.yml b/tests/Resources/no-hosts.yml index f2ce2ef..6771cc6 100644 --- a/tests/Resources/no-hosts.yml +++ b/tests/Resources/no-hosts.yml @@ -17,7 +17,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/symfony-envconf.yml b/tests/Resources/symfony-envconf.yml index d9c239f..3e19960 100644 --- a/tests/Resources/symfony-envconf.yml +++ b/tests/Resources/symfony-envconf.yml @@ -14,5 +14,5 @@ magephp: on-deploy: - symfony/cache-warmup - symfony/assets-install - - symfony/assetic-dump - - symfony/assetic-dump: { env: 'prod' } + - symfony/cache-pool-prune + - symfony/cache-pool-prune: { env: 'prod' } diff --git a/tests/Resources/testhost-skipping.yml b/tests/Resources/testhost-skipping.yml index e163bd1..5ce8f07 100644 --- a/tests/Resources/testhost-skipping.yml +++ b/tests/Resources/testhost-skipping.yml @@ -18,7 +18,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost-sudo.yml b/tests/Resources/testhost-sudo.yml index 04fd2e2..55a19ca 100644 --- a/tests/Resources/testhost-sudo.yml +++ b/tests/Resources/testhost-sudo.yml @@ -20,7 +20,7 @@ magephp: - symfony/cache-clear: { env: 'dev' } - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost-with-from.yml b/tests/Resources/testhost-with-from.yml index 228730d..1d4c91e 100644 --- a/tests/Resources/testhost-with-from.yml +++ b/tests/Resources/testhost-with-from.yml @@ -22,7 +22,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost-with-port.yml b/tests/Resources/testhost-with-port.yml index c6e5ff6..94e3ee6 100644 --- a/tests/Resources/testhost-with-port.yml +++ b/tests/Resources/testhost-with-port.yml @@ -21,7 +21,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'prod' } - symfony/assets-install: { env: 'prod' } - - symfony/assetic-dump: { env: 'prod' } + - symfony/cache-pool-prune: { env: 'prod' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost-without-releases-with-from.yml b/tests/Resources/testhost-without-releases-with-from.yml index d7b63ed..3520f7d 100644 --- a/tests/Resources/testhost-without-releases-with-from.yml +++ b/tests/Resources/testhost-without-releases-with-from.yml @@ -19,7 +19,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost-without-releases-with-port.yml b/tests/Resources/testhost-without-releases-with-port.yml index 9f4f184..27755a2 100644 --- a/tests/Resources/testhost-without-releases-with-port.yml +++ b/tests/Resources/testhost-without-releases-with-port.yml @@ -18,7 +18,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost-without-releases.yml b/tests/Resources/testhost-without-releases.yml index 8c09a74..7165c96 100644 --- a/tests/Resources/testhost-without-releases.yml +++ b/tests/Resources/testhost-without-releases.yml @@ -18,7 +18,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Resources/testhost.yml b/tests/Resources/testhost.yml index f55f9e9..b1b630e 100644 --- a/tests/Resources/testhost.yml +++ b/tests/Resources/testhost.yml @@ -21,7 +21,7 @@ magephp: on-deploy: - symfony/cache-warmup: { env: 'dev' } - symfony/assets-install: { env: 'dev' } - - symfony/assetic-dump: { env: 'dev' } + - symfony/cache-pool-prune: { env: 'dev' } on-release: post-release: post-deploy: \ No newline at end of file diff --git a/tests/Task/BuiltIn/Symfony/AsseticDumpTaskTest.php b/tests/Task/BuiltIn/Symfony/AsseticDumpTaskTest.php deleted file mode 100644 index 357cebf..0000000 --- a/tests/Task/BuiltIn/Symfony/AsseticDumpTaskTest.php +++ /dev/null @@ -1,71 +0,0 @@ -runtime = new RuntimeMockup(); - $this->runtime->setConfiguration(['environments' => ['test' => []]]); - $this->runtime->setEnvironment('test'); - } - - public function testAsseticDumpTask() - { - $task = new AsseticDumpTask(); - $task->setOptions(['env' => 'test']); - $task->setRuntime($this->runtime); - $this->assertEquals('[Symfony] Assetic Dump', $task->getDescription()); - $task->execute(); - - $testCase = [ - 'bin/console assetic:dump --env=test' => 120, - ]; - - $this->assertRanCommands($testCase); - } - - public function testAsseticDumpTaskWithTimeoutOption() - { - $task = new AsseticDumpTask(); - $task->setOptions(['env' => 'test', 'timeout' => 300]); - $task->setRuntime($this->runtime); - $task->execute(); - - - $testCase = [ - 'bin/console assetic:dump --env=test' => 300, - ]; - - $this->assertRanCommands($testCase); - } - - /** - * @param $testCase - */ - private function assertRanCommands($testCase) - { - $ranCommands = $this->runtime->getRanCommands(); - - // Check total of Executed Commands - $this->assertEquals(count($testCase), count($ranCommands)); - - // Check Generated Commands - $index = 0; - foreach ($testCase as $command => $timeout) { - $this->assertEquals($command, $ranCommands[$index++]); - $this->assertEquals($timeout, $this->runtime->getRanCommandTimeoutFor($command)); - } - } -}