dkdeploy-core 9.1.0 → 9.2.4

data/features/mysql.feature

@@ -10,14 +10,14 @@ Feature: Test tasks for namespace 'mysql'
     And I successfully run `cap dev "db:update[temp,dkdeploy_core.sql.gz]"`
     And I successfully run `cap dev db:download_content`
     And I successfully run `cap dev mysql:download_slow_log`
-    Then a file named "temp/slow-queries.dev.dkdeploy-core.dev.log" should exist
+    Then a file named "temp/slow-queries.dev.dkdeploy-core.test.log" should exist
 
   Scenario: Downloading the MYSQL slow log analyze file
     When I successfully run `cap dev "db:upload_settings[127.0.0.1,3306,dkdeploy_core,root,ilikerandompasswords,utf8]"`
     And I successfully run `cap dev "db:update[temp,dkdeploy_core.sql.gz]"`
     And I successfully run `cap dev db:download_content`
     And I successfully run `cap dev mysql:analyze_download_slow_log`
-    Then a file named "temp/mysql_slow_log_analyze.dev.dkdeploy-core.dev.log" should exist
+    Then a file named "temp/mysql_slow_log_analyze.dev.dkdeploy-core.test.log" should exist
 
   Scenario: Clearing the MySQL slow log file
     When I successfully run `cap dev "db:upload_settings[127.0.0.1,3306,dkdeploy_core,root,ilikerandompasswords,utf8]"`

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/test_environment/application'
 
 ssh_config = {}
@@ -11,8 +13,8 @@ unless ssh_key_files.empty?
   }
 end
 
-TEST_APPLICATION = Dkdeploy::TestEnvironment::Application.new(File.expand_path('../../../', __FILE__), 'dkdeploy-core.dev', ssh_config)
-TEST_APPLICATION.mysql_connection_settings = { host: 'dkdeploy-core.dev', username: 'root', password: 'ilikerandompasswords' }
+TEST_APPLICATION = Dkdeploy::TestEnvironment::Application.new(File.expand_path('../..', __dir__), 'dkdeploy-core.test', ssh_config)
+TEST_APPLICATION.mysql_connection_settings = { host: 'dkdeploy-core.test', username: 'root', password: 'ilikerandompasswords' }
 
 # this configuration tricks Bundler into executing another Bundler project with clean enviroment
 # The official way via Bundler.with_clean_env did not work properly here

data/features/utils.feature

@@ -28,10 +28,10 @@ Feature: Test tasks for namespace 'utils'
 Remote file content
 		"""
 		When I successfully run `cap dev utils:download_file['download_file.txt']`
-		Then a file named "temp/download_file.dkdeploy-core.dev.txt" should exist
+		Then a file named "temp/download_file.dkdeploy-core.test.txt" should exist
 
 	Scenario: Download a file from server which does exist locally
-		Given a file named "temp/download_file.dkdeploy-core.dev.txt" with:
+		Given a file named "temp/download_file.dkdeploy-core.test.txt" with:
 		"""
 Local file content
 		"""
@@ -41,7 +41,7 @@ Local file content
 Remote file content
 		"""
 		When I successfully run `cap dev utils:download_file['download_file.txt']`
-		Then the file "temp/download_file.dkdeploy-core.dev.txt" should contain exactly:
+		Then the file "temp/download_file.dkdeploy-core.test.txt" should contain exactly:
 		"""
 Remote file content
 

data/lib/capistrano/dkdeploy/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 require 'dkdeploy/rollback_manager'
@@ -7,19 +9,18 @@ require 'dkdeploy/scm/copy'
 install_plugin Dkdeploy::SCM::Copy
 
 # Load dkdeploy tasks
-load File.expand_path('../../../dkdeploy/tasks/deploy.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/fail.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/maintenance.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/utils.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/file_access.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/assets.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/apache.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/project_version.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/db.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/enhanced_symlinks.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/current_folder.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/bower.rake', __FILE__)
-load File.expand_path('../../../dkdeploy/tasks/mysql.rake', __FILE__)
+load File.expand_path('../../dkdeploy/tasks/deploy.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/fail.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/maintenance.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/utils.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/file_access.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/assets.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/apache.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/project_version.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/db.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/enhanced_symlinks.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/current_folder.rake', __dir__)
+load File.expand_path('../../dkdeploy/tasks/mysql.rake', __dir__)
 
 # Hook into symlink related tasks
 after 'deploy:check:linked_dirs', 'deploy:enhanced_symlinks:check:linked_dirs'
@@ -56,10 +57,6 @@ namespace :load do
     # Number of archives to keep around
     set :keep_rollback_archives, 5
 
-    # List of bower.json files
-    set(:bower_path, -> { fetch(:copy_source) })
-    set(:bower_paths, -> { Array(fetch(:copy_source)) })
-
     # List of filters for file_access:set_selected_custom_access
     set :selected_custom_file_access, []
 

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,11 +1,13 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   module Core
     # Class for version number
     #
     class Version
       MAJOR = 9
-      MINOR = 1
-      PATCH = 0
+      MINOR = 2
+      PATCH = 4
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join('.')

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
@@ -7,7 +9,7 @@ module Dkdeploy
     # DB related helpers
     module DB
       def db_dump_file(infix = '')
-        date = DateTime.now.strftime(datetime_format)
+        date = Time.now.strftime(datetime_format)
         ['database', fetch(:stage), infix, date].join('-') << '.sql'
       end
 
@@ -22,12 +24,12 @@ module Dkdeploy
       def db_settings_hash
         {
           'database' => {
-            'host'     => fetch(:db_host),
-            'port'     => fetch(:db_port),
-            'name'     => fetch(:db_name),
+            'host' => fetch(:db_host),
+            'port' => fetch(:db_port),
+            'name' => fetch(:db_name),
             'username' => fetch(:db_username),
             'password' => fetch(:db_password),
-            'charset'  => fetch(:db_charset)
+            'charset' => fetch(:db_charset)
           }
         }
       end

data/lib/dkdeploy/helpers/file_system.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 module Dkdeploy
@@ -22,9 +24,8 @@ module Dkdeploy
       # @param path [String] path to resolve
       # @return [String]
       def resolve_path_if_symlink(context, path)
-        if context.test " [ -L #{path} ] "
-          return context.capture :readlink, '-f', path
-        end
+        return context.capture :readlink, '-f', path if context.test " [ -L #{path} ] "
+
         path
       end
 
@@ -57,19 +58,13 @@ module Dkdeploy
         resolved_path = resolve_path_if_symlink(context, path)
 
         # change owner if set
-        if access_properties.key?(:owner)
-          context.execute :chown, recursive, access_properties.fetch(:owner), resolved_path
-        end
+        context.execute :chown, recursive, access_properties.fetch(:owner), resolved_path if access_properties.key?(:owner)
 
         # change group if set
-        if access_properties.key?(:group)
-          context.execute :chgrp, recursive, access_properties.fetch(:group), resolved_path
-        end
+        context.execute :chgrp, recursive, access_properties.fetch(:group), resolved_path if access_properties.key?(:group)
 
         # change mode if set
-        if access_properties.key?(:mode) # rubocop:disable Style/GuardClause
-          context.execute :chmod, recursive, access_properties.fetch(:mode), resolved_path
-        end
+        context.execute :chmod, recursive, access_properties.fetch(:mode), resolved_path if access_properties.key?(:mode)
       end
     end
   end

data/lib/dkdeploy/helpers/mysql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 module Dkdeploy
@@ -9,6 +11,7 @@ module Dkdeploy
       # @return [Boolean]
       def slow_log_exists?(file_path)
         return true if !file_path.empty? && test("[ -f #{file_path} ]")
+
         error I18n.t('file.not_exists_or_not_accessible_on_host', file: file_path, host: server, scope: :dkdeploy)
         false
       end

data/lib/dkdeploy/i18n.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i18n'
 
 en = {
@@ -42,11 +44,6 @@ en = {
       charset: 'Please enter the database character set',
       zipped_db_file: 'Please enter the name of the zipped SQL script file'
     },
-    bower: {
-      command: 'Please enter the command you want to run',
-      path: 'Please enter the path to the bower.json file',
-      paths: 'Please enter the paths bower.json files (separated by spaces)'
-    },
     selected_custom_file_access: {
       paths: 'Please enter a list of paths (entries separated by spaces)'
     },
@@ -94,10 +91,6 @@ en = {
       upload_extract: 'Extracting %{file}',
       exclude_file_not_found: "No exclude file found. To use set variable 'assets_exclude_file'"
     },
-    bower: {
-      skipping_missing_directory: 'Skipping directory %{bower_path} because it does not exist.',
-      skipping_directory_with_missing_bower_file: 'Skipping directory %{bower_path} because it does not contain a bower.json file.'
-    },
     copy: {
       archive: {
         generate: 'Generating the tar archive.',
@@ -144,6 +137,4 @@ capistrano_i18n_overwritten = {
 I18n.backend.store_translations(:en, dkdeploy: en)
 I18n.backend.store_translations(:en, capistrano: capistrano_i18n_overwritten)
 
-if I18n.respond_to?(:enforce_available_locales=)
-  I18n.enforce_available_locales = true
-end
+I18n.enforce_available_locales = true if I18n.respond_to?(:enforce_available_locales=)

data/lib/dkdeploy/interaction_handler/mysql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dkdeploy
   module InteractionHandler
     # Interaction handler for mysql
@@ -26,8 +28,9 @@ module Dkdeploy
         else
           @mysql_error_seen = true if data =~ /.*ERROR.*/i
           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
@@ -20,7 +22,7 @@ module Dkdeploy
           channel.send_data("#{@password}\n")
         else
           channel.close
-          raise 'Unexpected data from stream. Can not send password to undefined stream'
+          raise 'Unexpected data from stream. Can not send password to undefined stream.'
         end
       end
     end

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'
@@ -25,7 +27,7 @@ module Dkdeploy
           'Thumbs.db',
           'composer.lock'
         ]
-        set_if_empty :copy_archive_filename, -> { Dir::Tmpname.make_tmpname([fetch(:application) + '_', '.tar.gz'], nil) }
+        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
 
@@ -38,7 +40,7 @@ module Dkdeploy
       def define_tasks
         # 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', __FILE__)
+        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'
@@ -115,7 +117,7 @@ namespace :db do
         execute :rm, '-f', remote_dump_file
         execute :rm, '-f', remote_zipped_dump_file
         execute :mysqldump,
-                '--no-data', '--skip-set-charset',
+                '--no-data', '--skip-set-charset', '--no-tablespaces',
                 "--default-character-set=#{db_settings.fetch('charset')}",
                 '-u', db_settings.fetch('username'),
                 '-p',
@@ -144,12 +146,13 @@ namespace :db do
         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}"
+          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'),
@@ -179,7 +182,7 @@ namespace :db do
         execute :rm, '-f', remote_dump_file
         execute :rm, '-f', remote_zipped_dump_file
         execute :mysqldump,
-                '--no-data', '--skip-set-charset',
+                '--no-data', '--skip-set-charset', '--no-tablespaces',
                 "--default-character-set=#{db_settings.fetch('charset')}",
                 '-u', db_settings.fetch('username'),
                 '-p',
@@ -214,7 +217,7 @@ namespace :db do
         execute :rm, '-f', remote_file_name
         execute :rm, '-f', remote_zipped_file
         execute :mysqldump,
-                '--no-data', '--skip-set-charset',
+                '--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')}",
@@ -313,7 +316,7 @@ namespace :db do
                 "--default-character-set=#{db_settings.fetch('charset')}",
                 '--no-create-info', '--skip-comments',
                 '--skip-extended-insert', '--skip-set-charset',
-                '--complete-insert',
+                '--complete-insert', '--no-tablespaces',
                 '-u', db_settings.fetch('username'),
                 '-p',
                 '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'),
@@ -363,9 +366,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