Merge pull request #161 from xemlock/console-output

Add console output

Author: garak

src/Bowerphp/Bowerphp.php

@@ -105,19 +105,17 @@ public function installPackage(PackageInterface $package, InstallerInterface $in
 
         // if package is already installed, match current version with latest available version
         if ($this->isPackageInstalled($package)) {
+            $this->output->writelnInfoPackage($package, 'validate', sprintf('%s against %s#%s', $packageTag, $package->getName(), $package->getRequiredVersion()));
             $packageBower = $this->config->getPackageBowerFileContent($package);
             if ($packageTag == $packageBower['version']) {
                 // if version is fully matching, there's no need to install
                 return;
             }
         }
 
-        $this->output->writelnInfoPackage($package);
-
-        $this->output->writelnInstalledPackage($package);
-
         $this->cachePackage($package);
 
+        $this->output->writelnInstalledPackage($package);
         $installer->install($package);
 
         $overrides = $this->config->getOverrideFor($package->getName());
@@ -182,17 +180,18 @@ public function updatePackage(PackageInterface $package, InstallerInterface $ins
         $package->setRequires(isset($bower['dependencies']) ? $bower['dependencies'] : null);
 
         $packageTag = $this->getPackageTag($package);
+        $this->output->writelnInfoPackage($package, 'validate', sprintf('%s against %s#%s', $packageTag, $package->getName(), $package->getRequiredVersion()));
+
         $package->setRepository($this->repository);
         if ($packageTag == $package->getVersion()) {
             // if version is fully matching, there's no need to update
             return;
         }
         $package->setVersion($packageTag);
 
-        $this->output->writelnUpdatingPackage($package);
-
         $this->cachePackage($package);
 
+        $this->output->writelnUpdatingPackage($package);
         $installer->update($package);
 
         $overrides = $this->config->getOverrideFor($package->getName());
@@ -448,6 +447,8 @@ protected function findPackage($name)
      */
     private function cachePackage(PackageInterface $package)
     {
+        $this->output->writelnInfoPackage($package, 'download');
+
         // get release archive from repository
         $file = $this->repository->getRelease();
 

src/Bowerphp/Output/BowerphpConsoleOutput.php

@@ -31,11 +31,15 @@ public function __construct(OutputInterface $output)
      * writelnInfoPackage
      *
      * @param PackageInterface $package
+     * @param string           $action
+     * @param string           $message
      */
-    public function writelnInfoPackage(PackageInterface $package)
+    public function writelnInfoPackage(PackageInterface $package, $action = '', $message = '')
     {
-        $this->output->writeln(sprintf('bower <info>%s</info>',
-            str_pad($package->getName() . '#' . $package->getRequiredVersion(), 21, ' ', STR_PAD_RIGHT)
+        $this->output->writeln(sprintf('bower <info>%s</info> <fg=cyan>%s</fg=cyan> %s',
+            str_pad($package->getName() . '#' . $package->getRequiredVersion(), 21, ' ', STR_PAD_RIGHT),
+            str_pad($action, 10, ' ', STR_PAD_LEFT),
+            $message
         ));
     }
 

tests/Bowerphp/Test/BowerphpTest.php

@@ -204,6 +204,10 @@ public function testDoNotInstallAlreadyInstalledPackage()
             ->shouldReceive('install')->never()
         ;
 
+        $this->output
+            ->shouldReceive('writelnInfoPackage')
+        ;
+
         //$this->filesystem
         //    ->shouldReceive('exists')->with(getcwd() . '/bower_components/jquery/.bower.json')->andReturn(false)
         //    ->shouldReceive('dumpFile')->with('./tmp/jquery', "fileAsString...", 0644)

tests/Bowerphp/Test/Output/BowerphpConsoleOutputTest.php

@@ -28,7 +28,7 @@ public function testWritelnInfoPackage()
         ;
 
         $output
-            ->shouldReceive('writeln')->with('bower <info>jquery#2.1           </info>')
+            ->shouldReceive('writeln')->with('bower <info>jquery#2.1           </info> <fg=cyan>          </fg=cyan> ')
         ;
 
         $bConsoleOutput = new BowerphpConsoleOutput($output);