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
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'dkdeploy/dsl'
2
4
 
3
5
  include Capistrano::DSL
@@ -52,6 +54,7 @@ namespace :deploy do
52
54
  end
53
55
 
54
56
  next if rollback_archives.count <= fetch(:keep_rollback_archives)
57
+
55
58
  info I18n.t('keep_rollback_archives',
56
59
  scope: :dkdeploy,
57
60
  host: host.to_s,
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  include Capistrano::DSL
2
4
 
3
5
  namespace :deploy do
@@ -6,6 +8,7 @@ namespace :deploy do
6
8
  desc "Check directories to be linked exist in shared using the given hash 'enhanced_linked_dirs'"
7
9
  task :linked_dirs do
8
10
  next unless any? :enhanced_linked_dirs
11
+
9
12
  fetch(:enhanced_linked_dirs).each_key do |source|
10
13
  on release_roles :all do
11
14
  execute :mkdir, '-pv', shared_path.join(source)
@@ -16,6 +19,7 @@ namespace :deploy do
16
19
  desc "Check directories of files to be linked exist in shared using the given hash 'enhanced_linked_files'"
17
20
  task :make_linked_dirs do
18
21
  next unless any? :enhanced_linked_files
22
+
19
23
  fetch(:enhanced_linked_files).each_value do |target|
20
24
  on release_roles :all do
21
25
  execute :mkdir, '-pv', shared_path.join(target).dirname
@@ -26,6 +30,7 @@ namespace :deploy do
26
30
  desc "Check files to be linked exist in shared using the given hash 'enhanced_linked_files'"
27
31
  task :linked_files do
28
32
  next unless any? :enhanced_linked_files
33
+
29
34
  fetch(:enhanced_linked_files).each_key do |source|
30
35
  on release_roles :all do |host|
31
36
  unless test "[ -f #{shared_path.join source} ]"
@@ -41,6 +46,7 @@ namespace :deploy do
41
46
  desc "Symlink linked directories using the given hash 'enhanced_linked_dirs'"
42
47
  task :linked_dirs do
43
48
  next unless any? :enhanced_linked_dirs
49
+
44
50
  fetch(:enhanced_linked_dirs).each do |source, target|
45
51
  target = release_path.join(target)
46
52
  source = shared_path.join(source)
@@ -57,6 +63,7 @@ namespace :deploy do
57
63
  desc "Symlink linked files using the given hash 'enhanced_linked_files'"
58
64
  task :linked_files do
59
65
  next unless any? :enhanced_linked_files
66
+
60
67
  fetch(:enhanced_linked_files).each do |source, target|
61
68
  target = release_path.join(target)
62
69
  source = shared_path.join(source)
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  include Capistrano::DSL
2
4
 
3
5
  namespace :deploy do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'capistrano/i18n'
2
4
  require 'dkdeploy/i18n'
3
5
  require 'dkdeploy/helpers/file_system'
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'json'
2
4
  require 'i18n'
3
5
  require 'dkdeploy/i18n'
@@ -55,7 +57,7 @@ namespace :maintenance do
55
57
  next
56
58
  end
57
59
  end
58
- execute :rm, '-f', maintenance_config_file_path
60
+ execute :rm, maintenance_config_file_path
59
61
  end
60
62
  info I18n.t('tasks.maintenance.disabled', mode: 'regular', scope: :dkdeploy)
61
63
  end
@@ -64,7 +66,7 @@ namespace :maintenance do
64
66
  desc "Disables the maintenance permanent mode. The 'maintenance:disable' will work in a regular way again."
65
67
  task :disable_permanent do
66
68
  on release_roles :app, :web do
67
- execute :rm, '-f', maintenance_config_file_path
69
+ execute :rm, maintenance_config_file_path
68
70
  info I18n.t('tasks.maintenance.disabled', mode: 'permanent', scope: :dkdeploy)
69
71
  end
70
72
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'dkdeploy/constants'
2
4
  require 'dkdeploy/helpers/common'
3
5
  require 'dkdeploy/helpers/mysql'
@@ -13,6 +15,7 @@ namespace :mysql do
13
15
  mysql_slow_log = fetch(:mysql_slow_log, '')
14
16
  on roles :db do |server|
15
17
  next unless slow_log_exists? mysql_slow_log
18
+
16
19
  execute :echo, '', '>', mysql_slow_log
17
20
  info I18n.t('tasks.mysql.clear_slow_log', file: mysql_slow_log, host: server, scope: :dkdeploy)
18
21
  end
@@ -23,6 +26,7 @@ namespace :mysql do
23
26
  mysql_slow_log = fetch(:mysql_slow_log, '')
24
27
  on roles :db do |server|
25
28
  next unless slow_log_exists? mysql_slow_log
29
+
26
30
  local_filename = File.join(local_dump_path, "#{File.basename(mysql_slow_log, '.*')}.#{fetch(:stage)}.#{server.hostname}#{File.extname(mysql_slow_log)}")
27
31
  info I18n.t('file.download', file: mysql_slow_log, target: local_filename, host: server)
28
32
  download! mysql_slow_log, local_filename, via: :scp
@@ -34,6 +38,7 @@ namespace :mysql do
34
38
  mysql_slow_log = fetch(:mysql_slow_log, '')
35
39
  on roles :db do |server|
36
40
  next unless slow_log_exists? mysql_slow_log
41
+
37
42
  analyze_filename = "mysql_slow_log_analyze.#{fetch(:stage)}.#{server.hostname}.log"
38
43
  remote_filename = File.join(deploy_path, analyze_filename)
39
44
  local_filename = File.join(local_dump_path, analyze_filename)
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'capistrano/i18n'
2
4
  require 'dkdeploy/i18n'
3
5
  require 'dkdeploy/constants'
@@ -21,9 +23,7 @@ namespace :project_version do
21
23
  on release_roles :app do
22
24
  info I18n.t('tasks.project_version.update.update', scope: :dkdeploy)
23
25
  # remove the to be replaced remote version file
24
- if test " [ -f #{remote_version_file} ] "
25
- execute :rm, '-f', remote_version_file
26
- end
26
+ execute :rm, '-f', remote_version_file if test " [ -f #{remote_version_file} ] "
27
27
  # upload the current version file
28
28
  upload! local_version_file, remote_version_file
29
29
  end
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'capistrano/i18n'
2
4
  require 'dkdeploy/i18n'
3
5
 
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # Load DSL and Setup Up Stages
2
4
  require 'capistrano/setup'
3
5
 
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  source 'https://rubygems.org'
2
4
 
3
5
  gem 'dkdeploy-core', path: '../../'
@@ -6,6 +8,6 @@ gem 'dkdeploy-core', path: '../../'
6
8
  gem 'compass', '~> 1.0.3'
7
9
 
8
10
  # for debugging only
9
- gem 'pry', '~> 0.10.0'
11
+ gem 'pry', '~> 0.10'
10
12
 
11
13
  gem 'bundler'
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  set :application, 'test_app'
2
4
 
3
5
  SSHKit.config.command_map.prefix[:compass].push 'bundle exec'
@@ -16,6 +18,8 @@ set :asset_default_content, %w[download]
16
18
  set :asset_exclude_file, 'config/assets_exclude_file.txt'
17
19
  set :asset_folders, %w[download]
18
20
 
21
+ set :additional_ignore_tables, %w[test_table]
22
+
19
23
  require 'dkdeploy/interaction_handler/mysql'
20
24
  namespace :db do
21
25
  task :sql_error do
@@ -1,5 +1,7 @@
1
+ # frozen_string_literal: true
2
+
1
3
  set :deploy_to, '/var/www/dkdeploy'
2
- server 'dkdeploy-core.dev', roles: %w[web app backend db], primary: true
4
+ server 'dkdeploy-core.test', roles: %w[web app backend db], primary: true
3
5
 
4
6
  # no ssh compression on the dev stage
5
7
  set :ssh_options, {
@@ -1,3 +1,4 @@
1
+ # frozen_string_literal: true
1
2
 
2
3
  after 'deploy:symlink:release', '--dummy-task-name' do
3
4
  run_locally do
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  set :compass_sources, %w[
2
4
  htdocs/stylesheets/test1
3
5
  htdocs/stylesheets/test2
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # custom file access properties
2
4
  set :custom_file_access, {
3
5
  app: {
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # Deploy workflow. See http://capistranorb.com/documentation/getting-started/flow/
2
4
  after 'deploy:started', 'apache:htaccess'
3
5
  after 'deploy:started', 'assets:compile_compass'
metadata CHANGED
@@ -1,32 +1,32 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dkdeploy-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 9.1.0
4
+ version: 9.2.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Timo Webler
8
8
  - Nicolai Reuschling
9
- autorequire:
9
+ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-02-09 00:00:00.000000000 Z
12
+ date: 2020-08-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- name: bundler
15
+ name: aruba
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ">="
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '0'
20
+ version: 0.14.1
21
21
  type: :development
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ">="
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
- version: '0'
27
+ version: 0.14.1
28
28
  - !ruby/object:Gem::Dependency
29
- name: rake
29
+ name: bundler
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - ">="
@@ -40,117 +40,117 @@ dependencies:
40
40
  - !ruby/object:Gem::Version
41
41
  version: '0'
42
42
  - !ruby/object:Gem::Dependency
43
- name: rspec
43
+ name: cucumber
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '3.5'
48
+ version: '2.4'
49
49
  type: :development
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '3.5'
55
+ version: '2.4'
56
56
  - !ruby/object:Gem::Dependency
57
- name: cucumber
57
+ name: dkdeploy-test_environment
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: '2.4'
62
+ version: '2.0'
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
67
  - - "~>"
68
68
  - !ruby/object:Gem::Version
69
- version: '2.4'
69
+ version: '2.0'
70
70
  - !ruby/object:Gem::Dependency
71
- name: rubocop
71
+ name: mysql2
72
72
  requirement: !ruby/object:Gem::Requirement
73
73
  requirements:
74
74
  - - "~>"
75
75
  - !ruby/object:Gem::Version
76
- version: 0.50.0
76
+ version: '0.3'
77
77
  type: :development
78
78
  prerelease: false
79
79
  version_requirements: !ruby/object:Gem::Requirement
80
80
  requirements:
81
81
  - - "~>"
82
82
  - !ruby/object:Gem::Version
83
- version: 0.50.0
83
+ version: '0.3'
84
84
  - !ruby/object:Gem::Dependency
85
- name: aruba
85
+ name: pry
86
86
  requirement: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
- version: 0.14.1
90
+ version: '0.10'
91
91
  type: :development
92
92
  prerelease: false
93
93
  version_requirements: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - "~>"
96
96
  - !ruby/object:Gem::Version
97
- version: 0.14.1
97
+ version: '0.10'
98
98
  - !ruby/object:Gem::Dependency
99
- name: mysql2
99
+ name: rake
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
- - - "~>"
102
+ - - ">="
103
103
  - !ruby/object:Gem::Version
104
- version: '0.3'
104
+ version: '0'
105
105
  type: :development
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
- - - "~>"
109
+ - - ">="
110
110
  - !ruby/object:Gem::Version
111
- version: '0.3'
111
+ version: '0'
112
112
  - !ruby/object:Gem::Dependency
113
- name: pry
113
+ name: rspec
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - "~>"
117
117
  - !ruby/object:Gem::Version
118
- version: '0.10'
118
+ version: '3.5'
119
119
  type: :development
120
120
  prerelease: false
121
121
  version_requirements: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - "~>"
124
124
  - !ruby/object:Gem::Version
125
- version: '0.10'
125
+ version: '3.5'
126
126
  - !ruby/object:Gem::Dependency
127
- name: dkdeploy-test_environment
127
+ name: rubocop
128
128
  requirement: !ruby/object:Gem::Requirement
129
129
  requirements:
130
130
  - - "~>"
131
131
  - !ruby/object:Gem::Version
132
- version: '2.0'
132
+ version: 0.62.0
133
133
  type: :development
134
134
  prerelease: false
135
135
  version_requirements: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - "~>"
138
138
  - !ruby/object:Gem::Version
139
- version: '2.0'
139
+ version: 0.62.0
140
140
  - !ruby/object:Gem::Dependency
141
141
  name: capistrano
142
142
  requirement: !ruby/object:Gem::Requirement
143
143
  requirements:
144
144
  - - "~>"
145
145
  - !ruby/object:Gem::Version
146
- version: 3.10.1
146
+ version: 3.11.0
147
147
  type: :runtime
148
148
  prerelease: false
149
149
  version_requirements: !ruby/object:Gem::Requirement
150
150
  requirements:
151
151
  - - "~>"
152
152
  - !ruby/object:Gem::Version
153
- version: 3.10.1
153
+ version: 3.11.0
154
154
  - !ruby/object:Gem::Dependency
155
155
  name: highline
156
156
  requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,6 @@ files:
192
192
  - dkdeploy-core.gemspec
193
193
  - features/apache.feature
194
194
  - features/assets.feature
195
- - features/bower.feature
196
195
  - features/current_folder.feature
197
196
  - features/db.feature
198
197
  - features/deploy.feature
@@ -222,7 +221,6 @@ files:
222
221
  - lib/dkdeploy/scm/copy.rb
223
222
  - lib/dkdeploy/tasks/apache.rake
224
223
  - lib/dkdeploy/tasks/assets.rake
225
- - lib/dkdeploy/tasks/bower.rake
226
224
  - lib/dkdeploy/tasks/current_folder.rake
227
225
  - lib/dkdeploy/tasks/db.rake
228
226
  - lib/dkdeploy/tasks/deploy.rake
@@ -246,7 +244,6 @@ files:
246
244
  - spec/fixtures/application/config/preseed/download.tar.gz
247
245
  - spec/fixtures/application/htdocs/.hidden/.gitkeep
248
246
  - spec/fixtures/application/htdocs/Gemfile
249
- - spec/fixtures/application/htdocs/bower.json
250
247
  - spec/fixtures/application/htdocs/catalog/.hidden/.gitkeep
251
248
  - spec/fixtures/application/htdocs/catalog/index.html
252
249
  - spec/fixtures/application/htdocs/index.html
@@ -265,7 +262,7 @@ homepage: https://github.com/dkdeploy/dkdeploy-core
265
262
  licenses:
266
263
  - MIT
267
264
  metadata: {}
268
- post_install_message:
265
+ post_install_message:
269
266
  rdoc_options: []
270
267
  require_paths:
271
268
  - lib
@@ -273,22 +270,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
273
270
  requirements:
274
271
  - - "~>"
275
272
  - !ruby/object:Gem::Version
276
- version: '2.2'
273
+ version: '2.3'
277
274
  required_rubygems_version: !ruby/object:Gem::Requirement
278
275
  requirements:
279
276
  - - ">="
280
277
  - !ruby/object:Gem::Version
281
278
  version: '0'
282
279
  requirements: []
283
- rubyforge_project:
284
- rubygems_version: 2.7.5
285
- signing_key:
280
+ rubygems_version: 3.1.4
281
+ signing_key:
286
282
  specification_version: 4
287
283
  summary: dkd basic deployment tasks and strategies
288
284
  test_files:
289
285
  - features/apache.feature
290
286
  - features/assets.feature
291
- - features/bower.feature
292
287
  - features/current_folder.feature
293
288
  - features/db.feature
294
289
  - features/deploy.feature
@@ -313,7 +308,6 @@ test_files:
313
308
  - spec/fixtures/application/config/preseed/download.tar.gz
314
309
  - spec/fixtures/application/htdocs/.hidden/.gitkeep
315
310
  - spec/fixtures/application/htdocs/Gemfile
316
- - spec/fixtures/application/htdocs/bower.json
317
311
  - spec/fixtures/application/htdocs/catalog/.hidden/.gitkeep
318
312
  - spec/fixtures/application/htdocs/catalog/index.html
319
313
  - spec/fixtures/application/htdocs/index.html