Merge pull request #19 from wirecli/fix/cli-src-path-handling

fix(module): restore critical CLI options

Author: flydev-fr

Tests/Commands/Module/ModuleEnableCommandTest.php

@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Commands\Module;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Wirecli\Commands\Module\ModuleEnableCommand;
+
+/**
+ * Class ModuleEnableCommandTest
+ *
+ * @package Tests\Commands\Module
+ */
+class ModuleEnableCommandTest extends TestCase
+{
+    /**
+     * @var Application
+     */
+    private $application;
+
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+
+    protected function setUp(): void
+    {
+        $this->application = new Application();
+        $this->application->add(new ModuleEnableCommand());
+        
+        $command = $this->application->find('module:enable');
+        $this->commandTester = new CommandTester($command);
+    }
+
+    public function testConfigureSetsCorrectNameAndDescription()
+    {
+        $command = $this->application->find('module:enable');
+        
+        $this->assertEquals('module:enable', $command->getName());
+        $this->assertEquals('Enables provided module(s)', $command->getDescription());
+    }
+
+    public function testConfigureHasRequiredArguments()
+    {
+        $command = $this->application->find('module:enable');
+        $definition = $command->getDefinition();
+        
+        $this->assertTrue($definition->hasArgument('modules'));
+        $this->assertTrue($definition->hasOption('github'));
+        $this->assertTrue($definition->hasOption('branch'));
+    }
+
+    public function testGithubOptionIsOptional()
+    {
+        $command = $this->application->find('module:enable');
+        $definition = $command->getDefinition();
+        $githubOption = $definition->getOption('github');
+        
+        $this->assertFalse($githubOption->isValueRequired());
+        $this->assertTrue($githubOption->isValueOptional());
+    }
+
+    public function testBranchOptionIsOptional()
+    {
+        $command = $this->application->find('module:enable');
+        $definition = $command->getDefinition();
+        $branchOption = $definition->getOption('branch');
+        
+        $this->assertFalse($branchOption->isValueRequired());
+        $this->assertTrue($branchOption->isValueOptional());
+    }
+
+    public function testCommandHandlesCommaSeparatedModules()
+    {
+        $command = $this->application->find('module:enable');
+        $definition = $command->getDefinition();
+        $modulesArgument = $definition->getArgument('modules');
+        
+        $this->assertEquals('modules', $modulesArgument->getName());
+        $this->assertStringContainsString('comma separated', $modulesArgument->getDescription());
+    }
+} 

src/Commands/Module/ModuleEnableCommand.php

@@ -42,15 +42,28 @@ protected function execute(InputInterface $input, OutputInterface $output) {
       ->setInput($input)
       ->writeBlockCommand($this->getName());
 
+    // Refresh modules to discover any manually copied modules
+    \ProcessWire\wire('modules')->refresh();
+
     $modules = $this->tools->ask($input->getArgument('modules'), 'Modules', null, false, null, 'required');
     if (!is_array($modules)) $modules = explode(',', $modules);
 
     foreach ($modules as $module) {
+      $module = trim($module);
+      
       // if module doesn't exist, download the module
       if (!$this->checkIfModuleExists($module)) {
         $this->tools->writeComment("Cannot find '{$module}' locally, trying to download...");
         $this->tools->nl();
-        $this->passOnToModuleDownloadCommand($module, $output, $input);
+        
+        try {
+          $this->passOnToModuleDownloadCommand($module, $output, $input);
+          // Refresh modules after download to make sure the newly downloaded module is discoverable
+          \ProcessWire\wire('modules')->refresh();
+        } catch (\Exception $e) {
+          $this->tools->writeError("Failed to download module '{$module}': " . $e->getMessage());
+          continue;
+        }
       }
 
       // check whether module is already installed
@@ -59,35 +72,31 @@ protected function execute(InputInterface $input, OutputInterface $output) {
         continue;
       }
 
-      // install module
+      // install module with proper CLI options
       $options = array(
         'noPermissionCheck' => true,
         'noInit' => true
       );
 
-      if (\ProcessWire\wire('modules')->getInstall($module, $options)) {
-        $this->tools->writeSuccess(" Module `{$module}` installed successfully.");
-      } else {
-        $this->tools->writeError(" Module `{$module}` does not exist.");
+      try {
+        if (\ProcessWire\wire('modules')->getInstall($module, $options)) {
+          $this->tools->writeSuccess(" Module `{$module}` installed successfully.");
+        } else {
+          $this->tools->writeError(" Module `{$module}` installation failed.");
+        }
+      } catch (\Exception $e) {
+        $this->tools->writeError(" Module `{$module}` does not exist or installation failed: " . $e->getMessage());
       }
     }
 
     return static::SUCCESS;
   }
 
-  private function checkIfModuleExistsLocally($module, $output, $input) {
-    if (!$this->checkIfModuleExists($module)) {
-      $output->writeln("<comment>Cannot find '{$module}' locally, trying to download...</comment>");
-      $this->passOnToModuleDownloadCommand($module, $output, $input);
-    }
-
-  }
-
   private function passOnToModuleDownloadCommand($module, $output, $input) {
-    $command = $this->getApplication()->find('mod:download');
+    $command = $this->getApplication()->find('module:download');
 
     $arguments = array(
-      'command' => 'mod:download',
+      'command' => 'module:download',
       'modules' => $module,
       '--github' => $input->getOption('github'),
       '--branch' => $input->getOption('branch')