dkdeploy-typo3-cms 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7defac31faba874ad1097f02cf2efdff64ee38d617731118d8b3b6e7ddc38bfa
-  data.tar.gz: 39178bc80f3b08415018519268cadb83b5e2cab9f0ad3c49034b1b4b29bf3594
+  metadata.gz: 2efa618d6926181071595309ba8aa15c1b05ae2af7a381c36af6d9fdea1de110
+  data.tar.gz: ce9a5ffd61dde9d1f452c295f75508082127fc6a53a4f3ed2899624007beb719
 SHA512:
-  metadata.gz: ea8c4f80306702cbb608c1d35a59363a6b208adc351b68d39eeaa349b485efb9859dc2f22197559c96a1b70f7574336178df83936a53c72a36ee78a522463941
-  data.tar.gz: 4f7489984fbb4430fe5e92a01339598e69163c12481deee9debbc5004067b5b98e022623e7614f763432317a3b6b4f3aa828e9b3c4ee046e082727284493bd7a
+  metadata.gz: 76aaccb2fc2df6ffd38c3e1b134c965c305bea247e0e55af2549e4bbbb71bcd82ebfc7da0ba24f4f33c6ccc5b0aef61b8a3fb67ba4547060d6806ff505826108
+  data.tar.gz: d6fb48f97bde28ee4fd8112d1c02d5aaaf60464b588aa47f2a198af14a937324340d1422f80808c52bdc484cdcbba2a854e8d16f96060b8ad21f23ee7841ef13

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
 
 before_install:
   - gem install bundler --no-document

data/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.1.0] - 2018-12-06 
+### Summary
+
+- support for Ruby 2.5
+- add support for typo3_console task "extension:setupactive"
+- adjust typo3 variable for TYPO3 8.7 compatibility
+- use remote_web_root_path for path construction
+
 ## [8.0.0] - 2018-02-09
 ### Summary
 
@@ -26,5 +34,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - first public release
 
 [Unreleased]: https://github.com/dkdeploy/dkdeploy-typo3-cms/compare/master...develop
+[8.1.0]: https://github.com/dkdeploy/dkdeploy-typo3-cms/releases/tag/v8.1.0
 [8.0.0]: https://github.com/dkdeploy/dkdeploy-typo3-cms/releases/tag/v8.0.0
 [7.0.0]: https://github.com/dkdeploy/dkdeploy-typo3-cms/releases/tag/v7.0.0

data/CONTRIBUTORS.md

@@ -2,14 +2,18 @@
 
 The dkdeploy core maintainers would like to recognize following contributors (in alphabetic order):
 
+- Jan Bergmann
+- Dimitri Ebert
 - Sascha Egerer
 - Christoph Gerold
 - Johannes Goslar
+- Kai Harder
 - Kieran Hayes
 - Wilfried Irßlinger
 - Thomas Jahnke
 - Gleb Levitin
 - Luka Lüdicke
+- Minh-Thien Nhan
 - Nicolai Reuschling
 - Lars Tode
 - Timo Webler

data/README.md

