Merge pull request #1 from romainneutron/streams

Streams enhancement

Author: nlegoff

composer.json

@@ -13,6 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.3",
+        "doctrine/collections": "~1",
         "pimple/pimple": "~1",
         "symfony/process": "~2",
         "symfony/filesystem": "~2",

composer.lock

@@ -17,11 +17,18 @@
 
 abstract class AbstractAdapter implements AdapterInterface
 {
+    protected $manager;
+
+    public function __construct(ResourceManager $manager)
+    {
+        $this->manager = $manager;
+    }
+
     /**
      * @inheritdoc
      */
     public function open($path)
     {
-        return new Archive($path, $this, new FileResource($path));
+        return new Archive($path, $this, $this->manager);
     }
 }

src/Alchemy/Zippy/Adapter/AbstractAdapter.php

@@ -13,13 +13,13 @@
 namespace Alchemy\Zippy\Adapter;
 
 use Alchemy\Zippy\Exception\InvalidArgumentException;
-use Alchemy\Zippy\Exception\IOException;
 use Alchemy\Zippy\Exception\RuntimeException;
 use Alchemy\Zippy\Archive\MemberInterface;
 use Alchemy\Zippy\Parser\ParserInterface;
 use Alchemy\Zippy\Parser\ParserFactory;
 use Alchemy\Zippy\ProcessBuilder\ProcessBuilderFactoryInterface;
 use Alchemy\Zippy\ProcessBuilder\ProcessBuilderFactory;
+use Alchemy\Zippy\Resource\ResourceManager;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\ProcessBuilder;
 
@@ -50,12 +50,14 @@ abstract class AbstractBinaryAdapter extends AbstractAdapter implements BinaryAd
      * Constructor
      *
      * @param ParserInterface                     $parser   An output parser
+     * @param ResourceManager                     $manager  A resource manager
      * @param ProcessBuilderFactoryInterface      $inflator A process builder factory for the inflator binary
      * @param ProcessBuilderFactoryInterface|null $deflator A process builder factory for the deflator binary
      */
-    public function __construct(ParserInterface $parser, ProcessBuilderFactoryInterface $inflator, ProcessBuilderFactoryInterface $deflator = null)
+    public function __construct(ParserInterface $parser, ResourceManager $manager, ProcessBuilderFactoryInterface $inflator, ProcessBuilderFactoryInterface $deflator = null)
     {
         $this->parser = $parser;
+        $this->manager = $manager;
         $this->deflator = $deflator;
         $this->inflator = $inflator;
     }
@@ -121,7 +123,7 @@ public function setInflator(ProcessBuilderFactoryInterface $processBuilder)
      *
      * @throws RuntimeException In case object could not be instanciated
      */
-    public static function newInstance($inflatorBinaryName = null, $deflatorBinaryName = null)
+    public static function newInstance(ResourceManager $manager, $inflatorBinaryName = null, $deflatorBinaryName = null)
     {
         $finder = new ExecutableFinder();
 
@@ -145,7 +147,7 @@ public static function newInstance($inflatorBinaryName = null, $deflatorBinaryNa
             );
         }
 
-        return new static($outputParser, $inflator, $deflator);
+        return new static($outputParser, $manager, $inflator, $deflator);
     }
 
     /**
@@ -172,73 +174,4 @@ protected function addBuilderFileArgument(array $files, ProcessBuilder $builder)
 
         return 0 !== $iterations;
     }
-
-    /**
-     * Adds a resource to argument list
-     *
-     * @param Array          $files   An array of resource or resource URI
-     * @param ProcessBuilder $builder A Builder instance
-     *
-     * @return AbstractBinaryAdapter
-     *
-     * @throws RuntimeException In case resource could not be opened or readed
-     * @throws IOException In case Temporary direcory or fetched file could not be created
-     * @throws InvalidArgumentException In case the provided resource is invalid
-     */
-    protected function addBuilderResourceArgument(array $files, ProcessBuilder $builder)
-    {
-        array_walk($files, function($resource, $location) use ($builder) {
-            $stream = null;
-            $location = ltrim($location, '/');
-
-            if (is_resource($resource)) {
-                $stream = $resource;
-            } elseif (is_string($resource)) {
-                $stream = fopen($resource, 'r');
-            }
-
-            if (null === $stream) {
-                throw new InvalidArgumentException('A resource must be either a resource or a path to the resource');
-            }
-
-            if (false === $stream) {
-                throw new RuntimeException(sprintf('Fail to open stream %s', $resource));
-            }
-
-            if (is_numeric($location)) {
-                $meta = stream_get_meta_data($stream);
-                $location = basename($meta['uri']);
-            }
-
-            $tempFileInfo = new \SplFileInfo(sprintf('%s/%s', getcwd(), $location));
-
-            if (!is_dir($tempFileInfo->getPath()) && !mkdir($tempFileInfo->getPath(), 0777, true)) {
-                throw new IOException(sprintf('Fail to create directory %s', $tempFileInfo->getPath()));
-            }
-
-            if (false === $content = stream_get_contents($stream)) {
-                throw new RuntimeException(sprintf('Fail to fetch content from %s', $location));
-            }
-
-            try {
-                $tempFile = $tempFileInfo->openFile('w');
-                
-                if (null !== $tempFile->fwrite($content)) {
-                    $builder->add($location);
-                }
-
-                unset($tempFile, $tempFileInfo);
-            } catch (\RuntimeException $e) {
-                throw IOException(
-                    sprintf('failed to write %s', $tempFileInfo->getRealPath()),
-                    $e->getCode(),
-                    $e
-                );
-            }
-
-            fclose($stream);
-        });
-
-        return $this;
-    }
 }

