Allowing Inspector state to be cleared. (#1559)

* Allowing Inspector state to be cleared.

* Fixing misleading typo.

Author: grasmash

src/Robo/Blt.php

@@ -184,7 +184,7 @@ public function configureContainer($container) {
     $container->add('executor', Executor::class)
       ->withArgument('builder');
 
-    $container->add('inspector', Inspector::class)
+    $container->share('inspector', Inspector::class)
       ->withArgument('executor');
 
     $container->inflector(InspectorAwareInterface::class)

src/Robo/Commands/Blt/DoctorCommand.php

@@ -23,27 +23,28 @@ public function doctor() {
       && !$this->getInspector()->isVmCli()) {
       $result = $this->executeDoctorInsideVm();
       if ($result->wasSuccessful()) {
-        return $result;
+        return $result->getExitCode();
       }
     }
 
     // Try BLT doctor with default alias. This might be a Drupal VM alias.
     $alias = $this->getConfigValue('drush.alias');
+    $this->say('Attempting to run doctor on host machine...');
     $result = $this->executeDoctorOnHost($alias);
 
     // If default alias failed, try again using @self alias.
     if (!$result->wasSuccessful() && $alias != 'self') {
-      $this->logger->warning("Unable to run the doctor using @$alias. Trying with @self...");
+      $this->logger->warning("Unable to run the doctor using alias '@$alias'. Trying with '@self'...");
       $this->executeDoctorOnHost('self');
     }
 
     // If @self fails, try without any alias.
     if (!$result->wasSuccessful() && $alias != '') {
-      $this->logger->warning("Unable to run the doctor using @self. Trying without alias...");
+      $this->logger->warning("Unable to run the doctor using alias '@self'. Trying without alias...");
       $this->executeDoctorOnHost('');
     }
 
-    return $result;
+    return $result->getExitCode();
   }
 
   /**
@@ -73,6 +74,8 @@ protected function executeDoctorOnHost($alias) {
       ->alias($alias)
       ->uri("")
       ->includePath($this->getConfigValue('blt.root') . '/drush')
+      ->printOutput(FALSE)
+      ->printMetadata(FALSE)
       ->run();
 
     return $result;

src/Robo/Commands/Setup/BuildCommand.php

@@ -19,7 +19,7 @@ class BuildCommand extends BltTasks {
    * @aliases setup:all
    */
   public function setup() {
-    $this->say("Setting up local environment for @{$this->getConfigValue('site')}...");
+    $this->say("Setting up local environment for site '{$this->getConfigValue('site')}'...");
     $status_code = $this->invokeCommands([
       'setup:build',
       'setup:hash-salt',

src/Robo/Inspector/Inspector.php

@@ -33,6 +33,16 @@ class Inspector implements BuilderAwareInterface, ConfigAwareInterface, LoggerAw
    */
   protected $executor;
 
+  /**
+   * @var null
+   */
+  protected $isDrupalInstalled = NULL;
+
+  /**
+   * @var null
+   */
+  protected $isMySqlAvailable = NULL;
+
   /**
    * The constructor.
    *
@@ -43,6 +53,11 @@ public function __construct(Executor $executor) {
     $this->executor = $executor;
   }
 
+  public function clearState() {
+    $this->isDrupalInstalled = NULL;
+    $this->isMySqlAvailable = NULL;
+  }
+
   /**
    * Determines if the repository root directory exists.
    *
@@ -123,20 +138,19 @@ public function isDrupalSettingsFileValid() {
   /**
    * Checks that Drupal is installed, caches result.
    *
-   * This method caches its result in state.drupal.installed value.
+   * This method caches its result in $this->drupalIsInstalled.
    *
    * @return bool
    *   TRUE if Drupal is installed.
    */
   public function isDrupalInstalled() {
     // This will only run once per command. If Drupal is installed mid-command,
     // this value needs to be changed.
-    if (is_null($this->getConfigValue('state.drupal.installed'))) {
-      $installed = $this->getDrupalInstalled();
-      $this->getConfig()->set('state.drupal.installed', $installed);
+    if (is_null($this->isDrupalInstalled)) {
+      $this->isDrupalInstalled = $this->getDrupalInstalled();
     }
 
-    return $this->getConfigValue('state.drupal.installed');
+    return $this->isDrupalInstalled;
   }
 
   /**
@@ -171,18 +185,17 @@ public function getDrushStatus() {
   /**
    * Determines if MySQL is available, caches result.
    *
-   * This method caches its result in state.mysql.available config.
+   * This method caches its result in $this->mySqlAvailable.
    *
    * @return bool
    *   TRUE if MySQL is available.
    */
   public function isMySqlAvailable() {
-    if (is_null($this->getConfigValue('state.mysql.available'))) {
-      $mysql_available = $this->getMySqlAvailable();
-      $this->getConfig()->set('state.mysql.available', $mysql_available);
+    if (is_null($this->isMySqlAvailable)) {
+      $this->isMySqlAvailable = $this->getMySqlAvailable();
     }
 
-    return $this->getConfigValue('state.mysql.available');
+    return $this->isMySqlAvailable;
   }
 
   /**

src/Robo/Wizards/SetupWizard.php

@@ -44,6 +44,7 @@ public function wizardInstallDrupal() {
           ->execute("$bin/blt setup")
           ->detectInteractive()
           ->run();
+        $this->getInspector()->clearState();
       }
     }
   }