Merge pull request #25 from raulfraile/fix/current_dir

Fix extracting in the current directory

Author: raulfraile

src/Distill.php

@@ -11,11 +11,13 @@
 
 namespace Distill;
 
+use Distill\Exception\IO\Output\TargetDirectoryNotWritableException;
 use Distill\Extractor\ExtractorInterface;
 use Distill\Format\FormatChain;
 use Distill\Format\FormatChainInterface;
 use Distill\Format\FormatInterface;
 use Distill\Extractor\Util\Filesystem;
+use Symfony\Component\Filesystem\Filesystem as SfFilesystem;
 use Distill\Strategy\StrategyInterface;
 use Pimple\Container;
 
@@ -220,8 +222,25 @@ public function extractWithoutRootDirectory($file, $path, FormatInterface $forma
             throw new Exception\IO\Output\NotSingleDirectoryException($file);
         }
 
-        $this->filesystem->remove($path);
-        $this->filesystem->rename($singleRootDirectoryName, $path);
+        $workingDirectory = getcwd();
+        if ($workingDirectory === realpath($path)) {
+            if (dirname($workingDirectory) === $workingDirectory) {
+                // root directory
+                throw new TargetDirectoryNotWritableException($workingDirectory);
+            }
+            
+            chdir(dirname($workingDirectory));
+
+            $sfFilesystem = new SfFilesystem();
+            $filesRemove = new \FilesystemIterator($workingDirectory, \FilesystemIterator::SKIP_DOTS);
+            $sfFilesystem->remove($filesRemove);
+            $sfFilesystem->mirror($singleRootDirectoryName, $workingDirectory);
+
+            chdir($workingDirectory);
+        } else {
+            $this->filesystem->remove($path);
+            $this->filesystem->rename($singleRootDirectoryName, $path);
+        }
 
         return true;
     }

tests/DistillTest.php

@@ -405,6 +405,20 @@ public function testCannotExtractWithoutRootDirectoryNoDirectoryZipFiles()
         }
     }
 
+    public function testCanExtractWithoutRootDirectoryInCurrentDirectory()
+    {
+        $target = $this->getTemporaryPath();
+        $this->clearTemporaryPath();
+        mkdir($target);
+        chdir($target);
+
+        $response = $this->distill->extractWithoutRootDirectory($this->filesPath.'file_ok_dir.zip', '.', new Format\Simple\Zip());
+
+        $this->assertTrue($response);
+        $this->assertUncompressed($target, 'file_ok_dir.zip', false, '/uncompressed');
+        $this->clearTemporaryPath();
+    }
+
     public function testFormatIsNotSupportedAfterDisablingFormat()
     {
         $this->setExpectedException('Distill\\Exception\\IO\\Input\\FileFormatNotSupportedException');

tests/Method/Command/X7zipTest.php tests/Method/Command/X7ZipTest.phptests/Method/Command/X7zipTest.php renamed to tests/Method/Command/X7ZipTest.php

@@ -6,7 +6,7 @@
 use Distill\Format;
 use Distill\Tests\Method\AbstractMethodTest;
 
-class X7zipTest extends AbstractMethodTest
+class X7ZipTest extends AbstractMethodTest
 {
     public function setUp()
     {