src/Alchemy/Zippy/Adapter/AbstractBinaryAdapter.php

@@ -17,8 +17,7 @@
 use Alchemy\Zippy\Archive\Archive;
 use Alchemy\Zippy\Exception\InvalidArgumentException;
 use Alchemy\Zippy\Exception\RuntimeException;
-use Symfony\Component\Filesystem\Filesystem;
-use Symfony\Component\Filesystem\Exception\IOException;
+use Alchemy\Zippy\Resource\ResourceManager;
 
 abstract class AbstractTarAdapter extends AbstractBinaryAdapter
 {
@@ -46,18 +45,11 @@ public function add(ResourceInterface $resource, $files, $recursive = true)
         return $this->doAdd($this->getLocalOptions(), $resource, $files, $recursive);
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function addStream($path, $files)
-    {
-        return $this->doAddStream($this->getLocalOptions(), $path, $files);
-    }
 
     /**
      * @inheritdoc
      */
-    public function remove(ResourceInterface $resource, $files)
+    public function remove($path, $files)
     {
         return $this->doRemove($this->getLocalOptions(), $resource, $files);
     }
@@ -178,7 +170,7 @@ protected function doCreate($options, $path, $files = null, $recursive = true)
             ));
         }
 
-        return new Archive($path, $this, new FileResource($path));
+        return new Archive($path, $this, $this->manager);
     }
 
     protected function doListMembers($options, ResourceInterface $resource)
@@ -263,57 +255,6 @@ protected function doAdd($options, ResourceInterface $resource, $files, $recursi
         return $files;
     }
 
-    protected function doAddStream($options, $path, $files)
-    {
-        $files = (array) $files;
-
-        $builder = $this
-            ->inflator
-            ->create();
-
-        $builder
-            ->add('--append')
-            ->add(sprintf('--file=%s', $path));
-
-        $savedWorkingDirectory = getcwd();
-
-        $tempDir = sprintf('%s/%s', sys_get_temp_dir(), uniqid('zippy_'));
-
-        if (!is_dir($tempDir)) {
-            mkdir($tempDir);
-        }
-
-        // change working directory
-        chdir($tempDir);
-
-        if (!$this->addBuilderResourceArgument($files, $builder)) {
-            chdir($savedWorkingDirectory);
-            throw new InvalidArgumentException('Invalid streams');
-        }
-
-        $process = $builder->getProcess();
-
-        $process->run();
-
-        chdir($savedWorkingDirectory);
-
-        $filesystem = new Filesystem();
-
-        try {
-            $filesystem->remove($tempDir);
-        } catch (IOException $e) {
-
-        }
-
-        if (!$process->isSuccessful()) {
-            throw new RuntimeException(sprintf(
-                'Unable to execute the following command %s {output: %s}',
-                $process->getCommandLine(),
-                $process->getErrorOutput()
-            ));
-        }
-    }
-
     protected function doRemove($options, $path, $files)
     {
         $files = (array) $files;

src/Alchemy/Zippy/Adapter/AbstractTarAdapter.php

@@ -18,6 +18,12 @@
 use Alchemy\Zippy\Adapter\GNUTar\TarGNUTarAdapter;
 use Alchemy\Zippy\Adapter\GNUTar\TarGzGNUTarAdapter;
 use Alchemy\Zippy\Adapter\GNUTar\TarBz2GNUTarAdapter;
+use Alchemy\Zippy\Resource\ResourceManager;
+use Alchemy\Zippy\Resource\RequestMapper;
+use Alchemy\Zippy\Resource\TeleporterContainer;
+use Alchemy\Zippy\Resource\ResourceTeleporter;
+use Alchemy\Zippy\Resource\TargetLocator;
+use Symfony\Component\Filesystem\Filesystem;
 
 class AdapterContainer extends \Pimple
 {
@@ -33,6 +39,30 @@ public static function load()
         $container['zip.inflator'] = null;
         $container['zip.deflator'] = null;
 
+        $container['resource-manager'] = $container->share(function ($container) {
+            return new ResourceManager($container['request-mapper'], $container['resource-teleporter'], $container['filesystem']);
+        });
+
+        $container['request-mapper'] = $container->share(function ($container) {
+            return new RequestMapper($container['target-locator']);
+        });
+
+        $container['target-locator'] = $container->share(function () {
+            return new TargetLocator();
+        });
+
+        $container['teleporter-container'] = $container->share(function ($container) {
+            return TeleporterContainer::load();
+        });
+
+        $container['resource-teleporter'] = $container->share(function ($container) {
+            return new ResourceTeleporter($container['teleporter-container']);
+        });
+
+        $container['filesystem'] = $container->share(function () {
+            return new Filesystem();
+        });
+
         $container['Alchemy\\Zippy\\Adapter\\ZipAdapter'] = $container->share(function ($container) {
             return ZipAdapter::newInstance($container['zip.inflator'], $container['zip.deflator']);
         });