Refactor message on signle lines and using colors. Also take the --no-progress option into account.

Author: FlorentTorregrosa

src/FileFetcher.php

@@ -23,29 +23,40 @@ class FileFetcher {
    */
   protected $io;
 
+  /**
+   * @var bool
+   *
+   * A boolean indicating if progress should be displayed.
+   */
+  protected $progress;
+
   protected $source;
   protected $filenames;
   protected $fs;
 
-  public function __construct(RemoteFilesystem $remoteFilesystem, $source, $filenames = [], IOInterface $io) {
+  public function __construct(RemoteFilesystem $remoteFilesystem, $source, $filenames = [], IOInterface $io, $progress = TRUE) {
     $this->remoteFilesystem = $remoteFilesystem;
     $this->io = $io;
     $this->source = $source;
     $this->filenames = $filenames;
     $this->fs = new Filesystem();
+    $this->progress = $progress;
   }
 
   public function fetch($version, $destination) {
     array_walk($this->filenames, function ($filename) use ($version, $destination) {
       $url = $this->getUri($filename, $version);
       $this->fs->ensureDirectoryExists($destination . '/' . dirname($filename));
-      $this->io->write("Going to download the file $filename");
-      $this->io->write("  from: $url");
-      $this->io->write("  to: $destination/$filename");
-      $this->remoteFilesystem->copy($url, $url, $destination . '/' . $filename);
-      // Used to put a new line because the remote file system does not put
-      // one.
-      $this->io->write('');
+      if ($this->progress) {
+        $this->io->writeError("  - <info>$filename</info> (<comment>$url</comment>): ", FALSE);
+        $this->remoteFilesystem->copy($url, $url, $destination . '/' . $filename, $this->progress);
+        // Used to put a new line because the remote file system does not put
+        // one.
+        $this->io->writeError('');
+      }
+      else {
+        $this->remoteFilesystem->copy($url, $url, $destination . '/' . $filename, $this->progress);
+      }
     });
   }
 

src/Handler.php

@@ -33,6 +33,13 @@ class Handler {
    */
   protected $io;
 
+  /**
+   * @var bool
+   *
+   * A boolean indicating if progress should be displayed.
+   */
+  protected $progress;
+
   /**
    * @var \Composer\Package\PackageInterface
    */
@@ -47,6 +54,7 @@ class Handler {
   public function __construct(Composer $composer, IOInterface $io) {
     $this->composer = $composer;
     $this->io = $io;
+    $this->progress = TRUE;
   }
 
   /**
@@ -66,6 +74,15 @@ protected function getCorePackage($operation) {
     return NULL;
   }
 
+  /**
+   * Get the command options.
+   *
+   * @param \Composer\Plugin\CommandEvent $event
+   */
+  public function onCmdBeginsEvent(\Composer\Plugin\CommandEvent $event) {
+    $this->progress = !($event->getInput()->getOption('no-progress'));
+  }
+
   /**
    * Marks scaffolding to be processed after an install or update command.
    *
@@ -114,10 +131,10 @@ public function downloadScaffold() {
 
     $remoteFs = new RemoteFilesystem($this->io);
 
-    $fetcher = new PrestissimoFileFetcher($remoteFs, $options['source'], $files, $this->io, $this->composer->getConfig());
+    $fetcher = new PrestissimoFileFetcher($remoteFs, $options['source'], $files, $this->io, $this->progress, $this->composer->getConfig());
     $fetcher->fetch($version, $webroot);
 
-    $initialFileFetcher = new InitialFileFetcher($remoteFs, $options['source'], $this->getInitial(), $this->io);
+    $initialFileFetcher = new InitialFileFetcher($remoteFs, $options['source'], $this->getInitial(), $this->io, $this->progress);
     $initialFileFetcher->fetch($version, $webroot);
 
     // Call post-scaffold scripts.

src/InitialFileFetcher.php

@@ -15,13 +15,16 @@ public function fetch($version, $destination) {
       if (!file_exists($target)) {
         $url = $this->getUri($sourceFilename, $version);
         $this->fs->ensureDirectoryExists($destination . '/' . dirname($filename));
-        $this->io->write("Going to download the file $filename");
-        $this->io->write("  from: $url");
-        $this->io->write("  to: $target");
-        $this->remoteFilesystem->copy($url, $url, $target);
-        // Used to put a new line because the remote file system does not put
-        // one.
-        $this->io->write('');
+        if ($this->progress) {
+          $this->io->writeError("  - <info>$filename</info> (<comment>$url</comment>): ", FALSE);
+          $this->remoteFilesystem->copy($url, $url, $target, $this->progress);
+          // Used to put a new line because the remote file system does not put
+          // one.
+          $this->io->writeError('');
+        }
+        else {
+          $this->remoteFilesystem->copy($url, $url, $target, $this->progress);
+        }
       }
     });
   }

src/Plugin.php

@@ -11,6 +11,8 @@
 use Composer\Installer\PackageEvent;
 use Composer\Installer\PackageEvents;
 use Composer\IO\IOInterface;
+use Composer\Plugin\CommandEvent;
+use Composer\Plugin\PluginEvents;
 use Composer\Plugin\PluginInterface;
 use Composer\Script\ScriptEvents;
 
@@ -45,9 +47,19 @@ public static function getSubscribedEvents() {
       //PackageEvents::POST_PACKAGE_UNINSTALL => 'postPackage',
       //ScriptEvents::POST_INSTALL_CMD => 'postCmd',
       ScriptEvents::POST_UPDATE_CMD => 'postCmd',
+      PluginEvents::COMMAND => 'cmdBegins',
     );
   }
 
+  /**
+   * Command begins event callback.
+   *
+   * @param \Composer\Plugin\CommandEvent $event
+   */
+  public function cmdBegins(\Composer\Plugin\CommandEvent $event) {
+    $this->handler->onCmdBeginsEvent($event);
+  }
+
   /**
    * Post package event behaviour.
    *

src/PrestissimoFileFetcher.php

@@ -19,8 +19,8 @@ class PrestissimoFileFetcher extends FileFetcher {
    */
   protected $config;
 
-  public function __construct(\Composer\Util\RemoteFilesystem $remoteFilesystem, $source, array $filenames = [], IOInterface $io, Config $config) {
-    parent::__construct($remoteFilesystem, $source, $filenames, $io);
+  public function __construct(\Composer\Util\RemoteFilesystem $remoteFilesystem, $source, array $filenames = [], IOInterface $io, $progress = TRUE, Config $config) {
+    parent::__construct($remoteFilesystem, $source, $filenames, $io, $progress);
     $this->config = $config;
   }
 
@@ -37,10 +37,16 @@ protected function fetchWithPrestissimo($version, $destination) {
     array_walk($this->filenames, function ($filename) use ($version, $destination, &$requests) {
       $url = $this->getUri($filename, $version);
       $this->fs->ensureDirectoryExists($destination . '/' . dirname($filename));
-      $this->io->write("Going to download the file $filename");
-      $this->io->write("  from: $url");
-      $requests[] = new CopyRequest($url, $destination . '/' . $filename, false, $this->io, $this->config);
-      $this->io->write("  to: $destination/$filename");
+      if ($this->progress) {
+        $this->io->writeError("  - <info>$filename</info> (<comment>$url</comment>): ", FALSE);
+        $requests[] = new CopyRequest($url, $destination . '/' . $filename, false, $this->io, $this->config);
+        // Used to put a new line because the remote file system does not put
+        // one.
+        $this->io->writeError('');
+      }
+      else {
+        $requests[] = new CopyRequest($url, $destination . '/' . $filename, false, $this->io, $this->config);
+      }
     });
 
     $successCnt = $failureCnt = 0;
@@ -54,8 +60,10 @@ protected function fetchWithPrestissimo($version, $destination) {
       $result = $multi->getFinishedResults();
       $successCnt += $result['successCnt'];
       $failureCnt += $result['failureCnt'];
-      foreach ($result['urls'] as $url) {
-        $this->io->writeError("    <comment>$successCnt/$totalCnt</comment>:\t$url", true, \Composer\IO\IOInterface::VERBOSE);
+      if ($this->progress) {
+        foreach ($result['urls'] as $url) {
+          $this->io->writeError("    <comment>$successCnt/$totalCnt</comment>:\t$url", true, \Composer\IO\IOInterface::VERBOSE);
+        }
       }
     } while ($multi->remain());
   }