Fix composer command

Author: Chi-teck

scripts/run-sut-tests.sh

@@ -132,7 +132,7 @@ if [[ $TARGET_TEST = all || $TARGET_TEST = module_component ]]; then
   cp -R $SELF_PATH/$MODULE_MACHINE_NAME $MODULE_DIR
   cd $MODULE_DIR
 
-  $DCG composer -a bar -a 'Bar project' -a 'drupal-module' -a Yes
+  $DCG composer -a drupal/bar -a 'Bar project' -a 'drupal-module' -a Yes
   $DCG controller -a Bar -a bar -a BarController -a No -a Yes -a bar.example -a /bar/example -a Example -a 'access content'
   $DCG install -a Bar -a bar
   $DCG javascript -a Bar -a bar -a heavy-metal.js -a Yes -a heavy_metal

src/Command/Composer.php

@@ -3,7 +3,6 @@
 namespace DrupalCodeGenerator\Command;
 
 use DrupalCodeGenerator\Application;
-use Symfony\Component\Console\Question\Question;
 
 /**
  * Implements composer command.
@@ -15,19 +14,24 @@ final class Composer extends DrupalGenerator {
   protected string $alias = 'composer.json';
   protected string $label = 'composer.json';
   protected string $templatePath = Application::TEMPLATE_PATH . '/composer';
-  protected ?string $nameQuestion = NULL;
-  protected ?string $machineNameQuestion = 'Project machine name';
 
   /**
    * {@inheritdoc}
    */
   protected function generate(array &$vars): void {
-    $this->collectDefault($vars);
+    // @see https://getcomposer.org/doc/04-schema.md#name
+    $validator = static function (string $input): string {
+      if (!\preg_match('#^[a-z0-9]([_.-]?[a-z0-9]+)*/[a-z0-9](([_.]?|-{0,2})[a-z0-9]+)*$#', $input)) {
+        throw new \UnexpectedValueException('The package name sdsdf is invalid, it should be lowercase and have a vendor name, a forward slash, and a package name.');
+      }
+      return $input;
+    };
+    $vars['project_name'] = $this->ask('Project name', 'drupal/example', $validator);
+    [, $vars['machine_name']] = \explode('/', $vars['project_name']);
+
     $vars['description'] = $this->ask('Description');
 
-    $type_question = new Question('Type', 'drupal-module');
-    $type_question->setValidator([self::class, 'validateRequired']);
-    $type_question->setAutocompleterValues([
+    $type_choices = [
       'drupal-module',
       'drupal-custom-module',
       'drupal-theme',
@@ -36,20 +40,20 @@ protected function generate(array &$vars): void {
       'drupal-profile',
       'drupal-custom-profile',
       'drupal-drush',
-    ]);
-    $vars['type'] = $this->io->askQuestion($type_question);
+    ];
+    $vars['type'] = $this->choice('Project type', \array_combine($type_choices, $type_choices));
 
     $custom_types = [
       'drupal-custom-module',
       'drupal-custom-theme',
       'drupal-custom-profile',
     ];
-    if (!\in_array($vars['type'], $custom_types)) {
-      // If project type is custom, there is no reason to ask this.
-      $vars['drupal_org'] = $this->confirm('Is this project hosted on drupal.org?', FALSE);
+    if (\in_array($vars['type'], $custom_types)) {
+      $vars['drupal_org'] = FALSE;
     }
     else {
-      $vars['drupal_org'] = FALSE;
+      // If project type is custom, there is no reason to ask this.
+      $vars['drupal_org'] = $this->confirm('Is this project hosted on drupal.org?', FALSE);
     }
 
     $this->addFile('composer.json', 'composer');

templates/composer/composer.twig

@@ -1,5 +1,5 @@
 {
-    "name": "drupal/{{ machine_name }}",
+    "name": "{{ project_name }}",
     "type": "{{ type }}",
     "description": "{{ description }}",
     "keywords": ["Drupal"]{{ drupal_org ? ',' }}
@@ -9,7 +9,7 @@
     "authors": [
         {
             "name": "Your name here",
-            "homepage": "https://www.drupal.org/u/your_name_here",
+            "homepage": "https://www.drupal.org/u/YOUR_NAME_HERE",
             "role": "Maintainer"
         },
         {

tests/dcg/Generator/ComposerTest.php

@@ -2,22 +2,70 @@
 
 namespace DrupalCodeGenerator\Tests\Generator;
 
+use DrupalCodeGenerator\Command\Composer;
+use DrupalCodeGenerator\Test\GeneratorTest;
+
 /**
  * Test for composer command.
  */
-final class ComposerTest extends BaseGeneratorTest {
+final class ComposerTest extends GeneratorTest {
 
   protected string $class = 'Composer';
 
   protected array $interaction = [
     'Project machine name [%default_machine_name%]:' => 'example',
     'Description:' => 'Example description.',
-    'Type [drupal-module]:' => 'drupal-module',
     'Is this project hosted on drupal.org? [No]:' => 'Yes',
   ];
 
   protected array $fixtures = [
     'composer.json' => '/_composer.json',
   ];
 
+  protected string $fixtureDir = __DIR__;
+
+  /**
+   * Test callback.
+   */
+  public function testGenerator(): void {
+
+    $user_input = ['drupal/example', 'Some description.', 'drupal-module', 'Yes', 'Yes'];
+    $this->execute(new Composer(), $user_input);
+
+    $expected_display = <<< 'TXT'
+
+     Welcome to composer.json generator!
+    –––––––––––––––––––––––––––––––––––––
+
+     Project name [drupal/example]:
+     ➤ 
+
+     Description:
+     ➤ 
+
+     Project type:
+      [1] drupal-module
+      [2] drupal-custom-module
+      [3] drupal-theme
+      [4] drupal-custom-theme
+      [5] drupal-library
+      [6] drupal-profile
+      [7] drupal-custom-profile
+      [8] drupal-drush
+     ➤ 
+
+     Is this project hosted on drupal.org? [No]:
+     ➤ 
+
+     The following directories and files have been created or updated:
+    –––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
+     • composer.json
+
+
+    TXT;
+    $this->assertDisplay($expected_display);
+
+    $this->assertGeneratedFile('composer.json', '_composer.json');
+  }
+
 }

tests/dcg/Generator/_composer.json

@@ -1,14 +1,14 @@
 {
     "name": "drupal/example",
     "type": "drupal-module",
-    "description": "Example description.",
+    "description": "Some description.",
     "keywords": ["Drupal"],
     "license": "GPL-2.0+",
     "homepage": "https://www.drupal.org/project/example",
     "authors": [
         {
             "name": "Your name here",
-            "homepage": "https://www.drupal.org/u/your_name_here",
+            "homepage": "https://www.drupal.org/u/YOUR_NAME_HERE",
             "role": "Maintainer"
         },
         {