capistrano-sozo_magento2 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 067f69be7940139b39853f161c2cdccfaf59bc3efe7c889a3c4282b7a6c91191
-  data.tar.gz: b235fcf83c747dcdb843e64bdddd44df30366bdc84a363a90e0425571b8a04f4
+  metadata.gz: 1b1790fdeb92ff66403be9ccd3f3977ad51383a401deeb09d073e927f1dff17f
+  data.tar.gz: 38e34911ea738869e55fe0d0fe5b5e6baad4207a7af91fbbbcae8a615f1b6208
 SHA512:
-  metadata.gz: 4015c5c7f9cf4be49d35cda7732803d4e7bd240c7d4b5f85470c8a05587c452fcb48452509561b9d55ef3fa0330ce41582c63f965e427addc5590001c64f9360
-  data.tar.gz: 60fc48f2e8a1b5437749978e887eec9d7ff28601a27742199826ba9a60101931ace0b6bed9ed44d91858561b79c6bd90c1fe52eb7e0989efbcc47668ae984f35
+  metadata.gz: 81a868673b25d2ee710b90dba9be7b478b48dbe80b5c238dcdbe493e6255d6647202b619b6bb0c9d71c2c34632d7757450252193e1f218e571dba14dd3dd9e00
+  data.tar.gz: 3125ca35d6f5e0b0ef62cf3283fdf9f97935e5ff3a56268ac8c52c231ff7c36459084f9d72a174a5b60b073a9dd9fe557250e4d81bcede40f30852d38e688547

data/CHANGELOG.md

@@ -21,7 +21,43 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
-## [v1.1.0] - 2020-02-24
+
+## [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.
+
+### Changed
+- Updated Slack messaging to newer version to future proof.
+- Current directory fix now updates MAGE_ROOT as well.
+- Standardised tasks order based on key capistrano core tasks.
+
+### Removed
+- Removed dotenv from the gem.
+
+### Fixed
+- Fix issue when there were less than CAP_KEEP_BACKUPS available.
+
+
+## [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.
@@ -37,7 +73,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
@@ -47,5 +83,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.1"
+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/capistrano-sozo_magento.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
     spec.bindir        = "bin"
     spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
     spec.require_paths = ["lib"]
+
+    spec.required_ruby_version = '>= 2.5.3'
     
     spec.add_dependency "capistrano", "~> 3.9"
-    spec.add_dependency "dotenv", "~> 2.2"
 end

data/lib/capistrano/sozo_magento2.rb

@@ -1,10 +1,9 @@
 require 'date'
-require 'dotenv'
-Dotenv.load
 
-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__)
@@ -19,33 +18,34 @@ load File.expand_path('../tasks/server.rake', __FILE__)
 load File.expand_path('../tasks/wordpress.rake', __FILE__)
 
 after 'deploy:updating', 'composer:install'
-after 'composer:install', 'magento:setup:permissions'
+after 'deploy:updating', 'magento:patches:apply'
+after 'deploy:updating', 'magento:setup:permissions'
 
 before 'deploy:updated', 'slack:deploying'
-after 'slack:deploying', 'db:backup'
-after 'db:backup', 'sozo:config:setup'
-after 'sozo:config:setup', 'magento:maintenance:enable'
+before 'deploy:updated', 'db:backup'
+before 'deploy:updated', 'sozo:config:setup'
+before 'deploy:updated', 'magento:maintenance:enable'
 
 after 'deploy:updated', 'provision:setup_dir'
-after 'provision:setup_dir', 'magento:setup:upgrade'
-after 'magento:setup:upgrade', 'magento:setup:di:compile'
-after 'magento:setup:di:compile', 'magento:setup:static-content:deploy'
-after 'magento:setup:static-content:deploy', 'provision:permissions'
+after 'deploy:updated', 'magento:setup:upgrade'
+after 'deploy:updated', 'magento:setup:di:compile'
+after 'deploy:updated', 'magento:setup:static-content:deploy'
+after 'deploy:updated', 'provision:permissions'
 
 after 'deploy:finishing', 'sozo:symlink'
