capistrano-sozo_magento2 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d66531993d668be8a75fef480862d07035dcf0750f7831912f71bc749d5201
-  data.tar.gz: 5032e4073c3eed84ce9030206c0e9c3cfbdfbf29e8d12d1968802f48df3fa42b
+  metadata.gz: ab55bf423e1766857aeff0a542b1b2657e35a6401d7dda6469404df07060d90c
+  data.tar.gz: 43a54ea1407c899c1f9545c6cb6703977ac70690053f6efdd61d18024eb933dd
 SHA512:
-  metadata.gz: 3550c64e691e692c9e896078f269ecc8ef5035b3ce4c110df0020aa47cdd6d6c5e3b1bb47b58f06ef57db16b57a96510d6ac8509713fd3ff4f299519810842f1
-  data.tar.gz: 2e6f979c104a3c2d175894d0cc3e0ad08531abdc9bbfb8faa19cc2714c4d0e92bf18a2c2c6fa042f7a30a8228842167ea44ece6350482a4d886d2e344fedce98
+  metadata.gz: 0d068c92ebcd093a49b7ca63685a0d27e898aa3884d5ecd9a5ea9b7c339eae83c700eccaab3b5ac959b2c12d20cfae7d7526376365045996e8d88e5a38802dff
+  data.tar.gz: 42b84543c461b955f32cff824750a12b06ed8de464c5b6227915440b28f732a3d22355a0066bd38c45f425b16c58ecaa11e4d7ea6f40cbd7d078f15a5d5e39dd

data/.yardopts

@@ -0,0 +1,5 @@
+--protected
+--no-private
+-
+CHANGELOG.md
+LICENSE

data/CHANGELOG.md

@@ -21,7 +21,40 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
-## [v1.2.0] - 2020-03-25
+
+## [v1.4.0] - 2021-08-03
+### Added
+- New `deploy:check` info output with key information displayed.
+- Magento Cron control now included in the deployment methods with `:handle_cron` option (default false).
+- New check `sozo:git:check` to see if the branch exists in the repository before deployment begins.
+- Documented code with Yardoc
+
+### Changed
+- Delay added (3 seconds) before trying to delete a failed deployment to allow file or disk activity to finish.
+- Added sudo to failed deployments release deleting.
+- Changed maintenance mode path to use the `deploy_root` location from `current_path`
+- Checked all boolean values against string "true" or "false" using .to_s == 'true'
+
+
+## [v1.3.1] - 2021-07-29
+### Changed
+- Changed ENV options for WordPress plugins and themes removal.
+- Multi-PHP support via ability to pass PHP version via the command map.
+
+
+## [v1.3.0] - 2021-05-14
+### Added
+- New task to check for ece-patches file `.magento.env.yaml` and to apply if it finds one.
+
+
+## [v1.2.1] - 2021-05-06
+### Fixed
+- WordPress backup not respecting the :wp_backup false option
+- Erroneous symlink created inside release directories
+- Added simple text output in Slack message
+
+
+## [v1.2.0] - 2021-03-25
 ### Added
 - New variable `clear_failures` for future use.
 - New Slack class to control the message template.
@@ -38,7 +71,7 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 - Fix issue when there were less than CAP_KEEP_BACKUPS available.
 
 
-## [v1.1.0] - 2020-02-24
+## [v1.1.0] - 2021-02-24
 ### Added
 - Added defaults for the :wp_backup, :keep_backups and :slack_channel instead of using ENV's
 - Added BUILD.md for reminders on how to build and publish the gem.
@@ -54,7 +87,7 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 - Confirm command now using correct symbols to display against roles.
 
 
-## [v1.0.1] - 2020-02-20
+## [v1.0.1] - 2021-02-20
 ### Added
 - CHANGELOG.md
 - License text
@@ -64,5 +97,5 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 - Documentation references to the gem.
 
 
-### [v1.0.0] - 2020-02-20
+### [v1.0.0] - 2021-02-20
 - Initial release

data/README.md

