orchestration 0.7.0 → 0.7.1

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7891efd1c4930036b2245fad46bc9bc78c0de97b3c2cce26ede48d5a6de34a2c
4
- data.tar.gz: c56d7d3193fd6cafe76dc823924bcc1ba74fda288090d1424bfdce148789cb51
3
+ metadata.gz: d46427ecb6cb0665a6be31e5e49cd6a01a8c2f5148442f3c1bcc3852c87c83e9
4
+ data.tar.gz: d622198cebd4619d573f391f9eae23d68bea32606619f4d8965032c1eb096a98
5
5
  SHA512:
6
- metadata.gz: c82db0ac9646d8b93ad2ef72cff3216106e8558f670c086cd0647f5496559f0a0c32309b8e2680323e627345a9f6da9f2745d4d67a5a1d8d1e7a56d2fc91417c
7
- data.tar.gz: c0fc26b8ea7f66f7a50b52de3991fe5f4a99ec73b9186312e397fce229c184f8bdf8182d8bca991a79cb5b95f24ed3ce1907048bf27dceff482437129ce18ad4
6
+ metadata.gz: 89364f65e27bb9f05213a4a6c64351b1fc9e1b2e12eb890d4b90f2b1338cdab7e04b1dc1a43cf155d6fafe1f838c3c8a903dcccc1bf80b557e38a371aee902eb
7
+ data.tar.gz: 69aca6c30ba0fcbd2a8d1172a8e4904a88e8fe3d0875281f6cd8a2245e601d36c45fcbbd4f784b39935e6195a5d13c87cb5f1a0f8247823e3a2de2e209caf71e
data/.gitignore CHANGED
@@ -9,8 +9,6 @@
9
9
  # rspec failure tracking
10
10
  .rspec_status
11
11
 
12
- Gemfile.lock
13
-
14
12
  *.swp
15
13
  *.swo
16
14
 
@@ -34,5 +32,3 @@ docker/.build/
34
32
  docker/.context.tar
35
33
 
36
34
  .DS_Store
37
-
38
- .ruby-version
data/.ruby-version ADDED
@@ -0,0 +1 @@
1
+ 3.1.2
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
@@ -31,13 +31,13 @@ Add _Orchestration_ to your `Gemfile`:
31
31
  _Ruby 3.x_:
32
32
 
33
33
  ```ruby
34
- gem 'orchestration', '~> 0.7.0'
34
+ gem 'orchestration', '~> 0.7.1'
35
35
  ```
36
36
 
37
37
  _Ruby 2.x_:
38
38
 
39
39
  ```ruby
40
- gem 'orchestration', '~> 0.6.6'
40
+ gem 'orchestration', '~> 0.6.7'
41
41
  ```
42
42
 
43
43
  Install:
@@ -107,7 +107,9 @@ endif
107
107
  ifneq (${env},test)
108
108
  ifeq (,$(findstring test,$(MAKECMDGOALS)))
109
109
  ifeq (,$(findstring deploy,$(MAKECMDGOALS)))
110
- -include ${env_path}
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 (,$(env))
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=${env} ${log} || ${exit_fail}
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}") \
@@ -12,4 +12,4 @@ test:
12
12
 
13
13
  production:
14
14
  url: <%%= ENV['RABBITMQ_URL'] %>
15
- url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
15
+ management_url: <%%= ENV['RABBITMQ_MANAGEMENT_URL'] %>
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Orchestration
4
- VERSION = '0.7.0'
4
+ VERSION = '0.7.1'
5
5
  end
@@ -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'
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.7.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-05-01 00:00:00.000000000 Z
11
+ date: 2022-05-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: database_url
@@ -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