Merge pull request #162 from buggregator/feature/155

Add register modules sequence command.

.docker/Dockerfile

@@ -32,6 +32,7 @@ RUN composer config --no-plugins allow-plugins.spiral/composer-publish-plugin fa
 RUN composer install --no-dev
 
 WORKDIR /app
+RUN mkdir /app/runtime/configs -p
 RUN php app.php configure
 
 EXPOSE 8082/tcp

.rr-prod.yaml

@@ -9,10 +9,8 @@ metrics:
 server:
  command: 'php app.php'
  relay: pipes
- env:
- - MODE: roadrunner
  on_init:
- command: "php app.php configure"
+ command: "php app.php register:modules"
 
 logs:
  level: ${RR_LOG_LEVEL:-info}

.rr.yaml

@@ -9,10 +9,8 @@ metrics:
 server:
  command: 'php app.php'
  relay: pipes
- env:
- - MODE: roadrunner
  on_init:
- command: "php app.php configure"
+ command: "php app.php register:modules"
 
 logs:
  level: info

Makefile

@@ -1,4 +1,20 @@
 build:
+ if [ ! -d "runtime" ]; then \
+ mkdir runtime/configs -p; \
+ chmod 0777 -R runtime; \
+ fi
+ chmod +x bin/get-binaries.sh; \
+ if [ ! -f "bin/centrifugo" ]; then \
+ cd bin; \
+ ./get-binaries.sh; \
+ cd ../; \
+ fi
+ if [ ! -f "rr" ]; then \
+ vendor/bin/rr get;\
+ fi
+ if [ ! -d "vendor" ]; then \
+ composer i --ignore-platform-reqs; \
+ fi
  docker compose up --no-start;
 
 start:

app/modules/Metrics/Application/MetricsBootloader.php

@@ -4,7 +4,7 @@
 
 namespace Modules\Metrics\Application;
 
-use App\Application\Mode;
+use App\Interfaces\Console\RegisterModulesCommand;
 use Cycle\ORM\FactoryInterface;
 use Modules\Metrics\Infrastructure\RoadRunner\Collector;
 use Spiral\Boot\Bootloader\Bootloader;
@@ -54,7 +54,8 @@ public function defineSingletons(): array
 
  public function init(ConsoleBootloader $console): void
  {
- $console->addConfigureSequence(
+ $console->addSequence(
+ name: RegisterModulesCommand::SEQUENCE,
  sequence: 'metrics:declare',
  header: 'Declare metrics',
  );

app/modules/Projects/Application/ProjectBootloader.php

@@ -4,7 +4,7 @@
 
 namespace Modules\Projects\Application;
 
-use App\Application\Mode;
+use App\Interfaces\Console\RegisterModulesCommand;
 use Modules\Projects\Domain\ProjectFactoryInterface;
 use Modules\Projects\Domain\ProjectLocatorInterface;
 use Spiral\Boot\Bootloader\Bootloader;
@@ -40,13 +40,12 @@ public function defineSingletons(): array
  ];
  }
 
- public function init(ConsoleBootloader $console, Mode $mode): void
+ public function init(ConsoleBootloader $console): void
  {
- if ($mode->insideRoadRunner()) {
- $console->addConfigureSequence(
- sequence: 'projects:register',
- header: 'Register all projects in the system',
- );
- }
+ $console->addSequence(
+ name: RegisterModulesCommand::SEQUENCE,
+ sequence: 'projects:register',
+ header: 'Register all projects in the system',
+ );
  }
 }

app/modules/Webhooks/Application/WebhooksBootloader.php

@@ -4,7 +4,7 @@
 
 namespace Modules\Webhooks\Application;
 
-use App\Application\Mode;
+use App\Interfaces\Console\RegisterModulesCommand;
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use Modules\Metrics\Application\CollectorRegistryInterface;
@@ -92,9 +92,9 @@ public function defineSingletons(): array
  public function init(
  ConsoleBootloader $console,
  CollectorRegistryInterface $collectorRegistry,
- Mode $mode,
  ): void {
- $console->addConfigureSequence(
+ $console->addSequence(
+ name: RegisterModulesCommand::SEQUENCE,
  sequence: 'webhooks:register',
  header: 'Register webhooks from configuration',
  );

app/src/Interfaces/Console/RegisterModulesCommand.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Interfaces\Console;
+
+use App\Application\Commands\HandleReceivedEvent;
+use Psr\Container\ContainerInterface;
+use Spiral\Console\Attribute\AsCommand;
+use Spiral\Console\Command\SequenceCommand;
+use Spiral\Console\Config\ConsoleConfig;
+use Spiral\Cqrs\CommandBusInterface;
+
+#[AsCommand(
+ name: 'register:modules',
+ description: 'Register modules',
+)]
+final class RegisterModulesCommand extends SequenceCommand
+{
+ public const SEQUENCE = 'register:modules';
+
+ public function __invoke(ConsoleConfig $config, ContainerInterface $container): int
+ {
+ $this->info('Register buggregator modules...');
+ $this->newLine();
+
+ return $this->runSequence($config->getSequence(self::SEQUENCE), $container);
+ }
+}

composer.json

@@ -62,6 +62,7 @@
  "rector/rector": "^1.0",
  "sentry/sentry": "^4.7",
  "spiral-packages/database-seeder": "^3.1",
+ "spiral/roadrunner-cli": "^2.6",
  "spiral/testing": "^2.6",
  "vimeo/psalm": "^5.16"
  },