@@ -7,7 +7,7 @@ It is advised to use bundler.
 
 1. Add the following to your projects `Gemfile`
 ```
-gem "capistrano-sozo_magento2", "~> 1.2"
+gem "capistrano-sozo_magento2", "~> 1.3"
 ```
 2. Install
 ```
@@ -62,6 +62,20 @@ If you would like to customize the linked files or directories for your project,
 append :linked_dirs, 'path/to/link'
 ```
 
+## Command Mapping
+The module assumes the following bin files are in the following locations:
+1. `php` in your path accessible from the command line as php
+2. `composer` in `/usr/local/bin/composer`
+3. `n98-magerun` in `/usr/local/bin/n98-magerun`
+
+Composer and n98-magerun command are both prefixed with the PHP path (for multi-php support), if you are overwriting these commands via the command map you will need to include the php bin in your `stage.rb` file similar to the following. 
+```
+SSHKit.config.command_map[:php] = '/usr/bin/env php74 -dmemory_limit=-1'
+SSHKit.config.command_map[:composer] = SSHKit.config.command_map[:php], '-f /usr/local/bin/composer'
+SSHKit.config.command_map[:n98magerun] = SSHKit.config.command_map[:php], '-f /usr/local/bin/n98-magerun'
+SSHKit.config.command_map[:magento] = SSHKit.config.command_map[:php], '-f bin/magento --'
+```
+
 ## Versioning
 We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/sozo-design/capistrano-sozo-magento2/tags) or [CHANGELOG.md](./CHANGELOG.md). 
 

data/lib/capistrano/sozo_magento2.rb

@@ -1,8 +1,9 @@
 require 'date'
 
-SSHKit.config.command_map[:composer] = 'php -dmemory_limit=-1 -f /usr/local/bin/composer'
-SSHKit.config.command_map[:n98magerun] = '/usr/local/bin/n98-magerun'
-SSHKit.config.command_map[:magento] = "/usr/bin/env php -d memory_limit=1G -f bin/magento --"
+SSHKit.config.command_map[:php] = '/usr/bin/env php -dmemory_limit=-1'
+SSHKit.config.command_map[:composer] = SSHKit.config.command_map[:php], '-f /usr/local/bin/composer'
+SSHKit.config.command_map[:n98magerun] = SSHKit.config.command_map[:php], '-f /usr/local/bin/n98-magerun'
+SSHKit.config.command_map[:magento] = SSHKit.config.command_map[:php], '-f bin/magento --'
 
 load File.expand_path('../tasks/sozo_magento2.rake', __FILE__)
 load File.expand_path('../tasks/deploy.rake', __FILE__)
@@ -16,11 +17,16 @@ load File.expand_path('../tasks/provision.rake', __FILE__)
 load File.expand_path('../tasks/server.rake', __FILE__)
 load File.expand_path('../tasks/wordpress.rake', __FILE__)
 
+after 'deploy:check', 'sozo:git:check'
+after 'deploy:check', 'sozo:info'
+
 after 'deploy:updating', 'composer:install'
+after 'deploy:updating', 'magento:patches:apply'
 after 'deploy:updating', 'magento:setup:permissions'
 
 before 'deploy:updated', 'slack:deploying'
 before 'deploy:updated', 'db:backup'
+before 'deploy:updated', 'magento:cron:remove'
 before 'deploy:updated', 'sozo:config:setup'
 before 'deploy:updated', 'magento:maintenance:enable'
 
@@ -37,12 +43,15 @@ after 'deploy:finishing', 'wordpress:cleanup'
 after 'deploy:finishing', 'sozo:optimise'
 after 'deploy:finishing', 'server:service:restart'
 after 'deploy:finishing', 'magento:maintenance:disable'
+after 'deploy:finishing', 'magento:cron:install'
 
 after 'deploy:finished', "slack:deployed"
 after 'deploy:finished', "db:cleanup"
 
-after 'deploy:failed', "slack:failed"
 after 'deploy:failed', "sozo:fix_current"
+after 'deploy:failed', "slack:failed"
+after 'deploy:failed', 'magento:cron:remove'
+after 'deploy:failed', 'magento:cron:install'
 after 'deploy:failed', 'magento:maintenance:disable'
 
 namespace :load do

data/lib/capistrano/sozo_magento2/defaults.rb

@@ -27,9 +27,14 @@ set :composer_require_dev_flags,    '--optimize-autoloader --prefer-dist'
 set :date_path,                     Time.now.strftime("%Y%m%d%H%M%S")
 set :backupdir,                     ->{ "#{fetch(:deploy_root)}/backups" }
 set :backupdirdate,                 ->{ "#{fetch(:backupdir)}/#{fetch(:date_path)}" }
-set :wp_backup,                     fetch(:wp_backup, true)
 set :keep_backups,                  fetch(:keep_backups, 10)
 
+# WordPress integration defaults
+set :wp_backup,                     fetch(:wp_backup, true)
+set :wp_delete_themes,              fetch(:wp_delete_themes, 'twentyseventeen twentynineteen twentytwenty')
+set :wp_delete_plugins,             fetch(:wp_delete_plugins, 'hello')
+set :wp_disable_plugins,            fetch(:wp_disable_plugins, '')
+
 # Slack defaults
 set :slack_channel,                 fetch(:slack_channel, '#deployments')
 set :slack_webhook,                 'https://hooks.slack.com/services/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'
@@ -37,6 +42,9 @@ set :slack_webhook,                 'https://hooks.slack.com/services/T06K8GR2L/
 # Deployment defaults
 set :magento_deploy_confirm_roles,  fetch(:magento_deploy_confirm_roles, [])
 
+# Handle removing and installing of cron tasks?
+set :handle_cron,                   fetch(:handle_cron, false)
+
 # Other defaults (for future use)
 # Clear or leave the failed deployment dirs
 set :clear_failures,                fetch(:clear_failures, true)

data/lib/capistrano/sozo_magento2/info.rb

@@ -0,0 +1,64 @@
+require "capistrano/doctor/output_helpers"
+
+include Capistrano::DSL
+
+# @author Clive Walkden
+module SozoMagento2
+    # Class to out key information at the end of the deploy:check command
+    module Info
+        # Class to out key information at the end of the deploy:check command
+        class Info
+            WHITELIST = %i(
+                branch
+                environment
+                handle_cron
+                slack_channel
+                url
+              ).freeze
+              private_constant :WHITELIST
+            
+            include Capistrano::Doctor::OutputHelpers
+
+            # Initialize the class with access to env data
+            def initialize(env=Capistrano::Configuration.env)
+                @env = env
+            end
+
+            # Output the key information in the CLI
+            def call
+                title("Deployment Info")
+
+                values = inspect_all_values
+
+                table(values.keys.sort_by(&:to_s)) do |key, row|
+                    row.yellow if values[key] == "\"production\""
+                    row << key.inspect
+                    row << ''
+                    row << values[key]
+                end
+                
+                puts("")
+                warning("Make sure you check these values before deploying!")
+                puts("")
+            end
+
+            private
+
+            attr_reader :env
+
+            # Read all variables in
+            def variables
+                env.variables
+            end
+
+            # Only include variables in the whitelist
+            def inspect_all_values
+                variables.keys.each_with_object({}) do |key, inspected|
+                    if WHITELIST.include?(key)
+                        inspected[key] = variables.peek(key).inspect
+                    end
+                end
+            end
+        end
+    end
+end

data/lib/capistrano/sozo_magento2/slack.rb

@@ -2,14 +2,19 @@ require 'json'
 
 include Capistrano::DSL
 
+# @author Clive Walkden
 module SozoMagento2
+    # Slack message template
     module Slack
