Merge pull request #15 from Muetze42/development

Add `custom-assets:after-composer-update` command

README.md

@@ -14,7 +14,7 @@ Attention. The original vendor files will be overwritten.
 
 You must run the `php artisan nova:custom-assets` after every composer update!
 
-Tip: You can replace `@php artisan nova:publish` with `@php artisan nova:custom-assets` in Your `composer.json`
+Tip: You can replace `@php artisan nova:publish` with `@php artisan custom-assets:after-composer-update` in Your `composer.json`
 
 ## Install
 
@@ -32,6 +32,12 @@ php artisan nova:custom-assets
 
 ### Optional
 
+#### Run Command Only If A Nova Update Is Detected (Or The Package Has No Version Saved)
+
+```
+php aritsan custom-assets:after-composer-update
+```
+
 #### Publish Nova Assets Via Command
 
 ```
@@ -59,10 +65,12 @@ After a Nova update, you need to check your resource files to see if they are st
 I make not a release for every example. For all example resources take a look in the `resources` folder of the GitHub repository
 
 ## Other Composer Or NPM Command
+
 Create a command:
 `php artisan make:command CustomAssetsCommand`
 
 with followingen content:
+
 ```php
 <?php
 

src/Console/Commands/AfterComposerUpdateCommand.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace NormanHuth\NovaAssetsChanger\Console\Commands;
+
+use Laravel\Nova\Nova;
+
+class AfterComposerUpdateCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'custom-assets:after-composer-update';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'run command only if a Nova update is detected (or the package has no version saved)';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle(): int
+    {
+        $currentNovaVersion = Nova::version();
+        $changerVersion = null;
+        if ($this->storage->exists($this->memoryFile)) {
+            $content = json_decode($this->storage->get($this->memoryFile), true);
+            if (!empty($content[$this->lastUseNovaVersionKey])) {
+                $changerVersion = $content[$this->lastUseNovaVersionKey];
+            }
+        }
+
+        if ($currentNovaVersion != $changerVersion) {
+            $this->info('Run `nova:custom-assets` command');
+            $this->call('nova:custom-assets');
+            return 0;
+        }
+
+        $this->alert('No Nova Update detected. Don’t run `nova:custom-assets` command');
+        return 0;
+    }
+}

src/Console/Commands/Command.php

@@ -36,6 +36,14 @@ class Command extends BaseCommand
      */
     protected string $resourcePath = 'Nova';
 
+    /**
+     * File for saving package data
+     *
+     * @var string
+     */
+    protected string $memoryFile = 'asset-changer.json';
+    protected string $lastUseNovaVersionKey = 'last-used-nova-version';
+
     /**
      * Create a new console command instance.
      * Create 2 new On-Demand Disks

src/Console/Commands/CustomAssetsCommand.php

@@ -2,6 +2,7 @@
 
 namespace NormanHuth\NovaAssetsChanger\Console\Commands;
 
+use Laravel\Nova\Nova;
 use NormanHuth\NovaAssetsChanger\Helpers\Process;
 
 class CustomAssetsCommand extends Command
@@ -78,10 +79,19 @@ public function handle(): int
         $this->npmInstall();
         $this->npmProduction();
         $this->publishNovaAssets();
+        $this->saveCurrentNovaVersion();
 
         return 0;
     }
 
+    /**
+     * @return void
+     */
+    protected function saveCurrentNovaVersion(): void
+    {
+        $this->storage->put($this->memoryFile, json_encode([$this->lastUseNovaVersionKey => Nova::version()]));
+    }
+
     /**
      * @return void
      */
@@ -113,15 +123,15 @@ protected function npmProduction(): void
     protected function reinstallNova(): void
     {
         $this->info('Reinstall laravel/nova');
-        $succes = false;
+        $success = false;
         $this->process->runCommand($this->composerCommand.' reinstall laravel/nova');
         foreach ($this->process->getOutput() as $output) {
             if (str_contains($output, $this->installStrContainsCheck1) && str_contains($output, $this->installStrContainsCheck2)) {
-                $succes = true;
+                $success = true;
             }
             $this->line($output);
         }
-        if (!$succes) {
+        if (!$success) {
             $this->error('It could’t detect a new installation of Nova.');
             die();
         }

src/PackageServiceProvider.php

@@ -3,9 +3,6 @@
 namespace NormanHuth\NovaAssetsChanger;
 
 use Illuminate\Support\ServiceProvider;
-use NormanHuth\NovaAssetsChanger\Console\Commands\CustomAssetsCommand;
-use NormanHuth\NovaAssetsChanger\Console\Commands\PublishCommand;
-use NormanHuth\NovaAssetsChanger\Console\Commands\PublishFieldCommand;
 
 class PackageServiceProvider extends ServiceProvider
 {
@@ -19,12 +16,23 @@ public function boot(): void
         $this->publishes([
             __DIR__.'/../resources' => resource_path('Nova'),
         ]);
+
         if ($this->app->runningInConsole()) {
-            $this->commands([
-                CustomAssetsCommand::class,
-                PublishCommand::class,
-                PublishFieldCommand::class,
-            ]);
+            $this->commands($this->getCommands());
         }
     }
+
+    /**
+     * Get all package commands
+     *
+     * @return array
+     */
+    protected function getCommands(): array
+    {
+        return array_filter(array_map(function ($item) {
+            return '\\'.__NAMESPACE__.'\\Console\\Commands\\'.pathinfo($item, PATHINFO_FILENAME);
+        }, glob(__DIR__.'/Console/Commands/*.php')), function ($item) {
+            return class_basename($item) != 'Command';
+        });
+    }
 }