capistrano-sozo_magento2 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d66531993d668be8a75fef480862d07035dcf0750f7831912f71bc749d5201
-  data.tar.gz: 5032e4073c3eed84ce9030206c0e9c3cfbdfbf29e8d12d1968802f48df3fa42b
+  metadata.gz: 808960e0120a734084b78112c9497f68ed02df489515f806d9ffc0108c368ed2
+  data.tar.gz: dd00b79984f21952466e405443b006263e820517c2a0661cea0e4961a02991d2
 SHA512:
-  metadata.gz: 3550c64e691e692c9e896078f269ecc8ef5035b3ce4c110df0020aa47cdd6d6c5e3b1bb47b58f06ef57db16b57a96510d6ac8509713fd3ff4f299519810842f1
-  data.tar.gz: 2e6f979c104a3c2d175894d0cc3e0ad08531abdc9bbfb8faa19cc2714c4d0e92bf18a2c2c6fa042f7a30a8228842167ea44ece6350482a4d886d2e344fedce98
+  metadata.gz: a95a1a495572c06f9dcda5c8e535bc4785349044b0fb5c95702fc3aa8191b1337a3f64c9e977b97a914905b2c2a54278a2cb0df1473703850b6869179999803e
+  data.tar.gz: 5d32ba014c057f5a3e7116d99c68dad25a2432102688de1905b19793c2920f3ab477816eacfaf19b29f8a5b6e4d01af9fc8a5b60561efcc31da658301c4b3d04

data/CHANGELOG.md

@@ -21,6 +21,13 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
 
 ## [Unreleased]
 
+## [v1.2.1] - 2020-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] - 2020-03-25
 ### Added
 - New variable `clear_failures` for future use.

data/lib/capistrano/sozo_magento2/slack.rb

@@ -10,6 +10,7 @@ module SozoMagento2
                 "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,5 @@
 module Capistrano
     module SozoMagento2
-        VERSION = "1.2.0"
+        VERSION = "1.2.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
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sozo_magento2
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Clive Walkden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano