dkdeploy-core 9.0.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e20dc487baec36fb532f7f059d2901c83e91e6663132c7dfe05c9a42c6109a7
-  data.tar.gz: bbe8ea1e25b5395005584e02357e404abd9c96a9923c74c7ebbeebed2d1a0b16
+  metadata.gz: 01de919730c9238f0ddf22089d566239031ab4e4a5c764b6b936fbaee5790398
+  data.tar.gz: 7797adbab2d5eb3e6623b4317a6c493605e16e14cf59997576e24e1ecd83b9f1
 SHA512:
-  metadata.gz: 1972dd74e583e2ce2c870aa311d11ce96d40360b87a3fda52bb5f3a9d1365ca768e4153bf9e3fc90963cc4d40c41b58e1ef3bf27f011517116c4953460bc3dfe
-  data.tar.gz: 3d112034e4140b2126b11c5f91e382240d00b27b6ae2f34efd6434d0c79fe7669d25c37d51311316afbe3d429f6b952bfda0810bdb4b36539bfc8ae7db547f92
+  metadata.gz: a7a49cc2454cff2cd4b86aba5829ba4ece9b18b052056abd31504a963c7fd8f548b9f8f94f7de00974d3659cc76191c54a7566aaa272dd76cd86813fe93e45ab
+  data.tar.gz: '09189290d051c2d6fe873e4f24c474b206f575eb950d8643404105ee6d581f0c192a9fc6f4a1763fe8c8396a61f77c4286a7b968bc47f6c83f10b2c9d3dcd5b9'

data/CHANGELOG.md

@@ -2,10 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [9.0.1]
+## [9.1.0]
 ### Summary
 
-- use --no-tablespaces with mysqldump
+- Use correct capistrano context at copy scm
+- Update capistrano 3.10.1
+- Always execute tasks for each server or at rollback
 
 ## [9.0.0]
 ### Summary
@@ -27,11 +29,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - remove TYPO3 specific configuration
 - change some SCM roles from app to all
 
-## [8.0.2] - 2020-08-21
-### Summary
-
-- use --no-tablespaces with mysqldump
-
 ## [8.0.1] - 2017-05-15
 ### Summary
 
@@ -43,8 +40,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - first public release
 
 [Unreleased]: https://github.com/dkdeploy/dkdeploy-core/compare/master...develop
