dkdeploy-core 9.2.4 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b8d47ae6341ab09f689581ccc5559ed894272dcb143f3301ceb031b4bbdb15
-  data.tar.gz: 4a711648ad50471922f4e9c6c8c42ae4f63f43a85f046ab432f8ee3172090a62
+  metadata.gz: a777b01f3efd02018a09ceb89a51e981812363eb928806454a40686805abd637
+  data.tar.gz: a495bab21f8d00b9b65a7d1d41cbd999c621194a844e3029dced0268c6340141
 SHA512:
-  metadata.gz: 8e7238a372471f7cc15275dc029e3be212acdfbe167ddf3b1bf93909f38ae9bff7e2f2349aef6553290368d3631c7f4c3dac4a2979cb5e7a3d324cfed85343f6
-  data.tar.gz: ff391d1b570cb4ef8dd272020eb2cb290efc8d7806fa6182f178041be828c14f94e599419f044b0e2a648c5c7c789fba0908d3bf4fa8e648c02d757cd444398d
+  metadata.gz: cd85e39b2bf80958e0ebb5db6e86637e520e649a2deddc44f0f61b31d4395eb0da460d97331a55e5f337ce480789af37941c3d981686fcc12cd304da2e460b07
+  data.tar.gz: bb3de683784e0e600430b5e3100c7024ec42efc11d4dc920adefcd7c500d9102f913a5e51bf21dfac5620a4b3aea1b2fd99ddfefc80992a757640cc774d7086e

data/.rubocop.yml

@@ -5,21 +5,19 @@ AllCops:
     - 'config/**/*'
     - 'Vagrantfile'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.3
+  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.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,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [9.2.4] - 2020-08-21
+## [9.3.0] - 2020-07-06
 ### Summary
 
-- use --no-tablespaces with mysqldump
+- 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.3] - 2019-05-29
 ### Summary
@@ -34,24 +38,14 @@ 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]
-### Summary
-
-- use --no-tablespaces with mysqldump
-
-## [9.1.0]
+## [9.1.0] - 2018-02-09
 ### Summary
 
 - Use correct capistrano context at copy scm
 - Update capistrano 3.10.1
 - Always execute tasks for each server or at rollback
 
-## [9.0.1]
-### Summary
-
-- use --no-tablespaces with mysqldump
-
-## [9.0.0]
+## [9.0.0] 2017-10-16
 ### Summary
 
 - tasks around MySQL slow log
@@ -71,11 +65,6 @@ 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-21
-### Summary
-
-- use --no-tablespaces with mysqldump
-
 ## [8.0.1] - 2017-05-15
 ### Summary
 
@@ -87,15 +76,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - first public release
 
 [Unreleased]: https://github.com/dkdeploy/dkdeploy-core/compare/master...develop
-[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/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/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 = 'test'
-    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,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.3'
+  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'
@@ -28,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.62.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/lib/dkdeploy/core/version.rb

@@ -6,8 +6,8 @@ module Dkdeploy
     #
     class Version
       MAJOR = 9
-      MINOR = 2
-      PATCH = 4
+      MINOR = 3
+      PATCH = 0
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join('.')

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', '--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
+      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
   end
 
@@ -140,30 +136,27 @@ 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',
-                '--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
+      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
     end
   end
 
@@ -177,24 +170,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', '--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
+      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
   end
 
@@ -212,27 +203,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-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
+      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
 
     run_locally do
@@ -247,23 +236,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
 
@@ -274,22 +261,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
 
@@ -308,27 +293,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', '--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
+      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
 
     run_locally do
@@ -393,14 +376,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

@@ -31,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-core
 version: !ruby/object:Gem::Version
-  version: 9.2.4
+  version: 9.3.0
 platform: ruby
 authors:
 - Timo Webler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-07-06 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.62.0
+        version: 0.86.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.62.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
@@ -270,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="