capistrano-sozo_magento2 1.5.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c509eae724dea5c38746f591cb1038102bcce324373ef7ad1cb0f48c5ee604
-  data.tar.gz: 3da4dafb3310757ea46730200df4e48f3c6a2ebdf25d0536ea57cce0e46f37bb
+  metadata.gz: 923ebdbd8e0af793979bc643b64dcf620b6a41339e7a0a37fd1493d4c0ebe394
+  data.tar.gz: 96129ba2ee73f1f05a3e920676b8b70ed3dc1b0a2e70e500c31c19c0f75cfca1
 SHA512:
-  metadata.gz: 0fd96c30e041efc3a73b598cb9866cbfed78f0e7013c6d647100b2149ca6354f2a111e5a08c13bd1909328a7f9a7f0dd7af28772511d8aa4fb5b5cd53c701abc
-  data.tar.gz: '08953c640d73eb088071f465a9ed8d8b61805c7d922cbde614cf050ab9c247a7cfdccd112f6a9baad214f477ffecfe8dd9ee688e6d240193893df95a425e0a12'
+  metadata.gz: 0a084753174d86a81c8af5fa6b4b6334121688f924cddabdb0107f34012d09db7a6106531e058de9fc833a256170f18f23597a1cb640cde3ab94f345e07991c5
+  data.tar.gz: 8b2e192b898f69a731df2f1e38a1fcd83bd01691eefe336cb88e848a00957043d8432919827c09e8248dca394a36ef7b736ff1f8aadae7541edca3075bfc4b49

data/CHANGELOG.md

@@ -21,6 +21,31 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
+
+## [v1.7.0] - 2022-09-22
+### Changed
+- Fixed checks for branch existence to include tags.
+
+### Fixed
+- When deployment fails due to cleanup task failing.
+
+
+## [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

data/README.md

@@ -7,13 +7,16 @@ It is advised to use bundler.
 
 1. Add the following to your projects `Gemfile`
 ```
-gem "capistrano-sozo_magento2", "~> 1.5"
+gem "capistrano-sozo_magento2", "~> 1.6"
 ```
 2. Install
 ```
 bundle install
 ```
 
+## Updating
+Update the gem to the latest version with `bundle update capistrano-sozo_magento2 --conservative`
+
 ## Usage
 Make sure the following lines are added to your project's `Capfile`:
 ```

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 twentytwentyone')
+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')

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.5.1"
+        VERSION = "1.7.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__)
@@ -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'

data/lib/capistrano/tasks/deploy.rake

@@ -34,7 +34,7 @@ namespace :deploy do
                     directories_str = directories.map do |release|
                     releases_path.join(release)
                     end.join(" ")
-                    execute :sudo, 'rm', "-rf", directories_str
+                    execute :sudo, 'rm', "-rf", directories_str, "||", "true"
                     # TODO re-symlink the old directory
                 else
                     info t(:no_old_releases, host: host.to_s, keep_releases: keep)

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

@@ -15,11 +15,23 @@ namespace :sozo do
         desc "Git branch Check"
         task :check do
             on roles(:all) do
+                found = false
+                # Check if branch exists on remote
                 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
+                    found = true
+                else 
+                    # Check if a tag exists on remote
+                    check = capture(:git, 'ls-remote', '--tags', fetch(:repo_url), fetch(:branch), '|', 'wc', '-l')
+                    if check.to_i == 1
+                        info "Tag is available for deployment."
+                        found = true
+                    end
+                end
+
+                if found == false
                     error "Branch does not exist in git repository, have you pushed your changes?"
                     exit 1
                 end
@@ -91,8 +103,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.5.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-09-22 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