Exclude filename patterns from both the trigger and the output

Author: aarondfrancis

config/airdrop.php

@@ -98,6 +98,14 @@
             'exclude' => [
                 //
             ],
+
+            /*
+             * Filename strings or patterns that should be excluded,
+             * regardless of what directory they are found in.
+             */
+            'exclude_names' => [
+                '.DS_Store'
+            ]
         ]
     ],
 
@@ -128,5 +136,13 @@
         'exclude' => [
             //
         ],
+
+        /*
+         * Filename strings or patterns that should be excluded,
+         * regardless of what directory they are found in.
+         */
+        'exclude_names' => [
+            '.DS_Store'
+        ]
     ],
 ];

src/Drivers/FilesystemDriver.php

@@ -122,8 +122,11 @@ public function files()
     {
         $include = config('airdrop.outputs.include') ?? [];
         $exclude = config('airdrop.outputs.exclude') ?? [];
+        $excludeNames = config('airdrop.outputs.exclude_names') ?? [];
 
-        return FileSelection::create($include, $exclude)->selected();
+        return FileSelection::create($include, $exclude)
+            ->excludeNames($excludeNames)
+            ->selected();
     }
 
     /**

src/FileSelection.php

@@ -1,6 +1,7 @@
 <?php
 
 /**
+ * @author Aaron Francis
  * @author Spatie bvba info@spatie.be
  * @license MIT
  * @see https://github.com/spatie/laravel-backup/blob/master/src/Tasks/Backup/FileSelection.php
@@ -13,13 +14,24 @@
 
 class FileSelection
 {
-    /** @var \Illuminate\Support\Collection */
+    /**
+     * @var \Illuminate\Support\Collection
+     */
     protected $includeFilesAndDirectories;
 
-    /** @var \Illuminate\Support\Collection */
+    /**
+     * @var \Illuminate\Support\Collection
+     */
     protected $excludeFilesAndDirectories;
 
-    /** @var bool */
+    /**
+     * @var array
+     */
+    protected $excludeNames = [];
+
+    /**
+     * @var bool
+     */
     protected $shouldFollowLinks = false;
 
     /**
@@ -42,6 +54,17 @@ public function __construct($include = [], $exclude = [])
         $this->excludeFilesAndDirectories = collect($exclude);
     }
 
+    /**
+     * @param array $patterns
+     * @return FileSelection
+     */
+    public function excludeNames($patterns)
+    {
+        $this->excludeNames = $patterns;
+
+        return $this;
+    }
+
     /**
      * Do not included the given files and directories.
      *
@@ -77,10 +100,11 @@ protected function yieldSelectedFiles()
             return [];
         }
 
-        $finder = (new Finder())
+        $finder = (new Finder)
             ->ignoreDotFiles(false)
             ->ignoreVCS(false)
-            ->files();
+            ->files()
+            ->notName($this->excludeNames);
 
         if ($this->shouldFollowLinks) {
             $finder->followLinks();

src/Triggers/FileTrigger.php

@@ -24,8 +24,11 @@ public function triggerBuildWhenChanged($config = [])
     {
         $include = Arr::get($config, 'include', []);
         $exclude = Arr::get($config, 'exclude', []);
+        $excludeNames = Arr::get($config, 'exclude_names', []);
 
-        return collect($this->files($include, $exclude))
+        $files = $this->files($include, $exclude, $excludeNames);
+
+        return collect($files)
             ->diff($exclude)
             ->unique()
             ->values()
@@ -44,8 +47,10 @@ public function triggerBuildWhenChanged($config = [])
      * @param $exclude
      * @return Generator
      */
-    protected function files($include, $exclude)
+    protected function files($include, $exclude, $excludeNames)
     {
-        return FileSelection::create($include, $exclude)->selected();
+        return FileSelection::create($include, $exclude)
+            ->excludeNames($excludeNames)
+            ->selected();
     }
 }

tests/Drivers/FileSystemDriverTest.php

@@ -5,13 +5,16 @@
 
 namespace Hammerstone\Airdrop\Tests\Drivers;
 
+use Hammerstone\Airdrop\Concerns\MakesDrivers;
 use Hammerstone\Airdrop\Tests\BaseTest;
 use Hammerstone\Airdrop\Triggers\FileTrigger;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 
 class FileSystemDriverTest extends BaseTest
 {
+    use MakesDrivers;
+
     public function getEnvironmentSetUp($app)
     {
         Storage::fake('s3');
@@ -40,6 +43,26 @@ public function it_creates_and_uploads_a_zip()
         Storage::disk('s3')->assertExists('airdrop/airdrop-36eda7109ca99a5fb55cffefeca3c554.zip');
     }
 
+    /** @test */
+    public function names_get_excluded()
+    {
+        Storage::fake('s3');
+
+        config()->set('airdrop.outputs.include', [
+            base_path('tests/Support/public')
+        ]);
+
+        config()->set('airdrop.outputs.exclude_names', [
+            'app.js'
+        ]);
+
+        $files = $this->makeDriver()->files();
+
+        $this->assertCount(1, $files);
+        $this->assertStringEndsWith('css/app.css', $files[0]);
+
+    }
+
     /** @test */
     public function it_downloads_and_restores()
     {

tests/Triggers/InputFilesTriggerTest.php

@@ -72,4 +72,24 @@ public function files_get_excluded()
         $this->assertCount(1, $hashes);
         $this->assertEquals('62f6d1bfc836a1536c4869fe8f78249b', array_values($hashes)[0]);
     }
+
+    /** @test */
+    public function globs_get_excluded()
+    {
+        $config = [
+            'include' => [
+                base_path('tests/Support'),
+            ],
+            'exclude_names' => [
+                'secondary-webpack.mix.example'
+            ]
+        ];
+
+        $hashes = (new FileTrigger)->triggerBuildWhenChanged($config);
+
+        $this->assertCount(3, $hashes);
+        $this->assertEquals('d06dee8236430e6964e23ac1277ca231', array_values($hashes)[0]);
+        $this->assertEquals('01fdb3785b52fc70114089f31b1e9eff', array_values($hashes)[1]);
+        $this->assertEquals('62f6d1bfc836a1536c4869fe8f78249b', array_values($hashes)[2]);
+    }
 }