Merge pull request #51 from ncreuschling/ng

updated dependencies, updated RuboCop and fixed reported issues

Author: ncreuschling

.rubocop.yml

@@ -25,3 +25,5 @@ Metrics/BlockLength:
   Enabled: false
 Style/FormatStringToken:
   Enabled: false
+Style/MixinUsage:
+  Enabled: false

Berksfile.lock

@@ -3,44 +3,45 @@ DEPENDENCIES
     path: config/vm/cookbooks/dkdeploy-core
 
 GRAPH
-  7-zip (1.0.2)
-    windows (>= 1.2.2)
-  apt (2.9.2)
-  build-essential (2.3.1)
-    7-zip (>= 0.0.0)
-  chef-sugar (3.3.0)
-  chef_handler (1.3.0)
-  database (4.0.9)
+  apt (7.0.0)
+  build-essential (8.1.1)
+    mingw (>= 1.1)
+    seven_zip (>= 0.0.0)
+  compat_resource (12.19.1)
+  database (6.1.1)
     postgresql (>= 1.0.0)
   dkdeploy-core (1.0.0)
-    apt (~> 2.9)
-    database (~> 4.0)
-    mysql (~> 6.0)
-    mysql2_chef_gem (~> 1.0)
-  mariadb (0.3.1)
     apt (>= 0.0.0)
+    database (>= 0.0.0)
+    mysql (>= 0.0.0)
+    mysql2_chef_gem (>= 0.0.0)
+  inifile_chef_gem (0.1.0)
+    build-essential (>= 0.0.0)
+  mariadb (1.5.3)
+    apt (>= 0.0.0)
+    build-essential (>= 0.0.0)
+    selinux_policy (~> 2.0)
     yum (>= 0.0.0)
     yum-epel (>= 0.0.0)
-  mysql (6.1.2)
-    smf (>= 0.0.0)
-    yum-mysql-community (>= 0.0.0)
-  mysql2_chef_gem (1.0.2)
-    build-essential (>= 0.0.0)
+    yum-scl (>= 0.0.0)
+  mingw (2.0.2)
+    seven_zip (>= 0.0.0)
+  mysql (8.5.1)
+  mysql2_chef_gem (2.1.0)
+    build-essential (>= 2.4.0)
     mariadb (>= 0.0.0)
-    mysql (~> 6.0)
-  openssl (4.4.0)
-    chef-sugar (>= 3.1.1)
-  postgresql (4.0.0)
-    apt (>= 1.9.0)
-    build-essential (>= 0.0.0)
-    openssl (~> 4.0)
-  rbac (1.0.3)
-  smf (2.2.8)
-    rbac (>= 1.0.1)
-  windows (1.39.1)
-    chef_handler (>= 0.0.0)
-  yum (3.10.0)
-  yum-epel (0.6.5)
-    yum (~> 3.2)
-  yum-mysql-community (0.1.21)
-    yum (>= 3.2)
+    mysql (>= 8.2.0)
+  openssl (8.1.2)
+  postgresql (6.1.4)
+    build-essential (>= 2.0.0)
+    compat_resource (>= 12.16.3)
+    openssl (>= 4.0)
+  selinux_policy (2.1.0)
+  seven_zip (2.0.2)
+    windows (>= 1.2.2)
+  windows (4.2.2)
+  yum (5.1.0)
+  yum-epel (3.1.0)
+  yum-scl (0.2.0)
+    inifile_chef_gem (>= 0.0.0)
+    yum (>= 0.0.0)

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Next Version]
+### Summary
+
+- supports Ruby 2.5
+- removes Bower support
+- moved test infrastructure to Ubuntu Xenial
+
 ## [9.1.0]
 ### Summary
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2017 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

@@ -68,7 +68,7 @@ rvm (v1.29.x) with installed Ruby 2.2.
 
 Add the virtual box alias to your `hosts` file
 
-	192.168.156.180 dkdeploy-core.dev
+	192.168.156.180 dkdeploy-core.test
 
 ### Running tests
 
