Adding ngrok to more easily share progress on dev sites

app/Commands/Dns/SetHost.php

@@ -30,15 +30,15 @@ class SetHost extends BaseCommand
     public function handle(): void
     {
         if ($this->option('restore')) {
-            $this->porterLibrary->getMechanic()->restoreNetworking();
-            app(Config::class)->updateIp('127.0.0.1');
+            $this->porterLibrary->getMechanic()->removeAlternativeLoopbackAddress();
+            app(Config::class)->updateIp($this->porterLibrary->getMechanic()->getStandardLoopback());
             $this->porter->restart('dns');
 
             return;
         }
 
-        $this->porterLibrary->getMechanic()->setupNetworking();
-        app(Config::class)->updateIp($this->porterLibrary->getMechanic()->getHostAddress());
+        $this->porterLibrary->getMechanic()->addAlternativeLoopbackAddress();
+        app(Config::class)->updateIp($this->porterLibrary->getMechanic()->getAlternativeLoopback());
         $this->porter->restart('dns');
     }
 }

app/Commands/Ngrok/Open.php

@@ -78,7 +78,7 @@ public function handle(): void
     public function checkItWillResolveProperly()
     {
         try {
-            if ($this->porterLibrary->getMechanic()->isUsingDefaultHostAddress()) {
+            if ($this->porterLibrary->getMechanic()->isUsingStandardLoopback()) {
                 $this->info('You need to use an alternative loopback address.');
                 $this->info('Please run porter dns:set-host and review the documentation here: https://github.com/konsulting/porter#dns');
 

app/Models/Site.php

@@ -12,6 +12,7 @@
 class Site extends Model
 {
     protected $guarded = [];
+    protected $casts = ['secure' => 'boolean'];
 
     /**
      * PHP Version.

app/PorterLibrary.php

@@ -46,6 +46,20 @@ public function __construct(FilePublisher $filePublisher, Mechanic $mechanic, $p
         $this->mechanic = $mechanic;
     }
 
+    /**
+     * Set the Mechanic instance
+     *
+     * @param  Mechanic  $mechanic
+     *
+     * @return $this
+     */
+    public function setMechanic(Mechanic $mechanic)
+    {
+        $this->mechanic = $mechanic;
+
+        return $this;
+    }
+
     /**
      * Return the path for storing container config files.
      *

app/Support/Console/DockerCompose/NullCliCommand.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Support\Console\DockerCompose;
+
+
+class NullCliCommand extends CliCommand
+{
+    /**
+     * Execute the command.
+     *
+     * @return string|null
+     */
+    public function perform()
+    {
+        return null;
+    }
+}

app/Support/Mechanics/MacOs.php

@@ -6,8 +6,8 @@
 
 class MacOs extends Untrained
 {
-    /** @var string $hostAddress Address for Host */
-    protected $hostAddress = '10.200.10.1';
+    /** @var string Alternative Loopback Address */
+    protected $alternativeLoopback = '10.200.10.1';
 
     /**
      * Trust the given root certificate file in the Keychain.
@@ -63,71 +63,37 @@ public function flushDns()
     }
 
     /**
-     * Set up networking for Mac.
+     * Add the alternative loopback address to the system.
      *
      * Add a loopback alias to 10.200.10.1. This is then used as the IP for DNS resolution, otherwise
      * we get weird results when trying to access services hosted in docker (since they resolve
      * 127.0.0.1 to the requesting container).
      *
      * @return void
      */
-    public function setupNetworking()
+    public function addAlternativeLoopbackAddress()
     {
-        $this->consoleWriter->info("Adding loopback alias to {$this->hostAddress}/24. Please provide your sudo password.");
+        $this->consoleWriter->info("Adding loopback alias to {$this->alternativeLoopback}/24. Please provide your sudo password.");
 
-        $command = "sudo ifconfig lo0 alias {$this->hostAddress}/24";
+        $command = "sudo ifconfig lo0 alias {$this->alternativeLoopback}/24";
 
         $this->cli->passthru($command);
     }
 
     /**
-     * Restore networking on Mac.
+     * Remove the alternative loopback address from the system.
      *
      * @return void
      */
-    public function restoreNetworking()
+    public function removeAlternativeLoopbackAddress()
     {
-        $this->consoleWriter->info("Removing loopback alias to {$this->hostAddress}. Please provide your sudo password.");
+        $this->consoleWriter->info("Removing loopback alias to {$this->alternativeLoopback}. Please provide your sudo password.");
 
-        $command = "sudo ifconfig lo0 -alias {$this->hostAddress}";
+        $command = "sudo ifconfig lo0 -alias {$this->alternativeLoopback}";
 
         $this->cli->passthru($command);
     }
 
-    /**
-     * Return the host IP address in use.
-     *
-     * @return string
-     */
-    public function getHostAddress()
-    {
-        return $this->hostAddress;
-    }
-
-    /**
-     * Does a Porter domain resolve to the Host Address.
-     *
-     * @throws UnableToRetrieveIP
-     *
-     * @return bool
-     */
-    public function isUsingHostAddress()
-    {
-        return $this->getPorterDomainIp() === $this->getHostAddress();
-    }
-
-    /**
-     * Does a Porter domain resolve to 127.0.0.1.
-     *
-     * @throws UnableToRetrieveIP
-     *
-     * @return bool
-     */
-    public function isUsingDefaultHostAddress()
-    {
-        return $this->getPorterDomainIp() === '127.0.0.1';
-    }
-
     /**
      * Determine the working IP for Porter.
      *

app/Support/Mechanics/Mechanic.php

@@ -37,35 +37,51 @@ public function getUserHomePath();
     public function flushDns();
 
     /**
-     * Setup networking for Porter.
+     * Add the alternative loopback address to the system.
      *
      * @return void
      */
-    public function setupNetworking();
+    public function addAlternativeLoopbackAddress();
 
     /**
-     * Restore networking.
+     * Remove the alternative loopback address from the system.
      *
      * @return void
      */
-    public function restoreNetworking();
+    public function removeAlternativeLoopbackAddress();
 
     /**
-     * Get Host IP address.
+     * Get standard loopback address.
+     *
+     * @return string
+     */
+    public function getStandardLoopback();
+
+    /**
+     * Get alternative loopback address.
+     *
+     * @return string
      */
-    public function getHostAddress();
+    public function getAlternativeLoopback();
 
     /**
-     * Does a porter domain resolve to the Host Address.
+     * Does a Porter domain resolve to the standard loopback address.
      *
      * @return bool
      */
-    public function isUsingHostAddress();
+    public function isUsingAlternativeLoopback();
 
     /**
-     * Does a porter domain resolve to 127.0.0.1.
+     *  Does a Porter domain resolve to the standard loopback address?
      *
      * @return bool
      */
-    public function isUsingDefaultHostAddress();
+    public function isUsingStandardLoopback();
+
+    /**
+     * Determine the working IP for Porter.
+     *
+     * @return string
+     */
+    public function getPorterDomainIp();
 }

app/Support/Mechanics/Untrained.php

@@ -17,8 +17,11 @@ class Untrained implements Mechanic
     /** @var ServerBag */
     protected $serverBag;
 
-    /** @var string $hostAddress Address for Host */
-    protected $hostAddress = '127.0.0.1';
+    /** @var string Standard Loopback Address */
+    protected $standardLoopback = '127.0.0.1';
+
+    /** @var string Alternative Loopback Address */
+    protected $alternativeLoopback = '127.0.0.1';
 
     /**
      * Untrained constructor.
@@ -94,7 +97,7 @@ protected function iAmNotTrainedTo($activity)
      *
      * @return void
      */
-    public function setupNetworking()
+    public function addAlternativeLoopbackAddress()
     {
         $this->iAmNotTrainedTo('set up special networking for Porter');
     }
@@ -104,38 +107,58 @@ public function setupNetworking()
      *
      * @return void
      */
-    public function restoreNetworking()
+    public function removeAlternativeLoopbackAddress()
     {
         $this->iAmNotTrainedTo('restore special networking for Porter');
     }
 
     /**
-     * Get Host IP for Porter.
+     * Get standard loopback address.
+     *
+     * @return string
+     */
+    public function getStandardLoopback()
+    {
+        return $this->standardLoopback;
+    }
+
+    /**
+     * Get alternative loopback address.
      *
      * @return string
      */
-    public function getHostAddress()
+    public function getAlternativeLoopback()
     {
-        return $this->hostAddress;
+        return $this->alternativeLoopback;
     }
 
     /**
-     * Does a porter domain resolve to the Host Address.
+     * Does a Porter domain resolve to the standard loopback address.
      *
      * @return bool
      */
-    public function isUsingHostAddress()
+    public function isUsingAlternativeLoopback()
     {
-        $this->iAmNotTrainedTo('determine if we are using the Host Address for Porter');
+        return $this->getPorterDomainIp() === $this->getAlternativeLoopback();
     }
 
     /**
-     * Does a porter domain resolve to 127.0.0.1.
+     * Does a Porter domain resolve to the standard loopback address?
      *
      * @return bool
      */
-    public function isUsingDefaultHostAddress()
+    public function isUsingStandardLoopback()
+    {
+        return $this->getPorterDomainIp() === $this->getStandardLoopback();
+    }
+
+    /**
+     * Determine the working IP for Porter.
+     *
+     * @return string
+     */
+    public function getPorterDomainIp()
     {
-        $this->iAmNotTrainedTo('determine if we are using the Default Host Address for Porter');
+        $this->iAmNotTrainedTo('obtain the current IP address for Porter');
     }
 }

tests/Unit/Commands/Browser/OffTest.php

@@ -12,7 +12,7 @@ class OffTest extends BaseTestCase
     /** @test */
     public function it_turns_the_browser_on()
     {
-        $this->porter->shouldReceive('turnOffService')->with('browser');
+        $this->porter->shouldReceive('turnOffService')->with('browser')->once();
 
         $this->artisan('browser:off');
     }

tests/Unit/Commands/Browser/OnTest.php

@@ -12,7 +12,7 @@ class OnTest extends BaseTestCase
     /** @test */
     public function it_turns_the_browser_on()
     {
-        $this->porter->shouldReceive('turnOnService')->with('browser');
+        $this->porter->shouldReceive('turnOnService')->with('browser')->once();
 
         $this->artisan('browser:on');
     }

tests/Unit/Commands/MakeFilesTest.php

@@ -27,8 +27,8 @@ public function it_will_remake_the_files()
 
         factory(Site::class, 2)->create([]);
 
-        $this->porter->shouldReceive('isUp')->andReturn(false);
-        $this->porter->shouldReceive('compose');
+        $this->porter->shouldReceive('isUp')->once()->andReturn(false);
+        $this->porter->shouldReceive('compose')->once();
 
         $conf->shouldReceive('build')->twice();
         $cert->shouldReceive('build')->with('porter_default')->once();
@@ -47,8 +47,8 @@ public function it_will_remake_the_files_and_restart_porter()
 
         factory(Site::class, 2)->create([]);
 
-        $this->porter->shouldReceive('isUp')->andReturn(true);
-        $this->porter->shouldReceive('compose');
+        $this->porter->shouldReceive('isUp')->once()->andReturn(true);
+        $this->porter->shouldReceive('compose')->once();
 
         $conf->shouldReceive('build')->twice();
         $cert->shouldReceive('build')->with('porter_default')->once();

tests/Unit/Commands/MySql/OffTest.php

@@ -12,7 +12,7 @@ class OffTest extends BaseTestCase
     /** @test */
     public function it_turns_the_browser_on()
     {
-        $this->porter->shouldReceive('turnOffService')->with('mysql');
+        $this->porter->shouldReceive('turnOffService')->with('mysql')->once();
 
         $this->artisan('mysql:off');
     }

tests/Unit/Commands/MySql/OnTest.php

@@ -12,7 +12,7 @@ class OnTest extends BaseTestCase
     /** @test */
     public function it_turns_the_browser_on()
     {
-        $this->porter->shouldReceive('turnOnService')->with('mysql');
+        $this->porter->shouldReceive('turnOnService')->with('mysql')->once();
 
         $this->artisan('mysql:on');
     }

tests/Unit/Commands/MySql/OpenTest.php

@@ -27,9 +27,9 @@ public function it_runs_mysql()
         $this->dockerCompose->shouldReceive('runContainer')
             ->andReturn($command = \Mockery::mock(CliCommand::class));
 
-        $command->shouldReceive('append')->andReturn($command)
-            ->shouldReceive('interactive')->andReturn($command)
-            ->shouldReceive('perform');
+        $command->shouldReceive('append')->andReturn($command)->once();
+        $command->shouldReceive('interactive')->andReturn($command)->once();
+        $command->shouldReceive('perform')->once();
 
         $this->artisan('mysql:open');
     }