Merge branch 'development'

.travis.yml

@@ -1,20 +1,30 @@
 language: php
+
+sudo: false
+
 php:
   - 5.4
   - 5.5
   - 5.6
   - hhvm
   - 7.0
+
 matrix:
-    allow_failures:
-        - php: 7.0
-    fast_finish: true
-sudo: false
+  allow_failures:
+    - php: 7.0
+  fast_finish: true
+
+env:
+  - COMPOSER_LOWEST=0
+  - COMPOSER_LOWEST=1
+
 cache:
   directories:
     - $HOME/.composer/cache
+
 install:
   - composer install --no-interaction
-  - travis_wait composer update --prefer-lowest --no-interaction
+  - if [ "$COMPOSER_LOWEST" = 1 ]; then travis_wait composer update --prefer-lowest --no-interaction; fi
+
 script:
   - ./vendor/bin/phpunit -c ./phpunit.xml --coverage-text

composer.json

@@ -4,8 +4,9 @@
     "license": "MIT",
     "require": {
         "doctrine/cache": "~1.4.2",
+        "guzzlehttp/ringphp": "^1.1",
         "platformsh/console-form": "0.0.4",
-        "platformsh/client": "0.1.31",
+        "platformsh/client": "0.2.1",
         "symfony/console": "~2.5 >=2.5.2",
         "symfony/yaml": "~2.5",
         "symfony/finder": "~2.5",

platform

@@ -3,7 +3,9 @@
 
 define('CLI_ROOT', __DIR__);
 
-error_reporting(getenv('PLATFORMSH_CLI_DEBUG') ? E_ALL : false);
+// Ensure that errors are only reported once.
+ini_set('display_errors', 1);
+ini_set('log_errors', 0);
 
 if (file_exists(CLI_ROOT . '/vendor/autoload.php')) {
     require CLI_ROOT . '/vendor/autoload.php';

src/Command/Activity/ActivityLogCommand.php

@@ -77,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     protected function displayLog(Activity $activity, OutputInterface $output, $poll = true, $interval = 1)
     {
         $logger = function ($log) use ($output) {
-            $output->write($log);
+            $output->write(preg_replace('/^/m', '    ', $log));
         };
         if (!$poll) {
             $logger($activity['log']);

src/Command/Auth/LoginCommand.php

@@ -30,6 +30,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->stdErr->writeln("Please log in using your <info>Platform.sh</info> account\n");
         $this->configureAccount($input, $this->stdErr);
+        $this->clearCache();
         $this->stdErr->writeln("\n<info>Thank you, you are all set.</info>\n");
     }
 
@@ -53,21 +54,6 @@ function ($answer) {
         $question->setMaxAttempts(5);
         $email = $helper->ask($input, $output, $question);
 
-        $userExists = true;
-        if (!$userExists) {
-            $createAccountText = "\nThis email address is not associated with a Platform.sh account. \n";
-            $createAccountText .= 'Would you like to create a new account?';
-            $createAccount = $helper->confirm($createAccountText, $input, $output);
-            if ($createAccount) {
-                // @todo
-            } else {
-                // Start from the beginning.
-                $this->configureAccount($input, $output);
-
-                return;
-            }
-        }
-
         $pendingInvitation = false;
         if ($pendingInvitation) {
             $resendInviteText = "\nThis email address is associated with a Platform.sh account, \n";

src/Command/Domain/DomainAddCommand.php

@@ -2,6 +2,8 @@
 namespace Platformsh\Cli\Command\Domain;
 
 use GuzzleHttp\Exception\ClientException;
+use Platformsh\Cli\Util\ActivityUtil;
+use Platformsh\Client\Model\Activity;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -16,7 +18,7 @@ protected function configure()
         $this
           ->setName('domain:add')
           ->setDescription('Add a new domain to the project');
-        $this->addProjectOption();
+        $this->addProjectOption()->addNoWaitOption();
         $this->addDomainOptions();
         $this->setHelp('See https://docs.platform.sh/use-platform/going-live.html#1-domains');
         $this->addExample('Add the domain example.com', 'example.com');
@@ -38,7 +40,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         try {
-            $domain = $this->getSelectedProject()
+            $this->stdErr->writeln("Adding the domain <info>{$this->domainName}</info>");
+            $activity = $this->getSelectedProject()
                            ->addDomain($this->domainName, $this->sslOptions);
         }
         catch (ClientException $e) {
@@ -53,9 +56,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw $e;
         }
 
-        $this->stdErr->writeln("The domain <info>{$this->domainName}</info> was successfully added to the project.");
-
-        $this->displayDomain($domain, $this->stdErr);
+        if ($activity instanceof Activity && !$input->getOption('no-wait')) {
+            ActivityUtil::waitAndLog($activity, $this->stdErr);
+        }
 
         return 0;
     }

src/Command/Domain/DomainDeleteCommand.php

@@ -2,6 +2,8 @@
 namespace Platformsh\Cli\Command\Domain;
 
 use Platformsh\Cli\Command\PlatformCommand;
+use Platformsh\Cli\Util\ActivityUtil;
+use Platformsh\Client\Model\Activity;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -17,7 +19,7 @@ protected function configure()
           ->setName('domain:delete')
           ->setDescription('Delete a domain from the project')
           ->addArgument('name', InputArgument::REQUIRED, 'The domain name');
-        $this->addProjectOption();
+        $this->addProjectOption()->addNoWaitOption();
         $this->addExample('Delete the domain example.com', 'example.com');
     }
 
@@ -43,10 +45,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 0;
         }
 
-        $domain->delete();
+        $activity = $domain->delete();
 
         $this->stdErr->writeln("The domain <info>$name</info> has been deleted.");
 
+        if ($activity instanceof Activity && !$input->getOption('no-wait')) {
+            ActivityUtil::waitAndLog($activity, $this->stdErr);
+        }
+
         return 0;
     }
 }