@@ -81,11 +81,10 @@ Add the virtual box alias to your `hosts` file
 1. Install [git flow](https://github.com/nvie/gitflow)
 2. Install [Homebrew](http://brew.sh/) and run `brew install mysql`
 3. Install [NodeJS](https://nodejs.org) (supported: v0.12.7) via `brew install nodejs`
-4. Install [Bower](http://bower.io) (supported: v1.7.9) via `npm install -g [email protected]`
-5. If project is not checked out already do git clone `[email protected]:dkdeploy/dkdeploy-core.git`
-6. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
-7. Git flow initialze `git flow init -d`
-8. Installing gems `bundle install`
-9. Create new feature branch (`git flow feature start my-new-feature`)
-10. Run tests (README.md Testing)
-11. Commit your changes (`git commit -am 'Add some feature'`)
+4. If project is not checked out already do git clone `[email protected]:dkdeploy/dkdeploy-core.git`
+5. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
+6. Git flow initialze `git flow init -d`
+7. Installing gems `bundle install`
+8. Create new feature branch (`git flow feature start my-new-feature`)
+9. Run tests (README.md Testing)
+10. Commit your changes (`git commit -am 'Add some feature'`)

Vagrantfile

@@ -5,15 +5,15 @@ unless Vagrant.has_plugin?('vagrant-berkshelf')
   abort
 end
 
-Vagrant.require_version '~> 2.0.0'
-chef_version = '12.9.41'
+Vagrant.require_version '~> 2.0'
 
 Vagrant.configure(2) do |config|
-  domain = 'dkdeploy-core.dev'
+  chef_version = '13.6.4'
+  domain = 'dkdeploy-core.test'
   ip_address = '192.168.156.180'
 
   # Search boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = 'ubuntu/trusty64'
+  config.vm.box = 'bento/ubuntu-16.04'
   config.vm.box_check_update = false
   config.berkshelf.enabled = true
 
@@ -25,7 +25,7 @@ Vagrant.configure(2) do |config|
       chef.install = true
       chef.channel = 'stable'
       chef.version = chef_version
-      chef.log_level = :info
+      chef.log_level = :warn
       chef.add_recipe 'dkdeploy-core'
     end
 
@@ -37,7 +37,8 @@ Vagrant.configure(2) do |config|
                               'modifyvm', :id,
                               '--natdnsproxy1', 'off',
                               '--natdnshostresolver1', 'on',
-                              '--memory', '1024'
+                              '--memory', '1024',
+                              '--audio', 'none'
                            ]
     end
   end

config/vm/cookbooks/dkdeploy-core/metadata.rb

@@ -4,7 +4,7 @@
 description 'Project cookbook'
 version '1.0.0'
 
-depends 'mysql', '~> 6.0'
-depends 'mysql2_chef_gem', '~> 1.0'
-depends 'database', '~> 4.0'
-depends 'apt', '~> 2.9'
+depends 'mysql'
+depends 'database'
+depends 'mysql2_chef_gem'
+depends 'apt'

config/vm/cookbooks/dkdeploy-core/recipes/default.rb

@@ -19,17 +19,16 @@
 
 mysql_service 'default' do
   port '3306'
-  # Need for remote connection
-  bind_address '0.0.0.0'
-  action [:create, :start]
+  bind_address '0.0.0.0' # Need for remote connection
+  initial_root_password 'ilikerandompasswords'
   run_group 'vagrant'
   run_user 'vagrant'
+  action [:create, :start]
 end
 
 mysql_config 'default' do
   instance 'default' # necessary in some cases, causes hanging on provisioning https://github.com/chef-cookbooks/mysql/issues/387
-  # use different user to allow capistrano access to log file
-  owner 'vagrant'
+  owner 'vagrant' # use different user to allow capistrano access to log file
   group 'vagrant'
   source 'my_extra_settings.erb'
   notifies :restart, 'mysql_service[default]'
@@ -41,23 +40,22 @@
 end
 
 mysql_connection_info = {
-  :host     => '127.0.0.1',
-  :username => 'root',
-  :password => 'ilikerandompasswords'
+  host: '127.0.0.1',
+  username: 'root',
+  password: 'ilikerandompasswords'
 }
 
 mysql_database 'dkdeploy_core' do
   connection mysql_connection_info
-  action   :create
+  action :create
 end
 
 mysql_database_user 'root' do
   connection mysql_connection_info
-  host       '%'
-  password   'ilikerandompasswords'
-  action     :create
+  host '%'
+  password 'ilikerandompasswords'
   privileges [:all]
-  action     :grant
+  action [:create, :grant]
 end
 
 directory '/var/www' do

dkdeploy-core.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dkdeploy/core/version'
 
@@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)\/})
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'aruba', '~> 0.14.1'
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.5'
   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 'dkdeploy-test_environment', '~> 2.0'
   spec.add_development_dependency 'mysql2', '~> 0.3'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_development_dependency 'rubocop', '~> 0.60.0'
 
-  spec.add_dependency 'capistrano', '~> 3.10.1'
+  spec.add_dependency 'capistrano', '~> 3.11.0'
   spec.add_dependency 'highline', '~> 1.7.1'
 end

features/assets.feature

