orchestration 0.6.16 → 0.7.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +4 -0
  3. data/.strong_versions.yml +1 -0
  4. data/README.md +29 -12
  5. data/lib/orchestration/docker_compose/app_service.rb +2 -2
  6. data/lib/orchestration/docker_compose/compose_configuration.rb +1 -1
  7. data/lib/orchestration/environment.rb +3 -3
  8. data/lib/orchestration/file_helpers.rb +4 -4
  9. data/lib/orchestration/install_generator.rb +5 -42
  10. data/lib/orchestration/make/orchestration.mk +25 -45
  11. data/lib/orchestration/make.rb +0 -2
  12. data/lib/orchestration/services/database/configuration.rb +5 -5
  13. data/lib/orchestration/services/mixins/configuration_base.rb +1 -1
  14. data/lib/orchestration/services/mixins/http_healthcheck.rb +1 -1
  15. data/lib/orchestration/services/mongo/configuration.rb +1 -1
  16. data/lib/orchestration/templates/Dockerfile.erb +9 -11
  17. data/lib/orchestration/templates/rabbitmq.yml.erb +1 -1
  18. data/lib/orchestration/terminal.rb +1 -6
  19. data/lib/orchestration/version.rb +1 -1
  20. data/lib/orchestration.rb +19 -58
  21. data/lib/tasks/orchestration.rake +1 -4
  22. data/orchestration.gemspec +21 -23
  23. metadata +46 -78
  24. data/.ruby-version +0 -1
  25. data/Gemfile.lock +0 -275
  26. data/lib/orchestration/healthcheck.bash +0 -16
  27. data/lib/orchestration/make/orchestration.mk.orig +0 -535
data/lib/orchestration.rb CHANGED
@@ -33,67 +33,28 @@ require 'orchestration/terminal'
33
33
  require 'orchestration/version'
34
34
 
35
35
  module Orchestration
