dkdeploy-core 9.0.0 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0fa351619fa4722337d6fed4eaed15806f9ee10d
-  data.tar.gz: 49176a8bb577edf5251c4f5cc77bac4e7c11172d
+SHA256:
+  metadata.gz: a777b01f3efd02018a09ceb89a51e981812363eb928806454a40686805abd637
+  data.tar.gz: a495bab21f8d00b9b65a7d1d41cbd999c621194a844e3029dced0268c6340141
 SHA512:
-  metadata.gz: 32be81315488b81b06275168d880499745d74d88d5567e43c4a6dd21ce6e2a53c89fd4ef190e9a9739f454096b949fd38b9969b5b12c66a86a3dfbb2e40a85f0
-  data.tar.gz: 20786fdcf4fdeaa824a2c3fa18ab91a78030b5ba1c038676e0747010b736076f9f80c6e5dd8175aae4d49cc40892a20a06f3ad35895839cad03df31de295323c
+  metadata.gz: cd85e39b2bf80958e0ebb5db6e86637e520e649a2deddc44f0f61b31d4395eb0da460d97331a55e5f337ce480789af37941c3d981686fcc12cd304da2e460b07
+  data.tar.gz: bb3de683784e0e600430b5e3100c7024ec42efc11d4dc920adefcd7c500d9102f913a5e51bf21dfac5620a4b3aea1b2fd99ddfefc80992a757640cc774d7086e

data/.rubocop.yml

@@ -5,23 +5,51 @@ AllCops:
     - 'config/**/*'
     - 'Vagrantfile'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
   ExtraDetails: true
   DisplayStyleGuide: true
   DisplayCopNames: true
-GlobalVars:
+Style/GlobalVars:
   AllowedVariables: []
-MethodLength:
+Metrics/MethodLength:
   Max: 25
-LineLength:
+Layout/LineLength:
   Max: 200
-SpecialGlobalVars:
+Style/SpecialGlobalVars:
   Enabled: false
-BracesAroundHashParameters:
-  Enabled: false
-CyclomaticComplexity:
+Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/BlockLength:
   Enabled: false
 Style/FormatStringToken:
   Enabled: false
+Style/MixinUsage:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true

data/.travis.yml

@@ -2,12 +2,14 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.2
-  - 2.3
-  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 
 before_install:
-  - gem install bundler --no-document
+  - gem install bundler --no-doc
+  - gem install bundler-audit --no-doc
 
 script:
-  - bundle exec rubocop
+  - bundle-audit check --update
+  - bundle exec rubocop --display-cop-names --extra-details

data/Berksfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://supermarket.chef.io'
 
 cookbook 'dkdeploy-core', path: 'config/vm/cookbooks/dkdeploy-core'

data/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)

data/CHANGELOG.md

@@ -2,7 +2,50 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [9.0.0]
+## [9.3.0] - 2020-07-06
+### Summary
+
+- Update gem `capistrano` to 3.14.x
+- Update gem `highline` to 2.0.x
+- Update gem 'aruba' to 1.0.x
+- Test ruby 2.7 via travis
+- Requires Ruby v2.5 or later
+
+## [9.2.3] - 2019-05-29
+### Summary
+
+- Remove frozen string error
+- Update interaction handler for new `htpasswd` versions
+- Use correct test statement for task "remove_unless_symlinked"
+
+## [9.2.2] - 2019-02-18
+### Summary
+
+- run tests and linter against Ruby 2.3
+- fixed bug in clean_up_temporary_sources 
+
+## [9.2.1] - 2019-12-06
+### Summary
+
+- removed loading of pry
+
+## [9.2.0] - 2019-12-06 [YANKED]
+### Summary
+
+- supports Ruby 2.5
+- removes Bower support
+- moved test infrastructure to Ubuntu Xenial
+- we no longer remove maintenance_config_file_path forcefully to make failures more apparent
+- improved shell independence
+
+## [9.1.0] - 2018-02-09
+### Summary
+
+- Use correct capistrano context at copy scm
+- Update capistrano 3.10.1
+- Always execute tasks for each server or at rollback
+
+## [9.0.0] 2017-10-16
 ### Summary
 
 - tasks around MySQL slow log
