dkdeploy-core 9.0.0 → 9.3.0

data/lib/dkdeploy/scm/copy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tmpdir'
 require 'capistrano/scm/plugin'
 require 'capistrano/i18n'
@@ -25,6 +27,8 @@ module Dkdeploy
           'Thumbs.db',
           'composer.lock'
         ]
+        set_if_empty :copy_archive_filename, -> { [fetch(:application), rand(0x100000000).to_s(36)].join('_') + '.tar.gz' }
+        set_if_empty :copy_local_tmp_dir, Dir.mktmpdir
       end
 
       def register_hooks
@@ -34,51 +38,9 @@ module Dkdeploy
       end
 
       def define_tasks
-        eval_rakefile File.expand_path('../copy.rake', __FILE__)
-      end
-
-      # Archive filename as singleton
-      # Note: if the archive filename doesn't already exist it will be generated
-      #
-      # @return [String]
-      def archive_filename
-        @archive_filename ||= Dir::Tmpname.make_tmpname [application + '_', '.tar.gz'], nil
-      end
-
-      # Local temporary directory path as singleton
-      # Note: if the directory doesn't already exist it will be created
-      #
-      # @return [String]
-      def local_tmp_dir
-        @local_tmp_dir ||= Dir.mktmpdir
-      end
-
-      # Archive path in a local temporary directory
-      #
-      # @return [String]
-      def local_exclude_path
-        File.join local_tmp_dir, 'exclude.txt'
-      end
-
-      # Archive path in a local temporary directory
-      #
-      # @return [String]
-      def local_archive_path
-        File.join local_tmp_dir, archive_filename
-      end
-
-      # Remote temporary directory path
-      #
-      # @return [String]
-      def remote_tmp_dir
-        File.join fetch(:tmp_dir), application
-      end
-
-      # Archive path in a remote temporary directory
-      #
-      # @return [String]
-      def remote_archive_path
-        File.join remote_tmp_dir, archive_filename
+        # Don not use method "eval_rakefile" to load rake tasks.
+        # "eval_rakefile" defined wrong context and use sskit dsl api instead of capistrano dsl.
+        load File.expand_path('copy.rake', __dir__)
       end
     end
   end

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',
+              "--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,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',
-                '-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
 
@@ -174,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',
-                "--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
 
@@ -209,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-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
@@ -244,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
 
@@ -271,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
 
@@ -305,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',
-                '-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
@@ -363,9 +349,7 @@ namespace :db do
 
     remote_md5 = '' # to allow assignment in block and later comparison
     on primary :backend do
-      if test("[ -f #{remote_dump_md5_file} ]")
-        remote_md5 = capture("cat #{remote_dump_md5_file}")
-      end
+      remote_md5 = capture("cat #{remote_dump_md5_file}") if test("[ -f #{remote_dump_md5_file} ]")
     end
 
     run_locally do
@@ -392,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