Merge pull request #2 from ivarb/master

Fixed Project Versioner missing API method has()

src/Naneau/ProjectVersioner/Versioner.php

@@ -92,6 +92,23 @@ public function getCombined($directory, $separator = '-')
         return implode($separator, $found);
     }
 
+    /**
+     * Does a directory have a version?
+     *
+     * @param string $directory
+     * @return bool
+     **/
+    public function has($directory)
+    {
+        foreach ($this->getReaders() as $reader) {
+            if ($reader->canRead($directory)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Get the set of readers
      *

tests/Reader/ComposerTest.php

@@ -3,6 +3,7 @@
 use Naneau\ProjectVersioner\Versioner;
 use Naneau\ProjectVersioner\Reader\Composer as ComposerReader;
 use Naneau\ProjectVersioner\Reader\ComposerPackage as ComposerPackageReader;
+use Naneau\ProjectVersioner\Reader\ComposerJson as ComposerJsonReader;
 
 class ComposerTest extends \PHPUnit_Framework_TestCase
 {
@@ -27,4 +28,14 @@ public function testPackageRead()
 
         $this->assertEquals('v2.5.4', $versioner->get($directory));
     }
+
+    public function testComposerJsonRead()
+    {
+        $directory = __DIR__ . '/../projects/composer';
+
+        $readers = array(new ComposerJsonReader);
+        $versioner = new Versioner($readers);
+
+        $this->assertEquals('1.0.0', $versioner->get($directory));
+    }
 }

tests/Versioner/CombineReadersTest.php

@@ -79,4 +79,25 @@ public function testFileFirstWithCombine()
             )
         );
     }
+
+    public function testHasAVersion()
+    {
+        $versioner = new Versioner;
+
+        // This one should have a version
+        $versioner->setReaders(
+            array(new FileReader('VERSION'))
+        );
+        return $this->assertTrue(
+            $versioner->has(__DIR__ . '/../projects/composer-file/')
+        );
+
+        // Should not have a version
+        $versioner->setReaders(
+            array(new FileReader('FOO'))
+        );
+        return $this->assertFalse(
+            $versioner->has(__DIR__ . '/../projects/composer-file/')
+        );
+    }
 }

tests/projects/composer/composer.json

@@ -0,0 +1,24 @@
+{
+    "name": "naneau/project-versioner",
+    "description": "A tool to maintain project/sub-project versions based on Composer, file mtimes, etc.",
+    "license": "MIT",
+    "version": "1.0.0",
+    "authors": [
+        {
+            "name": "Maurice Fonk",
+            "email": "[email protected]"
+        }
+    ],
+
+    "autoload": {
+        "psr-4": {"Naneau\\ProjectVersioner\\": "src/Naneau/ProjectVersioner/"}
+    },
+
+    "minimum-stability": "stable",
+    "require": {
+        "symfony/finder": "~2.5"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.2"
+    }
+}