Adds a check for the Unix tree command >=v2.*

Author: raphaelstolt

README.md

@@ -197,23 +197,19 @@ Available presets are `PHP`, `Python`, and `Go`. With `PHP` being the default.
 #### Tree command
 
 The `tree` command of the lean package validator allows you to inspect the __flat__ `source` and `dist package` structure
-of the given project/micro-package. It requires the [tree](https://en.wikipedia.org/wiki/Tree_(command)) command to be installed.
+of the given project/micro-package. It requires the [tree](https://en.wikipedia.org/wiki/Tree_(command)) Unix command to
+be installed in version `>=2.0`.
 
 ``` bash
 lean-package-validator tree [<directory>] --src
 
 Package: stolt/lean-package-validator
 .
 ├── bin
-├── coverage-reports
 ├── example
-├── .git
 ├── .github
-├── .idea
-├── .phpunit.cache
 ├── src
 ├── tests
-├── vendor
 ├── box.json.dist
 ├── CHANGELOG.md
 ├── composer.json
@@ -230,7 +226,7 @@ Package: stolt/lean-package-validator
 ├── phpunit.xml.dist
 └── README.md
 
-10 directories, 15 files
+5 directories, 15 files
 ```
 
 ``` bash

src/Commands/TreeCommand.php

@@ -81,7 +81,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln($verboseOutput, OutputInterface::VERBOSITY_VERBOSE);
 
         $output->writeln('Package: <info>' . $this->getPackageName() . '</info>');
-        $output->write($this->tree->getTreeForDistPackage($this->directoryToOperateOn));
+        $output->write($this->tree->getTreeForDistPackage());
 
         return Command::SUCCESS;
     }

src/Tree.php

@@ -2,6 +2,7 @@
 
 namespace Stolt\LeanPackage;
 
+use Stolt\LeanPackage\Exceptions\GitHeadNotAvailable;
 use Stolt\LeanPackage\Exceptions\GitNotAvailable;
 use Stolt\LeanPackage\Exceptions\TreeNotAvailable;
 use Stolt\LeanPackage\Helpers\Str as OsHelper;
@@ -11,39 +12,50 @@ final class Tree
     private Archive $archive;
 
     /**
-     * @throws TreeNotAvailable
      * @throws GitNotAvailable
      */
     public function __construct(Archive $archive)
     {
-        if (!$this->detectTreeCommand()) {
-            throw new TreeNotAvailable();
-        }
-
         $this->archive = $archive;
 
         if (!$this->archive->isGitCommandAvailable()) {
             throw new GitNotAvailable();
         }
     }
 
+    /**
+     * @throws TreeNotAvailable
+     */
     public function getTreeForSrc(string $directory): string
     {
-        $command = 'tree -aL 1 --dirsfirst ' . \escapeshellarg($directory) . ' -I .git  2>&1';
+        if (!$this->detectTreeCommand()) {
+            throw new TreeNotAvailable('Unix tree command is not available.');
+        }
 
-        if ((new OsHelper())->isMacOs()) {
-            $command = 'tree -aL 1 --dirsfirst ' . \escapeshellarg($directory) . ' --gitignore -I .git  2>&1';
+        if (!$this->detectTreeCommandVersion()) {
+            throw new TreeNotAvailable('Required tree command version >=2.0 is not available.');
         }
 
+        $command = 'tree -aL 1 --dirsfirst ' . \escapeshellarg($directory) . ' --gitignore -I .git  2>&1';
+
         \exec($command, $output);
 
         $output[0] = '.';
 
         return \implode(PHP_EOL, $output) . PHP_EOL;
     }
 
-    public function getTreeForDistPackage(string $directory): string
+    /**
+     * @throws TreeNotAvailable
+     * @throws GitHeadNotAvailable
+     * @throws GitNotAvailable
+     */
+    public function getTreeForDistPackage(): string
     {
+        if (!$this->detectTreeCommand()) {
+            throw new TreeNotAvailable('Unix tree command is not available.');
+        }
+
         $this->archive->createArchive();
 
         $command = 'tar --list --exclude="*/*" --file ' . \escapeshellarg($this->archive->getFilename()) . ' | tree -aL 1 --dirsfirst --fromfile . 2>&1';
@@ -59,13 +71,27 @@ public function getTreeForDistPackage(string $directory): string
         return \implode(PHP_EOL, $output) . PHP_EOL;
     }
 
-    protected function detectTreeCommand(string $command = 'tree'): bool
+    protected function detectTreeCommand(): bool
     {
-        \exec('where ' . $command . ' 2>&1', $output, $returnValue);
+        $command = 'where tree 2>&1';
+
         if ((new OsHelper())->isWindows() === false) {
-            \exec('which ' . $command . ' 2>&1', $output, $returnValue);
+            $command = 'which tree 2>&1';
         }
 
+        \exec($command, $output, $returnValue);
+
         return $returnValue === 0;
     }
+
+    protected function detectTreeCommandVersion(): bool
+    {
+        \exec('tree --version 2>&1', $output);
+
+        if (\strpos($output[0], 'v2')) {
+            return true;
+        }
+
+        return false;
+    }
 }