dkdeploy-core 9.1.0 → 9.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +3 -1
  3. data/.travis.yml +2 -1
  4. data/Berksfile +2 -0
  5. data/Berksfile.lock +36 -35
  6. data/CHANGELOG.md +55 -0
  7. data/CONTRIBUTORS.md +3 -0
  8. data/Gemfile +2 -0
  9. data/LICENSE +1 -1
  10. data/README.md +9 -10
  11. data/Rakefile +2 -0
  12. data/Vagrantfile +8 -7
  13. data/config/vm/cookbooks/dkdeploy-core/metadata.rb +4 -4
  14. data/config/vm/cookbooks/dkdeploy-core/recipes/default.rb +11 -13
  15. data/dkdeploy-core.gemspec +10 -8
  16. data/features/assets.feature +0 -1
  17. data/features/file_access.feature +2 -2
  18. data/features/mysql.feature +2 -2
  19. data/features/support/env.rb +4 -2
  20. data/features/utils.feature +3 -3
  21. data/lib/capistrano/dkdeploy/core.rb +14 -17
  22. data/lib/dkdeploy.rb +2 -0
  23. data/lib/dkdeploy/constants.rb +2 -0
  24. data/lib/dkdeploy/core/version.rb +4 -2
  25. data/lib/dkdeploy/dsl.rb +2 -0
  26. data/lib/dkdeploy/helpers/assets.rb +2 -0
  27. data/lib/dkdeploy/helpers/common.rb +2 -0
  28. data/lib/dkdeploy/helpers/db.rb +7 -5
  29. data/lib/dkdeploy/helpers/file_system.rb +7 -12
  30. data/lib/dkdeploy/helpers/mysql.rb +3 -0
  31. data/lib/dkdeploy/i18n.rb +3 -12
  32. data/lib/dkdeploy/interaction_handler/mysql.rb +4 -1
  33. data/lib/dkdeploy/interaction_handler/password.rb +3 -1
  34. data/lib/dkdeploy/rollback_manager.rb +2 -0
  35. data/lib/dkdeploy/scm/copy.rake +3 -1
  36. data/lib/dkdeploy/scm/copy.rb +4 -2
  37. data/lib/dkdeploy/tasks/apache.rake +2 -0
  38. data/lib/dkdeploy/tasks/assets.rake +3 -1
  39. data/lib/dkdeploy/tasks/current_folder.rake +3 -1
  40. data/lib/dkdeploy/tasks/db.rake +9 -8
  41. data/lib/dkdeploy/tasks/deploy.rake +3 -0
  42. data/lib/dkdeploy/tasks/enhanced_symlinks.rake +7 -0
  43. data/lib/dkdeploy/tasks/fail.rake +2 -0
  44. data/lib/dkdeploy/tasks/file_access.rake +2 -0
  45. data/lib/dkdeploy/tasks/maintenance.rake +4 -2
  46. data/lib/dkdeploy/tasks/mysql.rake +5 -0
  47. data/lib/dkdeploy/tasks/project_version.rake +3 -3
  48. data/lib/dkdeploy/tasks/utils.rake +2 -0
  49. data/spec/fixtures/application/Capfile +2 -0
  50. data/spec/fixtures/application/Gemfile +3 -1
  51. data/spec/fixtures/application/config/deploy.rb +4 -0
  52. data/spec/fixtures/application/config/deploy/dev.rb +3 -1
  53. data/spec/fixtures/capistrano/configuration/add_output_after_create_symlink.rb +1 -0
  54. data/spec/fixtures/capistrano/configuration/custom_compass_sources.rb +2 -0
  55. data/spec/fixtures/capistrano/configuration/custom_file_access.rb +2 -0
  56. data/spec/fixtures/capistrano/configuration/default_deployment_behaviour.rb +2 -0
  57. metadata +38 -44
  58. data/features/bower.feature +0 -52
  59. data/lib/dkdeploy/tasks/bower.rake +0 -53
  60. data/spec/fixtures/application/htdocs/bower.json +0 -15
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 01de919730c9238f0ddf22089d566239031ab4e4a5c764b6b936fbaee5790398
4
- data.tar.gz: 7797adbab2d5eb3e6623b4317a6c493605e16e14cf59997576e24e1ecd83b9f1
3
+ metadata.gz: 14b8d47ae6341ab09f689581ccc5559ed894272dcb143f3301ceb031b4bbdb15
4
+ data.tar.gz: 4a711648ad50471922f4e9c6c8c42ae4f63f43a85f046ab432f8ee3172090a62
5
5
  SHA512:
6
- metadata.gz: a7a49cc2454cff2cd4b86aba5829ba4ece9b18b052056abd31504a963c7fd8f548b9f8f94f7de00974d3659cc76191c54a7566aaa272dd76cd86813fe93e45ab
7
- data.tar.gz: '09189290d051c2d6fe873e4f24c474b206f575eb950d8643404105ee6d581f0c192a9fc6f4a1763fe8c8396a61f77c4286a7b968bc47f6c83f10b2c9d3dcd5b9'
6
+ metadata.gz: 8e7238a372471f7cc15275dc029e3be212acdfbe167ddf3b1bf93909f38ae9bff7e2f2349aef6553290368d3631c7f4c3dac4a2979cb5e7a3d324cfed85343f6
7
+ data.tar.gz: ff391d1b570cb4ef8dd272020eb2cb290efc8d7806fa6182f178041be828c14f94e599419f044b0e2a648c5c7c789fba0908d3bf4fa8e648c02d757cd444398d
@@ -5,7 +5,7 @@ AllCops:
5
5
  - 'config/**/*'
6
6
  - 'Vagrantfile'
7
7
  - 'vendor/**/*'
8
- TargetRubyVersion: 2.2
8
+ TargetRubyVersion: 2.3
9
9
  ExtraDetails: true
10
10
  DisplayStyleGuide: true
11
11
  DisplayCopNames: true
@@ -25,3 +25,5 @@ Metrics/BlockLength:
25
25
  Enabled: false
26
26
  Style/FormatStringToken:
27
27
  Enabled: false
28
+ Style/MixinUsage:
29
+ Enabled: false
@@ -2,9 +2,10 @@ sudo: false
2
2
  language: ruby
3
3
  cache: bundler
4
4
  rvm:
5
- - 2.2
6
5
  - 2.3
7
6
  - 2.4
7
+ - 2.5
8
+ - 2.6
8
9
 
9
10
  before_install:
10
11
  - gem install bundler --no-document
data/Berksfile CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  source 'https://supermarket.chef.io'
2
4
 
3
5
  cookbook 'dkdeploy-core', path: 'config/vm/cookbooks/dkdeploy-core'
@@ -3,44 +3,45 @@ DEPENDENCIES
3
3
  path: config/vm/cookbooks/dkdeploy-core
4
4
 
5
5
  GRAPH
6
- 7-zip (1.0.2)
7
- windows (>= 1.2.2)
8
- apt (2.9.2)
9
- build-essential (2.3.1)
10
- 7-zip (>= 0.0.0)
11
- chef-sugar (3.3.0)
12
- chef_handler (1.3.0)
13
- database (4.0.9)
6
+ apt (7.0.0)
7
+ build-essential (8.1.1)
8
+ mingw (>= 1.1)
9
+ seven_zip (>= 0.0.0)
10
+ compat_resource (12.19.1)
11
+ database (6.1.1)
14
12
  postgresql (>= 1.0.0)
15
13
  dkdeploy-core (1.0.0)
16
- apt (~> 2.9)
17
- database (~> 4.0)
18
- mysql (~> 6.0)
19
- mysql2_chef_gem (~> 1.0)
20
- mariadb (0.3.1)
21
14
  apt (>= 0.0.0)
15
+ database (>= 0.0.0)
16
+ mysql (>= 0.0.0)
17
+ mysql2_chef_gem (>= 0.0.0)
18
+ inifile_chef_gem (0.1.0)
19
+ build-essential (>= 0.0.0)
20
+ mariadb (1.5.3)
21
+ apt (>= 0.0.0)
22
+ build-essential (>= 0.0.0)
23
+ selinux_policy (~> 2.0)
22
24
  yum (>= 0.0.0)
23
25
  yum-epel (>= 0.0.0)
