Handles differing Unix tree command behaviour

Author: raphaelstolt

peck.json

@@ -7,6 +7,7 @@
             "analyser",
             "analyse",
             "windowsish",
+            "macish",
             "lpv",
             "readme",
             "pathnames",

src/Helpers/Str.php

@@ -11,12 +11,28 @@ class Str
      *
      * @return boolean
      */
-    public function isWindows($os = PHP_OS): bool
+    public function isWindows(string $os = PHP_OS): bool
     {
         if (\strtoupper(\substr($os, 0, 3)) !== 'WIN') {
             return false;
         }
 
         return true;
     }
+
+    /**
+     * Check if the operating system is macish.
+     *
+     * @param string $os
+     *
+     * @return boolean
+     */
+    public function isMacOs(string $os = PHP_OS): bool
+    {
+        if (\strtoupper(\substr($os, 0, 3)) !== 'DAR') {
+            return false;
+        }
+
+        return true;
+    }
 }

src/Tree.php

@@ -29,10 +29,13 @@ public function __construct(Archive $archive)
 
     public function getTreeForSrc(string $directory): string
     {
-        \exec(
-            'tree -aL 1 --dirsfirst ' . \escapeshellarg($directory) . ' --gitignore -I .git  2>&1',
-            $output
-        );
+        $command = 'tree -aL 1 --dirsfirst ' . \escapeshellarg($directory) . ' -I .git  2>&1';
+
+        if ((new OsHelper())->isMacOs()) {
+            $command = 'tree -aL 1 --dirsfirst ' . \escapeshellarg($directory) . ' --gitignore -I .git  2>&1';
+        }
+
+        \exec($command, $output);
 
         $output[0] = '.';
 
@@ -43,10 +46,13 @@ public function getTreeForDistPackage(string $directory): string
     {
         $this->archive->createArchive();
 
-        \exec(
-            'tar --list --exclude="*/*" --file ' . \escapeshellarg($this->archive->getFilename()) . ' | tree -aL 1 --dirsfirst --fromfile . 2>&1',
-            $output
-        );
+        $command = 'tar --list --exclude="*/*" --file ' . \escapeshellarg($this->archive->getFilename()) . ' | tree -aL 1 --dirsfirst --fromfile . 2>&1';
+
+        if ((new OsHelper())->isMacOs()) {
+            $command = 'tar --list --file ' . \escapeshellarg($this->archive->getFilename()) . ' | tree -aL 1 --dirsfirst --fromfile . 2>&1';
+        }
+
+        \exec($command, $output);
 
         $this->archive->removeArchive();