@@ -37,7 +37,6 @@ Feature: Test tasks for namespace 'assets'
 		And I run `cap dev assets:add_htpasswd` interactively
 		And I type "dkd_test_user"
 		And I type "dkd_test_password"
-		And I close the stdin stream
 		Then the exit status should be 0
 		And a remote file named "shared_path/.htpasswd" should exist
 

features/bower.feature

@@ -87,7 +87,7 @@ Feature: Test tasks for namespace 'file_permissions'
 		Given I extend the development capistrano configuration variable custom_file_access with value {app: {release_path: {catalog: {mode: 'u+rwx,g+rwx,o-wx'}, not_existing: {mode: 'u+rwx,g+rwx,o-wx'}}}}
 		And a remote directory named "releases_path/not_existing" should not exist
 		When I successfully run `cap dev file_access:set_custom_access`
-		Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.dev"
+		Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.test"
 		And the output should not contain "sudo chmod  u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/not_existing"
 		And the output should contain "sudo chmod  u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/catalog"
 
@@ -115,6 +115,6 @@ Feature: Test tasks for namespace 'file_permissions'
 		And I extend the development capistrano configuration variable selected_custom_file_access with value [:not_existing, :catalog]
 		And a remote directory named "releases_path/not_existing" should not exist
 		When I successfully run `cap dev file_access:set_selected_custom_access`
-		Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.dev"
+		Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.test"
 		And the output should not contain "sudo chmod -R u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/not_existing"
 		And the output should contain "sudo chmod -R u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/catalog"

features/file_access.feature

@@ -10,14 +10,14 @@ Feature: Test tasks for namespace 'mysql'
     And I successfully run `cap dev "db:update[temp,dkdeploy_core.sql.gz]"`
     And I successfully run `cap dev db:download_content`
     And I successfully run `cap dev mysql:download_slow_log`
-    Then a file named "temp/slow-queries.dev.dkdeploy-core.dev.log" should exist
+    Then a file named "temp/slow-queries.dev.dkdeploy-core.test.log" should exist
 
   Scenario: Downloading the MYSQL slow log analyze file
     When I successfully run `cap dev "db:upload_settings[127.0.0.1,3306,dkdeploy_core,root,ilikerandompasswords,utf8]"`
     And I successfully run `cap dev "db:update[temp,dkdeploy_core.sql.gz]"`
     And I successfully run `cap dev db:download_content`
     And I successfully run `cap dev mysql:analyze_download_slow_log`
-    Then a file named "temp/mysql_slow_log_analyze.dev.dkdeploy-core.dev.log" should exist
+    Then a file named "temp/mysql_slow_log_analyze.dev.dkdeploy-core.test.log" should exist
 
   Scenario: Clearing the MySQL slow log file
     When I successfully run `cap dev "db:upload_settings[127.0.0.1,3306,dkdeploy_core,root,ilikerandompasswords,utf8]"`

features/mysql.feature

@@ -11,8 +11,8 @@
   }
 end
 
-TEST_APPLICATION = Dkdeploy::TestEnvironment::Application.new(File.expand_path('../../../', __FILE__), 'dkdeploy-core.dev', ssh_config)
-TEST_APPLICATION.mysql_connection_settings = { host: 'dkdeploy-core.dev', username: 'root', password: 'ilikerandompasswords' }
+TEST_APPLICATION = Dkdeploy::TestEnvironment::Application.new(File.expand_path('../..', __dir__), 'dkdeploy-core.test', ssh_config)
+TEST_APPLICATION.mysql_connection_settings = { host: 'dkdeploy-core.test', username: 'root', password: 'ilikerandompasswords' }
 
 # this configuration tricks Bundler into executing another Bundler project with clean enviroment
 # The official way via Bundler.with_clean_env did not work properly here

features/support/env.rb

@@ -28,10 +28,10 @@ Feature: Test tasks for namespace 'utils'
 Remote file content
 		"""
 		When I successfully run `cap dev utils:download_file['download_file.txt']`
-		Then a file named "temp/download_file.dkdeploy-core.dev.txt" should exist
+		Then a file named "temp/download_file.dkdeploy-core.test.txt" should exist
 
 	Scenario: Download a file from server which does exist locally
-		Given a file named "temp/download_file.dkdeploy-core.dev.txt" with:
+		Given a file named "temp/download_file.dkdeploy-core.test.txt" with:
 		"""
 Local file content
 		"""
@@ -41,7 +41,7 @@ Local file content
 Remote file content
 		"""
 		When I successfully run `cap dev utils:download_file['download_file.txt']`
-		Then the file "temp/download_file.dkdeploy-core.dev.txt" should contain exactly:
+		Then the file "temp/download_file.dkdeploy-core.test.txt" should contain exactly:
 		"""
 Remote file content