24
- mysql (6.1.2)
25
- smf (>= 0.0.0)
26
- yum-mysql-community (>= 0.0.0)
27
- mysql2_chef_gem (1.0.2)
28
- build-essential (>= 0.0.0)
26
+ yum-scl (>= 0.0.0)
27
+ mingw (2.0.2)
28
+ seven_zip (>= 0.0.0)
29
+ mysql (8.5.1)
30
+ mysql2_chef_gem (2.1.0)
31
+ build-essential (>= 2.4.0)
29
32
  mariadb (>= 0.0.0)
30
- mysql (~> 6.0)
31
- openssl (4.4.0)
32
- chef-sugar (>= 3.1.1)
33
- postgresql (4.0.0)
34
- apt (>= 1.9.0)
35
- build-essential (>= 0.0.0)
36
- openssl (~> 4.0)
37
- rbac (1.0.3)
38
- smf (2.2.8)
39
- rbac (>= 1.0.1)
40
- windows (1.39.1)
41
- chef_handler (>= 0.0.0)
42
- yum (3.10.0)
43
- yum-epel (0.6.5)
44
- yum (~> 3.2)
45
- yum-mysql-community (0.1.21)
46
- yum (>= 3.2)
33
+ mysql (>= 8.2.0)
34
+ openssl (8.1.2)
35
+ postgresql (6.1.4)
36
+ build-essential (>= 2.0.0)
37
+ compat_resource (>= 12.16.3)
38
+ openssl (>= 4.0)
39
+ selinux_policy (2.1.0)
40
+ seven_zip (2.0.2)
41
+ windows (>= 1.2.2)
42
+ windows (4.2.2)
43
+ yum (5.1.0)
44
+ yum-epel (3.1.0)
45
+ yum-scl (0.2.0)
46
+ inifile_chef_gem (>= 0.0.0)
47
+ yum (>= 0.0.0)
@@ -2,6 +2,43 @@
2
2
  All notable changes to this project will be documented in this file.
