Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit119f34b

Browse files
authored
Deployer refactoring (#59)
* Remove Local deploy* remove plugins* resolve variables refactoring* deployer refactoring
1 parentb5ceecb commit119f34b

File tree

52 files changed

+600
-2379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+600
-2379
lines changed

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PHP = $(PHP_CONT) php
1111
.DEFAULT_GOAL = help
1212
.PHONY = help build up start down logs sh composer vendor sf cc
1313

14-
## —— Help🐳🎵 ———————————————————————————————————————————————————————————————
14+
## —— Help 🎵 ———————————————————————————————————————————————————————————————
1515
help:## Outputs this help screen
1616
@grep -E'(^[a-zA-Z0-9_-]+:.*?##.*$$)|(^##)'$(MAKEFILE_LIST)| awk'BEGIN {FS = ":.*?## "}{printf "\033[32m%-30s\033[0m %s\n", $$1, $$2}'| sed -e's/\[32m##/[33m/'
1717

@@ -30,15 +30,15 @@ install: ## Install project
3030
@$(PHP_CONT) composer install
3131

3232
## —— CI ✨ ————————————————————————————————————————————————————————————————————
33-
ci: cs phpstan rector test
33+
ci: cs phpstan rector test## Run all all checks
3434

3535
cs:## Run tests
3636
$(PHP) vendor/bin/php-cs-fixer fix
3737

38-
phpstan:
38+
phpstan:## Run phpstan
3939
$(PHP) vendor/bin/phpstan
4040

41-
rector:
41+
rector:## Run rector
4242
$(PHP) vendor/bin/rector
4343

4444
test:## Run tests

‎phpstan.dist.neon‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ parameters:
66
- php
77
excludePaths:
88
- src/Automate/Configuration.php
9-
ignoreErrors:
10-
- '#Call to an undefined method [a-zA-Z0-9\\_]+::children\(\)#'

‎src/Automate/Application.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
useAutomate\Command\CheckCommand;
1515
useAutomate\Command\DeployCommand;
16-
useAutomate\Command\LocalDeployCommand;
1716
useSymfony\Component\Console\ApplicationasBaseApplication;
1817

1918
class Applicationextends BaseApplication
@@ -44,7 +43,6 @@ protected function getDefaultCommands(): array
4443
$commands =parent::getDefaultCommands();
4544

4645
$commands[] =newDeployCommand();
47-
$commands[] =newLocalDeployCommand();
4846
$commands[] =newCheckCommand();
4947

5048
return$commands;

‎src/Automate/Command/BaseCommand.php‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
useAutomate\Logger\ConsoleLogger;
1515
useAutomate\Logger\LoggerInterface;
16+
useAutomate\Model\Platform;
17+
useAutomate\Model\Project;
18+
useAutomate\VariableResolver;
1619
useSymfony\Component\Console\Command\Command;
17-
useSymfony\Component\Console\Output\OutputInterface;
1820
useSymfony\Component\Console\Style\SymfonyStyle;
1921

2022
abstractclass BaseCommandextends Command
@@ -23,10 +25,13 @@ abstract class BaseCommand extends Command
2325

2426
protectedfunctiongetLogger(SymfonyStyle$io):LoggerInterface
2527
{
26-
$verbosity =$io->getVerbosity() > OutputInterface::VERBOSITY_NORMAL
27-
? LoggerInterface::VERBOSITY_DEBUG
28-
: LoggerInterface::VERBOSITY_NORMAL;
28+
returnnewConsoleLogger($io);
29+
}
2930

30-
returnnewConsoleLogger($io,$verbosity);
31+
protectedfunctionresolveVariables(SymfonyStyle$io,Project$project,Platform$platform):void
32+
{
33+
$variableResolver =newVariableResolver($io);
34+
$variableResolver->resolvePlatform($platform);
35+
$variableResolver->resolveRepository($project);
3136
}
3237
}

‎src/Automate/Command/CheckCommand.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111

1212
namespaceAutomate\Command;
1313

