Cleanup installation (#35)

Author: jesseleite

README.md

@@ -14,7 +14,7 @@ composer require statamic/eloquent-driver
 Publish the config file:
 
 ```
-php artisan vendor:publish --provider="Statamic\Eloquent\ServiceProvider"
+php artisan vendor:publish --tag="statamic-eloquent-config"
 ```
 
 Since Statamic uses UUIDs within content files by default, we provide two solutions depending on whether you need to use existing content.
@@ -26,15 +26,15 @@ If you're starting from scratch, we can use traditional incrementing integers fo
 
 - Delete `content/collections/pages/home.md`
 - Change the structure `tree` in `content/collections/pages.yaml` to `{}`.
-- Copy the `create_entries_table` migration into `database/migrations`.
+- Run `php artisan vendor:publish --tag="statamic-eloquent-entries-table"`.
 - Run `php artisan migrate`.
 
 ### Starting from an existing site (using UUIDs)
 
 If you're planning to use existing content, we can use the existing UUIDs. This will prevent you from needing to update any data or relationships.
 
-- In the `config/statamic-eloquent-driver.php` file, change `model` to `UuidEntryModel`.
-- Copy the `create_entries_table_with_strings` migration into `database/migrations`.
+- In the `config/statamic/eloquent-driver.php` file, change `model` to `UuidEntryModel`.
+- Run `php artisan vendor:publish --tag="statamic-eloquent-entries-table-with-string-ids"`.
 - Run `php artisan migrate`.
 - Import entries into database with `php please eloquent:import-entries`.
 

database/migrations/2020_01_01_000000_create_entries_table.php renamed to database/migrations/create_entries_table.php

@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateEntriesTableWithStrings extends Migration
+class CreateEntriesTableWithStringIds extends Migration
 {
     /**
      * Run the migrations.

database/migrations/2020_01_01_000000_create_entries_table_with_strings.php renamed to database/migrations/create_entries_table_with_string_ids.php

@@ -16,25 +16,36 @@ class ServiceProvider extends AddonServiceProvider
 {
     protected $config = false;
 
+    protected $updateScripts = [
+        \Statamic\Eloquent\Updates\MoveConfig::class,
+    ];
+
     public function boot()
     {
         parent::boot();
 
-        $this->mergeConfigFrom($config = __DIR__.'/../config/eloquent-driver.php', 'statamic-eloquent-driver');
-
-        if ($this->app->runningInConsole()) {
-            $this->publishes([$config => config_path('statamic-eloquent-driver.php')]);
+        $this->mergeConfigFrom($config = __DIR__.'/../config/eloquent-driver.php', 'statamic.eloquent-driver');
 
-            $this->commands([ImportEntries::class]);
+        if (! $this->app->runningInConsole()) {
+            return;
         }
-    }
 
-    public function register()
-    {
-        $this->registerEntries();
+        $this->publishes([
+            $config => config_path('statamic/eloquent-driver.php'),
+        ], 'statamic-eloquent-config');
+
+        $this->publishes([
+            __DIR__.'/../database/migrations/create_entries_table.php' => $this->migrationsPath('create_entries_table'),
+        ], 'statamic-eloquent-entries-table');
+
+        $this->publishes([
+            __DIR__.'/../database/migrations/create_entries_table_with_string_ids.php' => $this->migrationsPath('create_entries_table_with_string_ids'),
+        ], 'statamic-eloquent-entries-table-with-string-ids');
+
+        $this->commands([ImportEntries::class]);
     }
 
-    protected function registerEntries()
+    public function register()
     {
         Statamic::repository(EntryRepositoryContract::class, EntryRepository::class);
         Statamic::repository(CollectionRepositoryContract::class, CollectionRepository::class);
@@ -46,7 +57,14 @@ protected function registerEntries()
         });
 
         $this->app->bind('statamic.eloquent.entries.model', function () {
-            return config('statamic-eloquent-driver.entries.model');
+            return config('statamic.eloquent-driver.entries.model');
         });
     }
+
+    protected function migrationsPath($filename)
+    {
+        $date = date('Y_m_d_His');
+
+        return database_path("migrations/{$date}_{$filename}.php");
+    }
 }

src/ServiceProvider.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Statamic\Eloquent\Updates;
+
+use Statamic\UpdateScripts\UpdateScript;
+
+class MoveConfig extends UpdateScript
+{
+    public function shouldUpdate($newVersion, $oldVersion)
+    {
+        return $this->isUpdatingTo('0.2.0');
+    }
+
+    public function update()
+    {
+        $oldPath = config_path('statamic-eloquent-driver.php');
+        $newPath = config_path('statamic/eloquent-driver.php');
+
+        if ($this->files->exists($newPath) || ! $this->files->exists($oldPath)) {
+            return;
+        }
+
+        $this->files->move($oldPath, $newPath);
+
+        $this->console()->info('Eloquent driver config successfully moved to [config/statamic/eloquent-driver.php]!');
+    }
+}