dkdeploy-core 9.0.0 → 9.3.0

data/lib/dkdeploy/tasks/deploy.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/dsl'
 
 include Capistrano::DSL
@@ -22,7 +24,7 @@ namespace :deploy do
       end
     end
     # Backup and remove last release
-    invoke 'deploy:cleanup_rollback'
+    invoke! 'deploy:cleanup_rollback'
 
     run_locally do
       error I18n.t('rollback_tasks', tasks_for_rollback: tasks_for_rollback.join(', '), scope: :dkdeploy) unless tasks_for_rollback.empty?
@@ -33,8 +35,7 @@ namespace :deploy do
       next unless Rake::Task.task_defined? task_name
 
       # call rollback task
-      Rake::Task[task_name].reenable
-      invoke task_name
+      invoke! task_name
     end
 
     run_locally do
@@ -53,6 +54,7 @@ namespace :deploy do
       end
 
       next if rollback_archives.count <= fetch(:keep_rollback_archives)
+
       info I18n.t('keep_rollback_archives',
                   scope: :dkdeploy,
                   host: host.to_s,

data/lib/dkdeploy/tasks/enhanced_symlinks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 namespace :deploy do
@@ -6,6 +8,7 @@ namespace :deploy do
       desc "Check directories to be linked exist in shared using the given hash 'enhanced_linked_dirs'"
       task :linked_dirs do
         next unless any? :enhanced_linked_dirs
+
         fetch(:enhanced_linked_dirs).each_key do |source|
           on release_roles :all do
             execute :mkdir, '-pv', shared_path.join(source)
@@ -16,6 +19,7 @@ namespace :deploy do
       desc "Check directories of files to be linked exist in shared using the given hash 'enhanced_linked_files'"
       task :make_linked_dirs do
         next unless any? :enhanced_linked_files
+
         fetch(:enhanced_linked_files).each_value do |target|
           on release_roles :all do
             execute :mkdir, '-pv', shared_path.join(target).dirname
@@ -26,6 +30,7 @@ namespace :deploy do
       desc "Check files to be linked exist in shared using the given hash 'enhanced_linked_files'"
       task :linked_files do
         next unless any? :enhanced_linked_files
+
         fetch(:enhanced_linked_files).each_key do |source|
           on release_roles :all do |host|
             unless test "[ -f #{shared_path.join source} ]"
@@ -41,6 +46,7 @@ namespace :deploy do
       desc "Symlink linked directories using the given hash 'enhanced_linked_dirs'"
       task :linked_dirs do
         next unless any? :enhanced_linked_dirs
+
         fetch(:enhanced_linked_dirs).each do |source, target|
           target = release_path.join(target)
           source = shared_path.join(source)
@@ -57,6 +63,7 @@ namespace :deploy do
       desc "Symlink linked files using the given hash 'enhanced_linked_files'"
       task :linked_files do
         next unless any? :enhanced_linked_files
+
         fetch(:enhanced_linked_files).each do |source, target|
           target = release_path.join(target)
           source = shared_path.join(source)

data/lib/dkdeploy/tasks/fail.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 include Capistrano::DSL
 
 namespace :deploy do

data/lib/dkdeploy/tasks/file_access.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'
 require 'dkdeploy/helpers/file_system'

data/lib/dkdeploy/tasks/maintenance.rake

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'i18n'
 require 'dkdeploy/i18n'
-require 'sshkit/dsl'
 require 'capistrano/dsl'
 
 include Capistrano::DSL
@@ -56,7 +57,7 @@ namespace :maintenance do
             next
           end
         end
-        execute :rm, '-f', maintenance_config_file_path
+        execute :rm, maintenance_config_file_path
       end
       info I18n.t('tasks.maintenance.disabled', mode: 'regular', scope: :dkdeploy)
     end
@@ -65,7 +66,7 @@ namespace :maintenance do
   desc "Disables the maintenance permanent mode. The 'maintenance:disable' will work in a regular way again."
   task :disable_permanent do
     on release_roles :app, :web do
-      execute :rm, '-f', maintenance_config_file_path
+      execute :rm, maintenance_config_file_path
       info I18n.t('tasks.maintenance.disabled', mode: 'permanent', scope: :dkdeploy)
     end
   end

data/lib/dkdeploy/tasks/mysql.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dkdeploy/constants'
 require 'dkdeploy/helpers/common'
 require 'dkdeploy/helpers/mysql'
@@ -13,6 +15,7 @@ namespace :mysql do
     mysql_slow_log = fetch(:mysql_slow_log, '')
     on roles :db do |server|
       next unless slow_log_exists? mysql_slow_log
+
       execute :echo, '', '>', mysql_slow_log
       info I18n.t('tasks.mysql.clear_slow_log', file: mysql_slow_log, host: server, scope: :dkdeploy)
     end
@@ -23,6 +26,7 @@ namespace :mysql do
     mysql_slow_log = fetch(:mysql_slow_log, '')
     on roles :db do |server|
       next unless slow_log_exists? mysql_slow_log
+
       local_filename = File.join(local_dump_path, "#{File.basename(mysql_slow_log, '.*')}.#{fetch(:stage)}.#{server.hostname}#{File.extname(mysql_slow_log)}")
       info I18n.t('file.download', file: mysql_slow_log, target: local_filename, host: server)
       download! mysql_slow_log, local_filename, via: :scp
@@ -34,6 +38,7 @@ namespace :mysql do
     mysql_slow_log = fetch(:mysql_slow_log, '')
     on roles :db do |server|
       next unless slow_log_exists? mysql_slow_log
+
       analyze_filename = "mysql_slow_log_analyze.#{fetch(:stage)}.#{server.hostname}.log"
       remote_filename = File.join(deploy_path, analyze_filename)
       local_filename = File.join(local_dump_path, analyze_filename)

data/lib/dkdeploy/tasks/project_version.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'
 require 'dkdeploy/constants'
@@ -21,9 +23,7 @@ namespace :project_version do
     on release_roles :app do
       info I18n.t('tasks.project_version.update.update', scope: :dkdeploy)
       # remove the to be replaced remote version file
-      if test " [ -f #{remote_version_file} ] "
-        execute :rm, '-f', remote_version_file
-      end
+      execute :rm, '-f', remote_version_file if test " [ -f #{remote_version_file} ] "
       # upload the current version file
       upload! local_version_file, remote_version_file
     end

data/lib/dkdeploy/tasks/utils.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'capistrano/i18n'
 require 'dkdeploy/i18n'
 

data/spec/fixtures/application/Capfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load DSL and Setup Up Stages
 require 'capistrano/setup'
 

data/spec/fixtures/application/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'dkdeploy-core', path: '../../'
@@ -6,6 +8,6 @@ gem 'dkdeploy-core', path: '../../'
 gem 'compass', '~> 1.0.3'
 
 # for debugging only
-gem 'pry', '~> 0.10.0'
+gem 'pry', '~> 0.10'
 
 gem 'bundler'

data/spec/fixtures/application/config/deploy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :application, 'test_app'
 
 SSHKit.config.command_map.prefix[:compass].push 'bundle exec'
@@ -16,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
@@ -27,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

data/spec/fixtures/application/config/deploy/dev.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 set :deploy_to, '/var/www/dkdeploy'
-server 'dkdeploy-core.dev', roles: %w[web app backend db], primary: true
+server 'dkdeploy-core.test', roles: %w[web app backend db], primary: true
 
 # no ssh compression on the dev stage
 set :ssh_options, {

data/spec/fixtures/capistrano/configuration/add_output_after_create_symlink.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 after 'deploy:symlink:release', '--dummy-task-name' do
   run_locally do

data/spec/fixtures/capistrano/configuration/custom_compass_sources.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 set :compass_sources, %w[
   htdocs/stylesheets/test1
   htdocs/stylesheets/test2

data/spec/fixtures/capistrano/configuration/custom_file_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # custom file access properties
 set :custom_file_access, {
   app: {

data/spec/fixtures/capistrano/configuration/default_deployment_behaviour.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Deploy workflow. See http://capistranorb.com/documentation/getting-started/flow/
 after 'deploy:started', 'apache:htaccess'
 after 'deploy:started', 'assets:compile_compass'

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-core
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.3.0
 platform: ruby
 authors:
 - Timo Webler
 - Nicolai Reuschling
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,131 +40,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: dkdeploy-test_environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: dkdeploy-test_environment
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.86.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 0.86.0
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.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
@@ -192,7 +192,6 @@ files:
 - dkdeploy-core.gemspec
 - features/apache.feature
 - features/assets.feature
-- features/bower.feature
 - features/current_folder.feature
 - features/db.feature
 - features/deploy.feature
@@ -204,7 +203,6 @@ files:
 - features/project_version.feature
 - features/support/env.rb
 - features/utils.feature
-- lib/capistrano/copy.rb
 - lib/capistrano/dkdeploy/core.rb
 - lib/dkdeploy.rb
 - lib/dkdeploy/constants.rb
@@ -223,7 +221,6 @@ files:
 - lib/dkdeploy/scm/copy.rb
 - lib/dkdeploy/tasks/apache.rake
 - lib/dkdeploy/tasks/assets.rake
-- lib/dkdeploy/tasks/bower.rake
 - lib/dkdeploy/tasks/current_folder.rake
 - lib/dkdeploy/tasks/db.rake
 - lib/dkdeploy/tasks/deploy.rake
@@ -247,7 +244,6 @@ files:
 - spec/fixtures/application/config/preseed/download.tar.gz
 - spec/fixtures/application/htdocs/.hidden/.gitkeep
 - spec/fixtures/application/htdocs/Gemfile
-- spec/fixtures/application/htdocs/bower.json
 - spec/fixtures/application/htdocs/catalog/.hidden/.gitkeep
 - spec/fixtures/application/htdocs/catalog/index.html
 - spec/fixtures/application/htdocs/index.html
@@ -266,7 +262,7 @@ homepage: https://github.com/dkdeploy/dkdeploy-core
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,22 +270,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: dkd basic deployment tasks and strategies
 test_files:
 - features/apache.feature
 - features/assets.feature
-- features/bower.feature
 - features/current_folder.feature
 - features/db.feature
 - features/deploy.feature
@@ -314,7 +308,6 @@ test_files:
 - spec/fixtures/application/config/preseed/download.tar.gz
 - spec/fixtures/application/htdocs/.hidden/.gitkeep
 - spec/fixtures/application/htdocs/Gemfile
-- spec/fixtures/application/htdocs/bower.json
 - spec/fixtures/application/htdocs/catalog/.hidden/.gitkeep
 - spec/fixtures/application/htdocs/catalog/index.html
 - spec/fixtures/application/htdocs/index.html