capistrano-sozo_magento2 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84cc07edb383402a00fb355b8b4b60bcf888916e9b26fb4fe7ba9343532df464
-  data.tar.gz: 828a269fcce6b08dd2d1d537e2fd9f1487615bfc2fe91c618217b6f5e9977e0f
+  metadata.gz: 1b1790fdeb92ff66403be9ccd3f3977ad51383a401deeb09d073e927f1dff17f
+  data.tar.gz: 38e34911ea738869e55fe0d0fe5b5e6baad4207a7af91fbbbcae8a615f1b6208
 SHA512:
-  metadata.gz: 8e60dbae8730826a6d503297040534fe91db718a8e075bd7076eb4779bedb73202b7efafb6ef8bdbb015dd04cf083b839943650dd7524ff7cf130d4547cd11b1
-  data.tar.gz: 3dfd136cd8afdef71e728db387c87c8cb52a7d376b8902e8d6922281fcf0f5ca847fbbad05562abd8f3658b146c4f1a5b8b8b3aee5b2e7f80d106696ff116cc2
+  metadata.gz: 81a868673b25d2ee710b90dba9be7b478b48dbe80b5c238dcdbe493e6255d6647202b619b6bb0c9d71c2c34632d7757450252193e1f218e571dba14dd3dd9e00
+  data.tar.gz: 3125ca35d6f5e0b0ef62cf3283fdf9f97935e5ff3a56268ac8c52c231ff7c36459084f9d72a174a5b60b073a9dd9fe557250e4d81bcede40f30852d38e688547

data/CHANGELOG.md

@@ -21,6 +21,13 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
+
+## [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.

data/README.md

@@ -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__)
@@ -42,8 +43,8 @@ after 'deploy:finishing', 'magento:maintenance:disable'
 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: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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'

data/lib/capistrano/sozo_magento2/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
     module SozoMagento2
-        VERSION = "1.3.0"
+        VERSION = "1.3.1"
     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,7 @@ 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
@@ -251,7 +251,7 @@ namespace :magento do
                 within release_path do
                     if test("[ -f #{release_path}/magento/.magento.env.yaml ]")
                         info 'Applying patches'
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/vendor/bin/ece-patches', 'apply --no-interaction'
+                        execute :php, '-f', 'magento/vendor/bin/ece-patches', 'apply --no-interaction'
                     else
                         info 'No patch file found, skipping.'
                     end
@@ -265,7 +265,7 @@ namespace :magento do
                 within release_path do
                     if test("[ -f #{release_path}/magento/.magento.env.yaml ]")
                         info 'Reverting patches'
-                        execute :php, '-dmemory_limit=-1', '-f', 'magento/vendor/bin/ece-patches', 'revert --no-interaction'
+                        execute :php, '-f', 'magento/vendor/bin/ece-patches', 'revert --no-interaction'
                     else
                         info 'No patch file found, skipping.'
                     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.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano