Merge pull request #11 from clue-labs/attic

Support including deleted files (attic) in CVS directory listings

Author: clue

src/Client.php

@@ -56,7 +56,7 @@ public function fetchFile($path, $revision = null)
         return $this->fetch($url);
     }
 
-    public function fetchDirectory($path, $revision = null)
+    public function fetchDirectory($path, $revision = null, $showAttic = false)
     {
         if (substr($path, -1) !== '/') {
             return $this->reject(new InvalidArgumentException('Directory path MUST end with trailing slash'));
@@ -68,6 +68,11 @@ public function fetchDirectory($path, $revision = null)
             $url .= '?pathrev=' . $revision;
         }
 
+        if ($showAttic) {
+            $url .= (strpos($url, '?') === false) ? '?' : '&';
+            $url .= 'hideattic=0';
+        }
+
         // TODO: path MUST end with trailing slash
         // TODO: accessing files will redirect to file with relative location URL (not supported by clue/buzz-react)
 

tests/ClientTest.php

@@ -67,6 +67,24 @@ public function testFetchDirectoryRevision()
         $this->expectPromiseReject($promise);
     }
 
+    public function testFetchDirectoryAttic()
+    {
+        $this->browser->expects($this->once())->method('get')->with($this->equalTo('http://viewvc.example.org/directory/?hideattic=0'))->will($this->returnValue($this->createPromiseRejected()));
+
+        $promise = $this->client->fetchDirectory('/directory/', null, true);
+
+        $this->expectPromiseReject($promise);
+    }
+
+    public function testFetchDirectoryRevisionAttic()
+    {
+        $this->browser->expects($this->once())->method('get')->with($this->equalTo('http://viewvc.example.org/directory/?pathrev=1.1&hideattic=0'))->will($this->returnValue($this->createPromiseRejected()));
+
+        $promise = $this->client->fetchDirectory('/directory/', '1.1', true);
+
+        $this->expectPromiseReject($promise);
+    }
+
     public function testFetchPatch()
     {
         $this->browser->expects($this->once())->method('get')->with($this->equalTo('http://viewvc.example.org/README.md?view=patch&r1=1.0&r2=1.1'))->will($this->returnValue($this->createPromiseRejected()));

tests/FunctionalClientTest.php renamed to tests/FunctionalApacheClientTest.php

@@ -6,7 +6,7 @@
 use React\Promise\PromiseInterface;
 use Clue\React\Block\Blocker;
 
-class FunctionalClientTest extends TestCase
+class FunctionalApacheClientTest extends TestCase
 {
     private $loop;
     private $viewvc;

tests/FunctionalGentooClientTest.php

@@ -0,0 +1,69 @@
+<?php
+
+use Clue\React\ViewVcApi\Client;
+use React\EventLoop\Factory as LoopFactory;
+use Clue\React\Buzz\Browser;
+use React\Promise\PromiseInterface;
+use Clue\React\Block\Blocker;
+
+class FunctionalGentooClientTest extends TestCase
+{
+    private $loop;
+    private $viewvc;
+    private $blocker;
+
+    public function setUp()
+    {
+        if (!function_exists('stream_socket_enable_crypto')) {
+            $this->markTestSkipped('TLS (HTTPS) not supported by your platform (HHVM?)');
+        }
+
+        $url = 'https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/';
+
+        $this->loop = LoopFactory::create();
+        $this->blocker = new Blocker($this->loop);
+        $browser = new Browser($this->loop);
+
+        // check connectivity to given URL only once
+        static $checked = null;
+        if ($checked === null) {
+            try {
+                $this->waitFor($browser->head($url));
+                $checked = true;
+            } catch (Exception $e) {
+                $checked = false;
+            }
+        }
+
+        if (!$checked) {
+            $this->markTestSkipped('Unable to reach Gentoo ViewVC');
+        }
+
+        $this->viewvc = new Client($url, $browser);
+    }
+
+    public function testFetchDirectoryAttic()
+    {
+        $path = '/';
+
+        $promise = $this->viewvc->fetchDirectory($path, null, true);
+        $files = $this->waitFor($promise);
+
+        $this->assertEquals(array('misc/', 'src/', 'users/', 'xml/', '.frozen'), $files);
+    }
+
+    public function testFetchFileDeletedShowsLastState()
+    {
+        $file = '.frozen';
+
+        $promise = $this->viewvc->fetchFile($file);
+        $contents = $this->waitFor($promise);
+
+        $this->assertEquals("robbat2\n", $contents);
+    }
+
+    private function waitFor(PromiseInterface $promise)
+    {
+        return $this->blocker->awaitOne($promise);
+    }
+}