capistrano-sozo_magento2 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab55bf423e1766857aeff0a542b1b2657e35a6401d7dda6469404df07060d90c
-  data.tar.gz: 43a54ea1407c899c1f9545c6cb6703977ac70690053f6efdd61d18024eb933dd
+  metadata.gz: dcc222d9e3fc341f69b780d94f5179850bee32fc6fbf9d5ca21872eace7a72a4
+  data.tar.gz: 1f0aa60540f6c2b1d3d0e23200d46f6543b0c1f1f63bf42210b070c09b85efef
 SHA512:
-  metadata.gz: 0d068c92ebcd093a49b7ca63685a0d27e898aa3884d5ecd9a5ea9b7c339eae83c700eccaab3b5ac959b2c12d20cfae7d7526376365045996e8d88e5a38802dff
-  data.tar.gz: 42b84543c461b955f32cff824750a12b06ed8de464c5b6227915440b28f732a3d22355a0066bd38c45f425b16c58ecaa11e4d7ea6f40cbd7d078f15a5d5e39dd
+  metadata.gz: df41ec7d95247860cf3cd56661457fba36053378d1c4b1f600324f3a4c352183c3321555ba51b332576507c8e7df95e9ef9e9ecb80e9919fd9dbde3e5d8c2a11
+  data.tar.gz: 34beb143b6d773664423c93361df841495625aabacaff27e0ae17fe4cc74a94ec711f03b89ea65270fe8d025758e5b52e05914c059df89f0666c7fb638e2c4fc

data/CHANGELOG.md

@@ -21,6 +21,39 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
+## [v1.6.0] - 2022-06-18
+### Added
+- Ability to copy over multiple themes and specify their name.
+
+### Changed
+- Removed `--no-suggest` from composer commands
+
+### Removed
+- Fishpig rake file
+- WordPress twentytwentytwo theme now deleted by default.
+
+### Fixed
+- Fixed the order of reindex and cache flush.
+- Fixed patch.log permissions if it exists.
+
+
+## [v1.5.1] - 2022-02-23
+### Changed
+- Reverted change to magento:patches:apply
+
+
+## [v1.5.0] - 2022-02-22
+### Added
+- Option to not clear files if the deployment fails via the `:clear_failures` option
+- Option to await user input before putting site in maintenance mode with `:magento_deploy_confirm_roles`
+
+### Changed
+- Deployment task order to lower site downtime.
+- WordPress twentytwentyone theme removed now by default.
+
+### Removed
+- magento:patches:apply command removed as it's part of the composer.bash ran at install time.
+
 
 ## [v1.4.0] - 2021-08-03
 ### Added

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.3"
+gem "capistrano-sozo_magento2", "~> 1.6"
 ```
 2. Install
 ```

data/lib/capistrano/sozo_magento2/defaults.rb

@@ -18,9 +18,9 @@ set :linked_dirs, fetch(:linked_dirs, []).push(
 )
 
 # Composer defaults
-set :composer_flags,                '--no-dev --optimize-autoloader --prefer-dist --no-interaction --no-suggest'
-set :composer_dev_flags,            '--prefer-dist --no-interaction --no-suggest'
-set :composer_require_flags,        '--update-no-dev --optimize-autoloader --prefer-dist --no-suggest'
+set :composer_flags,                '--no-dev --optimize-autoloader --prefer-dist --no-interaction'
+set :composer_dev_flags,            '--prefer-dist --no-interaction'
+set :composer_require_flags,        '--update-no-dev --optimize-autoloader --prefer-dist'
 set :composer_require_dev_flags,    '--optimize-autoloader --prefer-dist'
 
 # DB defaults
@@ -31,9 +31,10 @@ 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_themes,              fetch(:wp_delete_themes, 'twentyseventeen twentynineteen twentytwenty twentytwentyone twentytwentytwo')
 set :wp_delete_plugins,             fetch(:wp_delete_plugins, 'hello')
 set :wp_disable_plugins,            fetch(:wp_disable_plugins, '')
