dkdeploy-core 9.2.1 → 9.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc314cd065dd6f41c21eae17ef5bfd1f71c68d9b59baaedebb47d0056b08b62
-  data.tar.gz: 3103ff9b91275de71bd3e3d389ed8929cb77bdab8abbc62cb17d7b4190391c26
+  metadata.gz: e58ab7e8cfabba6a3487df0d9f71d5ebe51ee792d879a222192fcf2505984ba5
+  data.tar.gz: 8e677ff0e1ce67d678113e6c834691930f1f905bae404050e05a7d819bdc232f
 SHA512:
-  metadata.gz: 76f64a7f35a6666116b06c7357271bfa79b2be9f6f3d9016f01140fd401f18db25a33ea6aec3ed7325d8d133538d98eaf5eebba6573e06b6df2493e8d98354b5
-  data.tar.gz: 6d660867553159fb1ca6dc534c8d28e0c81eaaf09848dc3603b4d69ff05acc3daf9cc1a7dc59da3e821f0a1d3daef8876d0705ea2fda740d75862cc187874c7f
+  metadata.gz: db22a4b79f0377304670da85caf31b137074d2eb72c49732cdef0799bec84c877aadee81d51d5a46925af3d9e41cc6ff525ec58994671cb468a50d3dbbbcf5cd
+  data.tar.gz: ef76a89ae190848e8fd5f789a1c2dc13ba91ed898f266233c256a4479054ef126ace8ba9c02a9adbe1e84de7933cfba06c88e48701c9e712d0ce9c0e959c2cb0

data/.rubocop.yml

@@ -5,21 +5,19 @@ AllCops:
     - 'config/**/*'
     - 'Vagrantfile'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
   ExtraDetails: true
   DisplayStyleGuide: true
   DisplayCopNames: true
-GlobalVars:
+Style/GlobalVars:
   AllowedVariables: []
-MethodLength:
+Metrics/MethodLength:
   Max: 25
-LineLength:
+Layout/LineLength:
   Max: 200
-SpecialGlobalVars:
+Style/SpecialGlobalVars:
   Enabled: false
-BracesAroundHashParameters:
-  Enabled: false
-CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/BlockLength:
   Enabled: false
@@ -27,3 +25,31 @@ Style/FormatStringToken:
   Enabled: false
 Style/MixinUsage:
   Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true

data/.travis.yml

@@ -2,13 +2,14 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
   - 2.5
+  - 2.6
+  - 2.7
 
 before_install:
-  - gem install bundler --no-document
+  - gem install bundler --no-doc
+  - gem install bundler-audit --no-doc
 
 script:
-  - bundle exec rubocop
+  - bundle-audit check --update
+  - bundle exec rubocop --display-cop-names --extra-details

data/Berksfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://supermarket.chef.io'
 
 cookbook 'dkdeploy-core', path: 'config/vm/cookbooks/dkdeploy-core'

data/CHANGELOG.md

@@ -2,6 +2,38 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [9.3.1] - 2020-08-20
+### Summary
+
+- use --no-tablespaces with mysqldump
+
+## [9.3.0] - 2020-07-06
+### Summary
+
+- Update gem `capistrano` to 3.14.x
+- Update gem `highline` to 2.0.x
+- Update gem 'aruba' to 1.0.x
+- Test ruby 2.7 via travis
+- Requires Ruby v2.5 or later
+
+## [9.2.4] - 2020-08-20
+### Summary
+
+- use --no-tablespaces with mysqldump
+
+## [9.2.3] - 2019-05-29
+### Summary
+
+- Remove frozen string error
+- Update interaction handler for new `htpasswd` versions
+- Use correct test statement for task "remove_unless_symlinked"
+
+## [9.2.2] - 2019-02-18
+### Summary
+
+- run tests and linter against Ruby 2.3
+- fixed bug in clean_up_temporary_sources
+
 ## [9.2.1] - 2019-12-06
 ### Summary
 
@@ -16,6 +48,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - we no longer remove maintenance_config_file_path forcefully to make failures more apparent
 - improved shell independence
 
