Merge pull request #57 from dkdeploy/hotfix/9.2.3

Hotfix/9.2.3

Author: ncreuschling

CHANGELOG.md

@@ -2,7 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [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 

Vagrantfile

@@ -46,7 +46,7 @@ Vagrant.configure(2) do |config|
   if Vagrant.has_plugin?('landrush')
     config.landrush.enabled = true
     config.landrush.guest_redirect_dns = false
-    config.landrush.tld = 'dev'
+    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}"

lib/dkdeploy/core/version.rb

@@ -7,7 +7,7 @@ module Core
     class Version
       MAJOR = 9
       MINOR = 2
-      PATCH = 2
+      PATCH = 3
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join('.')

lib/dkdeploy/interaction_handler/mysql.rb

@@ -30,7 +30,7 @@ def on_data(_command, _stream_name, data, channel)
           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'

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

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)

lib/dkdeploy/tasks/db.rake

@@ -146,7 +146,7 @@ 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,

spec/fixtures/application/config/deploy.rb

@@ -18,6 +18,8 @@
 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