-after 'sozo:symlink', 'fishpig:setup:install_theme' 
-after 'fishpig:setup:install_theme', 'wordpress:sozo_mu'
-after 'wordpress:sozo_mu', 'wordpress:cleanup'
-after 'wordpress:cleanup', 'sozo:optimise'
-after 'sozo:optimise', 'server:service:restart'
-after 'server:service:restart', 'magento:maintenance:disable'
+after 'deploy:finishing', 'fishpig:setup:install_theme' 
+after 'deploy:finishing', 'wordpress:sozo_mu'
+after 'deploy:finishing', 'wordpress:cleanup'
+after 'deploy:finishing', 'sozo:optimise'
+after 'deploy:finishing', 'server:service:restart'
+after 'deploy:finishing', 'magento:maintenance:disable'
 
 after 'deploy:finished', "slack:deployed"
-after 'slack:deployed', "db:cleanup"
+after 'deploy:finished', "db:cleanup"
 
+after 'deploy:failed', "sozo:fix_current"
 after 'deploy:failed', "slack:failed"
-after 'slack:failed', "sozo:fix_current"
-after 'sozo:fix_current', 'magento:maintenance:disable'
+after 'deploy:failed', 'magento:maintenance:disable'
 
 namespace :load do
     task :defaults do

data/lib/capistrano/sozo_magento2/defaults.rb

@@ -27,12 +27,21 @@ 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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'
 
 # Deployment defaults
-set :magento_deploy_confirm_roles,  fetch(:magento_deploy_confirm_roles, [])
+set :magento_deploy_confirm_roles,  fetch(:magento_deploy_confirm_roles, [])
+
+# Other defaults (for future use)
+# Clear or leave the failed deployment dirs
+set :clear_failures,                fetch(:clear_failures, true)

data/lib/capistrano/sozo_magento2/slack.rb

@@ -0,0 +1,65 @@
+require 'json'
+
+include Capistrano::DSL
+
+module SozoMagento2
+    module Slack
+        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", 
+                        "text" => {
+                            "type" => "plain_text", 
+                            "text" => "Deployment Process Begun"
+                        }
+                    }, 
+                    {
+                        "type" => "divider"
+                    }, 
+                    { 
+                        "type" => "section", 
+                        "text" => {
+                            "type" => "mrkdwn", 
+                            "text" => "#{fetch(:url)} is being Deployed"
+                        }, 
+                        "accessory" => {
+                            "type" => "button", 
+                            "style" => "primary", 
+                            "text" => {
+                                "type" => "plain_text", 
+                                "text" => "Visit Site", 
+                                "emoji" => true
+                            },
+                            "value" => "click_me_123", 
+                            "url" => fetch(:url), 
+                            "action_id" => "button-action"
+                        }
+                    }, 
+                    {
+                        "type" => "section", 
+                        "fields" => [
+                            {
+                                "type" => "mrkdwn", 
+                                "text" => "*Branch:*\n#{fetch(:branch)}"
+                            }, 
+                            {
+                                "type" => "mrkdwn", 
+                                "text" => "*Developer:*\n#{fetch(:local_user)}"
+                            }, 
+                            {
+                                "type" => "mrkdwn", 
+                                "text" => "*Environment:*\n#{fetch(:environment)}"
+                            }
+                        ]
+                    }
+                ]
+            }
+        end
+    end
+end

data/lib/capistrano/sozo_magento2/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
     module SozoMagento2
-        VERSION = "1.1.0"
+        VERSION = "1.3.1"
     end
 end

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) == "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
 
@@ -49,11 +53,11 @@ namespace :db do
                 files = (valid - valid.last(fetch(:keep_backups).to_i)).map do |backup|
                     "#{fetch(:backupdir)}" + "/" + (backup).to_s
                 end
-            end
 
-            if files.any?
-                files.each_slice(100) do |files_batch|
-                    execute :rm, "-f", *files_batch
+                if files.any?
+                    files.each_slice(100) do |files_batch|
+                        execute :rm, "-f", *files_batch
+                    end
                 end
             end
         end

data/lib/capistrano/tasks/magento2.rake

@@ -5,7 +5,7 @@ namespace :magento do
         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 +14,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 +24,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 +34,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 +43,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 +76,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 +86,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 +95,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 +112,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 +131,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 +172,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 +183,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
@@ -197,7 +197,7 @@ namespace :magento 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'
+                        execute :php, '-f', 'magento/bin/magento', 'maintenance:enable'
                     end
                 end
             end
@@ -208,7 +208,7 @@ namespace :magento 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'
+                        execute :php, '-f', 'magento/bin/magento', 'maintenance:disable'
                     end
                 end
             end
