dkdeploy-typo3-cms 7.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: de0fa1b1b6b17b993e5bbfc00f3643bec583ff2e
-  data.tar.gz: 8d29b7c6262f3e8fb3862d9a74996844da44ebab
+SHA256:
+  metadata.gz: 7defac31faba874ad1097f02cf2efdff64ee38d617731118d8b3b6e7ddc38bfa
+  data.tar.gz: 39178bc80f3b08415018519268cadb83b5e2cab9f0ad3c49034b1b4b29bf3594
 SHA512:
-  metadata.gz: c77f61659eb8293abdcfd73f7a157b4ef366a4b48822e0cc977b055797915ea9bd733106f7d49c3e651bd9e1cf8fce19d488ce0b0f84d843acec19fc43884689
-  data.tar.gz: 336eef634bf69f19cc13d488f3020ef7445a48c0f80d9d596a0c507314d4b732ea5a2757b96ece0516d7147dc883ed722e58508fe57987998d2bc4de45760ec8
+  metadata.gz: ea8c4f80306702cbb608c1d35a59363a6b208adc351b68d39eeaa349b485efb9859dc2f22197559c96a1b70f7574336178df83936a53c72a36ee78a522463941
+  data.tar.gz: 4f7489984fbb4430fe5e92a01339598e69163c12481deee9debbc5004067b5b98e022623e7614f763432317a3b6b4f3aa828e9b3c4ee046e082727284493bd7a

data/.gitignore

@@ -18,3 +18,6 @@ tmp
 .vagrant
 .lock
 Gemfile.lock
+ubuntu-xenial-16.04-cloudimg-console.log
+
+

data/.rubocop.yml

@@ -5,6 +5,10 @@ AllCops:
     - 'config/**/*'
     - 'Vagrantfile'
     - 'vendor/**/*'
+  TargetRubyVersion: 2.2
+  ExtraDetails: true
+  DisplayStyleGuide: true
+  DisplayCopNames: true
 GlobalVars:
   AllowedVariables: []
 MethodLength:
@@ -21,3 +25,7 @@ AbcSize:
   Max: 25
 SpaceAfterComma:
   Enabled: false
+Style/FormatStringToken:
+  Enabled: false
+Metrics/BlockLength:
+  Enabled: false

data/.travis.yml

@@ -2,11 +2,12 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.1
   - 2.2
+  - 2.3
+  - 2.4
 
 before_install:
-  - gem install bundler --version 1.12.5 --no-document
+  - gem install bundler --no-document
 
 script:
   - bundle exec rubocop

data/Berksfile.lock

@@ -3,64 +3,56 @@ DEPENDENCIES
     path: config/vm/cookbooks/dkdeploy-typo3-cms
 
 GRAPH
-  apache2 (3.2.2)
+  apache2 (5.0.1)
   apt (3.0.0)
-  build-essential (4.0.0)
-    mingw (>= 0.0.0)
+  build-essential (8.0.3)
+    mingw (>= 1.1)
     seven_zip (>= 0.0.0)
-  chef-sugar (3.3.0)
-  chef_handler (1.4.0)
-  compat_resource (12.10.1)
+  compat_resource (12.19.0)
   database (5.1.2)
     postgresql (>= 1.0.0)
   dkdeploy-typo3-cms (1.0.0)
-    apache2 (~> 3.2)
+    apache2 (~> 5.0.1)
     apt (~> 3.0)
     database (~> 5.1)
-    mysql (~> 6.1)
+    mysql (~> 8.5.1)
     mysql2_chef_gem (~> 1.0)
-    php (~> 1.9)
-  iis (4.1.7)
-    windows (>= 1.34.6)
-  mariadb (0.3.1)
+    php (~> 4.5.0)
+  inifile_chef_gem (0.1.0)
+    build-essential (>= 0.0.0)
+  mariadb (1.5.2)
     apt (>= 0.0.0)
