dkdeploy-core 8.0.2 → 9.0.0

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

@@ -1,5 +1,5 @@
 set :deploy_to, '/var/www/dkdeploy'
-server 'dkdeploy-core.dev', roles: %w(web app backend), primary: true
+server 'dkdeploy-core.dev', roles: %w[web app backend db], primary: true
 
 # no ssh compression on the dev stage
 set :ssh_options, {
@@ -18,11 +18,11 @@ unless ssh_key_files.empty?
 end
 
 set :copy_source, 'htdocs'
-set :copy_exclude, %w(
+set :copy_exclude, %w[
   Gemfile*
   .hidden
   **/.hidden
-)
+]
 
 # version file path
 set :version_file_path, ''
@@ -33,3 +33,6 @@ set :default_file_access_owner_of_release_path, 'vagrant'
 
 set :default_file_access_group_of_shared_path, 'vagrant'
 set :default_file_access_group_of_release_path, 'vagrant'
+
+# mysql slow query log for performance analysis
+set :mysql_slow_log, '/var/log/mysql-default/slow-queries.log'

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

@@ -5,14 +5,51 @@ SSHKit.config.command_map.prefix[:chown].push 'sudo'
 SSHKit.config.command_map.prefix[:chgrp].push 'sudo'
 SSHKit.config.command_map.prefix[:chmod].push 'sudo'
 
-set :asset_folders, %w(fileadmin uploads)
-set :asset_default_content, %w(fileadmin uploads)
+set :asset_folders, %w[download]
+set :asset_default_content, %w[download]
 set :asset_exclude_file, 'config/assets_exclude_file.txt'
 
 set :format_options, command_output: true
 set :log_level, :debug
-set :format, :pretty
 
-set :asset_default_content, %w(fileadmin uploads)
+set :asset_default_content, %w[download]
 set :asset_exclude_file, 'config/assets_exclude_file.txt'
-set :asset_folders, %w(fileadmin uploads)
+set :asset_folders, %w[download]
+
+require 'dkdeploy/interaction_handler/mysql'
+namespace :db do
+  task :sql_error do
+    remote_db_file_path = File.join(shared_path, 'config')
+    remote_db_file = File.join(remote_db_file_path, 'broken.sql')
+    username = 'test_user'
+    password = "+p_secure[7Bvery_muchTL[E8yAGkMRT'A "
+    now = Time.now.to_i
+    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
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 
 after 'deploy:symlink:release', '--dummy-task-name' do
   run_locally do
-    # rubocop:disable UnneededPercentQ
-    info %q(Task 'deploy:symlink:release' executed)
+    info "Task 'deploy:symlink:release' executed"
   end
 end

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

@@ -1,4 +1,4 @@
-set :compass_sources, %w(
+set :compass_sources, %w[
   htdocs/stylesheets/test1
   htdocs/stylesheets/test2
-)
+]

metadata

@@ -1,62 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-core
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 9.0.0
 platform: ruby
 authors:
-- Lars Tode
 - Timo Webler
-- Kieran Hayes
 - Nicolai Reuschling
-- Johannes Goslar
-- Luka Lüdicke
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -77,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.40'
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -119,56 +115,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: dkdeploy-test_environment
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
-- !ruby/object:Gem::Dependency
-  name: sshkit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -185,28 +167,28 @@ dependencies:
         version: 1.7.1
 description: dkd basic deployment tasks and strategies
 email:
-- lars.tode@dkd.de
 - timo.webler@dkd.de
-- kieran.hayes@dkd.de
 - nicolai.reuschling@dkd.de
-- johannes.goslar@dkd.de
-- luka.luedicke@dkd.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - Berksfile
 - Berksfile.lock
+- CHANGELOG.md
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - Vagrantfile
+- assets/dkdeploy-logo.png
 - config/vm/cookbooks/dkdeploy-core/metadata.rb
 - config/vm/cookbooks/dkdeploy-core/recipes/default.rb
+- config/vm/cookbooks/dkdeploy-core/templates/my_extra_settings.erb
 - dkdeploy-core.gemspec
 - features/apache.feature
 - features/assets.feature
@@ -218,6 +200,7 @@ files:
 - features/error_handlers.feature
 - features/file_access.feature
 - features/maintenance.feature
+- features/mysql.feature
 - features/project_version.feature
 - features/support/env.rb
 - features/utils.feature
@@ -225,20 +208,22 @@ files:
 - lib/capistrano/dkdeploy/core.rb
 - lib/dkdeploy.rb
 - lib/dkdeploy/constants.rb
-- lib/dkdeploy/copy.rb
 - lib/dkdeploy/core/version.rb
 - lib/dkdeploy/dsl.rb
 - lib/dkdeploy/helpers/assets.rb
 - lib/dkdeploy/helpers/common.rb
 - lib/dkdeploy/helpers/db.rb
 - lib/dkdeploy/helpers/file_system.rb
+- lib/dkdeploy/helpers/mysql.rb
 - lib/dkdeploy/i18n.rb
+- lib/dkdeploy/interaction_handler/mysql.rb
 - lib/dkdeploy/interaction_handler/password.rb
 - lib/dkdeploy/rollback_manager.rb
+- lib/dkdeploy/scm/copy.rake
+- lib/dkdeploy/scm/copy.rb
 - lib/dkdeploy/tasks/apache.rake
 - lib/dkdeploy/tasks/assets.rake
 - lib/dkdeploy/tasks/bower.rake
-- lib/dkdeploy/tasks/copy.rake
 - lib/dkdeploy/tasks/current_folder.rake
 - lib/dkdeploy/tasks/db.rake
 - lib/dkdeploy/tasks/deploy.rake
@@ -246,6 +231,7 @@ files:
 - lib/dkdeploy/tasks/fail.rake
 - lib/dkdeploy/tasks/file_access.rake
 - lib/dkdeploy/tasks/maintenance.rake
+- lib/dkdeploy/tasks/mysql.rake
 - lib/dkdeploy/tasks/project_version.rake
 - lib/dkdeploy/tasks/utils.rake
 - spec/fixtures/application/Capfile
@@ -258,8 +244,7 @@ files:
 - spec/fixtures/application/config/etc/apache2/conf/dev.htaccess.erb
 - spec/fixtures/application/config/preseed/default_content.sql.gz
 - spec/fixtures/application/config/preseed/default_structure.sql.gz
-- spec/fixtures/application/config/preseed/fileadmin.tar.gz
-- spec/fixtures/application/config/preseed/uploads.tar.gz
+- 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
@@ -277,27 +262,28 @@ files:
 - spec/fixtures/capistrano/configuration/custom_compass_sources.rb
 - spec/fixtures/capistrano/configuration/custom_file_access.rb
 - spec/fixtures/capistrano/configuration/default_deployment_behaviour.rb
-homepage: https://redmine.dkd.de/projects/dkdeploy/wiki
+homepage: https://github.com/dkdeploy/dkdeploy-core
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.14
+signing_key: 
 specification_version: 4
 summary: dkd basic deployment tasks and strategies
 test_files:
@@ -311,6 +297,7 @@ test_files:
 - features/error_handlers.feature
 - features/file_access.feature
 - features/maintenance.feature
+- features/mysql.feature
 - features/project_version.feature
 - features/support/env.rb
 - features/utils.feature
@@ -324,8 +311,7 @@ test_files:
 - spec/fixtures/application/config/etc/apache2/conf/dev.htaccess.erb
 - spec/fixtures/application/config/preseed/default_content.sql.gz
 - spec/fixtures/application/config/preseed/default_structure.sql.gz
-- spec/fixtures/application/config/preseed/fileadmin.tar.gz
-- spec/fixtures/application/config/preseed/uploads.tar.gz
+- 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

data/lib/dkdeploy/copy.rb

@@ -1,121 +0,0 @@
-require 'tmpdir'
-require 'capistrano/scm'
-require 'capistrano/i18n'
-require 'dkdeploy/i18n'
-require 'dkdeploy/constants'
-
-include Capistrano::DSL
-
-module Dkdeploy
-  # Class for the capistrano copy
-  #
-  class Copy
-    include Dkdeploy::Constants
-
-    # Provide a wrapper for the SCM that loads a strategy for the user.
-    #
-    # @param [Rake] context     The context in which the strategy should run
-    # @param [Module] strategy  A module to include into the SCM instance. The
-    #    module should provide the abstract methods of Capistrano::SCM
-    #
-    def initialize(context, strategy)
-      @context = context
-      singleton = class << self; self; end
-      singleton.send(:include, strategy)
-    end
-
-    # Default copy strategy
-    #
-    module DefaultStrategy
-      # Checks if the local source directory exists.
-      #
-      def check
-        # scope object for the processing in the block
-        me = self
-        run_locally do
-          unless Dir.exist? me.copy_source
-            fatal I18n.t('directory.not_exists', name: me.copy_source, scope: :dkdeploy)
-            exit 1
-          end
-        end
-      end
-
-      # Copies the source file structure to the server excluding the not wanted elements.
-      #
-      def release
-        build_source_archive
-        copy_archive_to_server
-        clean_up_temporary_sources
-      end
-
-      # Builds a tar archive in a temporary directory
-      # excluding files and folders matching the configured pattern.
-      #
-      def build_source_archive
-        # scope object for the processing in the block
-        me = self
-        run_locally do
-          info I18n.t('tasks.copy.archive.generate', scope: :dkdeploy)
-
-          # generate an exclude.txt file with the patterns to be excluded
-          File.open(me.local_exclude_path, 'w+') do |file|
-            me.copy_exclude.each do |pattern|
-              file.puts pattern
-            end
-          end
-
-          # build the tar archive excluding the patterns from exclude.txt
-          within me.copy_source do
-            execute :tar, '-X ' + me.local_exclude_path, '-cpzf', me.local_archive_path, '.'
-          end
-        end
-      end
-
-      # Copies the tar archive on the remote server
-      # extracting it to the configured directory.
-      #
-      def copy_archive_to_server # rubocop:disable Metrics/AbcSize
-        # scope object for the processing in the block
-        me = self
-        on release_roles :app do
-          info I18n.t('file.upload', file: 'archive', target: me.remote_tmp_dir, scope: :dkdeploy)
-          execute :mkdir, '-p', me.remote_tmp_dir
-
-          upload! me.local_archive_path, me.remote_tmp_dir
-
-          info I18n.t('directory.create', directory: release_path, scope: :dkdeploy)
-          execute :mkdir, '-p', release_path
-
-          within release_path do
-            info I18n.t('tasks.copy.archive.extract', target: release_path, scope: :dkdeploy)
-            execute :tar, '-xpzf', me.remote_archive_path
-          end
-        end
-      end
-
-      # Cleans up the local and remote temporary directories
-      #
-      def clean_up_temporary_sources
-        # scope object for the processing in the block
-        me = self
-
-        # remove the local temporary directory
-        run_locally do
-          info I18n.t('file.remove', path: me.local_tmp_dir, scope: :dkdeploy)
-          execute :rm, '-rf', me.local_tmp_dir
-        end
-
-        # removes the remote archive
-        on release_roles :app do
-          info I18n.t('file.remove', path: me.remote_archive_path, scope: :dkdeploy)
-          execute :rm, '-f', me.remote_archive_path
-        end
-      end
-
-      # Fetches the current revision message
-      def fetch_revision
-        I18n.t('log.revision_log_message', copy_source: fetch(:copy_source), time: Time.now, scope: :dkdeploy)
-      end
-    end
-  end
-end

data/lib/dkdeploy/tasks/copy.rake

@@ -1,26 +0,0 @@
-require_relative '../copy'
-
-include Capistrano::DSL
-
-namespace :copy do
-  # Getter for copy strategy
-  #
-  def strategy
-    @strategy ||= Dkdeploy::Copy.new(self, fetch(:copy_strategy, Dkdeploy::Copy::DefaultStrategy))
-  end
-
-  desc 'Check if all configuration variables and copy sources exist'
-  task :check do
-    strategy.check
-  end
-
-  desc 'Upload the source repository to releases'
-  task :create_release do
-    strategy.release
-  end
-
-  desc 'Determine the revision that will be deployed'
-  task :set_current_revision do
-    set :current_revision, strategy.fetch_revision
-  end
-end