dkdeploy-core 9.2.2 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 975be721872df804b63245d574ee7f8c0c52a04479b44f2dc75bc33c2839cf68
-  data.tar.gz: 439049a3e552f4fb6d2dc783a2e0876db7564c5debd58394cb701614222a1911
+  metadata.gz: 6acb8c40708bb112f7b08cb5d00f26aa55c389a1fc556bcbafc73ab2a1b708f5
+  data.tar.gz: 5cb62f436995e877ae4892ea96bd6452aa382695a1962b9e4521675d2a44f8e4
 SHA512:
-  metadata.gz: 4fab2c04628bf881b7148a2de2932295786117dcfa7a5f3a19b7eee2e84f9700b6ec4e5d297603ec7dcf822ca331b1671bdbf92131f8100f01880a7c44a5a68e
-  data.tar.gz: cb26f718408624b56b744f6948a658ae4d339759b66744b36e64e596dbc2568142c8748be12f98453eb67123b5a74e45939ee39eedc682432e6b870a6734994d
+  metadata.gz: 6cab72a5a1ec9750b09794cdb8a42f779139855f9888370aec8c874db5f23d5cf911ad7dcb2db223f9146db420f52d694bc23c043b306928efcc78128b42aab3
+  data.tar.gz: 60d480c68407d803c889529ec07309f848b2b7f54e9fd27e8176a4c5e11777347d201c86a6cff90f18ad83c7ae3cb33942c5b9ca93d15cb596b4e6b004baca6f

data/.rubocop.yml

@@ -5,21 +5,19 @@ AllCops:
     - 'config/**/*'
     - 'Vagrantfile'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.7
   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.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/CHANGELOG.md

@@ -2,10 +2,42 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [10.0.0] - 2021-03-30
+### Summary
+
+- relaxed and updated gem dependencies
+
+## [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 
+- fixed bug in clean_up_temporary_sources
 
 ## [9.2.1] - 2019-12-06
 ### Summary
@@ -21,6 +53,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
 
@@ -28,6 +65,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
 
@@ -48,6 +90,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
 
@@ -59,10 +106,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/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2018 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de/
+Copyright (c) 2014-2021 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -13,7 +13,7 @@ This Rubygem `dkdeploy-core` represents the extension of [Capistrano](http://cap
 
 Add this line to your application's `Gemfile`
 
-	gem 'dkdeploy-core', '~> 9.2'
+	gem 'dkdeploy-core', '~> 10.0'
 
 and then execute
 
@@ -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/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

@@ -13,23 +13,23 @@ 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.3'
+  spec.required_ruby_version = '~> 2.7'
 
   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 'cucumber', '~> 5.3'
   spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
-  spec.add_development_dependency 'mysql2', '~> 0.3'
+  spec.add_development_dependency 'mysql2', '~> 0.5'
   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.62.0'
+  spec.add_development_dependency 'rubocop', '~> 1.12'
 
-  spec.add_dependency 'capistrano', '~> 3.11.0'
-  spec.add_dependency 'highline', '~> 1.7.1'
+  spec.add_dependency 'capistrano', '~> 3.16'
+  spec.add_dependency 'highline', '~> 2.0.3'
 end

data/lib/dkdeploy/core/version.rb

@@ -5,9 +5,9 @@ module Dkdeploy
     # Class for version number
     #
     class Version
-      MAJOR = 9
-      MINOR = 2
-      PATCH = 2
+      MAJOR = 10
+      MINOR = 0
+      PATCH = 0
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join('.')

data/lib/dkdeploy/interaction_handler/mysql.rb

@@ -30,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/tasks/assets.rake

@@ -46,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

@@ -8,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

@@ -82,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
 
@@ -112,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
 
@@ -140,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
 
@@ -176,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
 
@@ -211,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
@@ -246,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
 
@@ -273,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
 
@@ -307,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
@@ -392,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/spec/fixtures/application/config/deploy.rb

@@ -18,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
@@ -29,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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-core
 version: !ruby/object:Gem::Version
-  version: 9.2.2
+  version: 10.0.0
 platform: ruby
 authors:
 - Timo Webler
 - Nicolai Reuschling
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2021-03-30 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
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: dkdeploy-test_environment
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -129,42 +129,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '3.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.11.0
+        version: '3.16'
 - !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,15 +270,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: dkd basic deployment tasks and strategies
 test_files: