Migrate to namespaced argv

Split module config from global config

src/Cli/ArgvParserBuilder.php

@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Horde\Components\Cli;
+
+use Horde\Components\Constants;
+use Horde\Argv\Parser;
+use Horde\Argv\Option;
+use Horde\Argv\OptionGroup;
+use Horde\Argv\Values;
+use Horde\Components\Module;
+/**
+ * The Global Argv Parser with the fixed, always present options.
+ *
+ * It seals the actual horde/argv Parser and only hands out copies.
+ */
+class ArgvParserBuilder
+{
+    public function __construct(
+        /**
+         * The command line argument parser.
+         */
+    ) {
+        $this->reset();
+    }
+
+    public function reset(): self
+    {
+        $this->parser = new Parser;
+        return $this;
+    }
+
+    public function withGlobalOptions(): self
+    {
+        $this->parser->addOption(
+            new Option(
+                '-c',
+                '--config',
+                ['action' => 'store', 'help'   => sprintf(
+                    'the path to the configuration file for the components script (default : %s).',
+                    Constants::getConfigFile()
+                ), 'default' => Constants::getConfigFile()]
+            )
+        );
+        $this->parser->addOption(
+            new Option(
+                '-q',
+                '--quiet',
+                ['action' => 'store_true', 'help'   => 'Reduce output to a minimum']
+            )
+        );
+        $this->parser->addOption(
+            new Option(
+                '-v',
+                '--verbose',
+                ['action' => 'store_true', 'help'   => 'Reduce output to a maximum']
+            )
+        );
+        $this->parser->addOption(
+            new Option(
+                '-P',
+                '--pretend',
+                ['action' => 'store_true', 'help'   => 'Just pretend and indicate what would be done rather than performing the action.']
+            )
+        );
+        $this->parser->addOption(
+            new Option(
+                '-N',
+                '--nocolor',
+                ['action' => 'store_true', 'help'   => 'Avoid colors in the output']
+            )
+        );
+        $this->parser->addOption(
+            new Option(
+                '-d',
+                '--working-dir',
+                ['action' => 'store', 'help'   => 'The working directory for the command']
+            )
+        );
+        return $this;
+    }
+
+    public function withModuleOptions(Module $module): self
+    {
+        $group = new OptionGroup($this->parser, $module->getOptionGroupTitle(), $module->getOptionGroupDescription());
+        $group->addOptions($module->getOptionGroupOptions());
+        $this->parser->addOptionGroup($group);
+        return $this;
+    }
+
+    public function build(): Parser
+    {
+        return $this->parser;
+    }
+}

src/Cli/ModuleProvider.php

@@ -12,6 +12,8 @@
 use Horde\Cli\Modular\ModuleProvider as CliModuleProvider;
 use Horde\Cli\Modular\Module;
 use Horde\Cli\Modular\Modules;
+use Horde\Components\Module\Composer;
+use Horde\Components\Module\Package;
 
 /**
  * Components tool specific, context aware module provider
@@ -39,8 +41,10 @@ public function getModules(): Modules
     {
         return new Modules([
             $this->injector->get(ConfigModule::class),
+            $this->injector->get(Composer::class),
             $this->injector->get(Git::class),
-            $this->injector->get(Help::class)
+            $this->injector->get(Help::class),
+            $this->injector->get(Package::class)
         ]);
     }
 }

src/Component/ComponentDirectory.php

@@ -6,9 +6,9 @@
 use Horde\Components\Helper\Root as HelperRoot;
 use Horde\Components\Pear\Environment as PearEnvironment;
 use Horde\Components\RuntimeContext\CurrentWorkingDirectory;
-use stdClass;
+use Stringable;
 
-class ComponentDirectory
+class ComponentDirectory implements Stringable
 {
     private string $fullPath;
 
@@ -31,4 +31,9 @@ public function hasComposerJson(): bool
     {
         return is_file($this->fullPath . '/composer.json');
     }
+
+    public function __toString()
+    {
+        return $this->fullPath;
+    }
 }