Merge branch 'release/2.1.1'

webdevops · Jul 17, 2015 · 64761a4 · 64761a4
2 parents 6d062b1 + 6b47cfe
commit 64761a4
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CliTools Changelog
 ==================
 
+2.1.1 - 2015-07-17
+------------------
+- Fixed `php:composer` global command usage
+- Fixed `system:startup` terminal title in /etc/issue
+- Updated to Symfony 2.7.2
+- SLOC: 6,050
+
 2.1.0 - 2015-07-08
 ------------------
 - Added option `docker:create --up` for automatic startup

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # CliTools for Docker, PHP und MySQL development
 
-[![latest v2.1.0](https://img.shields.io/badge/latest-v2.1.0-green.svg?style=flat)](https://github.com/mblaschke/clitools/releases/tag/2.1.0)
+[![latest v2.1.1](https://img.shields.io/badge/latest-v2.1.1-green.svg?style=flat)](https://github.com/mblaschke/clitools/releases/tag/2.1.1)
 [![License GPL3](https://img.shields.io/badge/license-GPL3-blue.svg?style=flat)](/LICENSE)
 [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/mblaschke/clitools.svg)](http://isitmaintained.com/project/mblaschke/clitools "Average time to resolve an issue")
 [![Percentage of issues still open](http://isitmaintained.com/badge/open/mblaschke/clitools.svg)](http://isitmaintained.com/project/mblaschke/clitools "Percentage of issues still open")

diff --git a/src/app/CliTools/Console/Command/AbstractCommand.php b/src/app/CliTools/Console/Command/AbstractCommand.php
@@ -50,6 +50,13 @@ abstract class AbstractCommand extends Command {
      */
     protected $output;
 
+    /**
+     * Enable automatic terminal title
+     *
+     * @var bool
+     */
+    protected $automaticTerminalTitle = true;
+
     /**
      * Initializes the command just after the input has been validated.
      *
@@ -65,8 +72,10 @@ protected function initialize(InputInterface $input, OutputInterface $output) {
 
         ConsoleUtility::initialize($input, $output);
 
-        // Set default terminal title
-        $this->setTerminalTitle(explode(':', $this->getName()));
+        if ($this->automaticTerminalTitle) {
+            // Set default terminal title
+            $this->setTerminalTitle(explode(':', $this->getName()));
+        }
     }
 
     /**

diff --git a/src/app/CliTools/Console/Command/Mysql/AbstractCommand.php b/src/app/CliTools/Console/Command/Mysql/AbstractCommand.php
@@ -73,27 +73,37 @@ protected function initialize(InputInterface $input, OutputInterface $output) {
         $dsn      = null;
         $user     = null;
         $password = null;
+        $host     = DatabaseConnection::getDbHostname();
+        $port     = DatabaseConnection::getDbPort();
 
+        // host
         if ($this->input->hasOption('host') && $this->input->getOption('host')) {
             $host = $this->input->getOption('host');
-            $port = 3306;
+            $dsn  = false;
+        }
 
-            if ($this->input->getOption('port')) {
-                $port = $this->input->getOption('port');
-            }
+        // port
+        if ($this->input->hasOption('port') && $this->input->getOption('port')) {
+            $port = $this->input->getOption('port');
+            $dsn  = false;
+        }
 
+        // rebuild dsn
+        if ($dsn === false) {
             $dsn = 'mysql:host=' . urlencode($host) . ';port=' . (int)$port;
         }
 
+        // user
         if ($this->input->hasOption('user') && $this->input->getOption('user')) {
             $user = $this->input->getOption('user');
         }
 
+        // password
         if ($this->input->hasOption('password') && $this->input->getOption('password')) {
             $password = $this->input->getOption('password');
         }
 
-        if ($user !== null || $password  !== null) {
+        if ($dsn !== null || $user !== null || $password  !== null) {
             DatabaseConnection::setDsn($dsn, $user, $password);
         }
     }

diff --git a/src/app/CliTools/Console/Command/Php/ComposerCommand.php b/src/app/CliTools/Console/Command/Php/ComposerCommand.php
@@ -46,32 +46,81 @@ protected function configure() {
      * @return int|null|void
      */
     public function execute(InputInterface $input, OutputInterface $output) {
-        $composerCmd = $this->getApplication()->getConfigValue('bin', 'composer');
-
         $paramList = $this->getFullParameterList();
-        $composerJsonPath = UnixUtility::findFileInDirectortyTree('composer.json');
 
-        if (!empty($composerJsonPath)) {
-            $path = dirname($composerJsonPath);
-            $this->output->writeln('<comment>Found composer.json directory: ' . $path . '</comment>');
+        if ($this->checkIfComposerJsonIsNeeded($paramList)) {
+            $composerJsonPath = UnixUtility::findFileInDirectortyTree('composer.json');
 
-            // Switch to directory of docker-compose.yml
-            PhpUtility::chdir($path);
+            if (!empty($composerJsonPath)) {
+                $path = dirname($composerJsonPath);
+                $this->output->writeln('<comment>Found composer.json directory: ' . $path . '</comment>');
+                // Switch to directory of docker-compose.yml
+                PhpUtility::chdir($path);
+
+                return $this->runComposer($paramList);
+            } else {
+                $this->output->writeln('<error>No composer.json found in tree</error>');
+                return 1;
+            }
+        } else {
+            return $this->runComposer($paramList);
+        }
+    }
 
-            $command = new CommandBuilder();
-            $command->parse($composerCmd);
+    /**
+     * Check if composer.json is needed for command
+     *
+     * @param array $paramList Parameter list for composer
+     *
+     * @return int|null|void
+     */
+    protected function checkIfComposerJsonIsNeeded(array $paramList) {
+        if (empty($paramList)) {
+            // no params -> show help
+            return false;
+        }
 
-            if (!empty($paramList)) {
-                $command->setArgumentList($paramList);
+        $commandList = array(
+            'archive',
+            'dump-autoload',
+            'dumpautoload',
+            'info',
+            'install',
+            'remove',
+            'require',
+            'run-script',
+            'status',
+            'suggests',
+            'update',
+            'validate',
+        );
+
+        foreach ($commandList as $command) {
+            if (in_array($command, $paramList, true)) {
+                return true;
             }
+        }
 
-            $command->executeInteractive();
-        } else {
-            $this->output->writeln('<error>No composer.json found in tree</error>');
+        return false;
+    }
+
+    /**
+     * Run composer command
+     *
+     * @param array $paramList Parameter list for composer
+     *
+     * @return int|null|void
+     */
+    protected function runComposer(array $paramList) {
+        $composerCmd = $this->getApplication()->getConfigValue('bin', 'composer');
+
+        $command = new CommandBuilder();
+        $command->parse($composerCmd);
 
-            return 1;
+        if (!empty($paramList)) {
+            $command->setArgumentList($paramList);
         }
 
-        return 0;
+        $command->executeInteractive();
     }
 }
diff --git a/src/app/CliTools/Console/Command/System/BannerCommand.php b/src/app/CliTools/Console/Command/System/BannerCommand.php
@@ -27,6 +27,13 @@
 
 class BannerCommand extends \CliTools\Console\Command\AbstractCommand implements \CliTools\Console\Filter\OnlyRootFilterInterface {
 
+    /**
+     * Enable automatic terminal title
+     *
+     * @var bool
+     */
+    protected $automaticTerminalTitle = false;
+
     /**
      * Configure command
      */

diff --git a/src/command.php b/src/command.php
@@ -20,7 +20,7 @@
  */
 
 error_reporting(E_ALL);
-define('CLITOOLS_COMMAND_VERSION', '2.1.0');
+define('CLITOOLS_COMMAND_VERSION', '2.1.1');
 define('CLITOOLS_ROOT_FS', __DIR__);
 
 require __DIR__ . '/vendor/autoload.php';

diff --git a/src/composer.lock b/src/composer.lock