3
3
  This project adheres to [Semantic Versioning](http://semver.org/).
4
4
 
5
+ ## [9.2.4] - 2020-08-21
6
+ ### Summary
7
+
8
+ - use --no-tablespaces with mysqldump
9
+
10
+ ## [9.2.3] - 2019-05-29
11
+ ### Summary
12
+
13
+ - Remove frozen string error
14
+ - Update interaction handler for new `htpasswd` versions
15
+ - Use correct test statement for task "remove_unless_symlinked"
16
+
17
+ ## [9.2.2] - 2019-02-18
18
+ ### Summary
19
+
20
+ - run tests and linter against Ruby 2.3
21
+ - fixed bug in clean_up_temporary_sources
22
+
23
+ ## [9.2.1] - 2019-12-06
24
+ ### Summary
25
+
26
+ - removed loading of pry
27
+
28
+ ## [9.2.0] - 2019-12-06 [YANKED]
29
+ ### Summary
30
+
31
+ - supports Ruby 2.5
32
+ - removes Bower support
33
+ - moved test infrastructure to Ubuntu Xenial
34
+ - we no longer remove maintenance_config_file_path forcefully to make failures more apparent
35
+ - improved shell independence
36
+
37
+ ## [9.1.1]
38
+ ### Summary
39
+
40
+ - use --no-tablespaces with mysqldump
41
+
5
42
  ## [9.1.0]
6
43
  ### Summary
7
44
 
@@ -9,6 +46,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
9
46
  - Update capistrano 3.10.1
10
47
  - Always execute tasks for each server or at rollback
11
48
 
49
+ ## [9.0.1]
50
+ ### Summary
51
+
52
+ - use --no-tablespaces with mysqldump
53
+
12
54
  ## [9.0.0]
13
55
  ### Summary
14
56
 
@@ -29,6 +71,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
29
71
  - remove TYPO3 specific configuration
30
72
  - change some SCM roles from app to all
31
73
 
74
+ ## [8.0.2] - 2020-08-21
75
+ ### Summary
76
+
77
+ - use --no-tablespaces with mysqldump
78
+
32
79
  ## [8.0.1] - 2017-05-15
33
80
  ### Summary
34
81
 
@@ -40,7 +87,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
40
87
  - first public release
41
88
 
42
89
  [Unreleased]: https://github.com/dkdeploy/dkdeploy-core/compare/master...develop
90
+ [9.2.4]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.4
91
+ [9.2.3]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.3
92
+ [9.2.2]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.2
93
+ [9.2.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.1
94
+ [9.2.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.2.0
95
+ [9.1.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.1.1
43
96
  [9.1.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.1.0
97
+ [9.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.1
44
98
  [9.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v9.0.0
99
+ [8.0.2]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.2
45
100
  [8.0.1]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.1
46
101
  [8.0.0]: https://github.com/dkdeploy/dkdeploy-core/releases/tag/v8.0.0
@@ -7,11 +7,14 @@ The dkdeploy core maintainers would like to recognize following contributors (in
7
7
  - Sascha Egerer
8
8
  - Christoph Gerold
9
9
  - Johannes Goslar
10
+ - Kai Harder
10
11
  - Kieran Hayes
11
12
  - Wilfried Irßlinger
12
13
  - Thomas Jahnke
14
+ - Hannes Leutloff
13
15
  - Gleb Levitin
14
16
  - Luka Lüdicke
17
+ - Minh-Thien Nhan
15
18
  - Nicolai Reuschling
16
19
  - Lars Tode
17
20
  - Timo Webler
data/Gemfile CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  source 'https://rubygems.org/'
2
4
 
3
5
  # Specify your gem's dependencies in dkdeploy-core.gemspec
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2014-2017 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de/
1
+ Copyright (c) 2014-2018 dkd Internet Service GmbH, Frankfurt am Main (Germany), https://dkd.de/
2
2
 
3
3
  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:
4
4
 
data/README.md CHANGED
@@ -13,7 +13,7 @@ This Rubygem `dkdeploy-core` represents the extension of [Capistrano](http://cap
13
13
 
14
14
  Add this line to your application's `Gemfile`
15
15
 
16
- gem 'dkdeploy-core', '~> 9.1'
16
+ gem 'dkdeploy-core', '~> 9.2'
17
17
 
18
18
  and then execute
19
19
 
@@ -68,7 +68,7 @@ rvm (v1.29.x) with installed Ruby 2.2.
68
68
 
69
69
  Add the virtual box alias to your `hosts` file
70
70
 
71
- 192.168.156.180 dkdeploy-core.dev
71
+ 192.168.156.180 dkdeploy-core.test
72
72
 
73
73
  ### Running tests
74
74
 
@@ -81,11 +81,10 @@ Add the virtual box alias to your `hosts` file
81
81
  1. Install [git flow](https://github.com/nvie/gitflow)
82
82
  2. Install [Homebrew](http://brew.sh/) and run `brew install mysql`
83
83
  3. Install [NodeJS](https://nodejs.org) (supported: v0.12.7) via `brew install nodejs`
84
- 4. Install [Bower](http://bower.io) (supported: v1.7.9) via `npm install -g bower@1.7.9`
85
- 5. If project is not checked out already do git clone `git@github.com:dkdeploy/dkdeploy-core.git`
86
- 6. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
87
- 7. Git flow initialze `git flow init -d`
88
- 8. Installing gems `bundle install`
89
- 9. Create new feature branch (`git flow feature start my-new-feature`)
90
- 10. Run tests (README.md Testing)
91
- 11. Commit your changes (`git commit -am 'Add some feature'`)
84
+ 4. If project is not checked out already do git clone `git@github.com:dkdeploy/dkdeploy-core.git`
85
+ 5. Checkout origin develop branch (`git checkout --track -b develop origin/develop`)
86
+ 6. Git flow initialze `git flow init -d`
87
+ 7. Installing gems `bundle install`
88
+ 8. Create new feature branch (`git flow feature start my-new-feature`)
89
+ 9. Run tests (README.md Testing)
90
+ 10. Commit your changes (`git commit -am 'Add some feature'`)
data/Rakefile CHANGED
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  task default: :spec
2
4
  require 'bundler/gem_tasks'
3
5
 
@@ -5,15 +5,15 @@ unless Vagrant.has_plugin?('vagrant-berkshelf')
5
5
  abort
6
6
  end
7
7
 
8
- Vagrant.require_version '~> 2.0.0'
9
- chef_version = '12.9.41'
8
+ Vagrant.require_version '~> 2.0'
10
9
 
11
10
  Vagrant.configure(2) do |config|
12
- domain = 'dkdeploy-core.dev'
11
+ chef_version = '13.6.4'
12
+ domain = 'dkdeploy-core.test'
13
13
  ip_address = '192.168.156.180'
14
14
 
15
15
  # Search boxes at https://atlas.hashicorp.com/search.
16
- config.vm.box = 'ubuntu/trusty64'
16
+ config.vm.box = 'bento/ubuntu-16.04'
17
17
  config.vm.box_check_update = false
18
18
  config.berkshelf.enabled = true
19
19
 
@@ -25,7 +25,7 @@ Vagrant.configure(2) do |config|
25
25
  chef.install = true
26
26
  chef.channel = 'stable'
27
27
  chef.version = chef_version
28
- chef.log_level = :info
28
+ chef.log_level = :warn
29
29
  chef.add_recipe 'dkdeploy-core'
30
30
  end
31
31
 
@@ -37,7 +37,8 @@ Vagrant.configure(2) do |config|
37
37
  'modifyvm', :id,
38
38
  '--natdnsproxy1', 'off',
39
39
  '--natdnshostresolver1', 'on',
40
- '--memory', '1024'
40
+ '--memory', '1024',
41
+ '--audio', 'none'
41
42
  ]
42
43
  end
43
44
  end
@@ -45,7 +46,7 @@ Vagrant.configure(2) do |config|
45
46
  if Vagrant.has_plugin?('landrush')
46
47
  config.landrush.enabled = true
47
48
  config.landrush.guest_redirect_dns = false
48
- config.landrush.tld = 'dev'
49
+ config.landrush.tld = 'test'
49
50
  config.landrush.host domain, ip_address
50
51
  else
51
52
  config.vm.post_up_message = "Either install Vagrant plugin 'landrush' or add this entry to your host file: #{ip_address} #{domain}"
@@ -4,7 +4,7 @@ license 'MIT'
4
4
  description 'Project cookbook'
5
5
  version '1.0.0'
6
6
 
7
- depends 'mysql', '~> 6.0'
8
- depends 'mysql2_chef_gem', '~> 1.0'
9
- depends 'database', '~> 4.0'
10
- depends 'apt', '~> 2.9'
7
+ depends 'mysql'
8
+ depends 'database'
9
+ depends 'mysql2_chef_gem'
10
+ depends 'apt'
@@ -19,17 +19,16 @@ end
19
19
 
20
20
  mysql_service 'default' do
21
21
  port '3306'
22
- # Need for remote connection
23
- bind_address '0.0.0.0'
24
- action [:create, :start]
22
+ bind_address '0.0.0.0' # Need for remote connection
23
+ initial_root_password 'ilikerandompasswords'
25
24
  run_group 'vagrant'
26
25
  run_user 'vagrant'
26
+ action [:create, :start]
27
27
  end
28
28
 
29
29
  mysql_config 'default' do
30
30
  instance 'default' # necessary in some cases, causes hanging on provisioning https://github.com/chef-cookbooks/mysql/issues/387
31
- # use different user to allow capistrano access to log file
32
- owner 'vagrant'
31
+ owner 'vagrant' # use different user to allow capistrano access to log file
33
32
  group 'vagrant'
34
33
  source 'my_extra_settings.erb'
35
34
  notifies :restart, 'mysql_service[default]'
@@ -41,23 +40,22 @@ mysql2_chef_gem 'default' do
41
40
  end
42
41
 
43
42
  mysql_connection_info = {
44
- :host => '127.0.0.1',
45
- :username => 'root',
46
- :password => 'ilikerandompasswords'
43
+ host: '127.0.0.1',
44
+ username: 'root',
45
+ password: 'ilikerandompasswords'
47
46
  }
48
47
 
49
48
  mysql_database 'dkdeploy_core' do
50
49
  connection mysql_connection_info
51
- action :create
50
+ action :create
52
51
  end
53
52
 
54
53
  mysql_database_user 'root' do
55
54
  connection mysql_connection_info
56
- host '%'
57
- password 'ilikerandompasswords'
58
- action :create
55
+ host '%'
56
+ password 'ilikerandompasswords'
59
57
  privileges [:all]
60
- action :grant
58
+ action [:create, :grant]
61
59
  end
62
60
 
63
61
  directory '/var/www' do
@@ -1,4 +1,6 @@
1
- lib = File.expand_path('../lib', __FILE__)
1
+ # frozen_string_literal: true
2
+
3
+ lib = File.expand_path('lib', __dir__)
2
4
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
5
  require 'dkdeploy/core/version'
4
6
 
@@ -11,23 +13,23 @@ Gem::Specification.new do |spec|
11
13
  spec.description = 'dkd basic deployment tasks and strategies'
12
14
  spec.summary = 'dkd basic deployment tasks and strategies'
13
15
  spec.homepage = 'https://github.com/dkdeploy/dkdeploy-core'
14
- spec.required_ruby_version = '~> 2.2'
16
+ spec.required_ruby_version = '~> 2.3'
15
17
 
16
18
  spec.files = `git ls-files`.split($/)
17
19
  spec.executables = spec.files.grep(%r{^bin\/}) { |f| File.basename(f) }
18
20
  spec.test_files = spec.files.grep(%r{^(test|spec|features)\/})
19
21
  spec.require_paths = ['lib']
20
22
 
23
+ spec.add_development_dependency 'aruba', '~> 0.14.1'
21
24
  spec.add_development_dependency 'bundler'
22
- spec.add_development_dependency 'rake'
23
- spec.add_development_dependency 'rspec', '~> 3.5'
24
25
  spec.add_development_dependency 'cucumber', '~> 2.4'
25
- spec.add_development_dependency 'rubocop', '~> 0.50.0'
26
- spec.add_development_dependency 'aruba', '~> 0.14.1'
26
+ spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
27
27
  spec.add_development_dependency 'mysql2', '~> 0.3'
28
28
  spec.add_development_dependency 'pry', '~> 0.10'
29
- spec.add_development_dependency 'dkdeploy-test_environment', '~> 2.0'
29
+ spec.add_development_dependency 'rake'
30
+ spec.add_development_dependency 'rspec', '~> 3.5'
31
+ spec.add_development_dependency 'rubocop', '~> 0.62.0'
30
32
 
31
- spec.add_dependency 'capistrano', '~> 3.10.1'
33
+ spec.add_dependency 'capistrano', '~> 3.11.0'
32
34
  spec.add_dependency 'highline', '~> 1.7.1'
33
35
  end
@@ -37,7 +37,6 @@ Feature: Test tasks for namespace 'assets'
37
37
  And I run `cap dev assets:add_htpasswd` interactively
38
38
  And I type "dkd_test_user"
39
39
  And I type "dkd_test_password"
40
- And I close the stdin stream
41
40
  Then the exit status should be 0
42
41
  And a remote file named "shared_path/.htpasswd" should exist
43
42
 
@@ -87,7 +87,7 @@ Feature: Test tasks for namespace 'file_permissions'
87
87
  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'}}}}
88
88
  And a remote directory named "releases_path/not_existing" should not exist
89
89
  When I successfully run `cap dev file_access:set_custom_access`
90
- Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.dev"
90
+ Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.test"
91
91
  And the output should not contain "sudo chmod u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/not_existing"
92
92
  And the output should contain "sudo chmod u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/catalog"
93
93
 
@@ -115,6 +115,6 @@ Feature: Test tasks for namespace 'file_permissions'
115
115
  And I extend the development capistrano configuration variable selected_custom_file_access with value [:not_existing, :catalog]
116
116
  And a remote directory named "releases_path/not_existing" should not exist
117
117
  When I successfully run `cap dev file_access:set_selected_custom_access`
118
- Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.dev"
118
+ Then the output should contain "The resource /var/www/dkdeploy/current/not_existing does not exist on host dkdeploy-core.test"
119
119
  And the output should not contain "sudo chmod -R u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/not_existing"
120
120
  And the output should contain "sudo chmod -R u+rwx,g+rwx,o-wx /var/www/dkdeploy/current/catalog"