-[9.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.1
+[9.1.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.1.0
 [9.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.0
-[8.0.2]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.2
 [8.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.1
 [8.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.0

data/README.md

@@ -13,7 +13,7 @@ This Rubygem `dkdeploy-core` represents the extension of [Capistrano](http://cap
 
 Add this line to your application's `Gemfile`
 
-	gem 'dkdeploy-core', '~> 9.0'
+	gem 'dkdeploy-core', '~> 9.1'
 
 and then execute
 

data/dkdeploy-core.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
 
-  spec.add_dependency 'capistrano', '~> 3.9.0'
+  spec.add_dependency 'capistrano', '~> 3.10.1'
   spec.add_dependency 'highline', '~> 1.7.1'
 end

data/lib/dkdeploy/core/version.rb

@@ -4,8 +4,8 @@ module Dkdeploy
     #
     class Version
       MAJOR = 9
-      MINOR = 0
-      PATCH = 1
+      MINOR = 1
+      PATCH = 0
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join('.')

data/lib/dkdeploy/dsl.rb

@@ -6,15 +6,14 @@ module Dkdeploy
     # @param server [Capistrano::Configuration::Server] Server to execute task
     # @param task [String] Name of rake/capistrano task
     # @param args [Array] Arguments of rake/capistrano task
-    def invoke_for_server(server, task, *args) # rubocop:disable Metrics/AbcSize
+    def invoke_for_server(server, task, *args)
       backup_filter = fetch :filter, {}
       new_server_filter = Marshal.load(Marshal.dump(backup_filter))
       new_server_filter[:host] = server.hostname
       set :filter, new_server_filter
       env.setup_filters
       info I18n.t('dsl.invoke_for_server.set_filter', task: task, host: server.hostname, scope: :dkdeploy)
-      invoke task, *args
-      Rake::Task[task].reenable
+      invoke! task, *args
     ensure
       set :filter, backup_filter
       env.setup_filters

data/lib/dkdeploy/scm/copy.rake

@@ -1,6 +1,3 @@
-# This trick lets us access the copy plugin within `on` blocks.
-copy_plugin = self
-
 namespace :copy do
   desc 'Check if all configuration variables and copy sources exist'
   task :check do
@@ -24,11 +21,11 @@ namespace :copy do
 
       # generate an exclude.txt file with the patterns to be excluded
       exclude_content = copy_exclude.join("\n")
-      File.write(copy_plugin.local_exclude_path, exclude_content)
+      File.write(local_exclude_path, exclude_content)
 
       # build the tar archive excluding the patterns from exclude.txt
       within copy_source do
-        execute :tar, '-X ' + copy_plugin.local_exclude_path, '-cpzf', copy_plugin.local_archive_path, '.'
+        execute :tar, '-X ' + local_exclude_path, '-cpzf', local_archive_path, '.'
       end
     end
   end
@@ -38,17 +35,17 @@ namespace :copy do
   #
   task :copy_archive_to_server do
     on release_roles :all do
-      info I18n.t('file.upload', file: 'archive', target: copy_plugin.remote_tmp_dir, scope: :dkdeploy)
-      execute :mkdir, '-p', copy_plugin.remote_tmp_dir
+      info I18n.t('file.upload', file: 'archive', target: remote_tmp_dir, scope: :dkdeploy)
+      execute :mkdir, '-p', remote_tmp_dir
 
-      upload! copy_plugin.local_archive_path, copy_plugin.remote_tmp_dir
+      upload! local_archive_path, 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', copy_plugin.remote_archive_path
+        execute :tar, '-xpzf', remote_archive_path
       end
     end
   end
@@ -58,14 +55,14 @@ namespace :copy do
   task :clean_up_temporary_sources do
     # remove the local temporary directory
     run_locally do
-      info I18n.t('file.remove', path: copy_plugin.local_tmp_dir, scope: :dkdeploy)
-      execute :rm, '-rf', copy_plugin.local_tmp_dir
+      info I18n.t('file.remove', path: fetch(:copy_local_tmp_dir), scope: :dkdeploy)
+      execute :rm, '-rf', fetch(:copy_local_tmp_dir)
     end
 
     # removes the remote temp path including the uploaded archive
     on release_roles :all do
-      info I18n.t('file.remove', path: copy_plugin.remote_archive_path, scope: :dkdeploy)
-      execute :rm, '-rf', copy_plugin.remote_tmp_dir
+      info I18n.t('file.remove', path: remote_archive_path, scope: :dkdeploy)
+      execute :rm, '-rf', remote_tmp_dir
     end
   end
 
@@ -73,4 +70,32 @@ namespace :copy do
   task :set_current_revision do
     set :current_revision, I18n.t('log.revision_log_message', copy_source: fetch(:copy_source), time: Time.now, scope: :dkdeploy)
   end
+
+  # Archive path in a local temporary directory
+  #
+  # @return [String]
+  def local_exclude_path
+    File.join fetch(:copy_local_tmp_dir), 'exclude.txt'
+  end
+
+  # Archive path in a local temporary directory
+  #
+  # @return [String]
+  def local_archive_path
+    File.join fetch(:copy_local_tmp_dir), fetch(:copy_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, fetch(:copy_archive_filename)
+  end
 end

data/lib/dkdeploy/scm/copy.rb

@@ -25,6 +25,8 @@ 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_local_tmp_dir, Dir.mktmpdir
       end
 
       def register_hooks
@@ -34,51 +36,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', __FILE__)
       end
     end
   end

data/lib/dkdeploy/tasks/db.rake

@@ -115,7 +115,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-tablespaces',
+                '--no-data', '--skip-set-charset',
                 "--default-character-set=#{db_settings.fetch('charset')}",
                 '-u', db_settings.fetch('username'),
                 '-p',
@@ -150,7 +150,6 @@ namespace :db do
         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'),
@@ -180,7 +179,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-tablespaces',
+                '--no-data', '--skip-set-charset',
                 "--default-character-set=#{db_settings.fetch('charset')}",
                 '-u', db_settings.fetch('username'),
                 '-p',
@@ -215,7 +214,7 @@ namespace :db do
         execute :rm, '-f', remote_file_name
         execute :rm, '-f', remote_zipped_file
         execute :mysqldump,
-                '--no-data', '--skip-set-charset', '--no-tablespaces',
+                '--no-data', '--skip-set-charset',
                 '--no-create-info', '--skip-comments',
                 '--skip-extended-insert', '--skip-set-charset',
                 "--default-character-set=#{db_settings.fetch('charset')}",
@@ -314,7 +313,7 @@ namespace :db do
                 "--default-character-set=#{db_settings.fetch('charset')}",
                 '--no-create-info', '--skip-comments',
                 '--skip-extended-insert', '--skip-set-charset',
-                '--complete-insert', '--no-tablespaces',
+                '--complete-insert',
                 '-u', db_settings.fetch('username'),
                 '-p',
                 '-h', db_settings.fetch('host'), '-P', db_settings.fetch('port'),

data/lib/dkdeploy/tasks/deploy.rake

@@ -22,7 +22,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 +33,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

data/lib/dkdeploy/tasks/maintenance.rake

@@ -1,7 +1,6 @@
 require 'json'
 require 'i18n'
 require 'dkdeploy/i18n'
-require 'sshkit/dsl'
 require 'capistrano/dsl'
 
 include Capistrano::DSL

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-core
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.0
 platform: ruby
 authors:
 - Timo Webler
 - Nicolai Reuschling
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.1
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,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
@@ -266,7 +265,7 @@ homepage: https://github.com/dkdeploy/dkdeploy-core
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -281,8 +280,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.5
+signing_key: 
 specification_version: 4
 summary: dkd basic deployment tasks and strategies
 test_files:

data/lib/capistrano/copy.rb

@@ -1,2 +0,0 @@
-# if capistrano scm is set to copy, the current file will be loaded
-load File.expand_path('../../dkdeploy/tasks/copy.rake', __FILE__)