14-
useAutomate\Context\SSHContext;
1514
useAutomate\Loader;
16-
useAutomate\VariableResolver;
15+
useAutomate\Workflow\Context;
16+
useAutomate\Workflow\Session;
1717
useSymfony\Component\Console\Attribute\AsCommand;
1818
useSymfony\Component\Console\Command\Command;
1919
useSymfony\Component\Console\Input\InputArgument;
@@ -42,18 +42,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
4242
$platform =$project->getPlatform($input->getArgument('platform'));
4343
$io =newSymfonyStyle($input,$output);
4444

45-
$variableResolver =newVariableResolver($io);
46-
$variableResolver->resolvePlatform($platform);
47-
$variableResolver->resolveRepository($project);
48-
45+
$this->resolveVariables($io,$project,$platform);
4946
$logger =$this->getLogger($io);
5047

5148
try {
52-
$context =newSSHContext($project,$platform,$logger,$platform->getDefaultBranch());
49+
$context =newContext($project,$platform,$logger,$platform->getDefaultBranch());
5350

5451
$context->connect();
5552
$logger->section('Check git access');
56-
$context->run('git ls-remote'.$project->getRepository(),false,null,false);
53+
$context->exec(staticfunction (Session$session)use ($project):void {
54+
$session->exec('git ls-remote'.$project->getRepository(),false);
55+
});
5756
}catch (\Exception$exception) {
5857
$io->error($exception->getMessage());
5958

‎src/Automate/Command/DeployCommand.php‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@
1111

1212
namespaceAutomate\Command;
1313

14-
useAutomate\Context\SSHContext;
1514
useAutomate\Loader;
1615
useAutomate\Model\Platform;
17-
useAutomate\VariableResolver;
16+
useAutomate\Workflow\Context;
1817
useAutomate\Workflow\Deployer;
1918
useSymfony\Component\Console\Attribute\AsCommand;
2019
useSymfony\Component\Console\Command\Command;
@@ -46,10 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
4645
$platform =$project->getPlatform($input->getArgument('platform'));
4746
$io =newSymfonyStyle($input,$output);
4847

49-
$variableResolver =newVariableResolver($io);
50-
$variableResolver->resolvePlatform($platform);
51-
$variableResolver->resolveRepository($project);
52-
48+
$this->resolveVariables($io,$project,$platform);
5349
$logger =$this->getLogger($io);
5450

5551
$logger->section('Start deployment');
@@ -63,7 +59,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
6359
['Version',$input->getArgument('gitRef') ?:$platform->getDefaultBranch()],
6460
]);
6561

66-
$context =newSSHContext($project,$platform,$logger,$gitRef,$input->getOption('force'));
62+
$context =newContext($project,$platform,$logger,$gitRef,$input->getOption('force'));
6763
$workflow =newDeployer($context);
6864

6965
if (!$workflow->deploy()) {

‎src/Automate/Command/LocalDeployCommand.php‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎src/Automate/Configuration.php‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@
88

99
readonlyclass Configurationimplements ConfigurationInterface
1010
{
11-
publicfunction__construct(
12-
privatePluginManager$pluginManager,
13-
) {
14-
}
15-
16-
1711
publicfunctiongetConfigTreeBuilder():TreeBuilder
1812
{
1913
$treeBuilder =newTreeBuilder('automate');
@@ -33,7 +27,6 @@ public function getConfigTreeBuilder(): TreeBuilder
3327
->append($this->addCommandsNode('on_deploy'))
3428
->append($this->addCommandsNode('post_deploy'))
3529
->append($this->addPlatformsNode())
36-
->append($this->addPluginsNode())
3730
->end();
3831

3932
return$treeBuilder;
@@ -102,17 +95,4 @@ private function addServersNode(): NodeDefinition
10295
->end()
10396
->end();
10497
}
105-
106-
privatefunctionaddPluginsNode():NodeDefinition
107-
{
108-
$treeBuilder =newTreeBuilder('plugins');
109-
110-
$node =$treeBuilder->getRootNode()->children();
111-
112-
foreach ($this->pluginManager->getPlugins()as$plugin) {
113-
$node->append($plugin->getConfigurationNode());
114-
}
115-
116-
return$node->end();
117-
}
11898
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp