Merge branch 'release/8.0.0'

* release/8.0.0:
  prepare release v8.0.0
  Add TYPO3 specific configuration for assets and database
  add mysql string escaping for add_admin_user
  - removing upload_wrapper task - improving gitignore configuration - renaming custom variable for environment injection to CUSTOM_VARIABLE
  - update TYPO3 8.7.8 - moving tasks from step_definitions/typo3.rb to deploy.rb
  Update gems and TYPO3.
  fix travis ci badge link
  Updated copyright
  Pin rubocop to 0.46
  Set correct path to typo3_cms.rb

Author: ncreuschling

.gitignore

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

.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

.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

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)

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

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:
 

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`

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'
 

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

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

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

@@ -15,7 +15,7 @@
 group 'www-data' do
   action :create
   append true
-  members 'vagrant'
+  members 'ubuntu'
 end
 
 # PHP
@@ -24,7 +24,7 @@
 
 # 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 @@
 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