36
- class << self
37
- def root
38
- Pathname.new(File.dirname(__dir__))
39
- end
40
-
41
- def makefile
42
- root.join('lib', 'orchestration', 'make', 'orchestration.mk')
43
- end
44
-
45
- def rakefile
46
- root.join('lib', 'Rakefile')
47
- end
48
-
49
- def error(key, options = {})
50
- warn('# Orchestration Error')
51
- warn("# #{I18n.t("orchestration.#{key}", options)}")
52
- end
53
-
54
- def random_local_port
55
- socket = Socket.new(:INET, :STREAM, 0)
56
- socket.bind(Addrinfo.tcp('127.0.0.1', 0))
57
- port = socket.local_address.ip_port
58
- socket.close
59
- port
60
- end
61
-
62
- def print_environment
63
- return unless File.exist?('.env')
64
-
65
- $stderr.puts
66
- warn("#{prefix} #{Paint['Loading environment from', :cyan]} #{Paint['.env', :green]}")
67
- $stderr.puts
68
- environment_variables.each do |variable, value|
69
- terminal.print_variable(variable, value)
70
- end
71
- $stderr.puts
72
- end
73
-
74
- private
36
+ def self.root
37
+ Pathname.new(File.dirname(__dir__))
38
+ end
75
39
 
76
- def terminal
77
- @terminal ||= Terminal.new(Environment.new.settings)
78
- end
40
+ def self.makefile
41
+ root.join('lib', 'orchestration', 'make', 'orchestration.mk')
42
+ end
79
43
 
80
- def prefix
81
- "#{Paint['[', :white]}#{Paint['orchestration', :cyan]}#{Paint[']', :white]}"
82
- end
44
+ def self.rakefile
45
+ root.join('lib', 'Rakefile')
46
+ end
83
47
 
84
- def environment_variables
85
- File.readlines('.env').reject { |line| line.match(/^\s*#/) }
86
- .select { |line| line.include?('=') }
87
- .map do |line|
88
- variable, _, value = line.partition('=')
89
- [variable, value]
90
- end
91
- end
48
+ def self.error(key, options = {})
49
+ warn('# Orchestration Error')
50
+ warn("# #{I18n.t("orchestration.#{key}", options)}")
92
51
  end
93
- end
94
52
 
95
- if ENV['RAILS_ENV'] == 'development' && !ENV.key?('ORCHESTRATION_DISABLE_ENV')
96
- require 'dotenv-rails'
97
- Dotenv::Railtie.load
98
- Orchestration.print_environment
53
+ def self.random_local_port
54
+ socket = Socket.new(:INET, :STREAM, 0)
55
+ socket.bind(Addrinfo.tcp('127.0.0.1', 0))
56
+ port = socket.local_address.ip_port
57
+ socket.close
58
+ port
59
+ end
99
60
  end
data/lib/tasks/orchestration.rake CHANGED
@@ -110,9 +110,6 @@ post-setup:
110
110
  namespace :db do
111
111
  desc I18n.t('orchestration.rake.db.url')
112
112
  task :url do
113
- ENV['DATABASE_URL'] = nil
114
- ENV['DEVELOPMENT_DATABASE_URL'] = nil
115
- ENV['TEST_DATABASE_URL'] = nil
116
113
  config = Rails.application.config_for(:database).transform_keys(&:to_sym)
117
114
 
118
115
  if config[:adapter] == 'sqlite3'
@@ -127,7 +124,7 @@ post-setup:
127
124
  desc I18n.t('orchestration.rake.db.console')
128
125
  task :console do
129
126
  env = Orchestration::Environment.new
130
- options = ENV['db'] ? { config_path: "config/database.#{ENV['db']}.yml" } : {}
127
+ options = ENV['db'] ? { config_path: "config/database.#{ENV.fetch('db', nil)}.yml" } : {}
131
128
  sh Orchestration::Services::Database::Configuration.new(env, nil, options).console_command
132
129
  end
133
130
  end
data/orchestration.gemspec CHANGED
@@ -22,35 +22,33 @@ Gem::Specification.new do |spec|
22
22
  end
23
23
  end
24
24
 
25
- spec.required_ruby_version = '>= 2.6'
25
+ spec.required_ruby_version = '>= 3.1'
26
26
  spec.bindir = 'bin'
27
27
  spec.executables = []
28
28
  spec.require_paths = ['lib']
29
29
 
30
30
  spec.add_runtime_dependency 'database_url', '~> 0.1.2'
31
- spec.add_runtime_dependency 'dotenv-rails', '~> 2.8'
32
31
  spec.add_runtime_dependency 'erubis', '~> 2.7'
33
- spec.add_runtime_dependency 'i18n', '>= 0.5'
34
- spec.add_runtime_dependency 'paint', '~> 2.0'
35
- spec.add_runtime_dependency 'rails', '>= 4.1'
36
- spec.add_runtime_dependency 'thor', '~> 1.0'
32
+ spec.add_runtime_dependency 'i18n'
33
+ spec.add_runtime_dependency 'paint', '~> 2.2'
34
+ spec.add_runtime_dependency 'rails', '>= 6.1'
35
+ spec.add_runtime_dependency 'thor', '~> 1.2'
37
36
 
38
- spec.add_development_dependency 'activerecord', '~> 6.0'
39
- spec.add_development_dependency 'activerecord-postgis-adapter', '~> 7.1'
40
- spec.add_development_dependency 'bunny', '~> 2.12'
41
- spec.add_development_dependency 'devpack', '~> 0.3.2'
42
- spec.add_development_dependency 'mongoid', '~> 7.0'
43
- spec.add_development_dependency 'mysql2', '~> 0.5.2'
44
- spec.add_development_dependency 'pg', '~> 1.1'
45
- spec.add_development_dependency 'rails', '~> 6.0'
46
- spec.add_development_dependency 'rake', '~> 10.0'
47
- spec.add_development_dependency 'rspec', '~> 3.0'
48
- spec.add_development_dependency 'rspec-its', '~> 1.2'
49
- spec.add_development_dependency 'rubocop', '~> 1.12'
50
- spec.add_development_dependency 'rubocop-rails', '~> 2.9'
51
- spec.add_development_dependency 'rubocop-rake', '~> 0.5.1'
52
- spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
53
- spec.add_development_dependency 'sqlite3', '~> 1.3'
37
+ spec.add_development_dependency 'activerecord', '>= 6.0'
38
+ spec.add_development_dependency 'bunny', '~> 2.19'
39
+ spec.add_development_dependency 'devpack', '~> 0.4.0'
40
+ spec.add_development_dependency 'mongoid', '~> 7.4'
41
+ spec.add_development_dependency 'mysql2', '~> 0.5.3'
42
+ spec.add_development_dependency 'pg', '~> 1.3'
43
+ spec.add_development_dependency 'rails'
44
+ spec.add_development_dependency 'rake', '~> 13.0'
45
+ spec.add_development_dependency 'rspec', '~> 3.11'
46
+ spec.add_development_dependency 'rspec-its', '~> 1.3'
47
+ spec.add_development_dependency 'rubocop', '~> 1.28'
48
+ spec.add_development_dependency 'rubocop-rails', '~> 2.14'
49
+ spec.add_development_dependency 'rubocop-rake', '~> 0.6.0'
50
+ spec.add_development_dependency 'rubocop-rspec', '~> 2.10'
51
+ spec.add_development_dependency 'sqlite3', '~> 1.4'
54
52
  spec.add_development_dependency 'strong_versions', '~> 0.4.5'
55
- spec.add_development_dependency 'webmock', '~> 3.4'
53
+ spec.add_development_dependency 'webmock', '~> 3.14'
56
54
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: orchestration
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.16
4
+ version: 0.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bob Farrell
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-01-10 00:00:00.000000000 Z
11
+ date: 2022-05-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: database_url
@@ -24,20 +24,6 @@ dependencies:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 0.1.2
27
- - !ruby/object:Gem::Dependency
28
- name: dotenv-rails
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - "~>"
32
- - !ruby/object:Gem::Version
33
- version: '2.8'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - "~>"
39
- - !ruby/object:Gem::Version
40
- version: '2.8'
41
27
  - !ruby/object:Gem::Dependency
42
28
  name: erubis
43
29
  requirement: !ruby/object:Gem::Requirement
@@ -58,280 +44,266 @@ dependencies:
58
44
  requirements:
59
45
  - - ">="
60
46
  - !ruby/object:Gem::Version
61
- version: '0.5'
47
+ version: '0'
62
48
  type: :runtime
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
52
  - - ">="
67
53
  - !ruby/object:Gem::Version
68
- version: '0.5'
54
+ version: '0'
69
55
  - !ruby/object:Gem::Dependency
70
56
  name: paint
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
59
  - - "~>"
74
60
  - !ruby/object:Gem::Version
75
- version: '2.0'
61
+ version: '2.2'
76
62
  type: :runtime
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
66
  - - "~>"
81
67
  - !ruby/object:Gem::Version
82
- version: '2.0'
68
+ version: '2.2'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: rails
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
73
  - - ">="
88
74
  - !ruby/object:Gem::Version
89
- version: '4.1'
75
+ version: '6.1'
90
76
  type: :runtime
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
80
  - - ">="
95
81
  - !ruby/object:Gem::Version
96
- version: '4.1'
82
+ version: '6.1'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: thor
99
85
  requirement: !ruby/object:Gem::Requirement
100
86
  requirements:
101
87
  - - "~>"
102
88
  - !ruby/object:Gem::Version
103
- version: '1.0'
89
+ version: '1.2'
104
90
  type: :runtime
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
94
  - - "~>"
109
95
  - !ruby/object:Gem::Version
110
- version: '1.0'
96
+ version: '1.2'
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: activerecord
113
99
  requirement: !ruby/object:Gem::Requirement
114
100
  requirements:
115
- - - "~>"
101
+ - - ">="
116
102
  - !ruby/object:Gem::Version
117
103
  version: '6.0'
118
104
  type: :development
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
107
  requirements:
122
- - - "~>"
108
+ - - ">="
123
109
  - !ruby/object:Gem::Version
124
110
  version: '6.0'
125
- - !ruby/object:Gem::Dependency
126
- name: activerecord-postgis-adapter
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - "~>"
130
- - !ruby/object:Gem::Version
131
- version: '7.1'
132
- type: :development
133
- prerelease: false
134
- version_requirements: !ruby/object:Gem::Requirement
135
- requirements:
136
- - - "~>"
137
- - !ruby/object:Gem::Version
138
- version: '7.1'
139
111
  - !ruby/object:Gem::Dependency
140
112
  name: bunny
141
113
  requirement: !ruby/object:Gem::Requirement
142
114
  requirements:
143
115
  - - "~>"
144
116
  - !ruby/object:Gem::Version
145
- version: '2.12'
117
+ version: '2.19'
146
118
  type: :development
147
119
  prerelease: false
148
120
  version_requirements: !ruby/object:Gem::Requirement
149
121
  requirements:
150
122
  - - "~>"
151
123
  - !ruby/object:Gem::Version
152
- version: '2.12'
124
+ version: '2.19'
153
125
  - !ruby/object:Gem::Dependency
154
126
  name: devpack
155
127
  requirement: !ruby/object:Gem::Requirement
156
128
  requirements:
157
129
  - - "~>"
158
130
  - !ruby/object:Gem::Version
159
- version: 0.3.2
131
+ version: 0.4.0
160
132
  type: :development
161
133
  prerelease: false
162
134
  version_requirements: !ruby/object:Gem::Requirement
163
135
  requirements:
164
136
  - - "~>"
165
137
  - !ruby/object:Gem::Version
166
- version: 0.3.2
138
+ version: 0.4.0
167
139
  - !ruby/object:Gem::Dependency
168
140
  name: mongoid
169
141
  requirement: !ruby/object:Gem::Requirement
170
142
  requirements:
171
143
  - - "~>"
172
144
  - !ruby/object:Gem::Version
173
- version: '7.0'
145
+ version: '7.4'
174
146
  type: :development
175
147
  prerelease: false
176
148
  version_requirements: !ruby/object:Gem::Requirement
177
149
  requirements:
178
150
  - - "~>"
179
151
  - !ruby/object:Gem::Version
180
- version: '7.0'
152
+ version: '7.4'
181
153
  - !ruby/object:Gem::Dependency
182
154
  name: mysql2
183
155
  requirement: !ruby/object:Gem::Requirement
184
156
  requirements:
185
157
  - - "~>"
186
158
  - !ruby/object:Gem::Version
187
- version: 0.5.2
159
+ version: 0.5.3
188
160
  type: :development
189
161
  prerelease: false
190
162
  version_requirements: !ruby/object:Gem::Requirement
191
163
  requirements:
192
164
  - - "~>"
193
165
  - !ruby/object:Gem::Version
194
- version: 0.5.2
166
+ version: 0.5.3
195
167
  - !ruby/object:Gem::Dependency
196
168
  name: pg
197
169
  requirement: !ruby/object:Gem::Requirement
198
170
  requirements:
199
171
  - - "~>"
200
172
  - !ruby/object:Gem::Version
201
- version: '1.1'
173
+ version: '1.3'
202
174
  type: :development
203
175
  prerelease: false
204
176
  version_requirements: !ruby/object:Gem::Requirement
205
177
  requirements:
206
178
  - - "~>"
207
179
  - !ruby/object:Gem::Version
208
- version: '1.1'
180
+ version: '1.3'
209
181
  - !ruby/object:Gem::Dependency
210
182
  name: rails
211
183
  requirement: !ruby/object:Gem::Requirement
212
184
  requirements:
213
- - - "~>"
185
+ - - ">="
214
186
  - !ruby/object:Gem::Version
215
- version: '6.0'
187
+ version: '0'
216
188
  type: :development
217
189
  prerelease: false
218
190
  version_requirements: !ruby/object:Gem::Requirement
219
191
  requirements:
220
- - - "~>"
192
+ - - ">="
221
193
  - !ruby/object:Gem::Version
222
- version: '6.0'
194
+ version: '0'
223
195
  - !ruby/object:Gem::Dependency
224
196
  name: rake
225
197
  requirement: !ruby/object:Gem::Requirement
226
198
  requirements:
227
199
  - - "~>"
228
200
  - !ruby/object:Gem::Version
229
- version: '10.0'
201
+ version: '13.0'
230
202
  type: :development
231
203
  prerelease: false
232
204
  version_requirements: !ruby/object:Gem::Requirement
233
205
  requirements:
234
206
  - - "~>"
235
207
  - !ruby/object:Gem::Version
236
- version: '10.0'
208
+ version: '13.0'
237
209
  - !ruby/object:Gem::Dependency
238
210
  name: rspec
239
211
  requirement: !ruby/object:Gem::Requirement
240
212
  requirements:
241
213
  - - "~>"
242
214
  - !ruby/object:Gem::Version
243
- version: '3.0'
215
+ version: '3.11'
244
216
  type: :development
245
217
  prerelease: false
246
218
  version_requirements: !ruby/object:Gem::Requirement
247
219
  requirements:
248
220
  - - "~>"
249
221
  - !ruby/object:Gem::Version
250
- version: '3.0'
222
+ version: '3.11'
251
223
  - !ruby/object:Gem::Dependency
252
224
  name: rspec-its
253
225
  requirement: !ruby/object:Gem::Requirement
254
226
  requirements:
255
227
  - - "~>"
256
228
  - !ruby/object:Gem::Version
257
- version: '1.2'
229
+ version: '1.3'
258
230
  type: :development
259
231
  prerelease: false
260
232
  version_requirements: !ruby/object:Gem::Requirement
261
233
  requirements:
262
234
  - - "~>"
263
235
  - !ruby/object:Gem::Version
264
- version: '1.2'
236
+ version: '1.3'
265
237
  - !ruby/object:Gem::Dependency
266
238
  name: rubocop
267
239
  requirement: !ruby/object:Gem::Requirement
268
240
  requirements:
269
241
  - - "~>"
270
242
  - !ruby/object:Gem::Version
271
- version: '1.12'
243
+ version: '1.28'
272
244
  type: :development
273
245
  prerelease: false
274
246
  version_requirements: !ruby/object:Gem::Requirement
275
247
  requirements:
276
248
  - - "~>"
277
249
  - !ruby/object:Gem::Version
278
- version: '1.12'
250
+ version: '1.28'
279
251
  - !ruby/object:Gem::Dependency
280
252
  name: rubocop-rails
281
253
  requirement: !ruby/object:Gem::Requirement
282
254
  requirements:
283
255
  - - "~>"
284
256
  - !ruby/object:Gem::Version
285
- version: '2.9'
257
+ version: '2.14'
286
258
  type: :development
287
259
  prerelease: false
288
260
  version_requirements: !ruby/object:Gem::Requirement
289
261
  requirements:
290
262
  - - "~>"
291
263
  - !ruby/object:Gem::Version
292
- version: '2.9'
264
+ version: '2.14'
293
265
  - !ruby/object:Gem::Dependency
294
266
  name: rubocop-rake
295
267
  requirement: !ruby/object:Gem::Requirement
296
268
  requirements:
297
269
  - - "~>"
298
270
  - !ruby/object:Gem::Version
299
- version: 0.5.1
271
+ version: 0.6.0
300
272
  type: :development
301
273
  prerelease: false
302
274
  version_requirements: !ruby/object:Gem::Requirement
303
275
  requirements:
304
276
  - - "~>"
305
277
  - !ruby/object:Gem::Version
306
- version: 0.5.1
278
+ version: 0.6.0
307
279
  - !ruby/object:Gem::Dependency
308
280
  name: rubocop-rspec
309
281
  requirement: !ruby/object:Gem::Requirement
310
282
  requirements:
311
283
  - - "~>"
312
284
  - !ruby/object:Gem::Version
313
- version: '2.2'
285
+ version: '2.10'
314
286
  type: :development
315
287
  prerelease: false
316
288
  version_requirements: !ruby/object:Gem::Requirement
317
289
  requirements:
318
290
  - - "~>"
319
291
  - !ruby/object:Gem::Version
320
- version: '2.2'
292
+ version: '2.10'
321
293
  - !ruby/object:Gem::Dependency
322
294
  name: sqlite3
323
295
  requirement: !ruby/object:Gem::Requirement
324
296
  requirements:
325
297
  - - "~>"
326
298
  - !ruby/object:Gem::Version
327
- version: '1.3'
299
+ version: '1.4'
328
300
  type: :development
329
301
  prerelease: false
330
302
  version_requirements: !ruby/object:Gem::Requirement
331
303
  requirements:
332
304
  - - "~>"
333
305
  - !ruby/object:Gem::Version
334
- version: '1.3'
306
+ version: '1.4'
335
307
  - !ruby/object:Gem::Dependency
336
308
  name: strong_versions
337
309
  requirement: !ruby/object:Gem::Requirement
@@ -352,14 +324,14 @@ dependencies:
352
324
  requirements:
353
325
  - - "~>"
354
326
  - !ruby/object:Gem::Version
355
- version: '3.4'
327
+ version: '3.14'
356
328
  type: :development
357
329
  prerelease: false
358
330
  version_requirements: !ruby/object:Gem::Requirement
359
331
  requirements:
360
332
  - - "~>"
361
333
  - !ruby/object:Gem::Version
362
- version: '3.4'
334
+ version: '3.14'
363
335
  description: Tools to help launch apps in Docker
364
336
  email:
365
337
  - git@bob.frl
@@ -370,11 +342,9 @@ files:
370
342
  - ".gitignore"
371
343
  - ".rspec"
372
344
  - ".rubocop.yml"
373
- - ".ruby-version"
374
345
  - ".strong_versions.yml"
375
346
  - ".travis.yml"
376
347
  - Gemfile
377
- - Gemfile.lock
378
348
  - LICENSE
379
349
  - Makefile
380
350
  - README.md
@@ -399,11 +369,9 @@ files:
399
369
  - lib/orchestration/environment.rb
400
370
  - lib/orchestration/errors.rb
401
371
  - lib/orchestration/file_helpers.rb
402
- - lib/orchestration/healthcheck.bash
403
372
  - lib/orchestration/install_generator.rb
404
373
  - lib/orchestration/make.rb
405
374
  - lib/orchestration/make/orchestration.mk
406
- - lib/orchestration/make/orchestration.mk.orig
407
375
  - lib/orchestration/railtie.rb
408
376
  - lib/orchestration/service_check.rb
409
377
  - lib/orchestration/services.rb
@@ -456,14 +424,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
456
424
  requirements:
457
425
  - - ">="
458
426
  - !ruby/object:Gem::Version
459
- version: '2.6'
427
+ version: '3.1'
460
428
  required_rubygems_version: !ruby/object:Gem::Requirement
461
429
  requirements:
462
430
  - - ">="
463
431
  - !ruby/object:Gem::Version
464
432
  version: '0'
465
433
  requirements: []
466
- rubygems_version: 3.0.3.1
434
+ rubygems_version: 3.3.7
467
435
  signing_key:
468
436
  specification_version: 4
469
437
  summary: Docker orchestration toolkit
data/.ruby-version DELETED
@@ -1 +0,0 @@
1
- 2.6.9