Launcher moved to bundle.

.travis.yml

@@ -26,7 +26,7 @@ install:
   - composer update --prefer-dist
 
 script:
-  - vendor/bin/phpunit
+  - vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
 after_script:
   - vendor/bin/coveralls

composer.json

@@ -12,21 +12,21 @@
     "require": {
         "php": ">=5.5",
         "simple-bus/symfony-bridge": "^4.1",
-        "clearcodehq/command-bus-launcher": "dev-master",
         "symfony/framework-bundle": "~2.3",
         "symfony/console": "~2.3",
         "symfony/dependency-injection": "~2.3",
         "symfony/http-kernel": "~2.3",
-        "symfony/config": "~2.3"
+        "symfony/config": "~2.3",
+        "ramsey/uuid": "~3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "satooshi/php-coveralls": "^0.6.1"
     },
     "autoload": {
-        "psr-4" : { "ClearcodeHQ\\CommandBusLauncherBundle\\": "src" }
+        "psr-4" : { "ClearcodeHQ\\": "src" }
     },
     "autoload-dev": {
-        "psr-4" : { "tests\\ClearcodeHQ\\CommandBusLauncherBundle\\" : "tests" }
+        "psr-4" : { "tests\\ClearcodeHQ\\" : "tests" }
     }
 }

phpunit.xml.dist

@@ -3,8 +3,13 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
 
     <testsuites>
-        <testsuite name="tests">
+        <testsuite name="unit">
             <directory suffix="Test.php">./tests</directory>
+            <exclude>./tests/Command</exclude>
+        </testsuite>
+
+        <testsuite name="command">
+            <directory suffix="Test.php">./tests/Command</directory>
         </testsuite>
     </testsuites>
 
@@ -18,7 +23,4 @@
         </whitelist>
     </filter>
 
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>

src/Command/CommandBusLaunchCommand.php → src/Bundle/CommandBusLauncherBundle/Command/CommandBusLaunchCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ClearcodeHQ\CommandBusLauncherBundle\Command;
+namespace ClearcodeHQ\Bundle\CommandBusLauncherBundle\Command;
 
 use ClearcodeHQ\CommandBusLauncher\CommandLauncherException;
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;

src/CommandBusLauncherBundle.php → src/Bundle/CommandBusLauncherBundle/CommandBusLauncherBundle.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace ClearcodeHQ\CommandBusLauncherBundle;
+namespace ClearcodeHQ\Bundle\CommandBusLauncherBundle;
 
-use ClearcodeHQ\CommandBusLauncherBundle\DependencyInjection\Compiler\CommandHandlersCompilerPass;
+use ClearcodeHQ\Bundle\CommandBusLauncherBundle\DependencyInjection\Compiler\CommandHandlersCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 

src/DependencyInjection/CommandBusLauncherExtension.php → src/Bundle/CommandBusLauncherBundle/DependencyInjection/CommandBusLauncherExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ClearcodeHQ\CommandBusLauncherBundle\DependencyInjection;
+namespace ClearcodeHQ\Bundle\CommandBusLauncherBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/DependencyInjection/Compiler/CommandHandlersCompilerPass.php → src/Bundle/CommandBusLauncherBundle/DependencyInjection/Compiler/CommandHandlersCompilerPass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ClearcodeHQ\CommandBusLauncherBundle\DependencyInjection\Compiler;
+namespace ClearcodeHQ\Bundle\CommandBusLauncherBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/DependencyInjection/Configuration.php → src/Bundle/CommandBusLauncherBundle/DependencyInjection/Configuration.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ClearcodeHQ\CommandBusLauncherBundle\DependencyInjection;
+namespace ClearcodeHQ\Bundle\CommandBusLauncherBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;

src/CommandBusLauncher/ArgumentsProcessor.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+use ClearcodeHQ\CommandBusLauncher\ValueConverter\ValueConverter;
+
+class ArgumentsProcessor
+{
+    /**
+     * @var ValueConverter[]
+     */
+    private $valueConverters;
+
+    public function __construct(array $valueConverters = [])
+    {
+        $this->valueConverters = $valueConverters;
+    }
+
+    /**
+     * @param $arguments
+     *
+     * @return mixed
+     */
+    public function process($arguments)
+    {
+        foreach ($arguments as $key => $argument) {
+            $arguments[$key] = $this->convertValue($argument);
+        }
+
+        return $arguments;
+    }
+
+    private function convertValue($value)
+    {
+        foreach ($this->valueConverters as $valueConverter) {
+            if (null !== $convertedValue = $valueConverter->convert($value)) {
+                return $convertedValue;
+            }
+        }
+
+        return $value;
+    }
+}

src/CommandBusLauncher/CommandCollector.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class CommandCollector
+{
+    /**
+     * @var CommandReflection[]
+     */
+    public $commands = [];
+
+    /**
+     * @param array $services
+     */
+    public function processCommandServices(array $services)
+    {
+        foreach ($services as $service) {
+            $this->commands[] = CommandReflection::fromClass($service);
+        }
+    }
+
+    public function getCommandByName($commandName)
+    {
+        foreach ($this->commands as $command) {
+            if ($command->commandName == $commandName) {
+                return $command;
+            }
+        }
+
+        throw new CommandDoesNotExist(sprintf("Command '%s' does not exists", $commandName));
+    }
+}

src/CommandBusLauncher/CommandDoesNotExist.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class CommandDoesNotExist extends CommandLauncherException
+{
+}

