Merge pull request #153 from joomlatools/feature/152-commands

Load extra commands from home directory

Author: ercanozkaya

src/Joomlatools/Console/Application.php

@@ -79,6 +79,8 @@ public function run(Input\InputInterface $input = null, Output\OutputInterface $
 
         $this->_loadPlugins();
 
+        $this->_loadExtraCommands();
+
         parent::run($this->_input, $this->_output);
     }
 
@@ -204,6 +206,51 @@ public function getPlugins()
         return $this->_plugins;
     }
 
+    /**
+     * Loads extra commands from the ~/.joomlatools/console/commands/ folder 
+     * 
+     * Each PHP file in the folder is included and if the class in the file extends the base Symfony command
+     * it's instantiated and added to the app. 
+     *
+     * @return void
+     */
+    protected function _loadExtraCommands()
+    {
+        $path = $this->getConsoleHome().'/commands';
+
+        if (\is_dir($path)) 
+        {
+            $iterator = new \DirectoryIterator($path);
+
+            foreach ($iterator as $file)
+            {
+                if ($file->getExtension() == 'php') 
+                {
+                    require $file->getPathname();
+
+                    $className  = $file->getBasename('.php');
+
+                    if (\class_exists($className)) 
+                    {
+                        $reflection = new \ReflectionClass($className);
+    
+                        if (!$reflection->isSubclassOf('\Symfony\Component\Console\Command\Command')) {
+                            continue;
+                        }
+                        
+                        $command = new $className();
+    
+                        if (!$command instanceof \Symfony\Component\Console\Command\Command) {
+                            continue;
+                        }
+    
+                        $this->add($command);
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Set up environment
      */
@@ -227,7 +274,7 @@ protected function _setup()
 
             if (file_exists($old))
             {
-                $this->_output->writeln('<comment>Moving legacy plugin directory to ~/.joomlatools-console/plugins.</comment>');
+                $this->_output->writeln('<comment>Moving legacy plugin directory to ~/.joomlatools/console/plugins.</comment>');
 
                 $cmd = sprintf('mv %s %s', escapeshellarg($old), escapeshellarg($this->getPluginPath()));
                 exec($cmd);

src/Joomlatools/Console/Command/Site/Create.php

@@ -206,6 +206,26 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $command->run(new ArrayInput($arguments), $output);
         }
 
+        /*
+         * Run all site:create:* commands after site creation
+         */
+        try {
+            $commands = $this->getApplication()->all('site:create');
+            
+            foreach ($commands as $command) {
+                $arguments = array(
+                    $command->getName(),
+                    'site'   => $this->site,
+                    '--www'  => $this->www
+                );
+                $command->setApplication($this->getApplication());
+                $command->run(new ArrayInput($arguments), $output);
+            }
+        }
+        catch (\Symfony\Component\Console\Exception\NamespaceNotFoundException $e) {}
+        catch (\Symfony\Component\Console\Exception\CommandNotFoundException $e) {}
+        
+
         return 0;
     }