capistrano-magento2 0.8.8 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1ecc432d10021f836a35005807a6dc5127499d561a2081bd31168c2d1fc76a3
-  data.tar.gz: ba295633cb33ae700bb1b9ddf5c99d418469079b91ef2c87173c5425e72bd20f
+  metadata.gz: eaad2347f8c69fd68747d7a8494e38558b1ae3cdd5d75e6a71d04ee1225ad2ef
+  data.tar.gz: 764b2205316cbc49e6f13ea576eb0e54e93db5c719dcbc2df246219412052da1
 SHA512:
-  metadata.gz: 45e6e75fc726d56da63cbb53c46c17852e37472e5d6d34c53b8652417d4d3c35dac4fd6cb7ce5c5556f2cda7907b890415497cd6b57f0a5b9efa94cff02c9879
-  data.tar.gz: 6db56c44607d0e4258fcb5dd84a3ee0e2d148dd010765b64fca5db056f3a89610f27ce1e1d507499eeeb6d931ef13457dfd6b152b93b8b2d68e9da712f56c37b
+  metadata.gz: 4660f8b4ca18c8b2e01689521c21c474dc8e7e79f7771de843e8e5c3b48b91585b45d4166cf7f00e9d368bd7203a425e4a22ffb375fcde3086258d591a611867
+  data.tar.gz: 9cf38dee19d05b07354542618b85e82fb1f09c96c80285c59e76b20a0a6bbf4b6866d55ba494404306b3766528b73902d6a4bd6189907f70797de676fb443cb8

data/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Capistrano::Magento2 Change Log
 