@@ -218,7 +218,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 +227,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 +238,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,29 +1,49 @@
+require 'capistrano/sozo_magento2/slack'
+
+include SozoMagento2::Slack
+
 namespace :slack do
     desc "Post to channel that the site has been deployed"
     task :deployed do
         on roles(:all) do
-            execute :curl, "-X", "POST", "--data-urlencode", "'payload={\"channel\": \"#{fetch(:slack_channel)}\", \"username\": \"SOZO Deploy Bot\", \"pretext\": \"Deployment Successful\", \"text\": \"<#{fetch(:url)}> Deployed\", \"icon_emoji\": \":satellite:\", \"color\": \"good\", \"fields\": [{ \"title\": \"Branch\", \"value\": \"#{fetch(:branch)}\", \"short\": \"true\" },{ \"title\": \"Environment\", \"value\": \"#{fetch(:environment)}\", \"short\": \"true\" }]}'", "#{fetch(:slack_webhook)}"
+            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)
         end
     end
 
     desc "Post to channel that the site is being deployed"
     task :deploying do
         on roles(:all) do
-            execute :curl, "-X", "POST", "--data-urlencode", "'payload={\"channel\": \"#{fetch(:slack_channel)}\", \"username\": \"SOZO Deploy Bot\", \"pretext\": \"Deployment Process Begun\", \"text\": \"<#{fetch(:url)}> is being Deployed\", \"icon_emoji\": \":satellite:\", \"color\": \"warning\", \"fields\": [{ \"title\": \"Branch\", \"value\": \"#{fetch(:branch)}\", \"short\": \"true\" },{ \"title\": \"Environment\", \"value\": \"#{fetch(:environment)}\", \"short\": \"true\" }]}'", "#{fetch(:slack_webhook)}"
+            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)
         end
     end
 
     desc "Post to channel that something is happening"
     task :message do
         on roles(:all) do
-            execute :curl, "-X", "POST", "--data-urlencode", "'payload={\"channel\": \"#{fetch(:slack_channel)}\", \"username\": \"SOZO Deploy Bot\", \"pretext\": \"Next stage\", \"text\": \"<#{fetch(:url)}> is stage change\", \"icon_emoji\": \":satellite:\", \"color\": \"good\", \"fields\": [{ \"title\": \"Branch\", \"value\": \"#{fetch(:branch)}\", \"short\": \"true\" },{ \"title\": \"Environment\", \"value\": \"#{fetch(:environment)}\", \"short\": \"true\" }]}'", "#{fetch(:slack_webhook)}"
+            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)
         end
     end
 
     desc "Post to channel that the site deployment has failed"
     task :failed do
         on roles(:all) do
-            execute :curl, "-X", "POST", "--data-urlencode", "'payload={\"channel\": \"#{fetch(:slack_channel)}\", \"username\": \"SOZO Deploy Bot\", \"pretext\": \"Deployment Process Failed\", \"text\": \"<#{fetch(:url)}> deployment has failed\", \"icon_emoji\": \":satellite:\", \"color\": \"warning\", \"fields\": [{ \"title\": \"Branch\", \"value\": \"#{fetch(:branch)}\", \"short\": \"true\" },{ \"title\": \"Environment\", \"value\": \"#{fetch(:environment)}\", \"short\": \"true\" }]}'", "#{fetch(:slack_webhook)}"
+            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)
         end
     end
 end

data/lib/capistrano/tasks/sozo.rake

@@ -6,10 +6,19 @@ namespace :sozo 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."
 
-            execute :ln, "-sf", "#{fetch(:deploy_to)}/releases/#{valid.last}", "#{fetch(:deploy_to)}/current"
+            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
+
+            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
 

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.1.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 description: Magento 2 support for Capistrano 3.x in SOZO hosted environments
 email:
 - clive@sozodesign.co.uk
@@ -54,6 +40,7 @@ files:
 - capistrano-sozo_magento.gemspec
 - lib/capistrano/sozo_magento2.rb
 - lib/capistrano/sozo_magento2/defaults.rb
+- lib/capistrano/sozo_magento2/slack.rb
 - lib/capistrano/sozo_magento2/version.rb
 - lib/capistrano/tasks/composer.rake
 - lib/capistrano/tasks/db.rake
@@ -78,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="