src/Command/Domain/DomainListCommand.php

@@ -6,7 +6,6 @@
 use Platformsh\Client\Model\Domain;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DomainListCommand extends PlatformCommand
@@ -19,13 +18,8 @@ protected function configure()
         $this
           ->setName('domain:list')
           ->setAliases(array('domains'))
-          ->setDescription('Get a list of all domains')
-          ->addOption(
-            'project',
-            null,
-            InputOption::VALUE_REQUIRED,
-            'The project ID'
-          );
+          ->setDescription('Get a list of all domains');
+        $this->addProjectOption();
     }
 
     /**
@@ -62,7 +56,7 @@ protected function buildDomainRows(array $tree)
         foreach ($tree as $domain) {
             $rows[] = array(
               $domain['id'],
-              $formatter->format((bool) $domain['has_certificate']),
+              $formatter->format((bool) $domain['ssl']['has_certificate']),
               $formatter->format($domain['created_at'], 'created_at'),
             );
         }

src/Command/Environment/EnvironmentActivateCommand.php

@@ -6,7 +6,6 @@
 use Platformsh\Client\Model\Environment;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class EnvironmentActivateCommand extends PlatformCommand
@@ -17,10 +16,10 @@ protected function configure()
         $this
           ->setName('environment:activate')
           ->setDescription('Activate an environment')
-          ->addArgument('environment', InputArgument::IS_ARRAY, 'The environment(s) to activate')
-          ->addOption('no-wait', null, InputOption::VALUE_NONE, 'Do not wait for the operation to complete');
+          ->addArgument('environment', InputArgument::IS_ARRAY, 'The environment(s) to activate');
         $this->addProjectOption()
-             ->addEnvironmentOption();
+             ->addEnvironmentOption()
+             ->addNoWaitOption();
         $this->addExample('Activate the environments "develop" and "stage"', 'develop stage');
     }
 

src/Command/Environment/EnvironmentBranchCommand.php

@@ -34,20 +34,15 @@ protected function configure()
             InputOption::VALUE_NONE,
             "Create the new environment even if the branch cannot be checked out locally"
           )
-          ->addOption(
-            'no-wait',
-            null,
-            InputOption::VALUE_NONE,
-            'Do not wait for the Platform.sh branch to be created'
-          )
           ->addOption(
             'build',
             null,
             InputOption::VALUE_NONE,
             "Build the new environment locally"
           );
         $this->addProjectOption()
-             ->addEnvironmentOption();
+             ->addEnvironmentOption()
+             ->addNoWaitOption("Do not wait for the environment to be branched");
         $this->addExample('Create a new branch "sprint-2", based on "develop"', 'sprint-2 develop');
     }
 
@@ -167,6 +162,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $remoteSuccess = true;
         if (!$input->getOption('no-wait')) {
+            $this->stdErr->writeln('Waiting for the environment to be branched...');
             $remoteSuccess = ActivityUtil::waitAndLog(
               $activity,
               $this->stdErr,

src/Command/Environment/EnvironmentDeleteCommand.php

@@ -21,10 +21,10 @@ protected function configure()
           ->setDescription('Delete an environment')
           ->addArgument('environment', InputArgument::IS_ARRAY, 'The environment(s) to delete')
           ->addOption('inactive', null, InputOption::VALUE_NONE, 'Delete all inactive environments')
-          ->addOption('merged', null, InputOption::VALUE_NONE, 'Delete all merged environments')
-          ->addOption('no-wait', null, InputOption::VALUE_NONE, 'Do not wait for the operation to complete');
+          ->addOption('merged', null, InputOption::VALUE_NONE, 'Delete all merged environments');
         $this->addProjectOption()
-             ->addEnvironmentOption();
+             ->addEnvironmentOption()
+             ->addNoWaitOption();
         $this->addExample('Delete the environments "test" and "example-1"', 'test example-1');
         $this->addExample('Delete all inactive environments', '--inactive');
         $this->addExample('Delete all environments merged with "master"', '--merged master');