+    build-essential (>= 0.0.0)
+    selinux_policy (~> 2.0)
     yum (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  mingw (1.0.0)
-    compat_resource (>= 0.0.0)
+    yum-scl (>= 0.0.0)
+  mingw (2.0.1)
     seven_zip (>= 0.0.0)
-  mysql (6.1.3)
-    smf (>= 0.0.0)
-    yum-mysql-community (>= 0.0.0)
+  mysql (8.5.1)
   mysql2_chef_gem (1.1.0)
     build-essential (>= 0.0.0)
     mariadb (>= 0.0.0)
     mysql (>= 6.0)
-  openssl (4.4.0)
-    chef-sugar (>= 3.1.1)
-  php (1.9.0)
+  ohai (5.2.0)
+  openssl (7.1.0)
+  php (4.5.0)
     build-essential (>= 0.0.0)
-    iis (>= 0.0.0)
     mysql (>= 6.0.0)
-    windows (>= 1.39.1)
-    xml (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  postgresql (4.0.6)
-    apt (>= 1.9.0)
-    build-essential (>= 0.0.0)
-    openssl (~> 4.0)
-  rbac (1.0.3)
-  seven_zip (2.0.0)
+  postgresql (6.1.1)
+    build-essential (>= 2.0.0)
+    compat_resource (>= 12.16.3)
+    openssl (>= 4.0)
+  selinux_policy (2.0.1)
+    compat_resource (>= 12.16.3)
+  seven_zip (2.0.2)
     windows (>= 1.2.2)
-  smf (2.2.8)
-    rbac (>= 1.0.1)
-  windows (1.41.0)
-    chef_handler (>= 0.0.0)
-  xml (2.0.0)
-    build-essential (>= 0.0.0)
-    chef-sugar (>= 0.0.0)
-  yum (3.10.0)
-  yum-epel (0.7.0)
-    yum (>= 3.6.3)
-  yum-mysql-community (0.2.0)
-    yum (>= 3.2)
+  windows (3.2.0)
+    ohai (>= 4.0.0)
+  yum (5.0.1)
+  yum-epel (2.1.2)
+    compat_resource (>= 12.16.3)
+  yum-scl (0.2.0)
+    inifile_chef_gem (>= 0.0.0)
+    yum (>= 0.0.0)

data/CHANGELOG.md

@@ -3,10 +3,28 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.0.0] - 2018-02-09
+### Summary
+
+- rubocop upgrade to 0.50
+- ruby upgrade to 2.2
+- bundler upgrade
+- rake upgrade
+- dkdeploy-test_environment upgrade to 2.0
+- dkdeploy-core upgrade 9.0
+- dkdeploy-php upgrade 8.0
+- Add dependencies for `cucumber`, `rubocop`, `aruba` and `mysql2`
+- upgrade vagrant box to `ubuntu/xenial64`
+- update TYPO3 8.7
+- dropped support for TYPO3 7.6
+- moving deploy tasks from step_definitions/typo3.rb to deploy.rb for the testing 
+- Add TYPO3 specific configuration for assets and database
+
 ## [7.0.0] - 2017-01-16
 ### Summary
 
 - first public release
 
 [Unreleased]: https://github.com/dkdeploy/dkdeploy-typo3-cms/compare/master...develop
+[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/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de
+Copyright (c) 2014-2018 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -2,8 +2,8 @@
 
 # Dkdeploy::Typo3::Cms
 
-[![Build Status](https://api.travis-ci.org/dkdeploy/dkdeploy-typo3-cms.svg?branch=master)](https://travis-ci.org/repositories/dkdeploy/dkdeploy-typo3-cms)
-[![Gem Version](https://badge.fury.io/rb/dkdeploy-typo3-cms.svg)](https://badge.fury.io/rb/dkdeploy-typo3-cms) [![Inline docs](http://inch-ci.org/github/dkdeploy/dkdeploy-typo3-cms.svg?branch=master)](http://inch-ci.org/github/dkdeploy/dkdeploy-typo3-cms)
+[![Build Status](https://travis-ci.org/dkdeploy/dkdeploy-typo3-cms.svg?branch=master)](https://travis-ci.org/dkdeploy/dkdeploy-typo3-cms)
+[![Gem Version](https://badge.fury.io/rb/dkdeploy-typo3-cms.svg)](https://badge.fury.io/rb/dkdeploy-typo3-cms) [![Inline docs](http://inch-ci.org/github/dkdeploy/dkdeploy-typo3-cms.svg?branch=develop)](http://inch-ci.org/github/dkdeploy/dkdeploy-typo3-cms)
 
 ## Description
 
@@ -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', '~> 7.0'
+	gem 'dkdeploy-typo3-cms', '~> 8.0'
 
 and then execute
 
@@ -46,7 +46,7 @@ Certainly you have to adjust `config/deploy.rb` and respective stages and custom
 
 As next you have to append the following line to the `Capfile` in order to make use of dkdeploy extensions in addition to the standard Capistrano tasks:
 
-	require 'capistrano/dkdeploy/typo3-cms'
+	require 'capistrano/dkdeploy/typo3_cms'
 
 To convince yourself, that Capistrano tasks list has benn extended, please run
 
@@ -77,7 +77,7 @@ Add the virtual box alias to your `hosts` file
 ## Contributing
 
 1. Install [git flow](https://github.com/nvie/gitflow)
-2. Install [Homebrew](http://brew.sh/) and run `brew install mysql-connector-c`
+2. Install [Homebrew](http://brew.sh/) and run `brew install mysql`
 3. If project is not checked out already do git clone `git@github.com:dkdeploy/dkdeploy-typo3-cms.git`
 4. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
 5. Git flow initialize `git flow init -d`

data/Vagrantfile

@@ -5,32 +5,25 @@ unless Vagrant.has_plugin?('vagrant-berkshelf')
   abort
 end
 
-unless Vagrant.has_plugin?('vagrant-omnibus')
-  puts "Please install vagrant plugin vagrant-omnibus first\n"
-  puts " vagrant plugin install vagrant-omnibus\n\n"
-  puts "Exit vagrant\n\n"
-  abort
-end
-
+Vagrant.require_version '~> 2.0.0'
 chef_version = '12.9.41'
 
-Vagrant.require_version '>= 1.8.1'
-
-Vagrant.configure('2') do |config|
+Vagrant.configure(2) do |config|
   domain = 'dkdeploy-typo3-cms.dev'
   ip_address = '192.168.156.183'
 
-  config.vm.box = 'ubuntu/trusty64'
+  config.vm.box = 'ubuntu/xenial64'
   config.vm.box_check_update = false
-
   config.berkshelf.enabled = true
-  config.omnibus.chef_version = chef_version
 
   config.vm.define 'dkdeploy-typo3-cms', primary: true do |master_config|
     master_config.vm.network 'private_network', ip: ip_address
+
+    # Chef settings
     master_config.vm.provision :chef_solo do |chef|
-      chef.install = false # omnibus does it already
       chef.version = chef_version
+      chef.install = true
+      chef.channel = 'stable'
       chef.log_level = :info
       chef.add_recipe 'dkdeploy-typo3-cms'
 

data/config/vm/cookbooks/dkdeploy-typo3-cms/metadata.rb

@@ -4,9 +4,9 @@ license 'MIT'
 description 'Project cookbook'
 version '1.0'
 
-depends 'mysql', '~> 6.1'
+depends 'mysql', '~> 8.5.1'
 depends 'mysql2_chef_gem', '~> 1.0'
 depends 'database', '~> 5.1'
-depends 'apache2', '~> 3.2'
-depends 'php', '~> 1.9'
+depends 'apache2', '~> 5.0.1'
+depends 'php', '~> 4.5.0'
 depends 'apt', '~> 3.0' # version 2.9 is causing dependency issues

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

@@ -15,7 +15,7 @@ end
 group 'www-data' do
   action :create
   append true
-  members 'vagrant'
+  members 'ubuntu'
 end
 
 # PHP
@@ -24,7 +24,7 @@ include_recipe 'php::module_mysql'
 
 # Apache
 include_recipe 'apache2'
-include_recipe 'apache2::mod_php5'
+include_recipe 'apache2::mod_php'
 
 # install apache2-utils. It is needed for the assets:add_htpasswd task
 package 'apache2-utils' do
@@ -64,7 +64,7 @@ mysql_database 'dkdeploy_typo3_cms' do
 end
 
 directory '/var/www/' do
-  owner 'vagrant' # deployment is done by vagrant user
+  owner 'ubuntu' # deployment is done by ubuntu user
   group 'www-data' # apache2 is executed by www-data and needs access to directory
   mode '0770'
   action :create

data/dkdeploy-typo3-cms.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dkdeploy/typo3/cms/version'
@@ -7,11 +6,11 @@ Gem::Specification.new do |spec|
   spec.name          = 'dkdeploy-typo3-cms'
   spec.version       = Dkdeploy::Typo3::Cms::Version
   spec.authors       = ['Kieran Hayes', 'Timo Webler', 'Nicolai Reuschling', 'Luka Lüdicke']
-  spec.email         = %w(kieran.hayes@dkd.de timo.webler@dkd.de nicolai.reuschling@dkd.de luka.luedicke@dkd.de)
+  spec.email         = %w[kieran.hayes@dkd.de timo.webler@dkd.de nicolai.reuschling@dkd.de luka.luedicke@dkd.de]
   spec.description   = 'dkd TYPO3 deployment tasks and strategies'
   spec.summary       = 'dkd TYPO3 deployment tasks and strategies'
   spec.homepage      = 'https://github.com/dkdeploy/dkdeploy-typo3-cms'
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '~> 2.2'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
@@ -19,11 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.12.5'
-  spec.add_development_dependency 'rake', '~> 11.2'
-  spec.add_development_dependency 'rubocop', '~> 0.46'
-  spec.add_development_dependency 'dkdeploy-test_environment', '~> 1.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'cucumber', '~> 2.4'
+  spec.add_development_dependency 'rubocop', '0.50.0'
+  spec.add_development_dependency 'aruba', '~> 0.14.1'
+  spec.add_development_dependency 'mysql2', '~> 0.3'
+  spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
 
-  spec.add_dependency 'dkdeploy-php', '~> 7.0'
+  spec.add_dependency 'dkdeploy-php', '~> 8.0'
   spec.add_dependency 'phpass-ruby', '~> 0.1'
 end

data/features/cli.feature

@@ -3,59 +3,50 @@ Feature: Test tasks for namespace 'typo3:cms:cli:run'
   Background:
     Given a test app with the default configuration
     And the remote server is cleared
-    And the project is deployed
+    And a successfully deployed TYPO3 application
 
   Scenario: Running one time
     And I extend the development capistrano configuration from the fixture file cli_test_tasks.rb
     When I successfully run `cap dev typo3:cms:cli:break_after_one_run`
-    Then the output should contain "Running cli task for the 1. time"
-    And the output should not contain "Running cli task for the 2. time"
-    And the output should contain "Breaking loop after 1 run because block yields false"
+    Then the output from "cap dev typo3:cms:cli:break_after_one_run" should contain "Running cli task for the 1. time"
+    And the output from "cap dev typo3:cms:cli:break_after_one_run" should not contain "Running cli task for the 2. time"
+    And the output from "cap dev typo3:cms:cli:break_after_one_run" should contain "Breaking loop after 1 run because block yields false"
 
   Scenario: Running several times
     And I extend the development capistrano configuration from the fixture file cli_test_tasks.rb
     When I successfully run `cap dev typo3:cms:cli:break_after_three_runs`
-    Then the output should contain "Running cli task for the 1. time"
-    And the output should contain "Running cli task for the 2. time"
-    And the output should contain "Running cli task for the 3. time"
-    And the output should contain "Maximum number of cli calls reached!"
-    And the output should not contain "Breaking loop after 1 run because block yields false"
-    And the output should not contain "Breaking loop after 2 run because block yields false"
-    And the output should not contain "Breaking loop after 3 run because block yields false"
+    Then the output from "cap dev typo3:cms:cli:break_after_three_runs" should contain "Running cli task for the 1. time"
+    And the output from "cap dev typo3:cms:cli:break_after_three_runs" should contain "Running cli task for the 2. time"
+    And the output from "cap dev typo3:cms:cli:break_after_three_runs" should contain "Running cli task for the 3. time"
+    And the output from "cap dev typo3:cms:cli:break_after_three_runs" should contain "Maximum number of cli calls reached!"
+    And the output from "cap dev typo3:cms:cli:break_after_three_runs" should not contain "Breaking loop after 1 run because block yields false"
+    And the output from "cap dev typo3:cms:cli:break_after_three_runs" should not contain "Breaking loop after 2 run because block yields false"
+    And the output from "cap dev typo3:cms:cli:break_after_three_runs" should not contain "Breaking loop after 3 run because block yields false"
 
   Scenario: Running one time in release path
     And I extend the development capistrano configuration from the fixture file cli_break_after_one_run_in_release_path.rb
     When I successfully run `cap dev deploy`
-    Then the output should contain "Running cli task for the 1. time"
-    And the output should not contain "Running cli task for the 2. time"
-    And the output should contain "Breaking loop after 1 run because block yields false"
+    Then the output from "cap dev deploy" should contain "Running cli task for the 1. time"
+    And the output from "cap dev deploy" should not contain "Running cli task for the 2. time"
+    And the output from "cap dev deploy" should contain "Breaking loop after 1 run because block yields false"
 
   Scenario: Running several times in release path
     And I extend the development capistrano configuration from the fixture file cli_break_after_three_runs_in_release_path.rb
     When I successfully run `cap dev deploy`
-    Then the output should contain "Running cli task for the 1. time"
-    And the output should contain "Running cli task for the 2. time"
-    And the output should contain "Running cli task for the 3. time"
-    And the output should contain "Maximum number of cli calls reached!"
-    And the output should not contain "Breaking loop after 1 run because block yields false"
-    And the output should not contain "Breaking loop after 2 run because block yields false"
-    And the output should not contain "Breaking loop after 3 run because block yields false"
+    Then the output from "cap dev deploy" should contain "Running cli task for the 1. time"
+    And the output from "cap dev deploy" should contain "Running cli task for the 2. time"
+    And the output from "cap dev deploy" should contain "Running cli task for the 3. time"
+    And the output from "cap dev deploy" should contain "Maximum number of cli calls reached!"
+    And the output from "cap dev deploy" should not contain "Breaking loop after 1 run because block yields false"
+    And the output from "cap dev deploy" should not contain "Breaking loop after 2 run because block yields false"
+    And the output from "cap dev deploy" should not contain "Breaking loop after 3 run because block yields false"
 
   Scenario: Checking injected environment variables
+    And I extend the development capistrano configuration from the fixture file cli_test_tasks_variable_injection.rb
     When I successfully run `cap dev typo3:cms:cli:run`
-    Then the output should contain "TYPO3_COMPOSER_AUTOLOAD=1"
+    Then the output from "cap dev typo3:cms:cli:run" should contain "CUSTOM_VARIABLE=1"
 
   Scenario: Checking injected environment variables in release path
     And I extend the development capistrano configuration from the fixture file cli_test_tasks_with_path.rb
     When I successfully run `cap dev deploy`
-# Here in the regex string "any character" is used to match the slashes. Every attempt to use the directory slashes failed for unknown reasons
-    Then the output should match /.var.www.dkdeploy.releases.\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}.typo3.cli_dispatch\.phpsh/
-    And the output should contain "TYPO3_COMPOSER_AUTOLOAD=1"
-
-  Scenario: Checking injected environment variables
-    When I successfully run `cap dev typo3:cms:cli:upload_wrapper`
-    Then the remote file "current_path/typo3_cms_cli_dispatch.sh" should contain exactly:
-      """
-      #!/usr/bin/env bash
-      TYPO3_COMPOSER_AUTOLOAD='1' TERM='screen-256color' /usr/bin/env php /var/www/dkdeploy/current/typo3/cli_dispatch.phpsh $@
-      """
+    And the output should contain "CUSTOM_VARIABLE=1"

data/features/step_definitions/mysql.rb

@@ -1,4 +1,4 @@
-Given(/^the TYPO3 table be_users exists$/) do # rubocop:disable Metrics/BlockLength
+Given(/^the TYPO3 table be_users exists$/) do
   mysql_client = instantiate_mysql_client @database_name
   mysql_client.query 'DROP TABLE IF EXISTS be_users;'
   mysql_client.query "CREATE TABLE be_users (
@@ -6,13 +6,15 @@ Given(/^the TYPO3 table be_users exists$/) do # rubocop:disable Metrics/BlockLen
                                     pid int(11) unsigned DEFAULT '0' NOT NULL,
                                     tstamp int(11) unsigned DEFAULT '0' NOT NULL,
                                     username varchar(50) DEFAULT '' NOT NULL,
+                                    description varchar(2000) DEFAULT '' NOT NULL,
+                                    avatar int(11) unsigned NOT NULL default '0',
                                     password varchar(100) DEFAULT '' NOT NULL,
                                     admin tinyint(4) unsigned DEFAULT '0' NOT NULL,
                                     usergroup varchar(255) DEFAULT '' NOT NULL,
                                     disable tinyint(1) unsigned DEFAULT '0' NOT NULL,
                                     starttime int(11) unsigned DEFAULT '0' NOT NULL,
                                     endtime int(11) unsigned DEFAULT '0' NOT NULL,
-                                    lang char(2) DEFAULT '' NOT NULL,
+                                    lang varchar(6) DEFAULT '' NOT NULL,
                                     email varchar(80) DEFAULT '' NOT NULL,
                                     db_mountpoints text,
                                     options tinyint(4) unsigned DEFAULT '0' NOT NULL,
@@ -21,7 +23,7 @@ Given(/^the TYPO3 table be_users exists$/) do # rubocop:disable Metrics/BlockLen
                                     realName varchar(80) DEFAULT '' NOT NULL,
                                     userMods text,
                                     allowed_languages varchar(255) DEFAULT '' NOT NULL,
-                                    uc mediumtext,
+                                    uc mediumblob,
                                     file_mountpoints text,
                                     file_permissions text,
                                     workspace_perms tinyint(3) DEFAULT '1' NOT NULL,
@@ -34,7 +36,7 @@ Given(/^the TYPO3 table be_users exists$/) do # rubocop:disable Metrics/BlockLen
                                     usergroup_cached_list text,
                                     workspace_id int(11) DEFAULT '0' NOT NULL,
                                     workspace_preview tinyint(3) DEFAULT '1' NOT NULL,
-                                    category_perms varchar(255) DEFAULT '' NOT NULL,
+                                    category_perms text,
                                     PRIMARY KEY (uid),
                                     KEY parent (pid),
                                     KEY username (username)