src/CommandBusLauncher/CommandLauncher.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class CommandLauncher
+{
+    /** @var CommandCollector */
+    private $commandCollector;
+    /** @var ArgumentsProcessor */
+    private $argumentsProcessor;
+
+    /**
+     * @param CommandCollector   $commandCollector
+     * @param ArgumentsProcessor $argumentsProcessor
+     */
+    public function __construct(CommandCollector $commandCollector, ArgumentsProcessor $argumentsProcessor)
+    {
+        $this->commandCollector   = $commandCollector;
+        $this->argumentsProcessor = $argumentsProcessor;
+    }
+
+    /**
+     * @param $commandName
+     *
+     * @return CommandReflection
+     *
+     * @throws CommandDoesNotExist
+     */
+    public function getCommandReflection($commandName)
+    {
+        return $this->commandCollector->getCommandByName($commandName);
+    }
+
+    /**
+     * @param $commandName
+     * @param $arguments
+     *
+     * @return object
+     *
+     * @throws CommandDoesNotExist
+     */
+    public function getCommandToLaunch($commandName, $arguments)
+    {
+        $commandReflection = $this->commandCollector->getCommandByName($commandName);
+
+        return $commandReflection->createCommand($arguments, $this->argumentsProcessor);
+    }
+}

src/CommandBusLauncher/CommandLauncherException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class CommandLauncherException extends \Exception
+{
+}

src/CommandBusLauncher/CommandReflection.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class CommandReflection
+{
+    /** @var string */
+    public $commandName;
+    /** @var string */
+    public $commandClass;
+
+    /**
+     * @param $commandName
+     * @param $commandClass
+     */
+    public function __construct($commandName, $commandClass)
+    {
+        $this->commandName  = $commandName;
+        $this->commandClass = $commandClass;
+    }
+
+    /**
+     * @param $className
+     *
+     * @return CommandReflection
+     */
+    public static function fromClass($className)
+    {
+        $reflection = new \ReflectionClass($className);
+
+        return new self($reflection->getShortName(), $className);
+    }
+
+    /**
+     * @return \ReflectionParameter[]
+     */
+    public function parameters()
+    {
+        $commandReflection = new \ReflectionClass($this->commandClass);
+        $commandParameters = $commandReflection->getConstructor()->getParameters();
+
+        return $commandParameters;
+    }
+
+    /**
+     * @param array              $arguments
+     * @param ArgumentsProcessor $argumentsProcessor
+     *
+     * @return object
+     *
+     * @throws InvalidCommandArgument
+     * @throws MissingCommandArgument
+     */
+    public function createCommand(array $arguments, ArgumentsProcessor $argumentsProcessor)
+    {
+        $classReflection = new \ReflectionClass($this->commandClass);
+
+        $inputArguments = $argumentsProcessor->process($arguments);
+
+        foreach ($this->parameters() as $commandArgument) {
+            if ($commandArgument->getClass() !== null) {
+                if (!array_key_exists($commandArgument->getPosition(), $inputArguments)) {
+                    throw new MissingCommandArgument(
+                        sprintf("Missing argument %s for '%s' command", $commandArgument->getPosition() + 1, $this->commandName)
+                    );
+                }
+
+                $givenArgument         = $inputArguments[$commandArgument->getPosition()];
+                $requiredArgumentClass = $commandArgument->getClass()->name;
+
+                if (!is_object($givenArgument) || !$givenArgument instanceof $requiredArgumentClass) {
+                    throw new InvalidCommandArgument(
+                        sprintf(
+                            "Invalid argument for '%s' command. Expected parameter %s to be instance of '%s'",
+                            $this->commandName,
+                            $commandArgument->getPosition() + 1,
+                            $requiredArgumentClass
+                        )
+                    );
+                }
+            }
+        }
+
+        return $classReflection->newInstanceArgs($inputArguments);
+    }
+}

src/CommandBusLauncher/InvalidCommandArgument.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class InvalidCommandArgument extends CommandLauncherException
+{
+}

src/CommandBusLauncher/MissingCommandArgument.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher;
+
+class MissingCommandArgument extends CommandLauncherException
+{
+}

src/CommandBusLauncher/ValueConverter/IntConverter.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher\ValueConverter;
+
+class IntConverter implements ValueConverter
+{
+    public function convert($rawValue)
+    {
+        if (is_numeric($rawValue)) {
+            return (int) $rawValue;
+        }
+
+        return;
+    }
+}

src/CommandBusLauncher/ValueConverter/UuidConverter.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher\ValueConverter;
+
+use Ramsey\Uuid\Uuid;
+
+class UuidConverter implements ValueConverter
+{
+    public function convert($rawValue)
+    {
+        try {
+            return Uuid::fromString($rawValue);
+        } catch (\Exception $e) {
+            return;
+        }
+    }
+}

src/CommandBusLauncher/ValueConverter/ValueConverter.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace ClearcodeHQ\CommandBusLauncher\ValueConverter;
+
+interface ValueConverter
+{
+    public function convert($rawValue);
+}

tests/App/TestKernel.php → tests/Bundle/CommandBusLauncherBundle/App/TestKernel.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace tests\ClearcodeHQ\CommandBusLauncherBundle\App;
+namespace tests\ClearcodeHQ\Bundle\CommandBusLauncherBundle\App;
 
-use ClearcodeHQ\CommandBusLauncherBundle\CommandBusLauncherBundle;
+use ClearcodeHQ\Bundle\CommandBusLauncherBundle\CommandBusLauncherBundle;
 use SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;