Improved test suite and fixed bugs

Author: raulfraile

composer.json

@@ -27,7 +27,8 @@
     },
     "require-dev": {
         "raulfraile/ladybug": "~1.0",
-        "mockery/mockery": "0.9.1"
+        "mockery/mockery": "0.9.1",
+        "symfony/finder": "~2.4"
     },
     "suggest": {
         "ext-zip": "Allows to uncompress zip files using ZipArchive",

src/Chooser.php

@@ -124,22 +124,22 @@ public function setFiles($files)
     /**
      * Adds a new file.
      * @param string               $filename File name
-     * @param FormatInterface|null $format   Format
+     * @param FormatInterface|null $formatChain   Format
      *
      * @throws Exception\FormatGuesserRequiredException
      * @return Chooser
      */
-    public function addFile($filename, FormatInterface $format = null)
+    public function addFile($filename, FormatInterface $formatChain = null)
     {
-        if (null === $format) {
+        if (null === $formatChain) {
             if (null === $this->formatGuesser) {
                 throw new FormatGuesserRequiredException();
             }
 
-            $format = $this->formatGuesser->guess($filename);
+            $formatChain = $this->formatGuesser->guess($filename);
         }
 
-        $this->files[] = new File($filename, $format);
+        $this->files[] = new File($filename, $formatChain);
 
         return $this;
     }

src/File.php

@@ -11,7 +11,7 @@
 
 namespace Distill;
 
-use Distill\Format\FormatInterface;
+use Distill\Format\FormatChainInterface;
 
 class File implements FileInterface
 {
@@ -23,16 +23,16 @@ class File implements FileInterface
 
     /**
      * File format.
-     * @var FormatInterface
+     * @var FormatChainInterface
      */
     protected $format;
 
     /**
      * Constructor.
      * @param string          $path   File path
-     * @param FormatInterface $format File format
+     * @param FormatChainInterface $format File format
      */
-    public function __construct($path, FormatInterface $format)
+    public function __construct($path, FormatChainInterface $format)
     {
         $this->path = $path;
         $this->format = $format;
@@ -67,7 +67,7 @@ public function getPath()
     /**
      * {@inheritdoc}
      */
-    public function setFormat(FormatInterface $format)
+    public function setFormatChain(FormatChainInterface $format)
     {
         $this->format = $format;
 
@@ -77,7 +77,7 @@ public function setFormat(FormatInterface $format)
     /**
      * {@inheritdoc}
      */
-    public function getFormat()
+    public function getFormatChain()
     {
         return $this->format;
     }

src/FileInterface.php

@@ -11,7 +11,7 @@
 
 namespace Distill;
 
-use Distill\Format\FormatInterface;
+use Distill\Format\FormatChainInterface;
 
 interface FileInterface
 {
@@ -39,16 +39,16 @@ public function getPath();
 
     /**
      * Sets the file format.
-     * @param FormatInterface $format File format
+     * @param FormatChainInterface $format File format
      *
      * @return FileInterface
      */
-    public function setFormat(FormatInterface $format);
+    public function setFormatChain(FormatChainInterface $format);
 
     /**
      * Gets the file format.
      *
-     * @return FormatInterface File format
+     * @return FormatChainInterface File format
      */
-    public function getFormat();
+    public function getFormatChain();
 }

src/Format/FormatChain.php

@@ -16,7 +16,7 @@ class FormatChain implements FormatChainInterface, \Countable, \ArrayAccess, \It
     /** @var FormatInterface[] $formats */
     protected $formats;
 
-    public function __construct($formats = [])
+    public function __construct(array $formats = [])
     {
         $this->formats = $formats;
     }

src/Format/FormatChainInterface.php

@@ -16,4 +16,11 @@ interface FormatChainInterface// extends FormatInterface
     public function getChainFormats();
 
     public function isEmpty();
+
+    /**
+     * Gets the compression ratio level for the whole chain.
+     *
+     * @return integer Compression ratio level (0: low, 10: high)
+     */
+    public function getCompressionRatioLevel();
 }

src/Method/Command/Ar.php

@@ -11,6 +11,7 @@
 
 namespace Distill\Method\Command;
 
+use Distill\Exception\IO\Input\FileCorruptedException;
 use Distill\Format;
 
 /**
@@ -32,6 +33,10 @@ public function extract($file, $target, Format\FormatInterface $format)
         $command = sprintf("cd %s && ar -x %s", escapeshellarg($target), escapeshellarg($file));
         $exitCode = $this->executeCommand($command);
 
+        if ($exitCode > 0) {
+            throw new FileCorruptedException($file);
+        }
+
         return $this->isExitCodeSuccessful($exitCode);
     }
 

src/Method/Command/Bzip2.php

@@ -11,6 +11,7 @@
 
 namespace Distill\Method\Command;
 
+use Distill\Exception\IO\Input\FileCorruptedException;
 use Distill\Format;
 
 /**
@@ -29,11 +30,16 @@ public function extract($file, $target, Format\FormatInterface $format)
 
         $this->getFilesystem()->mkdir($target);
 
-        $outputPath = sprintf('%s/%s', $target, pathinfo($file, PATHINFO_FILENAME));
+        $copiedFile = $target . DIRECTORY_SEPARATOR . basename($file);
+        $this->getFilesystem()->copy($file, $copiedFile);
 
-        $command = sprintf("bzip2 -k -d -c %s >> %s", escapeshellarg($file), escapeshellarg($outputPath));
+        $command = sprintf("bzip2 -d %s", escapeshellarg($copiedFile));
         $exitCode = $this->executeCommand($command);
 
+        if (2 === $exitCode) {
+            throw new FileCorruptedException($file);
+        }
+
         return $this->isExitCodeSuccessful($exitCode);
     }
 

src/Method/Command/Cabextract.php

@@ -11,6 +11,7 @@
 
 namespace Distill\Method\Command;
 
+use Distill\Exception\IO\Input\FileCorruptedException;
 use Distill\Format;
 
 /**
@@ -32,6 +33,10 @@ public function extract($file, $target, Format\FormatInterface $format)
 
         $exitCode = $this->executeCommand($command);
 
+        if ($exitCode > 0) {
+            throw new FileCorruptedException($file);
+        }
+
         return $this->isExitCodeSuccessful($exitCode);
     }
 

src/Method/Command/Cpio.php

@@ -11,6 +11,7 @@
 
 namespace Distill\Method\Command;
 
+use Distill\Exception\IO\Input\FileCorruptedException;
 use Distill\Format;
 
 /**
@@ -32,6 +33,10 @@ public function extract($file, $target, Format\FormatInterface $format)
         $command = sprintf("cd %s && cpio -idv -F %s", escapeshellarg($target), escapeshellarg($file));
         $exitCode = $this->executeCommand($command);
 
+        if ($exitCode > 0) {
+            throw new FileCorruptedException($file);
+        }
+
         return $this->isExitCodeSuccessful($exitCode);
     }