@@ -13,7 +13,7 @@ dkdeploy-typo3-cms ruby gem represents the extension of [Capistrano](http://capi
 
 Add this line to your application's `Gemfile`
 
-	gem 'dkdeploy-typo3-cms', '~> 8.0'
+	gem 'dkdeploy-typo3-cms', '~> 8.1'
 
 and then execute
 

data/Vagrantfile

@@ -5,7 +5,7 @@ unless Vagrant.has_plugin?('vagrant-berkshelf')
   abort
 end
 
-Vagrant.require_version '~> 2.0.0'
+Vagrant.require_version '~> 2.0'
 chef_version = '12.9.41'
 
 Vagrant.configure(2) do |config|

data/config/vm/cookbooks/dkdeploy-typo3-cms/recipes/default.rb

@@ -15,7 +15,7 @@ end
 group 'www-data' do
   action :create
   append true
-  members 'ubuntu'
+  members 'vagrant'
 end
 
 # PHP

data/features/support/env.rb

@@ -4,7 +4,7 @@ ssh_config = {}
 ssh_key_files = Dir.glob(File.join(Dir.getwd, '.vagrant', 'machines', '**', 'virtualbox', 'private_key'))
 unless ssh_key_files.empty?
   # Define generated ssh key files
-  ssh_config = { user: 'ubuntu', keys: ssh_key_files }
+  ssh_config = { user: 'vagrant', keys: ssh_key_files }
 end
 
 TEST_APPLICATION = Dkdeploy::TestEnvironment::Application.new(File.expand_path('../../../', __FILE__), 'dkdeploy-typo3-cms.dev', ssh_config)

data/lib/dkdeploy/typo3/cms/helpers/cli.rb

@@ -10,7 +10,7 @@ module Dkdeploy
           # @return [Boolean] returns true/false as success of execution
           def typo3_cli(*cli_params)
             path_to_cli_dispatch = File.join(current_path, fetch(:path_to_typo3_cli))
-            run_script(current_path, path_to_cli_dispatch, cli_params)
+            run_script(File.join(current_path), path_to_cli_dispatch, cli_params)
           end
 
           # Execute a task typo3/cli_dispatch.phpsh cli_params in a specific directory
@@ -33,7 +33,7 @@ module Dkdeploy
           # @return [String] returns the last result of executing task
           def capture_typo3_cli_in_loop(maximum_loop_count, *cli_params, &block)
             path_to_cli_dispatch = File.join(current_path, fetch(:path_to_typo3_cli))
-            capture_script_in_loop(current_path, path_to_cli_dispatch, maximum_loop_count, cli_params, &block)
+            capture_script_in_loop(File.join(current_path), path_to_cli_dispatch, maximum_loop_count, cli_params, &block)
           end
 
           # Returns the last results of invocations of a task typo3/cli_dispatch.phpsh cli_params
@@ -56,7 +56,7 @@ module Dkdeploy
           # @return [Boolean] returns true/false as success of execution
           def typo3_console(*cli_params)
             path_to_typo3_console = File.join(current_path, fetch(:path_to_typo3_console))
-            run_script(current_path, path_to_typo3_console, cli_params)
+            run_script(File.join(current_path), path_to_typo3_console, cli_params)
           end
 
           # Execute a typo3_console task with cli_params in a specific directory
@@ -79,7 +79,7 @@ module Dkdeploy
           # @return [String] returns the last result of executing task
           def capture_typo3_console_in_loop(maximum_loop_count, *cli_params, &block)
             path_to_typo3_console = File.join(current_path, fetch(:path_to_typo3_console))
-            capture_script_in_loop(current_path, path_to_typo3_console, maximum_loop_count, cli_params, &block)
+            capture_script_in_loop(File.join(current_path), path_to_typo3_console, maximum_loop_count, cli_params, &block)
           end
 
           # Returns the last results of invocations of a typo3_console task with cli_params

data/lib/dkdeploy/typo3/cms/tasks/cache.rake

@@ -5,8 +5,10 @@ namespace :typo3 do
     namespace :cache do
       desc 'Clear TYPO3 file cache directory'
       task :clear_file_cache do |task|
+        remote_web_root_path = fetch(:remote_web_root_path, '.')
+
         on release_roles :app do
-          cache_path = File.join release_path, 'typo3temp', 'var', 'Cache'
+          cache_path = File.join release_path, remote_web_root_path, 'typo3temp', 'var', 'Cache'
           execute :rm, '-rf', cache_path if test "[ -d #{cache_path} ]"
         end
 

data/lib/dkdeploy/typo3/cms/tasks/typo3.rake

@@ -20,15 +20,18 @@ namespace :typo3 do
   namespace :cms do
     desc 'Clear typo3temp directory'
     task :clear_typo3temp do
+      remote_web_root_path = fetch(:remote_web_root_path, '.')
+
       on release_roles :app do
         info I18n.t('tasks.clear_temp.clear', scope: :dkdeploy)
-        execute :rm, '-rf', File.join(release_path, 'typo3temp', '*')
+        execute :rm, '-rf', File.join(release_path, remote_web_root_path, 'typo3temp', '*')
       end
     end
 
     desc 'Disable TYPO3 install tool'
     task :disable_install_tool do
-      flag = File.join(current_path, 'typo3conf', 'ENABLE_INSTALL_TOOL')
+      remote_web_root_path = fetch(:remote_web_root_path, '.')
+      flag                 = File.join(current_path, remote_web_root_path, 'typo3conf', 'ENABLE_INSTALL_TOOL')
 
       on release_roles :app do
         if test "[ -f #{flag} ]"
@@ -40,10 +43,12 @@ namespace :typo3 do
 
     desc 'Enable TYPO3 install tool'
     task :enable_install_tool do
+      remote_web_root_path = fetch(:remote_web_root_path, '.')
+
       on release_roles :app do
         info I18n.t('tasks.install_tool.enable', scope: :dkdeploy)
-        execute :mkdir, '-p', File.join(current_path, 'typo3conf')
-        execute :touch, File.join(current_path, 'typo3conf', 'ENABLE_INSTALL_TOOL')
+        execute :mkdir, '-p', File.join(current_path, remote_web_root_path, 'typo3conf')
+        execute :touch, File.join(current_path, remote_web_root_path, 'typo3conf', 'ENABLE_INSTALL_TOOL')
       end
     end
 
@@ -78,14 +83,17 @@ namespace :typo3 do
 
     desc 'Download extension to local workspace'
     task :fetch_extension, :extension do |_, args|
-      extension = ask_variable(args, :extension, 'tasks.fetch_extension.extension_name')
+      local_web_root_path  = ask_array_variable(args, :local_web_root_path, 'questions.local_web_root_path')
+      remote_web_root_path = fetch(:remote_web_root_path, '.')
+      extension            = ask_variable(args, :extension, 'tasks.fetch_extension.extension_name')
+
       FileUtils.mkdir_p File.join('temp', 'extensions')
       FileUtils.remove_dir File.join('temp', 'extensions', extension), true
-      source = File.join(current_path, 'typo3conf', 'ext', extension)
+      source = File.join(current_path, remote_web_root_path, 'typo3conf', 'ext', extension)
       target = File.join('temp', 'extensions')
 
       on primary(:backend) do
-        if test "[ -d #{File.join(current_path, 'typo3conf', 'ext', extension)} ]"
+        if test "[ -d #{File.join(current_path, remote_web_root_path, 'typo3conf', 'ext', extension)} ]"
           # download to temp
           info I18n.t('tasks.fetch_extension.download', extension: extension, scope: :dkdeploy)
           download! source, target, via: :scp, recursive: true
@@ -103,7 +111,7 @@ namespace :typo3 do
         rsync_exclude_directories.each do |exclude|
           rsync_excludes << '--exclude=' + exclude
         end
-        execute :rsync, '-vrS', '--force', '-C', '--delete', rsync_excludes, File.join('temp', 'extensions', extension, '/'), File.join('htdocs', 'typo3conf', 'ext', extension, '/')
+        execute :rsync, '-vrS', '--force', '-C', '--delete', rsync_excludes, File.join('temp', 'extensions', extension, '/'), File.join(local_web_root_path, 'typo3conf', 'ext', extension, '/')
       end
     end
 
@@ -208,11 +216,10 @@ namespace :typo3 do
       end
     end
 
-    # Deactivate Task. Wait for https://github.com/TYPO3-Console/typo3_console/pull/288
-    # desc 'add_static_db_content'
-    # task :add_static_db_content do
-    #   typo3_console 'database:importstaticdata'
-    # end
+    desc 'Task to import static extension data into TYPO3'
+    task :setup_active_extensions do
+      typo3_console 'extension:setupactive', '--verbose'
+    end
 
     desc 'Update translations for core and extensions (l10n)'
     task :update_translations, :typo3_languages_to_translate do |_, args|
@@ -222,6 +229,7 @@ namespace :typo3 do
 
     desc 'Remove not needed extensions'
     task :remove_extensions do
+      remote_web_root_path = fetch(:remote_web_root_path, '.')
       installed_extensions = (capture_typo3_console_in_loop 1, 'extension:list', '--active', '--raw').split("\n")
 
       run_locally do
@@ -233,13 +241,13 @@ namespace :typo3 do
 
       on roles :app do
         # Get extensions from typo3conf/ext directory
-        remote_list = capture(:ls, '-x', File.join(current_path, 'typo3conf', 'ext')).split
+        remote_list = capture(:ls, '-x', File.join(current_path, remote_web_root_path, 'typo3conf', 'ext')).split
 
         extensions_to_remove = (remote_list - installed_extensions)
         unless extensions_to_remove.empty?
           info I18n.t('tasks.typo3.cms.v6.remove_extensions.info', scope: :dkdeploy, removed_extensions: extensions_to_remove.join(', '))
           extensions_to_remove.each do |extension|
-            execute :rm, '-rf', "#{release_path}/typo3conf/ext/#{extension}"
+            execute :rm, '-rf', File.join(release_path, remote_web_root_path, 'typo3conf/ext', extension)
           end
         end
       end
@@ -261,8 +269,9 @@ namespace :typo3 do
 
     desc 'Sets up the TYPO3 6+ specific configuration for each stage'
     task :setup_additional_configuration, :additional_configuration_template do |_, args|
+      remote_web_root_path = fetch(:remote_web_root_path, '.')
       configuration_template = ask_variable(args, :additional_configuration_template, 'questions.additional_configuration_template')
-      remote_configuration_file = File.join(release_path, 'typo3conf', 'AdditionalConfiguration.php')
+      remote_configuration_file = File.join(release_path, remote_web_root_path, 'typo3conf', 'AdditionalConfiguration.php')
       unless File.exist?(configuration_template)
         run_locally do
           raise I18n.t('tasks.typo3.cms.v6.setup_additional_configuration.upload_info', configuration_template: configuration_template, scope: :dkdeploy)

data/lib/dkdeploy/typo3/cms/tasks/typoscript.rake

@@ -10,13 +10,14 @@ namespace :typo3 do
       desc "Uploads TypoScript config files from local paths prefixed by variable 'copy_source'"
       task :upload_configs, :copy_source, :typoscript_config_paths, :typoscript_config_file do |_, args|
         prefix      = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
+        remote      = fetch(:remote_web_root_path, '.')
         paths       = ask_array_variable(args, :typoscript_config_paths, 'tasks.typoscript.config_paths') { |question| question.default = '' }
         config_file = ask_variable(args, :typoscript_config_file, 'tasks.typoscript.config_file') { |question| question.default = 'config.txt' }
 
         paths.each do |path|
           local_path         = File.join(prefix, path)
           local_config_file  = File.join(local_path, config_file)
-          remote_path        = File.join(current_path, path)
+          remote_path        = File.join(current_path, remote, path)
           remote_config_file = File.join(remote_path, config_file)
 
           unless File.exist? local_config_file
@@ -38,13 +39,14 @@ namespace :typo3 do
       desc "Uploads PageTS files from local paths prefixed by variable 'copy_source'"
       task :upload_pagets, :copy_source, :typoscript_pagets_paths, :typoscript_pagets_file do |_, args|
         prefix      = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
+        remote      = fetch(:remote_web_root_path, '.')
         paths       = ask_array_variable(args, :typoscript_pagets_paths, 'tasks.typoscript.pagets_paths') { |question| question.default = '' }
         pagets_file = ask_variable(args, :typoscript_pagets_file, 'tasks.typoscript.pagets_file') { |question| question.default = 'PageTS.txt' }
 
         paths.each do |path|
           local_path         = File.join(prefix, path)
           local_pagets_file  = File.join(local_path, pagets_file)
-          remote_path        = File.join(current_path, path)
+          remote_path        = File.join(current_path, remote, path)
           remote_pagets_file = File.join(remote_path, pagets_file)
 
           unless File.exist? local_pagets_file
@@ -66,13 +68,14 @@ namespace :typo3 do
       desc "Uploads UserTS files from local paths prefixed by variable 'copy_source'"
       task :upload_userts, :copy_source, :typoscript_userts_paths, :typoscript_userts_file do |_, args|
         prefix      = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
+        remote      = fetch(:remote_web_root_path, '.')
         paths       = ask_array_variable(args, :typoscript_userts_paths, 'tasks.typoscript.userts_paths') { |question| question.default = '' }
         userts_file = ask_variable(args, :typoscript_userts_file, 'tasks.typoscript.userts_file') { |question| question.default = 'UserTS.txt' }
 
         paths.each do |path|
           local_path         = File.join(prefix, path)
           local_userts_file  = File.join(local_path, userts_file)
-          remote_path        = File.join(current_path, path)
+          remote_path        = File.join(current_path, remote, path)
           remote_userts_file = File.join(remote_path, userts_file)
 
           unless File.exist? local_userts_file
@@ -93,8 +96,9 @@ namespace :typo3 do
 
       desc 'Uploads all config files from given base path'
       task :upload_config_from_base_path, :copy_source, :typoscript_config_base_path, :typoscript_config_file do |_, args|
-        prefix = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
-        base_path = ask_variable(args, :typoscript_config_base_path, 'tasks.typoscript.typoscript_config_base_path') { |question| question.default = '.' }
+        prefix      = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
+        remote      = fetch(:remote_web_root_path, '.')
+        base_path   = ask_variable(args, :typoscript_config_base_path, 'tasks.typoscript.typoscript_config_base_path') { |question| question.default = '.' }
         config_file = ask_variable(args, :typoscript_config_file, 'tasks.typoscript.config_file') { |question| question.default = 'config.txt' }
 
         config_files = Dir[File.join(prefix, base_path, '**', config_file).to_s].map { |path_for_config_file| Pathname.new(path_for_config_file).relative_path_from(Pathname.new(prefix)).dirname.to_s }
@@ -102,6 +106,7 @@ namespace :typo3 do
         next if config_files.empty?
 
         set :copy_source, prefix
+        set :remote_web_root_path, remote
         set :typoscript_config_paths, config_files
         set :typoscript_config_file, config_file
         invoke 'typo3:cms:typoscript:upload_configs'
@@ -109,14 +114,16 @@ namespace :typo3 do
 
       desc 'Uploads all PageTS files from given base path'
       task :upload_pagets_from_base_path, :copy_source, :typoscript_pagets_base_path, :typoscript_pagets_file do |_, args|
-        prefix = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
-        base_path = ask_variable(args, :typoscript_pagets_base_path, 'tasks.typoscript.typoscript_pagets_base_path') { |question| question.default = '.' }
+        prefix      = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
+        remote      = fetch(:remote_web_root_path, '.')
+        base_path   = ask_variable(args, :typoscript_pagets_base_path, 'tasks.typoscript.typoscript_pagets_base_path') { |question| question.default = '.' }
         pagets_file = ask_variable(args, :typoscript_pagets_file, 'tasks.typoscript.pagets_file') { |question| question.default = 'PageTS.txt' }
 
         pagets_files = Dir[File.join(prefix, base_path, '**', pagets_file).to_s].map { |path_for_pagets_file| Pathname.new(path_for_pagets_file).relative_path_from(Pathname.new(prefix)).dirname.to_s }
         next if pagets_files.empty?
 
         set :copy_source, prefix
+        set :remote_web_root_path, remote
         set :typoscript_pagets_paths, pagets_files
         set :typoscript_pagets_file, pagets_file
         invoke 'typo3:cms:typoscript:upload_pagets'
@@ -124,14 +131,16 @@ namespace :typo3 do
 
       desc 'Uploads all UserTS files from given base path'
       task 'upload_userts_from_base_path', :copy_source, :typoscript_userts_base_path, :typoscript_userts_file do |_, args|
-        prefix = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
-        base_path = ask_variable(args, :typoscript_userts_base_path, 'tasks.typoscript.typoscript_userts_base_path') { |question| question.default = '.' }
+        prefix      = ask_variable(args, :copy_source, 'tasks.typoscript.copy_source') { |question| question.default = 'htdocs' }
+        remote      = fetch(:remote_web_root_path, '.')
+        base_path   = ask_variable(args, :typoscript_userts_base_path, 'tasks.typoscript.typoscript_userts_base_path') { |question| question.default = '.' }
         userts_file = ask_variable(args, :typoscript_userts_file, 'tasks.typoscript.userts_file') { |question| question.default = 'UserTS.txt' }
 
         userts_files = Dir[File.join(prefix, base_path, '**', userts_file).to_s].map { |path_for_userts_file| Pathname.new(path_for_userts_file).relative_path_from(Pathname.new(prefix)).dirname.to_s }
         next if userts_files.empty?
 
         set :copy_source, prefix
+        set :remote_web_root_path, remote
         set :typoscript_userts_paths, userts_files
         set :typoscript_userts_file, userts_file
         invoke 'typo3:cms:typoscript:upload_userts'
@@ -139,11 +148,12 @@ namespace :typo3 do
 
       desc 'Merge remote TypoScript config files'
       task :merge_configs, :typoscript_config_paths, :typoscript_config_file do |_, args|
-        paths = ask_array_variable(args, :typoscript_config_paths, 'tasks.typoscript.config_paths')
+        remote      = fetch(:remote_web_root_path, '.')
+        paths       = ask_array_variable(args, :typoscript_config_paths, 'tasks.typoscript.config_paths')
         config_file = ask_variable(args, :typoscript_config_file, 'tasks.typoscript.config_file') { |question| question.default = 'config.txt' }
 
         paths.each do |path|
-          path = File.join(release_path, path)
+          path = File.join(release_path, remote, path)
 
           target_config_file_with_stage_name = config_file.split('.').join(".#{fetch(:stage)}.")
           source_config_file = File.join(path, 'Stages', target_config_file_with_stage_name)
@@ -169,11 +179,12 @@ namespace :typo3 do
 
       desc 'Merge remote PageTS files'
       task :merge_pagets, :typoscript_pagets_paths, :typoscript_pagets_file do |_, args|
-        paths = ask_array_variable(args, :typoscript_pagets_paths, 'tasks.typoscript.pagets_paths')
+        remote      = fetch(:remote_web_root_path, '.')
+        paths       = ask_array_variable(args, :typoscript_pagets_paths, 'tasks.typoscript.pagets_paths')
         pagets_file = ask_variable(args, :typoscript_pagets_file, 'tasks.typoscript.pagets_file') { |question| question.default = 'PageTS.txt' }
 
         paths.each do |path|
-          path = File.join(release_path, path)
+          path = File.join(release_path, remote, path)
 
           target_pagets_file_with_stage_name = pagets_file.split('.').join(".#{fetch(:stage)}.")
           source_pagets_file = File.join(path, 'Stages', target_pagets_file_with_stage_name)
@@ -199,11 +210,12 @@ namespace :typo3 do
 
       desc 'Merge remote UserTS files'
       task :merge_userts, :typoscript_userts_paths, :typoscript_userts_file do |_, args|
-        paths = ask_array_variable(args, :typoscript_userts_paths, 'tasks.typoscript.userts_paths')
+        remote      = fetch(:remote_web_root_path, '.')
+        paths       = ask_array_variable(args, :typoscript_userts_paths, 'tasks.typoscript.userts_paths')
         userts_file = ask_variable(args, :typoscript_userts_file, 'tasks.typoscript.userts_file') { |question| question.default = 'UserTS.txt' }
 
         paths.each do |path|
-          path = File.join(release_path, path)
+          path = File.join(release_path, remote, path)
 
           target_userts_file_with_stage_name = userts_file.split('.').join(".#{fetch(:stage)}.")
           source_userts_file = File.join(path, 'Stages', target_userts_file_with_stage_name)
@@ -229,13 +241,14 @@ namespace :typo3 do
 
       desc 'Merge all remote config files for a given base path'
       task :merge_config_in_base_path, :typoscript_config_base_path, :typoscript_config_file do |_, args|
-        base_path = ask_variable(args, :typoscript_config_base_path, 'tasks.typoscript.typoscript_config_base_path') { |question| question.default = '.' }
+        remote      = fetch(:remote_web_root_path, '.')
+        base_path   = ask_variable(args, :typoscript_config_base_path, 'tasks.typoscript.typoscript_config_base_path') { |question| question.default = '.' }
         config_file = ask_variable(args, :typoscript_config_file, 'tasks.typoscript.config_file') { |question| question.default = 'config.txt' }
 
         list_of_files = ''
         target_config_file_with_stage_name = config_file.split('.').join(".#{fetch(:stage)}.")
         on primary :app do
-          list_of_files = capture :find, File.join(release_path, base_path), '-type f', "-name '#{target_config_file_with_stage_name}'"
+          list_of_files = capture :find, File.join(release_path, remote, base_path), '-type f', "-name '#{target_config_file_with_stage_name}'"
         end
 
         next if list_of_files.empty?
@@ -248,13 +261,14 @@ namespace :typo3 do
 
       desc 'Merge all remote PageTS files for a given base path'
       task :merge_pagets_in_base_path, :typoscript_pagets_base_path, :typoscript_pagets_file do |_, args|
-        base_path = ask_variable(args, :typoscript_pagets_base_path, 'tasks.typoscript.typoscript_pagets_base_path') { |question| question.default = '.' }
+        remote      = fetch(:remote_web_root_path, '.')
+        base_path   = ask_variable(args, :typoscript_pagets_base_path, 'tasks.typoscript.typoscript_pagets_base_path') { |question| question.default = '.' }
         pagets_file = ask_variable(args, :typoscript_pagets_file, 'tasks.typoscript.pagets_file') { |question| question.default = 'PageTS.txt' }
 
         list_of_files = ''
         target_pagets_file_with_stage_name = pagets_file.split('.').join(".#{fetch(:stage)}.")
         on primary :app do
-          list_of_files = capture :find, File.join(release_path, base_path), '-type f', "-name '#{target_pagets_file_with_stage_name}'"
+          list_of_files = capture :find, File.join(release_path, remote, base_path), '-type f', "-name '#{target_pagets_file_with_stage_name}'"
         end
 
         next if list_of_files.empty?
@@ -267,17 +281,18 @@ namespace :typo3 do
 
       desc 'Merge all remote UserTS files for a given bbase path'
       task :merge_userts_in_base_path, :typoscript_userts_base_path, :typoscript_userts_file do |_, args|
-        base_path = ask_variable(args, :typoscript_userts_base_path, 'tasks.typoscript.typoscript_userts_base_path') { |question| question.default = '.' }
+        remote      = fetch(:remote_web_root_path, '.')
+        base_path   = ask_variable(args, :typoscript_userts_base_path, 'tasks.typoscript.typoscript_userts_base_path') { |question| question.default = '.' }
         userts_file = ask_variable(args, :typoscript_userts_file, 'tasks.typoscript.userts_file') { |question| question.default = 'UserTS.txt' }
 
         list_of_files = ''
         target_userts_file_with_stage_name = userts_file.split('.').join(".#{fetch(:stage)}.")
         on primary :app do
-          list_of_files = capture :find, File.join(release_path, base_path), '-type f', "-name '#{target_userts_file_with_stage_name}'"
+          list_of_files = capture :find, File.join(release_path, remote, base_path), '-type f', "-name '#{target_userts_file_with_stage_name}'"
         end
 
         next if list_of_files.empty?
-        userts_files = list_of_files.split.map { |file| Pathname.new(file).relative_path_from(Pathname.new(release_path)).dirname.dirname.to_s }
+        userts_files = list_of_files.split.map { |file| Pathname.new(file).relative_path_from(Pathname.new(release_path) + remote).dirname.dirname.to_s }
 
         set :typoscript_userts_paths, userts_files
         set :typoscript_userts_file, userts_file

data/lib/dkdeploy/typo3/cms/version.rb

@@ -4,7 +4,7 @@ module Dkdeploy
       # Class for version number
       class Version
         MAJOR = 8
-        MINOR = 0
+        MINOR = 1
         PATCH = 0
 
         def self.to_s

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

@@ -11,7 +11,7 @@ unless ssh_key_files.empty?
   # Define generated ssh key files
   set :ssh_options, fetch(:ssh_options).merge(
     {
-      user: 'ubuntu',
+      user: 'vagrant',
       keys: ssh_key_files
     }
   )

data/vendor/AdditionalConfiguration.php.erb

@@ -1,7 +1,7 @@
 <?php
-<% if File.exist?(File.join('htdocs', 'typo3conf', 'AdditionalConfiguration.php')) %>
+<% if File.exist?(File.join(fetch(:local_web_root_path), 'typo3conf', 'AdditionalConfiguration.php')) %>
 // Content of default configuration file
-<%= sanitize_php File.read(File.join('htdocs', 'typo3conf', 'AdditionalConfiguration.php')) %>
+<%= sanitize_php File.read(File.join(fetch(:local_web_root_path), 'typo3conf', 'AdditionalConfiguration.php')) %>
 <% end %>
 <% if File.exist?(File.join('config', 'typo3', "AdditionalConfiguration.#{fetch(:stage)}.php")) %>
 

data/vendor/create_caretaker_instance_keys.php.erb

@@ -2,9 +2,9 @@
 
 $handle = fopen('<%= fetch(:caretaker_instance_keys_path) %>', 'w');
 fwrite($handle, "<?php
-\$TYPO3_CONF_VARS['EXT']['extConf']['caretaker_instance'] = serialize(
+\$GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['caretaker_instance'] = serialize(
     array_replace_recursive(
-        unserialize(\$TYPO3_CONF_VARS['EXT']['extConf']['caretaker_instance']),
+        unserialize(\$GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['caretaker_instance']),
         array (
             'crypto.' => array(
                 'instance.' => array(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dkdeploy-typo3-cms
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Kieran Hayes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-09 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: dkd TYPO3 deployment tasks and strategies