+## [9.1.1] - 2020-08-20
+### Summary
+
+- use --no-tablespaces with mysqldump
+
 ## [9.1.0] - 2018-02-09
 ### Summary
 
@@ -23,6 +60,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Update capistrano 3.10.1
 - Always execute tasks for each server or at rollback
 
+## [9.0.1] - 2020-08-20
+### Summary
+
+- use --no-tablespaces with mysqldump
+
 ## [9.0.0] 2017-10-16
 ### Summary
 
@@ -43,6 +85,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - remove TYPO3 specific configuration
 - change some SCM roles from app to all
 
+## [8.0.2] - 2020-08-20
+### Summary
+
+- use --no-tablespaces with mysqldump
+
 ## [8.0.1] - 2017-05-15
 ### Summary
 
@@ -54,9 +101,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - first public release
 
 [Unreleased]: https://github.com/dkdeploy/dkdeploy-core/compare/master...develop
+[9.3.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.3.1
+[9.3.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.3.0
+[9.2.4]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.4
+[9.2.3]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.3
+[9.2.2]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.2
 [9.2.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.1
 [9.2.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.0
+[9.1.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.1.1
 [9.1.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.1.0
+[9.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.1
 [9.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.0
+[8.0.2]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.2
 [8.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.1
 [8.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.0

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org/'
 
 # Specify your gem's dependencies in dkdeploy-core.gemspec

data/README.md

@@ -64,7 +64,7 @@ The complete list of the dkdeploy constants you find in `/lib/capistrano/dkdeplo
 
 ### Prerequisite
 
-rvm (v1.29.x) with installed Ruby 2.2.
+rvm (v1.29.x) with installed Ruby 2.2 or newer.
 
 Add the virtual box alias to your `hosts` file
 
@@ -74,7 +74,7 @@ Add the virtual box alias to your `hosts` file
 
 1. Starting the local box (`vagrant up --provision`)
 2. Checking coding styles (`rubocop`)
-3. Running BDD cucumber tests (`cucumber`)
+3. Running BDD cucumber tests (`BUNDLER_VERSION=2.1.4 cucumber`)
 
 ## Contributing
 
@@ -84,7 +84,7 @@ Add the virtual box alias to your `hosts` file
 4. If project is not checked out already do git clone `git@github.com:dkdeploy/dkdeploy-core.git`
 5. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
 6. Git flow initialze `git flow init -d`
-7. Installing gems `bundle install`
+7. Installing gems `BUNDLER_VERSION=1.17.3 bundle install`
 8. Create new feature branch (`git flow feature start my-new-feature`)
 9. Run tests (README.md Testing)
 10. Commit your changes (`git commit -am 'Add some feature'`)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 task default: :spec
 require 'bundler/gem_tasks'
 

data/Vagrantfile

@@ -19,6 +19,7 @@ Vagrant.configure(2) do |config|
 
   config.vm.define('dkdeploy-core', primary: true) do |master_config|
     master_config.vm.network 'private_network', ip: ip_address
+    master_config.vm.hostname = domain
 
     # Chef settings
     master_config.vm.provision :chef_solo do |chef|
@@ -41,14 +42,12 @@ Vagrant.configure(2) do |config|
                               '--audio', 'none'
                            ]
     end
-  end
 
-  if Vagrant.has_plugin?('landrush')
-    config.landrush.enabled = true
-    config.landrush.guest_redirect_dns = false
-    config.landrush.tld = 'dev'
-    config.landrush.host domain, ip_address
-  else
-    config.vm.post_up_message = "Either install Vagrant plugin 'landrush' or add this entry to your host file: #{ip_address} #{domain}"
+    unless Vagrant.has_plugin?('vagrant-hostsupdater')
+      master_config.vm.post_up_message = <<-HEREDOC
+          Add following entries to your host file or install vagrant plugin vagrant-hostsupdater ("vagrant plugin install vagrant-hostsupdater") and restart virtual box
+            #{ip_address} #{domain}
+      HEREDOC
+    end
   end
 end

data/dkdeploy-core.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dkdeploy/core/version'
@@ -11,14 +13,14 @@ Gem::Specification.new do |spec|
   spec.description   = 'dkd basic deployment tasks and strategies'
   spec.summary       = 'dkd basic deployment tasks and strategies'
   spec.homepage      = 'https://github.com/dkdeploy/dkdeploy-core'
-  spec.required_ruby_version = '~> 2.2'
+  spec.required_ruby_version = '~> 2.5'
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'aruba', '~> 0.14.1'
+  spec.add_development_dependency 'aruba', '~> 1.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'cucumber', '~> 2.4'
   spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
@@ -26,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.5'
-  spec.add_development_dependency 'rubocop', '~> 0.60.0'
+  spec.add_development_dependency 'rubocop', '~> 0.86.0'
 
-  spec.add_dependency 'capistrano', '~> 3.11.0'
-  spec.add_dependency 'highline', '~> 1.7.1'
+  spec.add_dependency 'capistrano', '~> 3.14.1'
+  spec.add_dependency 'highline', '~> 2.0.3'
 end

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/test_environment/application'
 
 ssh_config = {}

data/lib/capistrano/dkdeploy/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 require 'dkdeploy/rollback_manager'

data/lib/dkdeploy.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/core/version'

data/lib/dkdeploy/constants.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   # Global static methods
   #

data/lib/dkdeploy/core/version.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   module Core
     # Class for version number
     #
     class Version
       MAJOR = 9
-      MINOR = 2
+      MINOR = 3
       PATCH = 1
 
       def self.to_s

data/lib/dkdeploy/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   # dsl api
   module DSL

data/lib/dkdeploy/helpers/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 module Dkdeploy

data/lib/dkdeploy/helpers/common.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'highline'
 
 module Dkdeploy

data/lib/dkdeploy/helpers/db.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 include Capistrano::DSL

data/lib/dkdeploy/helpers/file_system.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 module Dkdeploy

data/lib/dkdeploy/helpers/mysql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 module Dkdeploy

data/lib/dkdeploy/i18n.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 en = {

data/lib/dkdeploy/interaction_handler/mysql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   module InteractionHandler
     # Interaction handler for mysql
@@ -28,7 +30,7 @@ module Dkdeploy
           return raise 'Unexpected data from stream. Can not send password to undefined stream' unless @mysql_error_seen
 
           # combine the multiple lines from error message. The fact that the error message will be shown multiple times is simply ignored
-          @return_message << data
+          @return_message += data
           message = 'Error on executing MySQL command! Response (error code) is: '
           SSHKit.config.output.send(:error, "#{message}\n         #{@return_message}")
           raise 'InteractionHandler caught a MySQL error'

data/lib/dkdeploy/interaction_handler/password.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   module InteractionHandler
     # Interaction handler for password

data/lib/dkdeploy/rollback_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   # The RollbackManager module is a mixin for managing rollback tasks.
   module RollbackManager

data/lib/dkdeploy/scm/copy.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :copy do
   desc 'Check if all configuration variables and copy sources exist'
   task :check do
@@ -62,7 +64,7 @@ namespace :copy do
     # removes the remote temp path including the uploaded archive
     on release_roles :all do
       info I18n.t('file.remove', path: remote_archive_path, scope: :dkdeploy)
-      execute :rm, '-rf', remote_tmp_dir
+      execute :rm, '-rf', remote_archive_path
     end
   end
 

data/lib/dkdeploy/scm/copy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'capistrano/scm/plugin'
 require 'capistrano/i18n'

data/lib/dkdeploy/tasks/apache.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'erb'
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'

data/lib/dkdeploy/tasks/assets.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 require 'dkdeploy/i18n'
 require 'dkdeploy/helpers/common'
@@ -44,7 +46,7 @@ namespace :assets do
     on release_roles :web do
       info I18n.t('directory.create', scope: :dkdeploy)
       execute :mkdir, '-p', shared_path
-      execute :htpasswd, '-c', htpasswd_path, username, interaction_handler: Dkdeploy::InteractionHandler::Password.new(password)
+      execute :htpasswd, '-c', htpasswd_path, username, interaction_handler: { /.*password.*/i => "#{password}\n" }
       info I18n.t('tasks.assets.add_htpasswd.successfully_created', scope: :dkdeploy)
     end
   end

data/lib/dkdeploy/tasks/current_folder.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 require 'dkdeploy/i18n'
@@ -6,7 +8,7 @@ namespace :current_folder do
   desc "Delete current folder unless it's a symlink"
   task :remove_unlesss_symlinked do
     on release_roles :all do
-      if test "[ -d #{current_path} && ! -L #{current_path} ]"
+      if test "[ -d #{current_path} ] && [ ! -L #{current_path} ]"
         execute :rm, '-rf', current_path
       else
         info I18n.t('info.ignoring_current_folder', scope: :dkdeploy)

data/lib/dkdeploy/tasks/db.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/constants'
 require 'dkdeploy/helpers/common'
 require 'dkdeploy/helpers/db'
@@ -80,23 +82,21 @@ namespace :db do
     end
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_zipped_file_name
-        execute :rm, '-f', remote_file_name
-        upload! local_zipped_file_name, remote_zipped_file_name, via: :scp
-        execute :gunzip, remote_zipped_file_name
-        execute :mysql,
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
-                '-e', "'source #{remote_file_name}'",
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-      ensure
-        execute :rm, '-f', remote_zipped_file_name
-        execute :rm, '-f', remote_file_name
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_zipped_file_name
+      execute :rm, '-f', remote_file_name
+      upload! local_zipped_file_name, remote_zipped_file_name, via: :scp
+      execute :gunzip, remote_zipped_file_name
+      execute :mysql,
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
+              '-e', "'source #{remote_file_name}'",
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+    ensure
+      execute :rm, '-f', remote_zipped_file_name
+      execute :rm, '-f', remote_file_name
     end
   end
 
@@ -110,24 +110,22 @@ namespace :db do
     remote_zipped_dump_file = "#{remote_dump_file}.gz"
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_dump_file
-        execute :rm, '-f', remote_zipped_dump_file
-        execute :mysqldump,
-                '--no-data', '--skip-set-charset',
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
-                '>', remote_dump_file,
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-        execute :gzip, remote_dump_file
-        download! remote_zipped_dump_file, 'temp', via: :scp
-      ensure
-        execute :rm, '-f', remote_dump_file
-        execute :rm, '-f', remote_zipped_dump_file
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_dump_file
+      execute :rm, '-f', remote_zipped_dump_file
+      execute :mysqldump,
+              '--no-data', '--skip-set-charset', '--no-tablespaces',
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
+              '>', remote_dump_file,
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+      execute :gzip, remote_dump_file
+      download! remote_zipped_dump_file, 'temp', via: :scp
+    ensure
+      execute :rm, '-f', remote_dump_file
+      execute :rm, '-f', remote_zipped_dump_file
     end
   end
 
@@ -138,29 +136,28 @@ namespace :db do
     remote_zipped_dump_file = "#{remote_dump_file}.gz"
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_dump_file
-        execute :rm, '-f', remote_zipped_dump_file
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_dump_file
+      execute :rm, '-f', remote_zipped_dump_file
 
-        ignore_tables_command_line = ignore_tables.inject('') do |command_line, table|
-          command_line << " --ignore-table=#{db_settings.fetch('name')}.#{table}"
-        end
-
-        execute :mysqldump,
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '--skip-set-charset',
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), ignore_tables_command_line, db_settings.fetch('name'),
-                '>', remote_dump_file,
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-        execute :gzip, remote_dump_file
-        download! remote_zipped_dump_file, 'temp', via: :scp
-      ensure
-        execute :rm, '-f', remote_dump_file
-        execute :rm, '-f', remote_zipped_dump_file
+      ignore_tables_command_line = ignore_tables.inject('') do |command_line, table|
+        command_line + " --ignore-table=#{db_settings.fetch('name')}.#{table}"
       end
+
+      execute :mysqldump,
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '--skip-set-charset',
+              '--no-tablespaces',
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), ignore_tables_command_line, db_settings.fetch('name'),
+              '>', remote_dump_file,
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+      execute :gzip, remote_dump_file
+      download! remote_zipped_dump_file, 'temp', via: :scp
+    ensure
+      execute :rm, '-f', remote_dump_file
+      execute :rm, '-f', remote_zipped_dump_file
     end
   end
 
@@ -174,24 +171,22 @@ namespace :db do
     remote_zipped_dump_file = "#{remote_dump_file}.gz"
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_dump_file
-        execute :rm, '-f', remote_zipped_dump_file
-        execute :mysqldump,
-                '--no-data', '--skip-set-charset',
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'), table_name,
-                '>', remote_dump_file,
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-        execute :gzip, remote_dump_file
-        download! remote_zipped_dump_file, zipped_dump_file, via: :scp
-      ensure
-        execute :rm, '-f', remote_dump_file
-        execute :rm, '-f', remote_zipped_dump_file
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_dump_file
+      execute :rm, '-f', remote_zipped_dump_file
+      execute :mysqldump,
+              '--no-data', '--skip-set-charset', '--no-tablespaces',
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'), table_name,
+              '>', remote_dump_file,
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+      execute :gzip, remote_dump_file
+      download! remote_zipped_dump_file, zipped_dump_file, via: :scp
+    ensure
+      execute :rm, '-f', remote_dump_file
+      execute :rm, '-f', remote_zipped_dump_file
     end
   end
 
@@ -209,27 +204,25 @@ namespace :db do
     FileUtils.mkdir_p file_path
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_file_name
-        execute :rm, '-f', remote_zipped_file
-        execute :mysqldump,
-                '--no-data', '--skip-set-charset',
-                '--no-create-info', '--skip-comments',
-                '--skip-extended-insert', '--skip-set-charset',
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'),
-                db_settings.fetch('name'), table_names.join(' '),
-                '>', remote_file_name,
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-        execute :gzip, remote_file_name
-        download! remote_zipped_file, local_zipped_file, via: :scp
-      ensure
-        execute :rm, '-f', remote_file_name
-        execute :rm, '-f', remote_zipped_file
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_file_name
+      execute :rm, '-f', remote_zipped_file
+      execute :mysqldump,
+              '--no-data', '--skip-set-charset', '--no-tablespaces',
+              '--no-create-info', '--skip-comments',
+              '--skip-extended-insert', '--skip-set-charset',
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'),
+              db_settings.fetch('name'), table_names.join(' '),
+              '>', remote_file_name,
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+      execute :gzip, remote_file_name
+      download! remote_zipped_file, local_zipped_file, via: :scp
+    ensure
+      execute :rm, '-f', remote_file_name
+      execute :rm, '-f', remote_zipped_file
     end
 
     run_locally do
@@ -244,23 +237,21 @@ namespace :db do
     remote_zipped_default_content_file = "#{remote_default_content_file}.gz"
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_default_content_file
-        execute :rm, '-f', remote_zipped_default_content_file
-        upload! local_zipped_default_content_file, remote_zipped_default_content_file, via: :scp
-        execute :gunzip, remote_zipped_default_content_file
-        execute :mysql,
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
-                '-e', "'source #{remote_default_content_file}'",
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-      ensure
-        execute :rm, '-f', remote_default_content_file
-        execute :rm, '-f', remote_zipped_default_content_file
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_default_content_file
+      execute :rm, '-f', remote_zipped_default_content_file
+      upload! local_zipped_default_content_file, remote_zipped_default_content_file, via: :scp
+      execute :gunzip, remote_zipped_default_content_file
+      execute :mysql,
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
+              '-e', "'source #{remote_default_content_file}'",
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+    ensure
+      execute :rm, '-f', remote_default_content_file
+      execute :rm, '-f', remote_zipped_default_content_file
     end
   end
 
@@ -271,22 +262,20 @@ namespace :db do
     remote_zipped_default_structure_file = "#{remote_default_structure_file}.gz"
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_default_structure_file
-        execute :rm, '-f', remote_zipped_default_structure_file
-        upload! local_zipped_default_structure_file, remote_zipped_default_structure_file, via: :scp
-        execute :gunzip, remote_zipped_default_structure_file
-        execute :mysql,
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '-u', db_settings.fetch('username'), '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
-                '-e', "'source #{remote_default_structure_file}'",
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-      ensure
-        execute :rm, '-f', remote_default_structure_file
-        execute :rm, '-f', remote_zipped_default_structure_file
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_default_structure_file
+      execute :rm, '-f', remote_zipped_default_structure_file
+      upload! local_zipped_default_structure_file, remote_zipped_default_structure_file, via: :scp
+      execute :gunzip, remote_zipped_default_structure_file
+      execute :mysql,
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '-u', db_settings.fetch('username'), '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'), db_settings.fetch('name'),
+              '-e', "'source #{remote_default_structure_file}'",
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+    ensure
+      execute :rm, '-f', remote_default_structure_file
+      execute :rm, '-f', remote_zipped_default_structure_file
     end
   end
 
@@ -305,27 +294,25 @@ namespace :db do
     local_zipped_file = "#{local_file_name}.gz"
 
     on primary :backend do
-      begin
-        db_settings = read_db_settings_for_context(self)
-        execute :rm, '-f', remote_file_name
-        execute :rm, '-f', remote_zipped_file
-        execute :mysqldump,
-                "--default-character-set=#{db_settings.fetch('charset')}",
-                '--no-create-info', '--skip-comments',
-                '--skip-extended-insert', '--skip-set-charset',
-                '--complete-insert',
-                '-u', db_settings.fetch('username'),
-                '-p',
-                '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'),
-                db_settings.fetch('name'), table_names,
-                '>', remote_file_name,
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
-        execute :gzip, remote_file_name
-        download! remote_zipped_file, local_zipped_file, via: :scp
-      ensure
-        execute :rm, '-f', remote_file_name
-        execute :rm, '-f', remote_zipped_file
-      end
+      db_settings = read_db_settings_for_context(self)
+      execute :rm, '-f', remote_file_name
+      execute :rm, '-f', remote_zipped_file
+      execute :mysqldump,
+              "--default-character-set=#{db_settings.fetch('charset')}",
+              '--no-create-info', '--skip-comments',
+              '--skip-extended-insert', '--skip-set-charset',
+              '--complete-insert', '--no-tablespaces',
+              '-u', db_settings.fetch('username'),
+              '-p',
+              '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'),
+              db_settings.fetch('name'), table_names,
+              '>', remote_file_name,
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
+      execute :gzip, remote_file_name
+      download! remote_zipped_file, local_zipped_file, via: :scp
+    ensure
+      execute :rm, '-f', remote_file_name
+      execute :rm, '-f', remote_zipped_file
     end
 
     run_locally do
@@ -390,14 +377,14 @@ namespace :db do
                 '-e', "'source #{remote_dump_file}'",
                 interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch('password'))
       end
-    rescue SSHKit::Command::Failed => exception
+    rescue SSHKit::Command::Failed => e
       run_locally do
         error "Removing #{remote_dump_file} and #{remote_dump_md5_file}"
         execute :rm, '-f', remote_dump_md5_file
         execute :rm, '-f', remote_dump_file
       end
       task.reenable
-      raise "upload_tables failed: #{exception.message}"
+      raise "upload_tables failed: #{e.message}"
     end
   end
 end

data/lib/dkdeploy/tasks/deploy.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/dsl'
 
 include Capistrano::DSL

data/lib/dkdeploy/tasks/enhanced_symlinks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 namespace :deploy do

data/lib/dkdeploy/tasks/fail.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 namespace :deploy do

data/lib/dkdeploy/tasks/file_access.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'
 require 'dkdeploy/helpers/file_system'

data/lib/dkdeploy/tasks/maintenance.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'i18n'
 require 'dkdeploy/i18n'

data/lib/dkdeploy/tasks/mysql.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/constants'
 require 'dkdeploy/helpers/common'
 require 'dkdeploy/helpers/mysql'

data/lib/dkdeploy/tasks/project_version.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'
 require 'dkdeploy/constants'

data/lib/dkdeploy/tasks/utils.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'
 

data/spec/fixtures/application/Capfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load DSL and Setup Up Stages
 require 'capistrano/setup'
 

data/spec/fixtures/application/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'dkdeploy-core', path: '../../'

data/spec/fixtures/application/config/deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :application, 'test_app'
 
 SSHKit.config.command_map.prefix[:compass].push 'bundle exec'
@@ -16,6 +18,8 @@ set :asset_default_content, %w[download]
 set :asset_exclude_file, 'config/assets_exclude_file.txt'
 set :asset_folders, %w[download]
 
+set :additional_ignore_tables, %w[test_table]
+
 require 'dkdeploy/interaction_handler/mysql'
 namespace :db do
   task :sql_error do
@@ -27,29 +31,27 @@ namespace :db do
     sql_string = StringIO.new "INSERT INTO be_users (username, password, admin, tstamp, crdate)
                                 VALUES ('#{username}', MD5('#{password}'), 1, #{now}, #{now});"
     on primary :backend do
-      begin
-        db_settings = {
-          charset: 'utf8',
-          username: 'root',
-          password: 'ilikerandompasswords',
-          host: '127.0.0.1',
-          port: 3306,
-          name: 'dkdeploy_core'
-        }
-        execute :mkdir, '-p', remote_db_file_path
-        execute :rm, '-rf', remote_db_file
-
-        upload! sql_string, remote_db_file
-        execute :mysql,
-                "--default-character-set=#{db_settings.fetch(:charset)}",
-                '-u', db_settings.fetch(:username),
-                '-p',
-                '-h', db_settings.fetch(:host), '-P', db_settings.fetch(:port), db_settings.fetch(:name),
-                '-e', "'source #{remote_db_file}'",
-                interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch(:password))
-      ensure
-        execute :rm, '-rf', remote_db_file
-      end
+      db_settings = {
+        charset: 'utf8',
+        username: 'root',
+        password: 'ilikerandompasswords',
+        host: '127.0.0.1',
+        port: 3306,
+        name: 'dkdeploy_core'
+      }
+      execute :mkdir, '-p', remote_db_file_path
+      execute :rm, '-rf', remote_db_file
+
+      upload! sql_string, remote_db_file
+      execute :mysql,
+              "--default-character-set=#{db_settings.fetch(:charset)}",
+              '-u', db_settings.fetch(:username),
+              '-p',
+              '-h', db_settings.fetch(:host), '-P', db_settings.fetch(:port), db_settings.fetch(:name),
+              '-e', "'source #{remote_db_file}'",
+              interaction_handler: Dkdeploy::InteractionHandler::MySql.new(db_settings.fetch(:password))
+    ensure
+      execute :rm, '-rf', remote_db_file
     end
   end
 end

data/spec/fixtures/application/config/deploy/dev.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :deploy_to, '/var/www/dkdeploy'
 server 'dkdeploy-core.test', roles: %w[web app backend db], primary: true
 

data/spec/fixtures/capistrano/configuration/add_output_after_create_symlink.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 after 'deploy:symlink:release', '--dummy-task-name' do
   run_locally do
     info "Task 'deploy:symlink:release' executed"

data/spec/fixtures/capistrano/configuration/custom_compass_sources.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :compass_sources, %w[
   htdocs/stylesheets/test1
   htdocs/stylesheets/test2

data/spec/fixtures/capistrano/configuration/custom_file_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # custom file access properties
 set :custom_file_access, {
   app: {

data/spec/fixtures/capistrano/configuration/default_deployment_behaviour.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Deploy workflow. See http://capistranorb.com/documentation/getting-started/flow/
 after 'deploy:started', 'apache:htaccess'
 after 'deploy:started', 'assets:compile_compass'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-core
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.3.1
 platform: ruby
 authors:
 - Timo Webler
 - Nicolai Reuschling
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-06 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,42 +129,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.86.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.60.0
+        version: 0.86.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: 3.14.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 2.0.3
 description: dkd basic deployment tasks and strategies
 email:
 - timo.webler@dkd.de
@@ -262,7 +262,7 @@ homepage: https://github.com/dkdeploy/dkdeploy-core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -270,16 +270,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: dkd basic deployment tasks and strategies
 test_files: