capistrano-craft 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0307770f776f3de8aa29e6903060ef0549e7bf81
-  data.tar.gz: f4d15ac89b13f88992b32e9b0c67d4cf0262695e
+  metadata.gz: 249fbb6884c17a8c88689bb3766cf51d64ecd3d6
+  data.tar.gz: 77503ac4c7d107900c120cca8ca06f4d97feaa4a
 SHA512:
-  metadata.gz: 5d30b65c31c6f3cabaac3711ed517b7986d4cd75db98320aee342f35670297bbdc96b327ae96f3b7587d8878e55d43950291f57ce89e7773fe4d0d23bd800ebf
-  data.tar.gz: 2d0c5092c8f1cc8c500e34d937cbc0499885303c3549c19100f284c65cd65efd1d1716acc72dc3e27ec59816bc46e859322e59a6ab2b05b930f05f36c8adee81
+  metadata.gz: 52ac278d6f8e8460c6cc3c5ef5315621d10f16b4be981bd9fae1913774afc8158a1d26785357a4ccaa075e2cee7ae2540ead7bc5bfcb89f0f584deb0215b38a6
+  data.tar.gz: 8da018126d8717da21f1fcf9bd3d4eb670f11bc7dfbce5af5a3e63e850f8994a9299599730eafcc7c0f61d6986b8f78b1dc009c0f5e87229288f90cf075e62b0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-craft (0.1.2)
+    capistrano-craft (0.1.3)
       capistrano (~> 3.1)
       capistrano-composer (~> 0.0.6)
 

data/README.md

@@ -1,6 +1,6 @@
 # Capistrano::Craft
 
-As of October 2019 this is very still very much under development. Please make sure you have appropriate backups to avoid any potential data loss.
+As of November 2019 this is very still very much under development. Please make sure you have appropriate backups to avoid any potential data loss.
 
 This gem automates the deployment of Craft CMS apps with Capistrano. It will automatically detect local and remote environment settings to make synchronizing of database and assets straightforward.
 
@@ -18,8 +18,23 @@ Or install system wide:
 
 ## Usage
 
-    $ staging deploy
-    $ production deploy
+The setting you will likely need to customize is:
+```
+# This should be your command to compile assets for production
+set :craft_compile_assets, "npm run production --production --silent"
+```
+
+If you are using PHP-FPM it is necessary to restart it after deployment. Currently capistrano-craft doesn't handle this for you and you may need to add something along the lines of the following to your `deploy.rb` file.
+
+```
+before 'deploy:published', 'fpm_restart'
+
+task :fpm_restart do
+  on release_roles :all do |host|
+    execute "sudo service php7.3-fpm restart"
+  end
+end
+```
 
 ### Compiling Assets
 
@@ -28,11 +43,13 @@ Change `:craft_compile_assets` to be your production asset compilation command.
 ### Synchronize Database
 
 
+### Upgrading Craft CMS
 
-### Settings
-
+When you deploy, Capistrano will run composer automatically installing your chosen packages. If you have upgraded Craft locally, the new version will automatically be installed on your deployment.
 
+If you were to upgrade on the server, then run `cap production craft:pull` to sync the database and assets down, the database would be running a newer version than your local codebase. This should be easily resolved by updating through Composer or the Craft admin area (assuming Craft runs correctly with the conflict).
 
+### Settings
 
 Full list of available settings:
 

data/lib/capistrano/craft/defaults.rb

@@ -17,7 +17,7 @@ set :craft_local_backups, "backups"
 set :craft_remote_backups, "shared/backups"
 
 # assets
-set :craft_compile_assets, "production --quiet"
+set :craft_compile_assets, "production"
 
 # console
 set :craft_console_path, -> { "craft" }

data/lib/capistrano/craft/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Craft
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/capistrano/tasks/craft.rake

@@ -17,10 +17,11 @@ namespace :craft do
   end
 
   namespace :cache do
-    desc "Run the cache/flush Craft command"
-    task :flush do
+    desc "Run the clear-caches/all Craft command"
+    task :clear do
       on release_roles(fetch(:craft_deploy_roles)) do
-        craft_console "cache/flush"
+        craft_console "cache/flush-all"
+        craft_console "clear-caches/all"
       end
     end
   end
@@ -35,6 +36,13 @@ namespace :craft do
         end
       end
     end
+
+    desc "Re-indexes assets across all volumes"
+    task :reindex do
+      on release_roles(fetch(:craft_deploy_roles)) do
+        craft_console "index-assets/all"
+      end
+    end
   end
 
   desc "Pull database and sync assets"
@@ -46,7 +54,8 @@ namespace :craft do
 	desc "Push database and sync assets"
 	task :push do
 		invoke "db:push"
-		invoke "craft:assets:sync"
+    invoke "craft:assets:sync"
+    invoke "craft:assets:reindex"
   end
   
 end

data/lib/capistrano/tasks/db.rake

@@ -19,15 +19,16 @@ namespace :db do
   task :backup do
     on release_roles(fetch(:craft_deploy_roles)) do
       # Export remote dump file
-      backup_file = "#{fetch(:deploy_to)}/shared/db.sql"
-      database_dump(fetch(:craft_remote_env), backup_file)
+      remote_backup_file = "#{fetch(:deploy_to)}/shared/db.sql"
+      database_dump(fetch(:craft_remote_env), remote_backup_file)
 
-      download! backup_file, backup_file_name
+      local_backup_file = backup_file_name
+      download! remote_backup_file, local_backup_file
 
       # Remove temp file
       execute "rm #{backup_file}"
 
-      set :backup_filename, backup_file_name
+      set :backup_filename, local_backup_file
     end
   end
 

data/lib/capistrano/tasks/deploy.rake

@@ -7,12 +7,12 @@ namespace :deploy do
   task :compile_assets do
     on release_roles(fetch(:craft_deploy_roles)) do
       within release_path do
-        execute :npm, "install", "--silent"
-        execute :npm, "run", fetch(:craft_compile_assets)
+        execute :yarn, "install"
+        execute :yarn, "run", fetch(:craft_compile_assets)
       end
     end
   end
 
   after 'deploy:updated', 'deploy:compile_assets'
-  after 'deploy:finished', 'craft:cache:flush'
+  after 'deploy:finished', 'craft:cache:clear'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-craft
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Chris Dyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano