Use relative path to find tag file

atoum · Apr 9, 2018 · 536a140 · 536a140
1 parent def5104
commit 536a140
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/classes/script.php b/classes/script.php
@@ -51,6 +51,17 @@ public function getDirectory()
         return rtrim($directory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
     }
 
+    public function getRelativeDirectory()
+    {
+        $directory = $this->adapter->dirname($this->getName());
+
+        if ($this->adapter->is_dir($directory) === false) {
+            $directory = $this->adapter->getcwd();
+        }
+
+        return rtrim($directory, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+    }
+
     public function setAdapter(adapter $adapter = null)
     {
         $this->adapter = $adapter ?: new adapter();

diff --git a/classes/scripts/git/pusher.php b/classes/scripts/git/pusher.php
@@ -58,7 +58,7 @@ public function setTagFile($tagFile = null)
         if ($tagFile !== null) {
             $tagFile = (string) $tagFile;
         } else {
-            $tagFile = $this->getDirectory() . self::defaultTagFile;
+            $tagFile = $this->getRelativeDirectory() . self::defaultTagFile;
         }
 
         $this->tagFile = $tagFile;

diff --git a/tests/units/classes/script.php b/tests/units/classes/script.php
@@ -638,4 +638,26 @@ public function testGetDirectory()
                 ->string($script->getDirectory())->isEqualTo($currentDirectory . DIRECTORY_SEPARATOR)
         ;
     }
+
+    public function testGetRelativeDirectory()
+    {
+        $this
+            ->given($script = new mock\script($name = uniqid()))
+            ->and($script->setAdapter($adapter = new atoum\test\adapter()))
+            ->and($adapter->is_dir = true)
+            ->and($adapter->dirname = $directory = uniqid())
+            ->then
+                ->string($script->getRelativeDirectory())->isEqualTo($directory . DIRECTORY_SEPARATOR)
+            ->if($adapter->dirname = $directory . DIRECTORY_SEPARATOR)
+            ->then
+                ->string($script->getRelativeDirectory())->isEqualTo($directory . DIRECTORY_SEPARATOR)
+            ->if($adapter->is_dir = false)
+            ->and($adapter->getcwd = $directory = uniqid())
+            ->then
+                ->string($script->getRelativeDirectory())->isEqualTo($directory . DIRECTORY_SEPARATOR)
+            ->and($adapter->getcwd = $directory . DIRECTORY_SEPARATOR)
+            ->then
+                ->string($script->getRelativeDirectory())->isEqualTo($directory . DIRECTORY_SEPARATOR)
+        ;
+     }
 }