+0.9.3
+=========
+
+* Updated to now specify `--non-interactive` flag on `app:config:import` so CLI command will not hang trying for user input.
+
+0.9.2
+=========
+
+* Fixed issue preventing use of `after` tasks on `magento:cache:flush` from being used to trigger service reloads at end of deployment ([issue #143](https://github.com/davidalger/capistrano-magento2/issues/143))
+* Updated to use DSL method `invoke!` to call iterant tasks ([see capistrano/capistrano/pull/1911](https://github.com/capistrano/capistrano/pull/1911)))
+
+0.9.1
+=========
+
+* Fixed regression in 0.9.0 where relying on the `-l` flag broke multilingual static content deployment ([issue #141](https://github.com/davidalger/capistrano-magento2/issues/141))
+
+0.9.0
+=========
+
+**Upgrade Notes:**
+
+As of this release only Magento 2.3 and later are supported and **support has been dropped for prior versions** which have long since reached their end-of-life. Moving forward versions past their EOL will no longer be supported by subsequent releases of this gem. Older versions of this gem may continue to be used to deploy older and EOL versions.
+
+If using a `Gemfile` with Bundler to lock versions of dependencies used for execution, the version lock on `capistrano` should be updated to `~>1.13` to match the minimal requirement of this release, otherwise `bundle update` will fail to update to version `0.9.0` of this gem. The following is recommended:
+
+```
+gem 'capistrano', '~> 3.14'
+gem 'capistrano-magento2', '~> 0.9'
+```
+
+If a capistrano version lock is present in a projects `deploy.rb` it will also need to be updated:
+
+```
+lock '~> 3.14'
+```
+
+**Change Summary:**
+
+* Dropped support for EOL versions of Magento and scrubbed all gated logic around legacy behaviors in 2.1.x and 2.2.x
+* Removed `magento:deploy:version_check` task and associated warning when attempting to deploy unsupported versions of Magento
+* Updated required version of `capistrano` to `~> 1.13` (>=1.13 and less than 2.0)
+* Resolved inability to use `--dry-run` flag ([issue #128](https://github.com/davidalger/capistrano-magento2/issues/128)) as made possible by the removal of all version related gating logic.
+* Dropped explicit default of `:magento_deploy_languages`; will now only be passed to `bin/magento` call when set in project configuration.
+* Updated zero-down deployment logic to rely on `app:config:status` to detect config changes rather than the md5sum of config.php in current and release directories.
+* Added `magento:app:config:status` to available commands for manual execution.
+* Fixes issue in 2.3.4 and later where app:config:import may fail if cache:flush is not run immediately prior ([issue #138](https://github.com/davidalger/capistrano-magento2/issues/138))
+
+0.8.9
+=========
+
+* Fixed issue with RabbitMQ settings caused by app:config:import running after setup-upgrade step vs prior to the database upgrades (which connects to RabbitMQ in recurring data upgrade scripts)
+
 0.8.8
 ==========
 

data/README.md

@@ -6,7 +6,10 @@ A Capistrano extension for Magento 2 deployments. Takes care of specific Magento
 
 ## Supported Magento Versions
 
-**As of version 0.7.0 this gem only supports deployment of Magento 2.1.1 or later; please use an earlier version to deploy older releases of Magento 2**
+The following describes minimum Magento versions supported by releases of this gem. Please use an earlier version to deploy older releases of Magento not supported by the most recent iterations of this gem.
+
+* Version 0.9.x supports deployment of Magento 2.3.0 and later.
+* Version 0.7.x supports deployment of Magento 2.1.1 and later.
 
 ## Installation
 
@@ -118,35 +121,33 @@ Before you can use Capistrano to deploy, you must configure the `config/deploy.r
 
 ### Magento Deploy Settings
 
-| setting                        | default | what it does
-| ------------------------------ | ------- | ---
-| `:magento_deploy_setup_role`   | `:all`  | Role from which primary host is chosen to run things like setup:upgrade on
-| `:magento_deploy_cache_shared` | `true`  | If true, cache operations are restricted to the primary node in setup role
-| `:magento_deploy_languages`    | `['en_US']` | Array of languages passed to static content deploy routine
-| `:magento_deploy_themes`       | `[]`   | Array of themes passed to static content deploy
-| `:magento_deploy_jobs`         | `4`    | Number of threads to use for static content deploy
-| `:magento_deploy_composer`     | `true` | Enables composer install behaviour in the built-in deploy routine
-| `:magento_deploy_production`   | `true` | Enables production specific DI compilation and static content generation
-| `:magento_deploy_no_dev`       | `true` | Enables use of --no-dev flag on composer install
-| `:magento_deploy_maintenance`  | `true` | Enables use of maintenance mode while magento:setup:upgrade runs
-| `:magento_deploy_confirm`      | `[]`   | Used to require confirmation of deployment to a set of capistrano stages
-| `:magento_deploy_chmod_d`      | `2770` | Default permissions applied to all directories in the release path
-| `:magento_deploy_chmod_f`      | `0660` | Default permissions applied to all non-executable files in the release path
+| setting                        | default  | what it does
+| ------------------------------ | -------- | ---
+| `:magento_deploy_setup_role`   | `:all`   | Role from which primary host is chosen to run things like setup:upgrade on
+| `:magento_deploy_cache_shared` | `true`   | If true, cache operations are restricted to the primary node in setup role
+| `:magento_deploy_languages`    | `[]`     | Array of languages passed to static content deploy routine
+| `:magento_deploy_themes`       | `[]`     | Array of themes passed to static content deploy
+| `:magento_deploy_jobs`         | `nil`    | Number of threads to use for static content deploy
+| `:magento_deploy_composer`     | `true`   | Enables composer install behavior in the built-in deploy routine
+| `:magento_deploy_production`   | `true`   | Enables production specific DI compilation and static content generation
+| `:magento_deploy_no_dev`       | `true`   | Enables use of --no-dev flag on composer install
+| `:magento_deploy_maintenance`  | `true`   | Enables use of maintenance mode while magento:setup:upgrade runs
+| `:magento_deploy_confirm`      | `[]`     | Used to require confirmation of deployment to a set of capistrano stages
+| `:magento_deploy_chmod_d`      | `'2770'` | Default permissions applied to all directories in the release path
+| `:magento_deploy_chmod_f`      | `'0660'` | Default permissions applied to all non-executable files in the release path
 | `:magento_deploy_chmod_x`      | `['bin/magento']` | Default list of files in release path to set executable bit on
-| `:magento_deploy_strategy`     | `nil`  | Can be `quick`, `standard` or `compact`; supported by Magento 2.2 or later
+| `:magento_deploy_strategy`     | `nil`    | Can be `quick`, `standard` or `compact`
 
 #### Example Usage
 
 Add a line similar to the following in `config/deploy.rb` to set a custom value on one of the above settings:
 
 ```ruby
+set :magento_deploy_jobs, '$(nproc)'
+set :magento_deploy_themes, ['Magento/backend', 'Magento/blank']
 set :magento_deploy_languages, ['en_US', 'en_CA']
 ```
 
-```ruby
-set :magento_deploy_composer, false
-```
-
 ### Capistrano Built-Ins
 
 For the sake of simplicity in new project setups `:linked_dirs` and `:linked_files` are pre-configured per the following.
@@ -154,7 +155,6 @@ For the sake of simplicity in new project setups `:linked_dirs` and `:linked_fil
 ```ruby
 set :linked_files, [
   'app/etc/env.php',
-  'app/etc/config.local.php',
   'var/.setup_cronjob_status',
   'var/.update_cronjob_status'
 ]
@@ -178,8 +178,6 @@ If you would like to customize the linked files or directories for your project,
 append :linked_dirs, 'path/to/link'
 ```
 
-Support for a `app/etc/config.local.php` configuration file was added to Magento 2.1.6. This file will be linked in from the `shared/app/etc` directory as of v0.6.4 of this gem. If this file is present in the project repository, the file will not be linked.
-
 ### Composer Auth Credentials
 
 Magento 2's composer repository requires auth credentials to install. These can be set on target servers in a global composer `auth.json` file, the project's `composer.json` or by setting them in your deployment configuration using the following two settings:

data/capistrano-magento2.gemspec

@@ -27,8 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'capistrano', '~> 3.1'
+  spec.add_dependency 'capistrano', '~> 3.14'
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/lib/capistrano/magento2.rb

@@ -14,10 +14,6 @@ SSHKit.config.command_map[:magento] = "/usr/bin/env php -f bin/magento --"
 module Capistrano
   module Magento2
     module Helpers
-      def magento_version
-        return Gem::Version::new((capture :php, "-f #{release_path}/bin/magento -- -V --no-ansi").split(' ').pop)
-      end
-
       def disabled_modules
         output = capture :magento, 'module:status --no-ansi'
         output = output.split("disabled modules:\n", 2)[1]
@@ -34,24 +30,6 @@ module Capistrano
     end
 
     module Setup
-      def static_content_deploy params
-        if magento_version >= Gem::Version.new('2.2.0-rc')
-          # Using -f here just in case MAGE_MODE environment variable in shell is set to something other than production
-          execute :magento, "setup:static-content:deploy -f #{params}"
-        else
-          # Sets pipefail option in shell allowing command exit codes to halt execution when piping command output
-          if not SSHKit.config.command_map[:magento].include? 'set -o pipefail' # avoids trouble on multi-host deploys
-            @@pipefail_less = SSHKit.config.command_map[:magento].dup
-            SSHKit.config.command_map[:magento] = "set -o pipefail; #{@@pipefail_less}"
-          end
-
-          execute :magento, "setup:static-content:deploy #{params} | stdbuf -o0 tr -d ."
-
-          # Unsets pipefail option in shell so it won't affect future command executions
-          SSHKit.config.command_map[:magento] = @@pipefail_less
-        end
-      end
-
       def deployed_version
         # Generate a static content version string, but only if one has not already been set on a previous call
         if not fetch(:magento_static_deployed_version)

data/lib/capistrano/magento2/defaults.rb

@@ -9,14 +9,12 @@
 
 set :linked_files, fetch(:linked_files, []).push(
   'app/etc/env.php',
-  'app/etc/config.local.php',
   'var/.setup_cronjob_status',
   'var/.update_cronjob_status'
 )
 
 set :linked_files_touch, fetch(:linked_files_touch, []).push(
   'app/etc/env.php',
-  'app/etc/config.local.php',
   'var/.setup_cronjob_status',
   'var/.update_cronjob_status'
 )
@@ -47,13 +45,13 @@ set :magento_deploy_chmod_x, fetch(:magento_deploy_chmod_x, ['bin/magento'])
 # deploy configuration defaults
 set :magento_deploy_composer, fetch(:magento_deploy_composer, true)
 set :magento_deploy_confirm, fetch(:magento_deploy_confirm, [])
-set :magento_deploy_languages, fetch(:magento_deploy_languages, ['en_US'])
+set :magento_deploy_languages, fetch(:magento_deploy_languages, [])
 set :magento_deploy_maintenance, fetch(:magento_deploy_maintenance, true)
 set :magento_deploy_production, fetch(:magento_deploy_production, true)
 set :magento_deploy_no_dev, fetch(:magento_deploy_no_dev, true)
 set :magento_deploy_themes, fetch(:magento_deploy_themes, [])
-set :magento_deploy_jobs, fetch(:magento_deploy_jobs, nil)      # this defaults to 4 when supported by bin/magento
-set :magento_deploy_strategy, fetch(:magento_deploy_strategy, nil)  # Magento 2.2 or later only: http://bit.ly/2yhMvVv
+set :magento_deploy_jobs, fetch(:magento_deploy_jobs, nil)
+set :magento_deploy_strategy, fetch(:magento_deploy_strategy, nil)
 
 # deploy targetting defaults
 set :magento_deploy_setup_role, fetch(:magento_deploy_setup_role, :all)

data/lib/capistrano/magento2/version.rb

@@ -9,6 +9,6 @@
 
 module Capistrano
   module Magento2
-    VERSION = '0.8.8'
+    VERSION = '0.9.3'
   end
 end

data/lib/capistrano/tasks/deploy.rake

@@ -11,7 +11,6 @@ include Capistrano::Magento2::Helpers
 
 namespace :deploy do
   before 'deploy:check:linked_files', 'magento:deploy:check'
-  before 'deploy:symlink:linked_files', 'magento:deploy:local_config'
 
   # If both 'scopes' and 'themes' are available in app/etc/config.php then the build should not require database or
   # cache backend configuration to deploy. Removing the link to app/etc/env.php in this case prevents any possible
@@ -50,7 +49,6 @@ namespace :deploy do
   task :updated do
     invoke 'magento:deploy:verify'
     invoke 'magento:composer:install' if fetch(:magento_deploy_composer)
-    invoke 'magento:deploy:version_check'
     invoke 'magento:setup:permissions'
 
     if fetch(:magento_deploy_production)
@@ -65,7 +63,7 @@ namespace :deploy do
       invoke 'magento:deploy:mode:production'
     end
 
-    invoke 'magento:setup:permissions'
+    invoke! 'magento:setup:permissions'
     invoke 'magento:maintenance:check'
     invoke 'magento:maintenance:enable' if fetch(:magento_deploy_maintenance)
 
@@ -77,18 +75,15 @@ namespace :deploy do
       end
     end
 
-    invoke 'magento:setup:db:schema:upgrade' if not fetch(:magento_internal_zero_down_flag)
-    invoke 'magento:setup:db:data:upgrade' if not fetch(:magento_internal_zero_down_flag)
-
-    # The app:config:import command was introduced in 2.2.0; check if it exists before invoking it
-    on primary fetch(:magento_deploy_setup_role) do
-      within release_path do
-        if test :magento, 'app:config:import --help >/dev/null 2>&1'
-          if not fetch(:magento_internal_zero_down_flag)
-            invoke 'magento:app:config:import'
-          end
+    if not fetch(:magento_internal_zero_down_flag)
+      on cache_hosts do
+        within release_path do
+          execute :magento, 'cache:flush'
         end
       end
+      invoke 'magento:app:config:import'
+      invoke 'magento:setup:db:schema:upgrade'
+      invoke 'magento:setup:db:data:upgrade'
     end
 
     on primary fetch(:magento_deploy_setup_role) do

data/lib/capistrano/tasks/magento.rake

@@ -27,7 +27,16 @@ namespace :magento do
       task :import do
         on primary fetch(:magento_deploy_setup_role) do
           within release_path do
-            execute :magento, 'app:config:import'
+            execute :magento, 'app:config:import --no-interaction'
+          end
+        end
+      end
+      
+      desc 'Checks if config propagation requires update'
+      task :status do
+        on primary fetch(:magento_deploy_setup_role) do
+          within release_path do
+            execute :magento, 'app:config:status'
           end
         end
       end
@@ -184,19 +193,6 @@ namespace :magento do
       end
     end
 
-    task :version_check do
-      on release_roles(:all), in: :sequence, wait: 1 do
-        within release_path do
-          _magento_version = magento_version
-          unless _magento_version >= Gem::Version.new('2.1.1')
-            error "\e[0;31mVersion 0.7.0 and later of this gem only support deployment of Magento 2.1.1 or newer; " +
-              "attempted to deploy v" + _magento_version.to_s + ". Please try again using an earlier version of this gem!\e[0m"
-            exit 1  # only need to check a single server, exit immediately
-          end
-        end
-      end
-    end
-
     task :check do
       on release_roles :all do
         next unless any? :linked_files_touch
@@ -231,17 +227,6 @@ namespace :magento do
       end
       exit 1 if is_err
     end
-
-    task :local_config do
-      on release_roles :all do
-        if test "[ -f #{release_path}/app/etc/config.local.php ]"
-          info "The repository contains app/etc/config.local.php, removing from :linked_files list."
-          _linked_files = fetch(:linked_files, [])
-          _linked_files.delete('app/etc/config.local.php')
-          set :linked_files, _linked_files
-        end
-      end
-    end
   end
 
   namespace :setup do
@@ -258,7 +243,7 @@ namespace :magento do
     end
     
     namespace :db do
-      desc 'Checks if database schema and/or data require upgrading'
+      desc 'Checks if DB schema or data requires upgrade'
       task :status do
         on primary fetch(:magento_deploy_setup_role) do
           within release_path do
@@ -311,7 +296,6 @@ namespace :magento do
           end
         end
       end
-      Rake::Task['magento:setup:permissions'].reenable  ## make task perpetually callable
     end
     
     namespace :di do
@@ -320,12 +304,7 @@ namespace :magento do
         on release_roles :all do
           within release_path do
             with mage_mode: :production do
-              output = capture :magento, 'setup:di:compile --no-ansi', verbosity: Logger::INFO
-
-              # 2.1.x doesn't return a non-zero exit code for certain errors (see davidalger/capistrano-magento2#41)
-              if output.to_s.include? 'Errors during compilation'
-                raise Exception, 'DI compilation command execution failed'
-              end
+              execute :magento, "setup:di:compile"
             end
           end
         end
@@ -337,62 +316,36 @@ namespace :magento do
       task :deploy do
         on release_roles :all do
           with mage_mode: :production do
-            _magento_version = magento_version
+            deploy_languages = fetch(:magento_deploy_languages)
+            if deploy_languages.count() > 0
+              deploy_languages = deploy_languages.join(' ').prepend(' ')
+            else
+              deploy_languages = nil
+            end
 
             deploy_themes = fetch(:magento_deploy_themes)
-            deploy_jobs = fetch(:magento_deploy_jobs)
-
             if deploy_themes.count() > 0
               deploy_themes = deploy_themes.join(' -t ').prepend(' -t ')
             else
               deploy_themes = nil
             end
 
+            deploy_jobs = fetch(:magento_deploy_jobs)
             if deploy_jobs
-              deploy_jobs = "--jobs #{deploy_jobs} "
+              deploy_jobs = " --jobs #{deploy_jobs}"
             else
               deploy_jobs = nil
             end
 
-            # Workaround core-bug with multi-lingual deployments on Magento 2.1.3 and greater. In these versions each
-            # language must be iterated individually. See issue #72 for details.
-            if _magento_version >= Gem::Version.new('2.1.3')
-              deploy_languages = fetch(:magento_deploy_languages)
-            else
-              deploy_languages = [fetch(:magento_deploy_languages).join(' ')]
-            end
-
-            # Magento 2.2 introduced static content compilation strategies that can be one of the following:
+            # Static content compilation strategies that can be one of the following:
             # quick (default), standard (like previous versions) or compact
             compilation_strategy = fetch(:magento_deploy_strategy)
-            if compilation_strategy and _magento_version >= Gem::Version.new('2.2.0')
-              compilation_strategy =  "-s #{compilation_strategy} "
-            else
-              compilation_strategy = nil
+            if compilation_strategy
+              compilation_strategy =  " -s #{compilation_strategy}"
             end
 
             within release_path do
-              # Magento 2.1 will fail to deploy if this file does not exist and static asset signing is enabled
-              execute :touch, "#{release_path}/pub/static/deployed_version.txt"
-
-              # This loop exists to support deploy on versions where each language must be deployed seperately
-              deploy_languages.each do |lang|
-                static_content_deploy "#{compilation_strategy}#{deploy_jobs}#{lang}#{deploy_themes}"
-              end
-            end
-
-            # Run again with HTTPS env var set to 'on' to pre-generate secure versions of RequireJS configs. A
-            # single run on these Magento versions will fail to generate the secure requirejs-config.js file.
-            if _magento_version < Gem::Version.new('2.1.8')
-              deploy_flags = ['css', 'less', 'images', 'fonts', 'html', 'misc', 'html-minify']
-                .join(' --no-').prepend(' --no-');
-
-              within release_path do with(https: 'on') {
-                # This loop exists to support deploy on versions where each language must be deployed seperately
-                deploy_languages.each do |lang|
-                  static_content_deploy "#{compilation_strategy}#{deploy_jobs}#{lang}#{deploy_themes}#{deploy_flags}"
-                end
-              } end
+              execute :magento, "setup:static-content:deploy#{compilation_strategy}#{deploy_jobs}#{deploy_languages}#{deploy_themes}"
             end
 
             # Set the deployed_version of static content to ensure it matches across all hosts
@@ -450,51 +403,43 @@ namespace :magento do
         end
 
         within release_path do
-          # The setup:db:status command is only available in Magento 2.2.2 and later
-          if not test :magento, 'setup:db:status --help >/dev/null 2>&1'
-            info "Magento CLI command setup:db:status is not available. Maintenance mode will be used by default."
-          else
-            info "Checking database status..."
-            # Check setup:db:status output and disable maintenance mode if all modules are up-to-date
-            database_status = capture :magento, 'setup:db:status', raise_on_non_zero_exit: false
-
-            if database_status.to_s.include? 'All modules are up to date'
-              info "All modules are up to date. No database updates should occur during this release."
-              info ""
-              disable_maintenance = true
-            else
-              puts "      #{database_status.gsub("\n", "\n      ").sub("Run 'setup:upgrade' to update your DB schema and data.", "")}"
-            end
+          info "Checking database status..."
+          # Check setup:db:status output and if out-of-date do not disable maintenance mode
+          database_status = capture :magento, 'setup:db:status', raise_on_non_zero_exit: false
+          database_uptodate = false
 
-            # Gather md5sums of app/etc/config.php on current and new release
-            info "Checking config status..."
-            config_hash_release = capture :md5sum, "#{release_path}/app/etc/config.php"
-            if test "[ -f #{current_path}/app/etc/config.php ]"
-              config_hash_current = capture :md5sum, "#{current_path}/app/etc/config.php"
-            else
-              config_hash_current = ("%-34s" % "n/a") + "#{current_path}/app/etc/config.php"
-            end
+          if database_status.to_s.include? 'All modules are up to date'
+            info "All modules are up to date."
+            info ""
+            database_uptodate = true
+          else
+            puts "      #{database_status.gsub("\n", "\n      ").sub(" Run 'setup:upgrade' to update your DB schema and data.", "")}"
+          end
 
-            # Output some informational messages showing the config.php hash values
-            info "<release_path>/app/etc/config.php hash: #{config_hash_release.split(" ")[0]}"
-            info "<current_path>/app/etc/config.php hash: #{config_hash_current.split(" ")[0]}"
+          # Check app:config:status output and if out-of-date do not disable maintenance mode
+          info "Checking config status..."
+          config_status = capture :magento, 'app:config:status', raise_on_non_zero_exit: false
+          config_uptodate = false
 
-            # If hashes differ, maintenance mode should not be disabled even if there are no database changes.
-            if config_hash_release.split(" ")[0] != config_hash_current.split(" ")[0]
-              info "Maintenance mode will not be disabled (config hashes differ)."
-              disable_maintenance = false
-            end
-            info ""
+          if config_status.to_s.include? 'Config files are up to date'
+            info "Config files are up to date."
+            config_uptodate = true
+          else
+            puts "      #{config_status.gsub("\n", "\n      ").sub(" Run app:config:import or setup:upgrade command to synchronize configuration.", "")}"
           end
+          info ""
 
-          if maintenance_enabled or disable_maintenance
-            info "Disabling maintenance mode management..."
+          # If both checks above reported up-to-date status checks disable maintenance mode
+          if database_uptodate and config_uptodate
+            disable_maintenance = true
           end
 
           if maintenance_enabled
+            info "Disabling maintenance mode management..."
             info "Maintenance mode was already active prior to deploy."
             set :magento_deploy_maintenance, false
           elsif disable_maintenance
+            info "Disabling maintenance mode management..."
             info "There are no database updates or config changes. This is a zero-down deployment."
             set :magento_internal_zero_down_flag, true # Set internal flag to stop db schema/data upgrades from running
             set :magento_deploy_maintenance, false     # Disable maintenance mode management since it is not neccessary

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-magento2
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.3
 platform: ruby
 authors:
 - David Alger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-12 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: A Capistrano extension for Magento 2 deployments. Takes care of specific
   Magento 2 requirements and adds tasks specific to the Magento 2 application.
 email:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Capistrano extension for Magento 2 deployments.