+set :wp_copy_themes,                fetch(:wp_copy_themes, 'fishpig')
 
 # Slack defaults
 set :slack_channel,                 fetch(:slack_channel, '#deployments')
@@ -47,4 +48,4 @@ 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)
+set :clear_failures,                fetch(:clear_failures, true)

data/lib/capistrano/sozo_magento2/version.rb

@@ -4,6 +4,6 @@ module Capistrano
     module SozoMagento2
         # The plugin version number
         # @return [String] The gem version number
-        VERSION = "1.4.0"
+        VERSION = "1.6.0"
     end
 end

data/lib/capistrano/sozo_magento2.rb

@@ -11,7 +11,6 @@ load File.expand_path('../tasks/composer.rake', __FILE__)
 load File.expand_path('../tasks/sozo.rake', __FILE__)
 load File.expand_path('../tasks/slack.rake', __FILE__)
 load File.expand_path('../tasks/db.rake', __FILE__)
-load File.expand_path('../tasks/fishpig.rake', __FILE__)
 load File.expand_path('../tasks/magento2.rake', __FILE__)
 load File.expand_path('../tasks/provision.rake', __FILE__)
 load File.expand_path('../tasks/server.rake', __FILE__)
@@ -24,12 +23,12 @@ 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'
 
+after 'deploy:updated', 'slack:deploying'
+after 'deploy:updated', 'magento:maintenance:enable'
 after 'deploy:updated', 'provision:setup_dir'
 after 'deploy:updated', 'magento:setup:upgrade'
 after 'deploy:updated', 'magento:setup:di:compile'
@@ -37,7 +36,7 @@ after 'deploy:updated', 'magento:setup:static-content:deploy'
 after 'deploy:updated', 'provision:permissions'
 
 after 'deploy:finishing', 'sozo:symlink'
-after 'deploy:finishing', 'fishpig:setup:install_theme' 
+after 'deploy:finishing', 'wordpress:copy_themes' 
 after 'deploy:finishing', 'wordpress:sozo_mu'
 after 'deploy:finishing', 'wordpress:cleanup'
 after 'deploy:finishing', 'sozo:optimise'
@@ -58,4 +57,4 @@ namespace :load do
     task :defaults do
         load 'capistrano/sozo_magento2/defaults.rb'
     end
-end
+end

data/lib/capistrano/tasks/deploy.rake

@@ -7,6 +7,14 @@ namespace :deploy do
         end
     end
 
+    after :updated, :confirm_setup do
+        if fetch(:magento_deploy_confirm_roles).include? fetch(:stage).to_s
+            print "\e[0;31m      Put site in maintenance mode and deploy to #{fetch(:stage).to_s}? [y/n] \e[0m"
+            proceed = STDIN.gets[0..0] rescue nil
+            exit unless proceed == 'y' || proceed == 'Y'
+        end
+    end
+
 
     Rake::Task["cleanup"].clear_actions
 
@@ -40,7 +48,7 @@ namespace :deploy do
     desc "Failed deployment tasks"
     task :failed do
         on release_roles :all do |host|
-            on roles :production, :staging, :testing do
+            if (fetch(:clear_failures) == "true")
                 # Hold for a few seconds to make sure all disk related actions have completed
                 info "Waiting for file / disk writing to complete"
                 sleep(3)
@@ -51,4 +59,4 @@ namespace :deploy do
             end
         end
     end
-end
+end

data/lib/capistrano/tasks/magento2.rake

@@ -292,4 +292,15 @@ namespace :magento do
         end
     end
 
+    namespace :fishpig do
+        desc 'Create and install Fishpig WordPress theme'
+        task :create_theme do
+            on release_roles :all do
+                within release_path do
+                    execute :php, '-f', 'magento/bin/magento', 'fishpig:wordpress:build-theme', '--install-path=magento/wp'
+                end
+            end
+        end
+    end
+
 end

data/lib/capistrano/tasks/provision.rake

@@ -15,9 +15,15 @@ namespace :provision do
                 execute :sudo, "find", "#{release_path}/magento", '-type d -print0 | sudo xargs --no-run-if-empty --null --max-procs=0 chmod 770'
                 execute :sudo, "find", "#{release_path}/magento", '-type f -print0 | sudo xargs --no-run-if-empty --null --max-procs=0 chmod 660'
 
+                # Magento bin permissions update
                 if test("[ -f #{release_path}/magento/bin/magento ]")
                     execute :sudo, "chmod", "+x", "#{release_path}/magento/bin/magento"
                 end
+                
+                # patch.log permission check
+                if test("[ -f #{deploy_to}/shared/magento/var/log/patch.log ]")
+                    execute :sudo, "chmod", "0664", "#{deploy_to}/shared/magento/var/log/patch.log"
+                end
 
                 execute :sudo, "find", "#{release_path}/magento", '-print0 | sudo xargs --no-run-if-empty --null --max-procs=0 chown', "#{fetch(:username)}:#{fetch(:group)}"
 
@@ -32,7 +38,7 @@ namespace :provision do
         on roles :app do
             info ("Checking for setup directory - #{release_path}/magento/setup")
 
-            if test("[ -d #{release_path}/magento/setup/ ]")
+            if test("[ -d #{release_path}/magento/setup ]")
             else
                 upload! "#{fetch(:magento_dir)}/setup", "#{release_path}/magento/", recursive: true
                 invoke 'provision:permissions'

data/lib/capistrano/tasks/sozo.rake

@@ -91,8 +91,8 @@ namespace :sozo do
         end
         on roles :production do
             within release_path do
-                invoke 'magento:cache:flush'
                 invoke 'magento:indexer:reindex'
+                invoke 'magento:cache:flush'
             end
         end
     end

data/lib/capistrano/tasks/wordpress.rake

@@ -26,4 +26,30 @@ namespace :wordpress do
         end
     end
 
+    desc "Copy Wordpress themes across"
+    task :copy_themes do
+        on roles :all do |host|
+            within release_path do
+                if fetch(:wp_copy_themes).length >= 1
+                    # Retrieve the themes and split them into an array
+                    themes = fetch(:wp_copy_themes).split(" ")
+                    compiletheme = false
+
+                    # Loop through and create the required theme directories
+                    themes.each do |theme|
+                        execute :mkdir, "-p", "#{release_path}/magento/wp/wp-content/themes/#{theme}"
+                        execute :sudo, 'cp', '-a', "#{release_path}/environments/global/wp/wp-content/themes/#{theme}/.", "#{release_path}/magento/wp/wp-content/themes/#{theme}/"
+                        if theme != "fishpig"
+                            compiletheme = true
+                        end 
+                    end
+
+                    if compiletheme
+                        invoke 'magento:fishpig:create_theme'
+                    end
+                end
+            end
+        end
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sozo_magento2
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -47,7 +47,6 @@ files:
 - lib/capistrano/tasks/composer.rake
 - lib/capistrano/tasks/db.rake
 - lib/capistrano/tasks/deploy.rake
-- lib/capistrano/tasks/fishpig.rake
 - lib/capistrano/tasks/magento2.rake
 - lib/capistrano/tasks/provision.rake
 - lib/capistrano/tasks/server.rake

data/lib/capistrano/tasks/fishpig.rake

@@ -1,16 +0,0 @@
-namespace :fishpig do
-	namespace :setup do
-		desc "Install the Wordpress Fishpig theme"
-	    task :install_theme do
-	        on roles :all do |host|
-  				within release_path do
-  					execute :mkdir, "-p", "#{release_path}/magento/wp/wp-content/themes/fishpig"
-	            end
-	        end
-
-	        on roles(:all) do
-	            execute :sudo, 'cp', '-a', "#{release_path}/environments/global/wp/wp-content/themes/fishpig/.", "#{release_path}/magento/wp/wp-content/themes/fishpig/"
-	        end
-	    end
-	end
-end