Merge pull request #488 from pantheon-systems/silence_drush

Made Drush and WP-CLI silent when running in --silent mode

Author: TeslaDethray

php/Terminus/CommandWithSSH.php

@@ -29,10 +29,16 @@ protected function send_command($server, $remote_exec, $args, $assoc_args) {
     }
 
     $cmd = 'ssh -T ' . $server['user'] . '@' . $server['host'] . ' -p ' . $server['port'] . ' -o "AddressFamily inet"' . " " . escapeshellarg($remote_cmd);
+    if (\Terminus::get_config('silent')) {
+      ob_start();
+    }
+    passthru($cmd, $exit_code);
+    if (\Terminus::get_config('silent')) {
+      $this->logger->info(ob_get_clean());
+    }
 
-    passthru( $cmd, $exit_code );
     if ($exit_code == 255) {
-      \Terminus::error("Failed to connect. Check your credentials, and that you are specifying a valid environment.");
+      $this->logger->error("Failed to connect. Check your credentials, and that you are specifying a valid environment.");
     }
     return( $exit_code );
   }

php/commands/drush.php

@@ -63,7 +63,7 @@ function __invoke( $args, $assoc_args ) {
         $flags .= "--$k ";
       }
     }
-    Terminus::line( "Running drush %s %s on %s-%s", array($command, $flags, $site->get('name'), $environment));
+    $this->logger->info( "Running drush %s %s on %s-%s", array($command, $flags, $site->get('name'), $environment));
     $this->send_command($server, 'drush', $args, $assoc_args );
   }
 

php/commands/wp.php

@@ -62,7 +62,7 @@ function __invoke( $args, $assoc_args ) {
         $flags .= "--$k ";
       }
     }
-    Terminus::line( "Running wp %s %s on %s-%s", array($command,$flags,$site->get('name'),$environment));
+    $this->logger->info( "Running wp %s %s on %s-%s", array($command,$flags,$site->get('name'),$environment));
     $this->send_command($server, 'wp', $args, $assoc_args );
 
   }