Merge pull request #10 from Medesis/feature/update_dependencies

update dependencies.

Author: websi

.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
     - 'config/**/*'
     - 'Vagrantfile'
     - 'vendor/**/*'
+  ExtraDetails: true
+  DisplayStyleGuide: true
+  DisplayCopNames: true
 GlobalVars:
   AllowedVariables: []
 MethodLength:
@@ -22,3 +25,7 @@ Metrics/AbcSize:
   Max: 30
 Style/SignalException:
   EnforcedStyle: only_raise
+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

CHANGELOG.md

@@ -11,6 +11,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 
 - `Dkdeploy::Php::Helpers::Http::http_get_with_redirect` gets arguments as options hash now
+- Vagrant 2.0.x support
+- 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
+- Add dependencies for cucumber, rubocop, aruba and mysql2
 
 ### Fixed
 

Vagrantfile

@@ -5,33 +5,26 @@ 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 '>= 1.8.1'
+Vagrant.require_version '~> 2.0.0'
 chef_version = '12.9.41'
 
-Vagrant.configure('2') do |config|
+Vagrant.configure(2) do |config|
   domain = 'dkdeploy-php.dev'
   domain_second = 'second-dkdeploy-php.dev'
   ip_address = '192.168.156.181'
 
   config.vm.box = 'ubuntu/trusty64'
   config.vm.box_check_update = false
   config.berkshelf.enabled = true
-  config.omnibus.chef_version = chef_version
 
   config.vm.define('dkdeploy-php', 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.version = chef_version
-      chef.install = false # omnibus does it already
+      chef.install = true
+      chef.channel = 'stable'
       chef.log_level = :info
       chef.add_recipe 'dkdeploy-php'
       chef.json = {}

dkdeploy-php.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/php/version'
@@ -7,22 +6,25 @@ Gem::Specification.new do |spec|
   spec.name          = 'dkdeploy-php'
   spec.version       = Dkdeploy::Php::Version
   spec.license       = 'MIT'
-  spec.authors       = ['Lars Tode', 'Timo Webler', 'Kieran Hayes', 'Nicolai Reuschling']
-  spec.email         = ['lars.tode@dkd.de', 'timo.webler@dkd.de', 'kieran.hayes@dkd.de', 'nicolai.reuschling@dkd.de']
+  spec.authors       = ['Timo Webler', 'Nicolai Reuschling']
+  spec.email         = %w[timo.webler@dkd.de nicolai.reuschling@dkd.de]
   spec.description   = 'dkd PHP deployment tasks and strategies'
   spec.summary       = 'dkd php deployment tasks and strategies'
   spec.homepage      = 'https://github.com/dkdeploy/dkdeploy-php'
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '~> 2.2'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
   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-core', '~> 8.0'
+  spec.add_dependency 'dkdeploy-core', '~> 9.0'
 end

lib/dkdeploy/php/tasks/composer.rake

@@ -24,7 +24,7 @@ namespace :composer do
       begin
         # run composer status
         invoke 'composer:local:run', :status
-      rescue
+      rescue SSHKit::StandardError
         run_locally do
           command = SSHKit::Command.new :composer, :status, '-v', *default_arguments
           error I18n.t('tasks.composer.local.check_status.failure', command: command.to_s, scope: :dkdeploy)

lib/dkdeploy/php/tasks/db.rake

@@ -18,7 +18,7 @@ namespace :db do
     end
 
     desc 'Show migration status'
-    task status: [:copy_doctrine_to_server, :copy_migrations_to_server] do
+    task status: %i[copy_doctrine_to_server copy_migrations_to_server] do
       run_locally do
         info I18n.t('tasks.db.migrations.status.info', scope: :dkdeploy)
       end
@@ -30,7 +30,7 @@ namespace :db do
     end
 
     desc 'Migrate Database'
-    task migrate: [:copy_doctrine_to_server, :copy_migrations_to_server] do
+    task migrate: %i[copy_doctrine_to_server copy_migrations_to_server] do
       run_locally do
         info I18n.t('tasks.db.migrations.migrate.info', scope: :dkdeploy)
       end

lib/dkdeploy/php/tasks/php.rake

@@ -43,7 +43,6 @@ namespace :php do
           error I18n.t('tasks.php.clear_apc_cache.response_not_success', code: response.code, message: response.message, scope: :dkdeploy)
           raise
         end
-
       ensure
         # Delete file, if uploaded before
         execute(:rm, '-f', remote_apc_file) if delete_apc_file
@@ -80,7 +79,6 @@ namespace :php do
           error I18n.t('tasks.php.clear_opcache.response_not_success', code: response.code, message: response.message, scope: :dkdeploy)
           raise
         end
-
       ensure
         # Delete file, if uploaded before
         execute(:rm, '-f', remote_opcache_file) if delete_opcache_file

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

@@ -1,5 +1,5 @@
 set :deploy_to, '/var/www/dkdeploy'
-server 'dkdeploy-php.dev', roles: %w(web app backend), primary: true
+server 'dkdeploy-php.dev', roles: %w[web app backend], primary: true
 
 # no ssh compression on the dev stage
 set :ssh_options, {
@@ -18,11 +18,11 @@
 end
 
 set :copy_source, 'htdocs'
-set :copy_exclude, %w(
+set :copy_exclude, %w[
   Gemfile*
   .hidden
   **/.hidden
-)
+]
 
 # Set http open timeout to 1 second
 set :http_open_timeout, 60

spec/fixtures/capistrano/configuration/server_with_faulty_domain_configuration.rb

@@ -1,2 +1,2 @@
 
-server 'dkdeploy-php.dev', roles: %w(web app backend), domain: 'not-existing-dkdeploy.dev'
+server 'dkdeploy-php.dev', roles: %w[web app backend], domain: 'not-existing-dkdeploy.dev'