@@ -33,6 +76,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - first public release
 
 [Unreleased]: https://github.com/dkdeploy/dkdeploy-core/compare/master...develop
+[9.2.2]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.2
+[9.2.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.1
+[9.2.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.0
+[9.1.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.1.0
 [9.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.0
 [8.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.1
 [8.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.0

data/CONTRIBUTORS.md

@@ -7,11 +7,14 @@ The dkdeploy core maintainers would like to recognize following contributors (in
 - Sascha Egerer
 - Christoph Gerold
 - Johannes Goslar
+- Kai Harder
 - Kieran Hayes
 - Wilfried Irßlinger
 - Thomas Jahnke
+- Hannes Leutloff
 - Gleb Levitin
 - Luka Lüdicke
+- Minh-Thien Nhan
 - Nicolai Reuschling
 - Lars Tode
 - Timo Webler

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org/'
 
 # Specify your gem's dependencies in dkdeploy-core.gemspec

data/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:
 

data/README.md

@@ -13,7 +13,7 @@ This Rubygem `dkdeploy-core` represents the extension of [Capistrano](http://cap
 
 Add this line to your application's `Gemfile`
 
-	gem 'dkdeploy-core', '~> 9.0'
+	gem 'dkdeploy-core', '~> 9.2'
 
 and then execute
 
@@ -64,28 +64,27 @@ The complete list of the dkdeploy constants you find in `/lib/capistrano/dkdeplo
 
 ### Prerequisite
 
-rvm (v1.29.x) with installed Ruby 2.2.
+rvm (v1.29.x) with installed Ruby 2.2 or newer.
 
 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
 
 1. Starting the local box (`vagrant up --provision`)
 2. Checking coding styles (`rubocop`)
-3. Running BDD cucumber tests (`cucumber`)
+3. Running BDD cucumber tests (`BUNDLER_VERSION=2.1.4 cucumber`)
 
 ## Contributing
 
 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 bower@1.7.9`
-5. If project is not checked out already do git clone `git@github.com: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 `git@github.com: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 `BUNDLER_VERSION=1.17.3 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'`)

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 task default: :spec
 require 'bundler/gem_tasks'
 

data/Vagrantfile

@@ -5,27 +5,28 @@ 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
 
   config.vm.define('dkdeploy-core', primary: true) do |master_config|
     master_config.vm.network 'private_network', ip: ip_address
+    master_config.vm.hostname = domain
 
     # Chef settings
     master_config.vm.provision :chef_solo do |chef|
       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,17 +38,16 @@ Vagrant.configure(2) do |config|
                               'modifyvm', :id,
                               '--natdnsproxy1', 'off',
                               '--natdnshostresolver1', 'on',
-                              '--memory', '1024'
+                              '--memory', '1024',
+                              '--audio', 'none'
                            ]
     end
-  end
 
-  if Vagrant.has_plugin?('landrush')
-    config.landrush.enabled = true
-    config.landrush.guest_redirect_dns = false
-    config.landrush.tld = 'dev'
-    config.landrush.host domain, ip_address
-  else
-    config.vm.post_up_message = "Either install Vagrant plugin 'landrush' or add this entry to your host file: #{ip_address} #{domain}"
+    unless Vagrant.has_plugin?('vagrant-hostsupdater')
+      master_config.vm.post_up_message = <<-HEREDOC
+          Add following entries to your host file or install vagrant plugin vagrant-hostsupdater ("vagrant plugin install vagrant-hostsupdater") and restart virtual box
+            #{ip_address} #{domain}
+      HEREDOC
+    end
   end
 end

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

@@ -4,7 +4,7 @@ license 'MIT'
 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'

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

@@ -19,17 +19,16 @@ end
 
 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 @@ mysql2_chef_gem 'default' do
 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