orchestration 0.6.6 → 0.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +0 -4
- data/.ruby-version +1 -0
- data/.strong_versions.yml +1 -0
- data/Gemfile.lock +262 -0
- data/README.md +10 -7
- data/lib/orchestration/docker_compose/app_service.rb +1 -1
- data/lib/orchestration/docker_compose/compose_configuration.rb +1 -1
- data/lib/orchestration/environment.rb +5 -5
- data/lib/orchestration/file_helpers.rb +3 -3
- data/lib/orchestration/install_generator.rb +1 -1
- data/lib/orchestration/make/orchestration.mk +9 -5
- data/lib/orchestration/services/database/configuration.rb +5 -5
- data/lib/orchestration/services/mixins/configuration_base.rb +1 -1
- data/lib/orchestration/services/mixins/http_healthcheck.rb +1 -1
- data/lib/orchestration/services/mongo/configuration.rb +1 -1
- data/lib/orchestration/templates/rabbitmq.yml.erb +1 -1
- data/lib/orchestration/version.rb +1 -1
- data/lib/tasks/orchestration.rake +5 -2
- data/orchestration.gemspec +21 -21
- metadata +48 -46
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d46427ecb6cb0665a6be31e5e49cd6a01a8c2f5148442f3c1bcc3852c87c83e9
|
4
|
+
data.tar.gz: d622198cebd4619d573f391f9eae23d68bea32606619f4d8965032c1eb096a98
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 89364f65e27bb9f05213a4a6c64351b1fc9e1b2e12eb890d4b90f2b1338cdab7e04b1dc1a43cf155d6fafe1f838c3c8a903dcccc1bf80b557e38a371aee902eb
|
7
|
+
data.tar.gz: 69aca6c30ba0fcbd2a8d1172a8e4904a88e8fe3d0875281f6cd8a2245e601d36c45fcbbd4f784b39935e6195a5d13c87cb5f1a0f8247823e3a2de2e209caf71e
|
data/.gitignore
CHANGED
data/.ruby-version
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
3.1.2
|
data/.strong_versions.yml
CHANGED
data/Gemfile.lock
ADDED
@@ -0,0 +1,262 @@
|
|
1
|
+
PATH
|
2
|
+
remote: .
|
3
|
+
specs:
|
4
|
+
orchestration (0.7.0)
|
5
|
+
database_url (~> 0.1.2)
|
6
|
+
erubis (~> 2.7)
|
7
|
+
i18n
|
8
|
+
paint (~> 2.2)
|
9
|
+
rails (>= 6.1)
|
10
|
+
thor (~> 1.2)
|
11
|
+
|
12
|
+
GEM
|
13
|
+
remote: https://rubygems.org/
|
14
|
+
specs:
|
15
|
+
actioncable (7.0.3)
|
16
|
+
actionpack (= 7.0.3)
|
17
|
+
activesupport (= 7.0.3)
|
18
|
+
nio4r (~> 2.0)
|
19
|
+
websocket-driver (>= 0.6.1)
|
20
|
+
actionmailbox (7.0.3)
|
21
|
+
actionpack (= 7.0.3)
|
22
|
+
activejob (= 7.0.3)
|
23
|
+
activerecord (= 7.0.3)
|
24
|
+
activestorage (= 7.0.3)
|
25
|
+
activesupport (= 7.0.3)
|
26
|
+
mail (>= 2.7.1)
|
27
|
+
net-imap
|
28
|
+
net-pop
|
29
|
+
net-smtp
|
30
|
+
actionmailer (7.0.3)
|
31
|
+
actionpack (= 7.0.3)
|
32
|
+
actionview (= 7.0.3)
|
33
|
+
activejob (= 7.0.3)
|
34
|
+
activesupport (= 7.0.3)
|
35
|
+
mail (~> 2.5, >= 2.5.4)
|
36
|
+
net-imap
|
37
|
+
net-pop
|
38
|
+
net-smtp
|
39
|
+
rails-dom-testing (~> 2.0)
|
40
|
+
actionpack (7.0.3)
|
41
|
+
actionview (= 7.0.3)
|
42
|
+
activesupport (= 7.0.3)
|
43
|
+
rack (~> 2.0, >= 2.2.0)
|
44
|
+
rack-test (>= 0.6.3)
|
45
|
+
rails-dom-testing (~> 2.0)
|
46
|
+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
47
|
+
actiontext (7.0.3)
|
48
|
+
actionpack (= 7.0.3)
|
49
|
+
activerecord (= 7.0.3)
|
50
|
+
activestorage (= 7.0.3)
|
51
|
+
activesupport (= 7.0.3)
|
52
|
+
globalid (>= 0.6.0)
|
53
|
+
nokogiri (>= 1.8.5)
|
54
|
+
actionview (7.0.3)
|
55
|
+
activesupport (= 7.0.3)
|
56
|
+
builder (~> 3.1)
|
57
|
+
erubi (~> 1.4)
|
58
|
+
rails-dom-testing (~> 2.0)
|
59
|
+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
60
|
+
activejob (7.0.3)
|
61
|
+
activesupport (= 7.0.3)
|
62
|
+
globalid (>= 0.3.6)
|
63
|
+
activemodel (7.0.3)
|
64
|
+
activesupport (= 7.0.3)
|
65
|
+
activerecord (7.0.3)
|
66
|
+
activemodel (= 7.0.3)
|
67
|
+
activesupport (= 7.0.3)
|
68
|
+
activestorage (7.0.3)
|
69
|
+
actionpack (= 7.0.3)
|
70
|
+
activejob (= 7.0.3)
|
71
|
+
activerecord (= 7.0.3)
|
72
|
+
activesupport (= 7.0.3)
|
73
|
+
marcel (~> 1.0)
|
74
|
+
mini_mime (>= 1.1.0)
|
75
|
+
activesupport (7.0.3)
|
76
|
+
concurrent-ruby (~> 1.0, >= 1.0.2)
|
77
|
+
i18n (>= 1.6, < 2)
|
78
|
+
minitest (>= 5.1)
|
79
|
+
tzinfo (~> 2.0)
|
80
|
+
addressable (2.8.0)
|
81
|
+
public_suffix (>= 2.0.2, < 5.0)
|
82
|
+
amq-protocol (2.3.2)
|
83
|
+
ast (2.4.2)
|
84
|
+
bson (4.15.0)
|
85
|
+
builder (3.2.4)
|
86
|
+
bunny (2.19.0)
|
87
|
+
amq-protocol (~> 2.3, >= 2.3.1)
|
88
|
+
sorted_set (~> 1, >= 1.0.2)
|
89
|
+
concurrent-ruby (1.1.10)
|
90
|
+
crack (0.4.5)
|
91
|
+
rexml
|
92
|
+
crass (1.0.6)
|
93
|
+
database_url (0.1.2)
|
94
|
+
devpack (0.4.0)
|
95
|
+
diff-lcs (1.5.0)
|
96
|
+
digest (3.1.0)
|
97
|
+
erubi (1.10.0)
|
98
|
+
erubis (2.7.0)
|
99
|
+
globalid (1.0.0)
|
100
|
+
activesupport (>= 5.0)
|
101
|
+
hashdiff (1.0.1)
|
102
|
+
i18n (1.10.0)
|
103
|
+
concurrent-ruby (~> 1.0)
|
104
|
+
loofah (2.18.0)
|
105
|
+
crass (~> 1.0.2)
|
106
|
+
nokogiri (>= 1.5.9)
|
107
|
+
mail (2.7.1)
|
108
|
+
mini_mime (>= 0.1.1)
|
109
|
+
marcel (1.0.2)
|
110
|
+
method_source (1.0.0)
|
111
|
+
mini_mime (1.1.2)
|
112
|
+
minitest (5.15.0)
|
113
|
+
mongo (2.17.1)
|
114
|
+
bson (>= 4.8.2, < 5.0.0)
|
115
|
+
mongoid (7.4.0)
|
116
|
+
activemodel (>= 5.1, < 7.1, != 7.0.0)
|
117
|
+
mongo (>= 2.10.5, < 3.0.0)
|
118
|
+
ruby2_keywords (~> 0.0.5)
|
119
|
+
mysql2 (0.5.4)
|
120
|
+
net-imap (0.2.3)
|
121
|
+
digest
|
122
|
+
net-protocol
|
123
|
+
strscan
|
124
|
+
net-pop (0.1.1)
|
125
|
+
digest
|
126
|
+
net-protocol
|
127
|
+
timeout
|
128
|
+
net-protocol (0.1.3)
|
129
|
+
timeout
|
130
|
+
net-smtp (0.3.1)
|
131
|
+
digest
|
132
|
+
net-protocol
|
133
|
+
timeout
|
134
|
+
nio4r (2.5.8)
|
135
|
+
nokogiri (1.13.6-x86_64-linux)
|
136
|
+
racc (~> 1.4)
|
137
|
+
paint (2.2.1)
|
138
|
+
parallel (1.22.1)
|
139
|
+
parser (3.1.2.0)
|
140
|
+
ast (~> 2.4.1)
|
141
|
+
pg (1.3.5)
|
142
|
+
public_suffix (4.0.7)
|
143
|
+
racc (1.6.0)
|
144
|
+
rack (2.2.3)
|
145
|
+
rack-test (1.1.0)
|
146
|
+
rack (>= 1.0, < 3)
|
147
|
+
rails (7.0.3)
|
148
|
+
actioncable (= 7.0.3)
|
149
|
+
actionmailbox (= 7.0.3)
|
150
|
+
actionmailer (= 7.0.3)
|
151
|
+
actionpack (= 7.0.3)
|
152
|
+
actiontext (= 7.0.3)
|
153
|
+
actionview (= 7.0.3)
|
154
|
+
activejob (= 7.0.3)
|
155
|
+
activemodel (= 7.0.3)
|
156
|
+
activerecord (= 7.0.3)
|
157
|
+
activestorage (= 7.0.3)
|
158
|
+
activesupport (= 7.0.3)
|
159
|
+
bundler (>= 1.15.0)
|
160
|
+
railties (= 7.0.3)
|
161
|
+
rails-dom-testing (2.0.3)
|
162
|
+
activesupport (>= 4.2.0)
|
163
|
+
nokogiri (>= 1.6)
|
164
|
+
rails-html-sanitizer (1.4.2)
|
165
|
+
loofah (~> 2.3)
|
166
|
+
railties (7.0.3)
|
167
|
+
actionpack (= 7.0.3)
|
168
|
+
activesupport (= 7.0.3)
|
169
|
+
method_source
|
170
|
+
rake (>= 12.2)
|
171
|
+
thor (~> 1.0)
|
172
|
+
zeitwerk (~> 2.5)
|
173
|
+
rainbow (3.1.1)
|
174
|
+
rake (13.0.6)
|
175
|
+
rbtree (0.4.5)
|
176
|
+
regexp_parser (2.4.0)
|
177
|
+
rexml (3.2.5)
|
178
|
+
rspec (3.11.0)
|
179
|
+
rspec-core (~> 3.11.0)
|
180
|
+
rspec-expectations (~> 3.11.0)
|
181
|
+
rspec-mocks (~> 3.11.0)
|
182
|
+
rspec-core (3.11.0)
|
183
|
+
rspec-support (~> 3.11.0)
|
184
|
+
rspec-expectations (3.11.0)
|
185
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
186
|
+
rspec-support (~> 3.11.0)
|
187
|
+
rspec-its (1.3.0)
|
188
|
+
rspec-core (>= 3.0.0)
|
189
|
+
rspec-expectations (>= 3.0.0)
|
190
|
+
rspec-mocks (3.11.1)
|
191
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
192
|
+
rspec-support (~> 3.11.0)
|
193
|
+
rspec-support (3.11.0)
|
194
|
+
rubocop (1.30.0)
|
195
|
+
parallel (~> 1.10)
|
196
|
+
parser (>= 3.1.0.0)
|
197
|
+
rainbow (>= 2.2.2, < 4.0)
|
198
|
+
regexp_parser (>= 1.8, < 3.0)
|
199
|
+
rexml (>= 3.2.5, < 4.0)
|
200
|
+
rubocop-ast (>= 1.18.0, < 2.0)
|
201
|
+
ruby-progressbar (~> 1.7)
|
202
|
+
unicode-display_width (>= 1.4.0, < 3.0)
|
203
|
+
rubocop-ast (1.18.0)
|
204
|
+
parser (>= 3.1.1.0)
|
205
|
+
rubocop-rails (2.14.2)
|
206
|
+
activesupport (>= 4.2.0)
|
207
|
+
rack (>= 1.1)
|
208
|
+
rubocop (>= 1.7.0, < 2.0)
|
209
|
+
rubocop-rake (0.6.0)
|
210
|
+
rubocop (~> 1.0)
|
211
|
+
rubocop-rspec (2.11.1)
|
212
|
+
rubocop (~> 1.19)
|
213
|
+
ruby-progressbar (1.11.0)
|
214
|
+
ruby2_keywords (0.0.5)
|
215
|
+
set (1.0.2)
|
216
|
+
sorted_set (1.0.3)
|
217
|
+
rbtree
|
218
|
+
set (~> 1.0)
|
219
|
+
sqlite3 (1.4.2)
|
220
|
+
strong_versions (0.4.5)
|
221
|
+
i18n (>= 0.5)
|
222
|
+
paint (~> 2.0)
|
223
|
+
strscan (3.0.3)
|
224
|
+
thor (1.2.1)
|
225
|
+
timeout (0.3.0)
|
226
|
+
tzinfo (2.0.4)
|
227
|
+
concurrent-ruby (~> 1.0)
|
228
|
+
unicode-display_width (2.1.0)
|
229
|
+
webmock (3.14.0)
|
230
|
+
addressable (>= 2.8.0)
|
231
|
+
crack (>= 0.3.2)
|
232
|
+
hashdiff (>= 0.4.0, < 2.0.0)
|
233
|
+
websocket-driver (0.7.5)
|
234
|
+
websocket-extensions (>= 0.1.0)
|
235
|
+
websocket-extensions (0.1.5)
|
236
|
+
zeitwerk (2.5.4)
|
237
|
+
|
238
|
+
PLATFORMS
|
239
|
+
x86_64-linux
|
240
|
+
|
241
|
+
DEPENDENCIES
|
242
|
+
activerecord (>= 6.0)
|
243
|
+
bunny (~> 2.19)
|
244
|
+
devpack (~> 0.4.0)
|
245
|
+
mongoid (~> 7.4)
|
246
|
+
mysql2 (~> 0.5.3)
|
247
|
+
orchestration!
|
248
|
+
pg (~> 1.3)
|
249
|
+
rails
|
250
|
+
rake (~> 13.0)
|
251
|
+
rspec (~> 3.11)
|
252
|
+
rspec-its (~> 1.3)
|
253
|
+
rubocop (~> 1.28)
|
254
|
+
rubocop-rails (~> 2.14)
|
255
|
+
rubocop-rake (~> 0.6.0)
|
256
|
+
rubocop-rspec (~> 2.10)
|
257
|
+
sqlite3 (~> 1.4)
|
258
|
+
strong_versions (~> 0.4.5)
|
259
|
+
webmock (~> 3.14)
|
260
|
+
|
261
|
+
BUNDLED WITH
|
262
|
+
2.3.14
|
data/README.md
CHANGED
@@ -26,10 +26,18 @@ The below screenshot demonstrates _Orchestration_ being installed in a brand new
|
|
26
26
|
|
27
27
|
### Install
|
28
28
|
|
29
|
-
Add _Orchestration_ to your Gemfile
|
29
|
+
Add _Orchestration_ to your `Gemfile`:
|
30
|
+
|
31
|
+
_Ruby 3.x_:
|
32
|
+
|
33
|
+
```ruby
|
34
|
+
gem 'orchestration', '~> 0.7.1'
|
35
|
+
```
|
36
|
+
|
37
|
+
_Ruby 2.x_:
|
30
38
|
|
31
39
|
```ruby
|
32
|
-
gem 'orchestration', '~> 0.6.
|
40
|
+
gem 'orchestration', '~> 0.6.7'
|
33
41
|
```
|
34
42
|
|
35
43
|
Install:
|
@@ -50,11 +58,6 @@ rake orchestration:install server=unicorn # (or 'puma' [default], etc.)
|
|
50
58
|
|
51
59
|
To rebuild all build-out at any time, pass `force=yes` to the above install command.
|
52
60
|
|
53
|
-
To rebuild just `orchestration/Makefile` (useful after upgrading the _Orchestration_ gem):
|
54
|
-
```bash
|
55
|
-
rake orchestration:install:makefile
|
56
|
-
```
|
57
|
-
|
58
61
|
You will be prompted to enter values for your _Docker_ organisation and repository name. For example, the _organisation_ and _repository_ for https://hub.docker.com/r/rubyorchestration/sampleapp are `rubyorchestration` and `sampleapp` respectively. If you are unsure of these values, they can be modified later by editing `.orchestration.yml` in the root of your project directory.
|
59
62
|
|
60
63
|
#### Configuration files
|
@@ -9,7 +9,7 @@ module Orchestration
|
|
9
9
|
def environment
|
10
10
|
return @environment unless @environment.nil?
|
11
11
|
|
12
|
-
ENV
|
12
|
+
ENV.fetch('RAILS_ENV', nil) || ENV.fetch('RACK_ENV', nil) || 'development'
|
13
13
|
end
|
14
14
|
|
15
15
|
def web_server
|
@@ -20,16 +20,16 @@ module Orchestration
|
|
20
20
|
def database_url
|
21
21
|
case environment
|
22
22
|
when 'development'
|
23
|
-
ENV
|
23
|
+
ENV.fetch('DEVELOPMENT_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
|
24
24
|
when 'test'
|
25
|
-
ENV
|
25
|
+
ENV.fetch('TEST_DATABASE_URL', nil) || ENV.fetch('DATABASE_URL', nil)
|
26
26
|
else
|
27
|
-
ENV
|
27
|
+
ENV.fetch('DATABASE_URL', nil)
|
28
28
|
end
|
29
29
|
end
|
30
30
|
|
31
31
|
def mongo_url
|
32
|
-
ENV
|
32
|
+
ENV.fetch('MONGO_URL', nil)
|
33
33
|
end
|
34
34
|
|
35
35
|
def mongoid_configuration_path
|
@@ -95,9 +95,9 @@ module Orchestration
|
|
95
95
|
end
|
96
96
|
|
97
97
|
def ensure_line_in_file(path, line, echo: true, regex: nil)
|
98
|
-
return if line_in_file?(path, line
|
98
|
+
return if line_in_file?(path, line:, regex:)
|
99
99
|
|
100
|
-
append_file(path, "\n#{line.chomp}\n", echo:
|
100
|
+
append_file(path, "\n#{line.chomp}\n", echo:)
|
101
101
|
true
|
102
102
|
end
|
103
103
|
|
@@ -131,7 +131,7 @@ module Orchestration
|
|
131
131
|
|
132
132
|
def force?
|
133
133
|
# Rake task was invoked with `force=yes`
|
134
|
-
ENV
|
134
|
+
ENV.fetch('force', nil) == 'yes'
|
135
135
|
end
|
136
136
|
end
|
137
137
|
end
|
@@ -68,7 +68,7 @@ module Orchestration
|
|
68
68
|
path = @env.root.join('config', 'unicorn.rb')
|
69
69
|
create_file(path, content, backup: true)
|
70
70
|
regex = /gem\s+['"]unicorn['"]/
|
71
|
-
ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex:
|
71
|
+
ensure_line_in_file(gemfile_path, "gem 'unicorn'", regex:)
|
72
72
|
end
|
73
73
|
|
74
74
|
def database_yml
|
@@ -107,7 +107,9 @@ endif
|
|
107
107
|
ifneq (${env},test)
|
108
108
|
ifeq (,$(findstring test,$(MAKECMDGOALS)))
|
109
109
|
ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
|
110
|
-
|
110
|
+
ifeq (,$(findstring setup,$(MAKECMDGOALS)))
|
111
|
+
-include ${env_path}
|
112
|
+
endif
|
111
113
|
endif
|
112
114
|
endif
|
113
115
|
endif
|
@@ -122,7 +124,9 @@ ifneq (,$(findstring test,$(MAKECMDGOALS)))
|
|
122
124
|
env=test
|
123
125
|
endif
|
124
126
|
|
125
|
-
ifneq (,$(
|
127
|
+
ifneq (,$(RAILS_ENV))
|
128
|
+
env=$(RAILS_ENV)
|
129
|
+
else ifneq (,$(env))
|
126
130
|
# `env` set by current shell.
|
127
131
|
else ifneq (,$(RAILS_ENV))
|
128
132
|
env=$(RAILS_ENV)
|
@@ -312,8 +316,8 @@ setup: _log-notify
|
|
312
316
|
@$(call make,start env=${env})
|
313
317
|
ifneq (,$(wildcard config/database.yml))
|
314
318
|
@$(call echo,Preparing ${env_human} database)
|
315
|
-
@$(call system,rake db:create RAILS_ENV="${env}")
|
316
|
-
@${rake} db:create RAILS_ENV=${env} ${log} || : ${log}
|
319
|
+
@$(call system,rake db:create RAILS_ENV="${env}" DATABASE_URL='${url}')
|
320
|
+
@${rake} db:create RAILS_ENV=${env} DATABASE_URL='${url}' ${log} || : ${log}
|
317
321
|
ifneq (,$(wildcard db/structure.sql))
|
318
322
|
@$(call system,rake db:structure:load RAILS_ENV="${env}" DATABASE_URL="${url}")
|
319
323
|
@${rake} db:structure:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
|
@@ -322,7 +326,7 @@ ifneq (,$(wildcard config/database.yml))
|
|
322
326
|
@${rake} db:schema:load RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
|
323
327
|
endif
|
324
328
|
@$(call system,rake db:migrate RAILS_ENV="${env}" DATABASE_URL="${url}")
|
325
|
-
@${rake} db:migrate RAILS_ENV
|
329
|
+
@${rake} db:migrate RAILS_ENV="${env}" DATABASE_URL='${url}' ${log} || ${exit_fail}
|
326
330
|
endif
|
327
331
|
@if $(MAKE) -n post-setup >/dev/null 2>&1; then \
|
328
332
|
$(call system,make post-setup RAILS_ENV="${env}") \
|
@@ -21,10 +21,10 @@ module Orchestration
|
|
21
21
|
def settings(healthcheck: false)
|
22
22
|
{
|
23
23
|
adapter: adapter.name,
|
24
|
-
host
|
25
|
-
port
|
26
|
-
username
|
27
|
-
password
|
24
|
+
host:,
|
25
|
+
port:,
|
26
|
+
username:,
|
27
|
+
password:,
|
28
28
|
database: healthcheck ? adapter.credentials['database'] : database
|
29
29
|
}.transform_keys(&:to_s)
|
30
30
|
end
|
@@ -64,7 +64,7 @@ module Orchestration
|
|
64
64
|
return {} unless File.exist?(database_configuration_path) || custom?
|
65
65
|
|
66
66
|
yaml = ERB.new(File.read(database_configuration_path)).result
|
67
|
-
YAML.safe_load(yaml,
|
67
|
+
YAML.safe_load(yaml, aliases: true)[@env.environment] || {}
|
68
68
|
end
|
69
69
|
|
70
70
|
def url_config
|
@@ -64,7 +64,7 @@ module Orchestration
|
|
64
64
|
return {} unless File.exist?(@env.mongoid_configuration_path)
|
65
65
|
|
66
66
|
yaml = File.read(@env.mongoid_configuration_path)
|
67
|
-
config = YAML.safe_load(yaml,
|
67
|
+
config = YAML.safe_load(yaml, aliases: true)
|
68
68
|
env = config.fetch(@env.environment, nil)
|
69
69
|
return {} if env.nil?
|
70
70
|
|
@@ -110,6 +110,9 @@ 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
|
113
116
|
config = Rails.application.config_for(:database).transform_keys(&:to_sym)
|
114
117
|
|
115
118
|
if config[:adapter] == 'sqlite3'
|
@@ -124,7 +127,7 @@ post-setup:
|
|
124
127
|
desc I18n.t('orchestration.rake.db.console')
|
125
128
|
task :console do
|
126
129
|
env = Orchestration::Environment.new
|
127
|
-
options = ENV['db'] ? { config_path: "config/database.#{ENV
|
130
|
+
options = ENV['db'] ? { config_path: "config/database.#{ENV.fetch('db', nil)}.yml" } : {}
|
128
131
|
sh Orchestration::Services::Database::Configuration.new(env, nil, options).console_command
|
129
132
|
end
|
130
133
|
end
|
@@ -161,7 +164,7 @@ post-setup:
|
|
161
164
|
end
|
162
165
|
|
163
166
|
adapter::Healthcheck.start(
|
164
|
-
nil, nil, config_path: path, service_name: name, sidecar: ENV
|
167
|
+
nil, nil, config_path: path, service_name: name, sidecar: ENV.fetch('sidecar', nil)
|
165
168
|
)
|
166
169
|
end
|
167
170
|
end
|
data/orchestration.gemspec
CHANGED
@@ -22,33 +22,33 @@ Gem::Specification.new do |spec|
|
|
22
22
|
end
|
23
23
|
end
|
24
24
|
|
25
|
-
spec.required_ruby_version = '>=
|
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
31
|
spec.add_runtime_dependency 'erubis', '~> 2.7'
|
32
|
-
spec.add_runtime_dependency 'i18n'
|
33
|
-
spec.add_runtime_dependency 'paint', '~> 2.
|
34
|
-
spec.add_runtime_dependency 'rails', '>=
|
35
|
-
spec.add_runtime_dependency 'thor', '~> 1.
|
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'
|
36
36
|
|
37
|
-
spec.add_development_dependency 'activerecord', '
|
38
|
-
spec.add_development_dependency 'bunny', '~> 2.
|
39
|
-
spec.add_development_dependency 'devpack', '~> 0.
|
40
|
-
spec.add_development_dependency 'mongoid', '~> 7.
|
41
|
-
spec.add_development_dependency 'mysql2', '~> 0.5.
|
42
|
-
spec.add_development_dependency 'pg', '~> 1.
|
43
|
-
spec.add_development_dependency 'rails'
|
44
|
-
spec.add_development_dependency 'rake', '~>
|
45
|
-
spec.add_development_dependency 'rspec', '~> 3.
|
46
|
-
spec.add_development_dependency 'rspec-its', '~> 1.
|
47
|
-
spec.add_development_dependency 'rubocop', '~> 1.
|
48
|
-
spec.add_development_dependency 'rubocop-rails', '~> 2.
|
49
|
-
spec.add_development_dependency 'rubocop-rake', '~> 0.
|
50
|
-
spec.add_development_dependency 'rubocop-rspec', '~> 2.
|
51
|
-
spec.add_development_dependency 'sqlite3', '~> 1.
|
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'
|
52
52
|
spec.add_development_dependency 'strong_versions', '~> 0.4.5'
|
53
|
-
spec.add_development_dependency 'webmock', '~> 3.
|
53
|
+
spec.add_development_dependency 'webmock', '~> 3.14'
|
54
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.
|
4
|
+
version: 0.7.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Bob Farrell
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-05-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: database_url
|
@@ -44,68 +44,68 @@ dependencies:
|
|
44
44
|
requirements:
|
45
45
|
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '0
|
47
|
+
version: '0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '0
|
54
|
+
version: '0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: paint
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '2.
|
61
|
+
version: '2.2'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '2.
|
68
|
+
version: '2.2'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rails
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
|
-
version: '
|
75
|
+
version: '6.1'
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
80
|
- - ">="
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: '
|
82
|
+
version: '6.1'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: thor
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '1.
|
89
|
+
version: '1.2'
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '1.
|
96
|
+
version: '1.2'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: activerecord
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
|
-
- - "
|
101
|
+
- - ">="
|
102
102
|
- !ruby/object:Gem::Version
|
103
103
|
version: '6.0'
|
104
104
|
type: :development
|
105
105
|
prerelease: false
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
107
107
|
requirements:
|
108
|
-
- - "
|
108
|
+
- - ">="
|
109
109
|
- !ruby/object:Gem::Version
|
110
110
|
version: '6.0'
|
111
111
|
- !ruby/object:Gem::Dependency
|
@@ -114,196 +114,196 @@ dependencies:
|
|
114
114
|
requirements:
|
115
115
|
- - "~>"
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: '2.
|
117
|
+
version: '2.19'
|
118
118
|
type: :development
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
122
|
- - "~>"
|
123
123
|
- !ruby/object:Gem::Version
|
124
|
-
version: '2.
|
124
|
+
version: '2.19'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: devpack
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
129
|
- - "~>"
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: 0.
|
131
|
+
version: 0.4.0
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - "~>"
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 0.
|
138
|
+
version: 0.4.0
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
140
|
name: mongoid
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
143
|
- - "~>"
|
144
144
|
- !ruby/object:Gem::Version
|
145
|
-
version: '7.
|
145
|
+
version: '7.4'
|
146
146
|
type: :development
|
147
147
|
prerelease: false
|
148
148
|
version_requirements: !ruby/object:Gem::Requirement
|
149
149
|
requirements:
|
150
150
|
- - "~>"
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: '7.
|
152
|
+
version: '7.4'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: mysql2
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - "~>"
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: 0.5.
|
159
|
+
version: 0.5.3
|
160
160
|
type: :development
|
161
161
|
prerelease: false
|
162
162
|
version_requirements: !ruby/object:Gem::Requirement
|
163
163
|
requirements:
|
164
164
|
- - "~>"
|
165
165
|
- !ruby/object:Gem::Version
|
166
|
-
version: 0.5.
|
166
|
+
version: 0.5.3
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
168
|
name: pg
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
171
|
- - "~>"
|
172
172
|
- !ruby/object:Gem::Version
|
173
|
-
version: '1.
|
173
|
+
version: '1.3'
|
174
174
|
type: :development
|
175
175
|
prerelease: false
|
176
176
|
version_requirements: !ruby/object:Gem::Requirement
|
177
177
|
requirements:
|
178
178
|
- - "~>"
|
179
179
|
- !ruby/object:Gem::Version
|
180
|
-
version: '1.
|
180
|
+
version: '1.3'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
182
|
name: rails
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
|
-
- - "
|
185
|
+
- - ">="
|
186
186
|
- !ruby/object:Gem::Version
|
187
|
-
version: '
|
187
|
+
version: '0'
|
188
188
|
type: :development
|
189
189
|
prerelease: false
|
190
190
|
version_requirements: !ruby/object:Gem::Requirement
|
191
191
|
requirements:
|
192
|
-
- - "
|
192
|
+
- - ">="
|
193
193
|
- !ruby/object:Gem::Version
|
194
|
-
version: '
|
194
|
+
version: '0'
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
196
|
name: rake
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
199
|
- - "~>"
|
200
200
|
- !ruby/object:Gem::Version
|
201
|
-
version: '
|
201
|
+
version: '13.0'
|
202
202
|
type: :development
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
206
|
- - "~>"
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version: '
|
208
|
+
version: '13.0'
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
210
|
name: rspec
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
213
|
- - "~>"
|
214
214
|
- !ruby/object:Gem::Version
|
215
|
-
version: '3.
|
215
|
+
version: '3.11'
|
216
216
|
type: :development
|
217
217
|
prerelease: false
|
218
218
|
version_requirements: !ruby/object:Gem::Requirement
|
219
219
|
requirements:
|
220
220
|
- - "~>"
|
221
221
|
- !ruby/object:Gem::Version
|
222
|
-
version: '3.
|
222
|
+
version: '3.11'
|
223
223
|
- !ruby/object:Gem::Dependency
|
224
224
|
name: rspec-its
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|
226
226
|
requirements:
|
227
227
|
- - "~>"
|
228
228
|
- !ruby/object:Gem::Version
|
229
|
-
version: '1.
|
229
|
+
version: '1.3'
|
230
230
|
type: :development
|
231
231
|
prerelease: false
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
233
233
|
requirements:
|
234
234
|
- - "~>"
|
235
235
|
- !ruby/object:Gem::Version
|
236
|
-
version: '1.
|
236
|
+
version: '1.3'
|
237
237
|
- !ruby/object:Gem::Dependency
|
238
238
|
name: rubocop
|
239
239
|
requirement: !ruby/object:Gem::Requirement
|
240
240
|
requirements:
|
241
241
|
- - "~>"
|
242
242
|
- !ruby/object:Gem::Version
|
243
|
-
version: '1.
|
243
|
+
version: '1.28'
|
244
244
|
type: :development
|
245
245
|
prerelease: false
|
246
246
|
version_requirements: !ruby/object:Gem::Requirement
|
247
247
|
requirements:
|
248
248
|
- - "~>"
|
249
249
|
- !ruby/object:Gem::Version
|
250
|
-
version: '1.
|
250
|
+
version: '1.28'
|
251
251
|
- !ruby/object:Gem::Dependency
|
252
252
|
name: rubocop-rails
|
253
253
|
requirement: !ruby/object:Gem::Requirement
|
254
254
|
requirements:
|
255
255
|
- - "~>"
|
256
256
|
- !ruby/object:Gem::Version
|
257
|
-
version: '2.
|
257
|
+
version: '2.14'
|
258
258
|
type: :development
|
259
259
|
prerelease: false
|
260
260
|
version_requirements: !ruby/object:Gem::Requirement
|
261
261
|
requirements:
|
262
262
|
- - "~>"
|
263
263
|
- !ruby/object:Gem::Version
|
264
|
-
version: '2.
|
264
|
+
version: '2.14'
|
265
265
|
- !ruby/object:Gem::Dependency
|
266
266
|
name: rubocop-rake
|
267
267
|
requirement: !ruby/object:Gem::Requirement
|
268
268
|
requirements:
|
269
269
|
- - "~>"
|
270
270
|
- !ruby/object:Gem::Version
|
271
|
-
version: 0.
|
271
|
+
version: 0.6.0
|
272
272
|
type: :development
|
273
273
|
prerelease: false
|
274
274
|
version_requirements: !ruby/object:Gem::Requirement
|
275
275
|
requirements:
|
276
276
|
- - "~>"
|
277
277
|
- !ruby/object:Gem::Version
|
278
|
-
version: 0.
|
278
|
+
version: 0.6.0
|
279
279
|
- !ruby/object:Gem::Dependency
|
280
280
|
name: rubocop-rspec
|
281
281
|
requirement: !ruby/object:Gem::Requirement
|
282
282
|
requirements:
|
283
283
|
- - "~>"
|
284
284
|
- !ruby/object:Gem::Version
|
285
|
-
version: '2.
|
285
|
+
version: '2.10'
|
286
286
|
type: :development
|
287
287
|
prerelease: false
|
288
288
|
version_requirements: !ruby/object:Gem::Requirement
|
289
289
|
requirements:
|
290
290
|
- - "~>"
|
291
291
|
- !ruby/object:Gem::Version
|
292
|
-
version: '2.
|
292
|
+
version: '2.10'
|
293
293
|
- !ruby/object:Gem::Dependency
|
294
294
|
name: sqlite3
|
295
295
|
requirement: !ruby/object:Gem::Requirement
|
296
296
|
requirements:
|
297
297
|
- - "~>"
|
298
298
|
- !ruby/object:Gem::Version
|
299
|
-
version: '1.
|
299
|
+
version: '1.4'
|
300
300
|
type: :development
|
301
301
|
prerelease: false
|
302
302
|
version_requirements: !ruby/object:Gem::Requirement
|
303
303
|
requirements:
|
304
304
|
- - "~>"
|
305
305
|
- !ruby/object:Gem::Version
|
306
|
-
version: '1.
|
306
|
+
version: '1.4'
|
307
307
|
- !ruby/object:Gem::Dependency
|
308
308
|
name: strong_versions
|
309
309
|
requirement: !ruby/object:Gem::Requirement
|
@@ -324,14 +324,14 @@ dependencies:
|
|
324
324
|
requirements:
|
325
325
|
- - "~>"
|
326
326
|
- !ruby/object:Gem::Version
|
327
|
-
version: '3.
|
327
|
+
version: '3.14'
|
328
328
|
type: :development
|
329
329
|
prerelease: false
|
330
330
|
version_requirements: !ruby/object:Gem::Requirement
|
331
331
|
requirements:
|
332
332
|
- - "~>"
|
333
333
|
- !ruby/object:Gem::Version
|
334
|
-
version: '3.
|
334
|
+
version: '3.14'
|
335
335
|
description: Tools to help launch apps in Docker
|
336
336
|
email:
|
337
337
|
- git@bob.frl
|
@@ -342,9 +342,11 @@ files:
|
|
342
342
|
- ".gitignore"
|
343
343
|
- ".rspec"
|
344
344
|
- ".rubocop.yml"
|
345
|
+
- ".ruby-version"
|
345
346
|
- ".strong_versions.yml"
|
346
347
|
- ".travis.yml"
|
347
348
|
- Gemfile
|
349
|
+
- Gemfile.lock
|
348
350
|
- LICENSE
|
349
351
|
- Makefile
|
350
352
|
- README.md
|
@@ -424,14 +426,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
424
426
|
requirements:
|
425
427
|
- - ">="
|
426
428
|
- !ruby/object:Gem::Version
|
427
|
-
version: '
|
429
|
+
version: '3.1'
|
428
430
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
429
431
|
requirements:
|
430
432
|
- - ">="
|
431
433
|
- !ruby/object:Gem::Version
|
432
434
|
version: '0'
|
433
435
|
requirements: []
|
434
|
-
rubygems_version: 3.
|
436
|
+
rubygems_version: 3.3.7
|
435
437
|
signing_key:
|
436
438
|
specification_version: 4
|
437
439
|
summary: Docker orchestration toolkit
|