Remember Docker URL, support TCP/IP connections (closes #2)

Author: clue

src/Client.php

@@ -13,51 +13,53 @@
 class Client
 {
     private $browser;
+    private $url;
     private $parser;
 
-    public function __construct(Browser $browser, ResponseParser $parser = null)
+    public function __construct(Browser $browser, $url, ResponseParser $parser = null)
     {
         if ($parser === null) {
             $parser = new ResponseParser();
         }
 
         $this->browser = $browser;
+        $this->url = $url;
         $this->parser = $parser;
     }
 
     public function ping()
     {
-        return $this->browser->get('/_ping')->then(array($this->parser, 'expectPlain'));
+        return $this->browser->get($this->url('/_ping'))->then(array($this->parser, 'expectPlain'));
     }
 
     public function info()
     {
-        return $this->browser->get('/info')->then(array($this->parser, 'expectJson'));
+        return $this->browser->get($this->url('/info'))->then(array($this->parser, 'expectJson'));
     }
 
     public function version()
     {
-        return $this->browser->get('/version')->then(array($this->parser, 'expectJson'));
+        return $this->browser->get($this->url('/version'))->then(array($this->parser, 'expectJson'));
     }
 
     public function containerList($all = false, $size = false)
     {
-        return $this->browser->get('/containers/json?all=' . $all . '&size=' . $size)->then(array($this->parser, 'expectJson'));
+        return $this->browser->get($this->url('/containers/json?all=' . $all . '&size=' . $size))->then(array($this->parser, 'expectJson'));
     }
 
     public function containerInspect($container)
     {
-        return $this->browser->get('/containers/' . $container . '/json')->then(array($this->parser, 'expectJson'));
+        return $this->browser->get($this->url('/containers/' . $container . '/json'))->then(array($this->parser, 'expectJson'));
     }
 
     public function containerTop($container)
     {
-        return $this->browser->get('/containers/' . $container . '/top')->then(array($this->parser, 'expectJson'));
+        return $this->browser->get($this->url('/containers/' . $container . '/top'))->then(array($this->parser, 'expectJson'));
     }
 
     public function containerWait($container)
     {
-        return $this->browser->post('/containers/' . $container . '/wait')->then(array($this->parser, 'expectJson'));
+        return $this->browser->post($this->url('/containers/' . $container . '/wait'))->then(array($this->parser, 'expectJson'));
     }
 
     /**
@@ -68,7 +70,7 @@ public function containerWait($container)
      */
     public function containerStop($container, $t)
     {
-        return $this->browser->post('/containers/' . $container . '/stop?t=' . $t)->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->post($this->url('/containers/' . $container . '/stop?t=' . $t))->then(array($this->parser, 'expectEmpty'));
     }
 
     /**
@@ -79,22 +81,22 @@ public function containerStop($container, $t)
      */
     public function containerRestart($container, $t)
     {
-        return $this->browser->post('/containers/' . $container . '/restart?t=' . $t)->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->post($this->url('/containers/' . $container . '/restart?t=' . $t))->then(array($this->parser, 'expectEmpty'));
     }
 
     public function containerKill($container, $signal = null)
     {
-        return $this->browser->post('/containers/' . $container . '/kill?signal=' . $signal)->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->post($this->url('/containers/' . $container . '/kill?signal=' . $signal))->then(array($this->parser, 'expectEmpty'));
     }
 
     public function containerPause($container)
     {
-        return $this->browser->post('/containers/' . $container . '/pause')->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->post($this->url('/containers/' . $container . '/pause'))->then(array($this->parser, 'expectEmpty'));
     }
 
     public function containerUnpause($container)
     {
-        return $this->browser->post('/containers/' . $container . '/unpause')->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->post($this->url('/containers/' . $container . '/unpause'))->then(array($this->parser, 'expectEmpty'));
     }
 
     /**
@@ -106,11 +108,16 @@ public function containerUnpause($container)
      */
     public function containerDelete($container, $v = false, $force = false)
     {
-        return $this->browser->delete('/containers/' . $container . '?v=' . (int)$v . '&force=' . (int)$force)->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->delete($this->url('/containers/' . $container . '?v=' . (int)$v . '&force=' . (int)$force))->then(array($this->parser, 'expectEmpty'));
     }
 
     public function containerResize($container, $w, $h)
     {
-        return $this->browser->get('/containers/' . $container . '/resize?w=' . $w . '&h=' . $h)->then(array($this->parser, 'expectEmpty'));
+        return $this->browser->get($this->url('/containers/' . $container . '/resize?w=' . $w . '&h=' . $h))->then(array($this->parser, 'expectEmpty'));
+    }
+
+    private function url($url)
+    {
+        return $this->url . $url;
     }
 }

src/Factory.php

@@ -23,10 +23,18 @@ public function createClient($url = null)
             $url = 'unix:///var/run/docker.sock';
         }
 
-        $sender = Sender::createFromLoopUnix($this->loop, $url);
+        $sender = null;
+
+        if (substr($url, 0, 7) === 'unix://') {
+            // send everything through a local unix domain socket
+            $sender = Sender::createFromLoopUnix($this->loop, $url);
+
+            // pretend all HTTP URLs to be on localhost
+            $url = 'http://localhost';
+        }
 
         $browser = new Browser($this->loop, $sender);
 
-        return new Client($browser);
+        return new Client($browser, $url);
     }
 }

tests/ClientTest.php

@@ -15,7 +15,7 @@ public function setUp()
     {
         $this->browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
         $this->parser = $this->getMock('Clue\React\Docker\Io\ResponseParser');
-        $this->client = new Client($this->browser, $this->parser);
+        $this->client = new Client($this->browser, '', $this->parser);
     }
 
     public function testPing()