Merge pull request #2 from pantheon-systems/drush

Better remote command support.
pantheon-systems · Feb 25, 2014 · 99cce1a · 99cce1a
2 parents d5291b4 + 6a1a2ac
commit 99cce1a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/php/Terminus/CommandWithSSH.php b/php/Terminus/CommandWithSSH.php
@@ -29,6 +29,9 @@ protected function send_command($server, $remote_exec, $args, $assoc_args) {
     $cmd = 'ssh -T ' . $server['user'] . '@' . $server['host'] . ' -p ' . $server['port'] . ' -o "AddressFamily inet"' . " '" . $remote_cmd . "'";
 
     passthru( $cmd, $exit_code );
-    exit( $exit_code );
+    if ($result == 255) {
+      \Terminus::error("Failed to connect. Check your credentials, and that you are specifying a valid environment.");
+    }
+    return( $exit_code );
   }
 }
diff --git a/php/commands/drush.php b/php/commands/drush.php
@@ -36,23 +36,19 @@ function __invoke( $args, $assoc_args ) {
       Terminus::error("Command could not be completed.");
       exit;
     }
-    # TODO: validate environment quickly.
-    #if (!isset($site->environments->$environment)) {
-    #  Terminus::error("The '$environment' environment does not exist.");
-    #}
 
-    # see https://github.com/pantheon-systems/titan-mt/blob/master/dashboardng/app/workshops/site/models/environment.coffee
     $server = Array(
       'user' => "$environment.$site->site_uuid",
       'host' => "appserver.$environment.$site->site_uuid.drush.in",
       'port' => '2222'
     );
-
-    # Sanitize assoc args.
+    # Sanitize assoc args so we don't try to pass our own flags.
+    # TODO: DRY this out?
     unset($assoc_args['site']);
     if (isset($assoc_args['environment'])) {
       unset($assoc_args['environment']);
     }
+
     # Create user-friendly output
     $command = implode( $args, ' ' );
     $flags = '';
@@ -64,7 +60,7 @@ function __invoke( $args, $assoc_args ) {
         $flags .= "--$k";
       }
     }
-    Terminus::line( "Running drush $command $flags against $site_name-$environment" );
+    Terminus::line( "Running drush $command $flags on $site_name-$environment" );
     $this->send_command($server, 'drush', $args, $assoc_args );
   }
 

diff --git a/php/commands/wp.php b/php/commands/wp.php
@@ -36,10 +36,6 @@ function __invoke( $args, $assoc_args ) {
       Terminus::error("Command could not be completed.");
       exit;
     }
-    # TODO: validate environment quickly.
-    #if (!isset($site->environments->$environment)) {
-    #  Terminus::error("The '$environment' environment does not exist.");
-    #}
 
     # see https://github.com/pantheon-systems/titan-mt/blob/master/dashboardng/app/workshops/site/models/environment.coffee
     $server = Array(
@@ -48,11 +44,13 @@ function __invoke( $args, $assoc_args ) {
       'port' => '2222'
     );
 
-    # Sanitize assoc args.
+    # Sanitize assoc args so we don't try to pass our own flags.
+    # TODO: DRY this out?
     unset($assoc_args['site']);
     if (isset($assoc_args['environment'])) {
       unset($assoc_args['environment']);
     }
+
     # Create user-friendly output
     $command = implode( $args, ' ' );
     $flags = '';
@@ -64,8 +62,9 @@ function __invoke( $args, $assoc_args ) {
         $flags .= "--$k";
       }
     }
-    Terminus::line( "Running wp-cli $command $flags against $site_name-$environment" );
+    Terminus::line( "Running drush $command $flags on $site_name-$environment" );
     $this->send_command($server, 'wp', $args, $assoc_args );
+
   }
 
 }