Merge branch 'release/8.1.0'

* release/8.1.0:
  prepare release of v8.1.0
  [TASK] use remote_web_root_path for path construction
  [BUGFIX] adjust user configuration in vm
  Adjust typo3 variable for TYPO3 8.7 compatibility
  Add support for typo3_console task "extension:setupactive"
  [CI] Test against Ruby 2.5

Author: ncreuschling

.travis.yml

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

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

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

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
 

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|

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

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

features/support/env.rb

@@ -4,7 +4,7 @@
 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)

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

@@ -10,7 +10,7 @@ module Cli
           # @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 @@ def typo3_cli_in_path(path, *cli_params)
           # @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 @@ def capture_typo3_cli_in_path_in_loop(path, maximum_loop_count, *cli_params, &bl
           # @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 @@ def typo3_console_in_path(path, *cli_params)
           # @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

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
 

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)