+        # Slack message template
+        # @return [String] the template hash
         def message_hash
             {
                 "channel" => fetch(:slack_channel), 
                 "username" => "SOZO Deploy Bot", 
                 "icon_emoji" => ":satellite:", 
                 "color" => "good", 
+                "text" => "#{fetch(:url)} Deployment Process Begun",
                 "blocks" => [
                     {
                         "type" => "header", 

data/lib/capistrano/sozo_magento2/version.rb

@@ -1,5 +1,9 @@
+# @author Clive Walkden
 module Capistrano
+    # The plugin version number
     module SozoMagento2
-        VERSION = "1.2.0"
+        # The plugin version number
+        # @return [String] The gem version number
+        VERSION = "1.4.0"
     end
 end

data/lib/capistrano/tasks/composer.rake

@@ -1,3 +1,4 @@
+# Composer namespace
 namespace :composer do
     desc "Install the Composer dependencies"
     task :install do

data/lib/capistrano/tasks/db.rake

@@ -7,14 +7,14 @@ namespace :db do
             if test("[ ! -d #{fetch(:backupdir)} ]")
                 execute :mkdir, "-p", fetch(:backupdir)
             end
-
-            invoke 'db:mag_backup'
-            invoke 'db:wp_backup' if fetch(:wp_backup)
+            
+            invoke 'db:mag_db_backup'
+            invoke 'db:wp_db_backup'
         end
     end
 
     desc "Backup Magento database"
-    task :mag_backup do
+    task :mag_db_backup do
         on roles :all do
             info "Backing up Magento database."
             execute :n98magerun, 'db:dump', "--root-dir='#{fetch(:mage_root)}'",
@@ -25,14 +25,18 @@ namespace :db do
     end
 
     desc "Backup WordPress database"
-    task :wp_backup do
+    task :wp_db_backup do
         # Backup the database with a timestamp
         on roles :all do
-            info "Backing up WordPress database."
-            execute :n98magerun, 'db:dump', "--root-dir='#{fetch(:mage_root)}'",
-                                        '--compression="gzip"',
-                                        '--connection="wordpress"',
-                                        '--force', "#{fetch(:backupdir)}/#{fetch(:date_path)}_wp.sql.gz"
+            if (fetch(:wp_backup).to_s == "true")
+                info "Backing up WordPress database."
+                execute :n98magerun, 'db:dump', "--root-dir='#{fetch(:mage_root)}'",
+                                            '--compression="gzip"',
+                                            '--connection="wordpress"',
+                                            '--force', "#{fetch(:backupdir)}/#{fetch(:date_path)}_wp.sql.gz"
+            else
+                info "WordPress backup set to false"
+            end
         end
     end
 

data/lib/capistrano/tasks/deploy.rake

@@ -41,7 +41,12 @@ namespace :deploy do
     task :failed do
         on release_roles :all do |host|
             on roles :production, :staging, :testing do
-                execute :rm, '-rf', release_path
+                # Hold for a few seconds to make sure all disk related actions have completed
+                info "Waiting for file / disk writing to complete"
+                sleep(3)
+                # Added sudo to make sure we can clear everything
+                info "Removing failed deployment"
+                execute :sudo, 'rm', '-rf', release_path
                 info "Removed failed deployment"
             end
         end

data/lib/capistrano/tasks/magento2.rake

@@ -1,11 +1,37 @@
 namespace :magento do
 
+    namespace :cron do
+        desc 'Remove cron'
+        task :remove do
+            on release_roles :all do
+                info "Disabling cron"
+                if (fetch(:handle_cron).to_s == "true")
+                    execute :php, '-f', "#{fetch(:deploy_root)}/magento2/bin/magento", 'cron:remove'
+                else
+                    info "Cron not controlled by capistrano"
+                end
+            end
+        end
+
+        desc 'Install cron'
+        task :install do
+            on release_roles :all do
+                info "Enabling cron"
+                if (fetch(:handle_cron).to_s == "true")
+                    execute :php, '-f', "#{fetch(:deploy_root)}/magento2/bin/magento", 'cron:install', '-d'
+                else
+                    info "Cron not controlled by capistrano"
+                end
+            end
+        end
+    end
+
     namespace :cache do
         desc 'Flush Magento cache storage'
         task :flush do
             on release_roles :all do
                 within release_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'cache:flush'
+                    execute :php, '-f', 'magento/bin/magento', 'cache:flush'
                 end
             end
         end
@@ -14,7 +40,7 @@ namespace :magento do
         task :clean do
             on release_roles :all do
                 within release_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'cache:clean'
+                    execute :php, '-f', 'magento/bin/magento', 'cache:clean'
                 end
             end
         end
@@ -24,7 +50,7 @@ namespace :magento do
             on release_roles :all do
                 within release_path do
                     if File.exist?("magento/bin/magento")
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'cache:enable', 'config layout block_html collections reflection db_ddl eav config_integration config_integration_api full_page translate config_webservice'
+                        execute :php, '-f', 'magento/bin/magento', 'cache:enable', 'config layout block_html collections reflection db_ddl eav config_integration config_integration_api full_page translate config_webservice'
                     end
                 end
             end
@@ -34,7 +60,7 @@ namespace :magento do
         task :disable do
             on release_roles :all do
                 within release_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'cache:disable'
+                    execute :php, '-f', 'magento/bin/magento', 'cache:disable'
                 end
             end
         end
@@ -43,7 +69,7 @@ namespace :magento do
         task :status do
             on release_roles :all do
                 within release_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'cache:status'
+                    execute :php, '-f', 'magento/bin/magento', 'cache:status'
                 end
             end
         end
@@ -76,7 +102,7 @@ namespace :magento do
                     if test("[ -f #{release_path}/magento/app/etc/config.php ]")
                         # Exists, carry on
                     else
-                        execute :php, '-dmemory_limit=-1', '-f', 'bin/magento', "module:enable", "--all"
+                        execute :php, '-f', 'bin/magento', "module:enable", "--all"
                     end
                 end
             end
@@ -86,7 +112,7 @@ namespace :magento do
         task 'disable', :module_name do |t, args|
             on release_roles :staging do
                 within release_path + 'magento/' do
-                    execute :php, '-dmemory_limit=-1', '-f', 'bin/magento', "module:disable", args[:module_name]
+                    execute :php, '-f', 'bin/magento', "module:disable", args[:module_name]
                 end
             end
         end
@@ -95,7 +121,7 @@ namespace :magento do
         task 'enable', :module_name do |t, args|
             on release_roles :staging do
                 within release_path + 'magento/' do
-                    execute :php, '-dmemory_limit=-1', '-f', 'bin/magento', "module:enable", args[:module_name], '-f'
+                    execute :php, '-f', 'bin/magento', "module:enable", args[:module_name], '-f'
                     invoke 'magento:setup:upgrade'
                     invoke 'magento:setup:static-content:deploy'
                 end
@@ -112,7 +138,7 @@ namespace :magento do
                     within release_path + 'magento/' do
                         ask(:parameter, '')
                         ask(:value, '')
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', "setup:config:set", "--#{fetch(:parameter)}=#{fetch(:value)}", "--no-interaction"
+                        execute :php, '-f', 'magento/bin/magento', "setup:config:set", "--#{fetch(:parameter)}=#{fetch(:value)}", "--no-interaction"
                     end
                 end
             end
@@ -131,7 +157,7 @@ namespace :magento do
         task :upgrade do
             on release_roles :all do
                 within release_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'setup:upgrade', '-n'
+                    execute :php, '-f', 'magento/bin/magento', 'setup:upgrade', '-n'
                 end
             end
         end
@@ -172,7 +198,7 @@ namespace :magento do
             task :compile do
                 on release_roles :all do
                     within release_path do
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'setup:di:compile'
+                        execute :php, '-f', 'magento/bin/magento', 'setup:di:compile'
                     end
                 end
             end
@@ -183,7 +209,7 @@ namespace :magento do
             task :deploy do
                 on release_roles :all do
                     within release_path do
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'setup:static-content:deploy -f en_US en_GB -j6'
+                        execute :php, '-f', 'magento/bin/magento', 'setup:static-content:deploy -f en_US en_GB -j6'
                     end
                 end
             end
@@ -195,22 +221,14 @@ namespace :magento do
         desc 'Enable maintenance mode'
         task :enable do
             on release_roles :all do
-                within current_path do
-                    if File.exist?("magento/bin/magento")
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'maintenance:enable'
-                    end
-                end
+                execute :php, '-f', "#{fetch(:deploy_root)}/magento2/bin/magento", 'maintenance:enable'
             end
         end
 
         desc 'Disable maintenance mode'
         task :disable do
             on release_roles :all do
-                within current_path do
-                    if File.exist?("magento/bin/magento")
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'maintenance:disable'
-                    end
-                end
+                execute :php, '-f', "#{fetch(:deploy_root)}/magento2/bin/magento", 'maintenance:disable'
             end
         end
 
@@ -218,7 +236,7 @@ namespace :magento do
         task :status do
             on release_roles :all do
                 within current_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'maintenance:status'
+                    execute :php, '-f', 'magento/bin/magento', 'maintenance:status'
                 end
             end
         end
@@ -227,7 +245,7 @@ namespace :magento do
         task 'allow-ips', :ip do |t, args|
             on release_roles :all do
                 within current_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'maintenance:allow-ips', args[:ip]
+                    execute :php, '-f', 'magento/bin/magento', 'maintenance:allow-ips', args[:ip]
                 end
             end
         end
@@ -238,7 +256,37 @@ namespace :magento do
         task :reindex do
             on release_roles :all do
                 within release_path do
-                    execute :php, '-dmemory_limit=-1', '-f', 'magento/bin/magento', 'indexer:reindex'
+                    execute :php, '-f', 'magento/bin/magento', 'indexer:reindex'
+                end
+            end
+        end
+    end
+
+    namespace :patches do
+        desc 'Run the ece-patch tool if the .magento.env.yaml file exists'
+        task :apply do
+            on release_roles :all do
+                within release_path do
+                    if test("[ -f #{release_path}/magento/.magento.env.yaml ]")
+                        info 'Applying patches'
+                        execute :php, '-f', 'magento/vendor/bin/ece-patches', 'apply --no-interaction'
+                    else
+                        info 'No patch file found, skipping.'
+                    end
+                end
+            end
+        end
+
+        desc 'Revert patches if the .magento.env.yaml files exists'
+        task :revert do
+            on release_roles :all do
+                within release_path do
+                    if test("[ -f #{release_path}/magento/.magento.env.yaml ]")
+                        info 'Reverting patches'
+                        execute :php, '-f', 'magento/vendor/bin/ece-patches', 'revert --no-interaction'
+                    else
+                        info 'No patch file found, skipping.'
+                    end
                 end
             end
         end

data/lib/capistrano/tasks/slack.rake

@@ -1,5 +1,4 @@
 require 'capistrano/sozo_magento2/slack'
-require 'json'
 
 include SozoMagento2::Slack
 
@@ -8,6 +7,7 @@ namespace :slack do
     task :deployed do
         on roles(:all) do
             slack_template = message_hash
+            slack_template['text'] = "#{fetch(:url)} Deployment Process Successful"
             slack_template['blocks'][0]['text']['text'] = ":smile: Deployment Successful :smile:"
             slack_template['blocks'][2]['text']['text'] = "#{fetch(:url)} Deployed."
             execute :curl, "--request", "POST", "--header", "'Content-Type: application/json'", "--data", "'" + JSON.generate(slack_template) + "'", fetch(:slack_webhook)
@@ -18,6 +18,7 @@ namespace :slack do
     task :deploying do
         on roles(:all) do
             slack_template = message_hash
+            slack_template['text'] = "#{fetch(:url)} Deployment Process Begun"
             slack_template['blocks'][0]['text']['text'] = ":crossed_fingers: Deployment Process Begun :crossed_fingers:"
             slack_template['blocks'][2]['text']['text'] = "#{fetch(:url)} is being Deployed."
             execute :curl, "--request", "POST", "--header", "'Content-Type: application/json'", "--data", "'" + JSON.generate(slack_template) + "'", fetch(:slack_webhook)
@@ -28,6 +29,7 @@ namespace :slack do
     task :message do
         on roles(:all) do
             slack_template = message_hash
+            slack_template['text'] = "Some message here"
             slack_template['blocks'][0]['text']['text'] = "Message"
             slack_template['blocks'][2]['text']['text'] = "Some message to go here"
             execute :curl, "--request", "POST", "--header", "'Content-Type: application/json'", "--data", "'" + JSON.generate(slack_template) + "'", fetch(:slack_webhook)
@@ -38,6 +40,7 @@ namespace :slack do
     task :failed do
         on roles(:all) do
             slack_template = message_hash
+            slack_template['text'] = "#{fetch(:url)} Deployment Process Failed!"
             slack_template['blocks'][0]['text']['text'] = ":boom: Deployment Process Failed :boom:"
             slack_template['blocks'][2]['text']['text'] = "#{fetch(:url)} deployment has failed."
             execute :curl, "--request", "POST", "--header", "'Content-Type: application/json'", "--data", "'" + JSON.generate(slack_template) + "'", fetch(:slack_webhook)

data/lib/capistrano/tasks/sozo.rake

@@ -1,16 +1,51 @@
+require 'capistrano/sozo_magento2/info'
+
+include SozoMagento2::Info
+
 namespace :sozo do
 
+    desc "Info"
+    task :info do
+        on roles(:all) do
+            SozoMagento2::Info::Info.new.call
+        end
+    end
+
+    namespace :git do
+        desc "Git branch Check"
+        task :check do
+            on roles(:all) do
+                check = capture(:git, 'ls-remote', '--heads', fetch(:repo_url), fetch(:branch), '|', 'wc', '-l')
+
+                if check.to_i == 1
+                    info "Branch is available for deployment."
+                else
+                    error "Branch does not exist in git repository, have you pushed your changes?"
+                    exit 1
+                end
+            end
+        end
+    end
+
     desc "Fix current directory if needed"
     task :fix_current do
         on roles(:all) do
             releases = capture(:ls, "-x", releases_path).split
             valid, invalid = releases.partition { |e| /^\d{14}$/ =~ e }
 
-            info "last release #{valid.last}"
-            info "Creating symlink from #{fetch(:deploy_to)}/releases/#{valid.last} to #{fetch(:deploy_to)}/current"
+            info "Checking current and magento root directories are setup correctly."
+
+            current = "#{fetch(:deploy_to)}/current"
+            if test("[ ! -e #{current} ]")
+                info "Current link #{current} link is broken, regenerating."
+                execute :ln, "-sf", "#{fetch(:deploy_to)}/releases/#{valid.last}", current
+            end
 
-            execute :ln, "-sf", "#{fetch(:deploy_to)}/releases/#{valid.last}", "#{fetch(:deploy_to)}/current"
-            execute :ln, "-sf", "#{fetch(:deploy_to)}/releases/#{valid.last}", "#{fetch(:mage_root)}"
+            m2root = "#{fetch(:mage_root)}"
+            if test("[ ! -e #{m2root} ]")
+                info "M2Path link #{m2root} link is broken, regenerating."
+                execute :ln, "-sf", "#{fetch(:deploy_to)}/releases/#{valid.last}/magento", m2root
+            end
         end
     end
 
@@ -56,7 +91,6 @@ namespace :sozo do
         end
         on roles :production do
             within release_path do
-                invoke 'magento:cache:enable'
                 invoke 'magento:cache:flush'
                 invoke 'magento:indexer:reindex'
             end

data/lib/capistrano/tasks/wordpress.rake

@@ -12,10 +12,15 @@ namespace :wordpress do
         on roles :all do |host|
             within release_path + "magento/wp/" do
                 info "Removing default unused WordPress Plugins and Themes"
-                execute :wp, 'plugin', 'delete', 'hello'
-                execute :wp, 'theme', 'delete', 'twentyseventeen'
-                execute :wp, 'theme', 'delete', 'twentynineteen'
-                execute :wp, 'theme', 'delete', 'twentytwenty'
+                if fetch(:wp_disable_plugins).length >= 1
+                    execute :wp, 'plugin', 'deactivate', fetch(:wp_disable_plugins)
+                end
+                if fetch(:wp_delete_plugins).length >= 1
+                    execute :wp, 'plugin', 'delete', fetch(:wp_delete_plugins)
+                end
+                if fetch(:wp_delete_themes).length >= 1
+                    execute :wp, 'theme', 'delete', fetch(:wp_delete_themes)
+                end
                 execute :rm, '-f', 'readme.html'
             end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sozo_magento2
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".yardopts"
 - BUILD.md
 - CHANGELOG.md
 - Gemfile
@@ -40,6 +41,7 @@ files:
 - capistrano-sozo_magento.gemspec
 - lib/capistrano/sozo_magento2.rb
 - lib/capistrano/sozo_magento2/defaults.rb
+- lib/capistrano/sozo_magento2/info.rb
 - lib/capistrano/sozo_magento2/slack.rb
 - lib/capistrano/sozo_magento2/version.rb
 - lib/capistrano/tasks/composer.rake