rails-conflicted-credentials 0.1.2 → 0.1.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 276f84be9c79524d035e6198602bfd1dd2690cd8240cfefa0e323c6f79eec37f
4
- data.tar.gz: f76789a7b44815f04881fbc81306dea9194baf11ac879785e483468fbc9035fb
3
+ metadata.gz: 6d4012feeac511d429eec885373f20668700493820936b5b2435323322488737
4
+ data.tar.gz: 811de5c58a98a149bf1f9a05781679e13a434438eb41d9eb90e728ab8c21e81f
5
5
  SHA512:
6
- metadata.gz: ad3bc8d7bf87652ea98202c00e64bf27e843c10a4a3e9c5ef7d1f44a4e6a9ffd21535ce4b7d5b5a39a0ea18aa17abf93de913bb3fd64acf76be2398bb53366c8
7
- data.tar.gz: 135d224ebb19b65d9ebfac59b3ac3c87ab95945a71b90f5873ba210d5a87035dbc35fd84fff34ed981132f00878cee04317fe24eb24838930b7559132821e28d
6
+ metadata.gz: 6cf90c625f2dcb9e6550a8696e24eac6353d8e1b469b58b4a6d79e7a81ff2916028bbc6b80f351552a8d79bc4764949ef6c7a686fa79af735feccb4bd13bfbfb
7
+ data.tar.gz: a0155ddfc185d8f722a4d8e357bfb78dd302decb98f7df0dad6c954d560fbc641009395aebcd8934e998339a93f324c40af4a8c4321f638eb84df3f19497fd57
data/.rubocop.yml CHANGED
@@ -14,19 +14,9 @@ AllCops:
14
14
  - '**/tmp/**/*'
15
15
  - '**/templates/**/*'
16
16
  - '**/vendor/**/*'
17
- - 'actionmailbox/test/dummy/**/*'
18
- - 'activestorage/test/dummy/**/*'
19
- - 'actiontext/test/dummy/**/*'
20
- - 'tools/rail_inspector/test/fixtures/*'
21
- - guides/source/debugging_rails_applications.md
22
- - guides/source/active_support_instrumentation.md
23
17
  - '**/node_modules/**/*'
24
18
  - '**/CHANGELOG.md'
25
- - '**/2_*_release_notes.md'
26
- - '**/3_*_release_notes.md'
27
- - '**/4_*_release_notes.md'
28
- - '**/5_*_release_notes.md'
29
- - '**/6_*_release_notes.md'
19
+ - '**/gemfiles/**'
30
20
 
31
21
 
32
22
  Performance:
data/Appraisals ADDED
@@ -0,0 +1,22 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Specify here only version constraints that differ from
4
+ # `rpush.gemspec`.
5
+ #
6
+ # > The dependencies in your Appraisals file are combined with dependencies in
7
+ # > your Gemfile, so you don't need to repeat anything that's the same for each
8
+ # > appraisal. If something is specified in both the Gemfile and an appraisal,
9
+ # > the version from the appraisal takes precedence.
10
+ # > https://github.com/thoughtbot/appraisal
11
+
12
+ appraise "rails-7-1" do
13
+ gem "rails", "~> 7.1.0"
14
+ end
15
+
16
+ appraise "rails-7-2" do
17
+ gem "rails", "~> 7.2.0"
18
+ end
19
+
20
+ appraise "rails-8-0" do
21
+ gem "rails", "~> 8.0.0"
22
+ end
data/CHANGELOG.md CHANGED
@@ -1,5 +1,15 @@
1
1
  ## [Unreleased]
2
2
 
3
+ ## [0.1.4] - 2026-06-16
4
+
5
+ * Fix tests on Ruby 4.0 and add CI for Ruby 4.0 [\#6](https://github.com/sixis/rails-conflicted-credentials/pull/6) ([SixiS](https://github.com/sixis))
6
+ * Lazy load `Rails::Credentials::Command` so `anyway_config` can load credentials [\#5](https://github.com/sixis/rails-conflicted-credentials/pull/5) ([arthurthefourth](https://github.com/arthurthefourth))
7
+ * Rails version appraisals [\#4](https://github.com/sixis/rails-conflicted-credentials/pull/4) ([SixiS](https://github.com/sixis))
8
+
9
+ ## [0.1.3] - 2025-07-08
10
+
11
+ * Fix rails dependency version [\#3](https://github.com/sixis/rails-conflicted-credentials/pull/3) ([SixiS](https://github.com/sixis))
12
+
3
13
  ## [0.1.2] - 2025-07-01
4
14
 
5
15
  * Fix edit command to work with saved internal conflicts [\#2](https://github.com/sixis/rails-conflicted-credentials/pull/2) ([SixiS](https://github.com/sixis))
data/README.md CHANGED
@@ -17,7 +17,7 @@ gg3TRVAh5NYnGx7Vwu8KpfmrspG75Oh0WSTFW9QC--3WhE+IKJeq4ZNPEv--BOT8y29V6OL9D8A4oN9F
17
17
  ```
18
18
 
19
19
  and you wish they could be edited like:
20
- ```
20
+ ```yaml
21
21
  baz: foo
22
22
  <<<<<<< HEAD
23
23
  foo: bar
@@ -65,7 +65,13 @@ rails credentials:help
65
65
 
66
66
  ## Development
67
67
 
68
- After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
68
+ After checking out the repo, run `bin/setup` to install dependencies.
69
+ Then run `rake test` to run the tests.
70
+ `bundle exec appraisal rake test` to run the tests against each version of rails.
71
+
72
+ You can also run `bin/console` for an interactive prompt that will allow you to experiment.
73
+
74
+ Run `bundle exec appraisal install` after making any changes to the Gemfile or requirements in the gemspec.
69
75
 
70
76
  ## Contributing
71
77
 
@@ -0,0 +1,26 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "minitest"
6
+ gem "irb"
7
+ gem "rake"
8
+ gem "rails", "~> 7.1.0"
9
+
10
+ group :rubocop do
11
+ gem "rubocop"
12
+ gem "rubocop-minitest"
13
+ gem "rubocop-packaging"
14
+ gem "rubocop-performance"
15
+ gem "rubocop-rails"
16
+ gem "rubocop-md"
17
+ end
18
+
19
+ group :test do
20
+ gem "minitest-retry"
21
+ gem "minitest-mock"
22
+ gem "importmap-rails"
23
+ gem "propshaft"
24
+ end
25
+
26
+ gemspec path: "../"
@@ -0,0 +1,308 @@
1
+ PATH
2
+ remote: ..
3
+ specs:
4
+ rails-conflicted-credentials (0.1.3)
5
+ rails (>= 7.1)
6
+
7
+ GEM
8
+ remote: https://rubygems.org/
9
+ specs:
10
+ actioncable (7.1.5.1)
11
+ actionpack (= 7.1.5.1)
12
+ activesupport (= 7.1.5.1)
13
+ nio4r (~> 2.0)
14
+ websocket-driver (>= 0.6.1)
15
+ zeitwerk (~> 2.6)
16
+ actionmailbox (7.1.5.1)
17
+ actionpack (= 7.1.5.1)
18
+ activejob (= 7.1.5.1)
19
+ activerecord (= 7.1.5.1)
20
+ activestorage (= 7.1.5.1)
21
+ activesupport (= 7.1.5.1)
22
+ mail (>= 2.7.1)
23
+ net-imap
24
+ net-pop
25
+ net-smtp
26
+ actionmailer (7.1.5.1)
27
+ actionpack (= 7.1.5.1)
28
+ actionview (= 7.1.5.1)
29
+ activejob (= 7.1.5.1)
30
+ activesupport (= 7.1.5.1)
31
+ mail (~> 2.5, >= 2.5.4)
32
+ net-imap
33
+ net-pop
34
+ net-smtp
35
+ rails-dom-testing (~> 2.2)
36
+ actionpack (7.1.5.1)
37
+ actionview (= 7.1.5.1)
38
+ activesupport (= 7.1.5.1)
39
+ nokogiri (>= 1.8.5)
40
+ racc
41
+ rack (>= 2.2.4)
42
+ rack-session (>= 1.0.1)
43
+ rack-test (>= 0.6.3)
44
+ rails-dom-testing (~> 2.2)
45
+ rails-html-sanitizer (~> 1.6)
46
+ actiontext (7.1.5.1)
47
+ actionpack (= 7.1.5.1)
48
+ activerecord (= 7.1.5.1)
49
+ activestorage (= 7.1.5.1)
50
+ activesupport (= 7.1.5.1)
51
+ globalid (>= 0.6.0)
52
+ nokogiri (>= 1.8.5)
53
+ actionview (7.1.5.1)
54
+ activesupport (= 7.1.5.1)
55
+ builder (~> 3.1)
56
+ erubi (~> 1.11)
57
+ rails-dom-testing (~> 2.2)
58
+ rails-html-sanitizer (~> 1.6)
59
+ activejob (7.1.5.1)
60
+ activesupport (= 7.1.5.1)
61
+ globalid (>= 0.3.6)
62
+ activemodel (7.1.5.1)
63
+ activesupport (= 7.1.5.1)
64
+ activerecord (7.1.5.1)
65
+ activemodel (= 7.1.5.1)
66
+ activesupport (= 7.1.5.1)
67
+ timeout (>= 0.4.0)
68
+ activestorage (7.1.5.1)
69
+ actionpack (= 7.1.5.1)
70
+ activejob (= 7.1.5.1)
71
+ activerecord (= 7.1.5.1)
72
+ activesupport (= 7.1.5.1)
73
+ marcel (~> 1.0)
74
+ activesupport (7.1.5.1)
75
+ base64
76
+ benchmark (>= 0.3)
77
+ bigdecimal
78
+ concurrent-ruby (~> 1.0, >= 1.0.2)
79
+ connection_pool (>= 2.2.5)
80
+ drb
81
+ i18n (>= 1.6, < 2)
82
+ logger (>= 1.4.2)
83
+ minitest (>= 5.1)
84
+ mutex_m
85
+ securerandom (>= 0.3)
86
+ tzinfo (~> 2.0)
87
+ appraisal (2.5.0)
88
+ bundler
89
+ rake
90
+ thor (>= 0.14.0)
91
+ ast (2.4.3)
92
+ base64 (0.3.0)
93
+ benchmark (0.4.1)
94
+ bigdecimal (3.2.2)
95
+ builder (3.3.0)
96
+ concurrent-ruby (1.3.5)
97
+ connection_pool (2.5.3)
98
+ crass (1.0.6)
99
+ date (3.4.1)
100
+ drb (2.2.3)
101
+ erb (5.0.1)
102
+ erubi (1.13.1)
103
+ globalid (1.2.1)
104
+ activesupport (>= 6.1)
105
+ i18n (1.14.7)
106
+ concurrent-ruby (~> 1.0)
107
+ importmap-rails (2.1.0)
108
+ actionpack (>= 6.0.0)
109
+ activesupport (>= 6.0.0)
110
+ railties (>= 6.0.0)
111
+ io-console (0.8.0)
112
+ irb (1.15.2)
113
+ pp (>= 0.6.0)
114
+ rdoc (>= 4.0.0)
115
+ reline (>= 0.4.2)
116
+ json (2.12.2)
117
+ language_server-protocol (3.17.0.5)
118
+ lint_roller (1.1.0)
119
+ logger (1.7.0)
120
+ loofah (2.24.1)
121
+ crass (~> 1.0.2)
122
+ nokogiri (>= 1.12.0)
123
+ mail (2.8.1)
124
+ mini_mime (>= 0.1.1)
125
+ net-imap
126
+ net-pop
127
+ net-smtp
128
+ marcel (1.0.4)
129
+ mini_mime (1.1.5)
130
+ mini_portile2 (2.8.9)
131
+ minitest (6.0.6)
132
+ drb (~> 2.0)
133
+ prism (~> 1.5)
134
+ minitest-mock (5.27.0)
135
+ minitest-retry (0.2.5)
136
+ minitest (>= 5.0)
137
+ mutex_m (0.3.0)
138
+ net-imap (0.5.9)
139
+ date
140
+ net-protocol
141
+ net-pop (0.1.2)
142
+ net-protocol
143
+ net-protocol (0.2.2)
144
+ timeout
145
+ net-smtp (0.5.1)
146
+ net-protocol
147
+ nio4r (2.7.4)
148
+ nokogiri (1.18.8)
149
+ mini_portile2 (~> 2.8.2)
150
+ racc (~> 1.4)
151
+ nokogiri (1.18.8-aarch64-linux-gnu)
152
+ racc (~> 1.4)
153
+ nokogiri (1.18.8-aarch64-linux-musl)
154
+ racc (~> 1.4)
155
+ nokogiri (1.18.8-arm-linux-gnu)
156
+ racc (~> 1.4)
157
+ nokogiri (1.18.8-arm-linux-musl)
158
+ racc (~> 1.4)
159
+ nokogiri (1.18.8-arm64-darwin)
160
+ racc (~> 1.4)
161
+ nokogiri (1.18.8-x86_64-darwin)
162
+ racc (~> 1.4)
163
+ nokogiri (1.18.8-x86_64-linux-gnu)
164
+ racc (~> 1.4)
165
+ nokogiri (1.18.8-x86_64-linux-musl)
166
+ racc (~> 1.4)
167
+ parallel (1.27.0)
168
+ parser (3.3.8.0)
169
+ ast (~> 2.4.1)
170
+ racc
171
+ pp (0.6.2)
172
+ prettyprint
173
+ prettyprint (0.2.0)
174
+ prism (1.9.0)
175
+ propshaft (1.1.0)
176
+ actionpack (>= 7.0.0)
177
+ activesupport (>= 7.0.0)
178
+ rack
179
+ railties (>= 7.0.0)
180
+ psych (5.2.6)
181
+ date
182
+ stringio
183
+ racc (1.8.1)
184
+ rack (3.1.16)
185
+ rack-session (2.1.1)
186
+ base64 (>= 0.1.0)
187
+ rack (>= 3.0.0)
188
+ rack-test (2.2.0)
189
+ rack (>= 1.3)
190
+ rackup (2.2.1)
191
+ rack (>= 3)
192
+ rails (7.1.5.1)
193
+ actioncable (= 7.1.5.1)
194
+ actionmailbox (= 7.1.5.1)
195
+ actionmailer (= 7.1.5.1)
196
+ actionpack (= 7.1.5.1)
197
+ actiontext (= 7.1.5.1)
198
+ actionview (= 7.1.5.1)
199
+ activejob (= 7.1.5.1)
200
+ activemodel (= 7.1.5.1)
201
+ activerecord (= 7.1.5.1)
202
+ activestorage (= 7.1.5.1)
203
+ activesupport (= 7.1.5.1)
204
+ bundler (>= 1.15.0)
205
+ railties (= 7.1.5.1)
206
+ rails-dom-testing (2.3.0)
207
+ activesupport (>= 5.0.0)
208
+ minitest
209
+ nokogiri (>= 1.6)
210
+ rails-html-sanitizer (1.6.2)
211
+ loofah (~> 2.21)
212
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
213
+ railties (7.1.5.1)
214
+ actionpack (= 7.1.5.1)
215
+ activesupport (= 7.1.5.1)
216
+ irb
217
+ rackup (>= 1.0.0)
218
+ rake (>= 12.2)
219
+ thor (~> 1.0, >= 1.2.2)
220
+ zeitwerk (~> 2.6)
221
+ rainbow (3.1.1)
222
+ rake (13.3.0)
223
+ rdoc (6.14.2)
224
+ erb
225
+ psych (>= 4.0.0)
226
+ regexp_parser (2.10.0)
227
+ reline (0.6.1)
228
+ io-console (~> 0.5)
229
+ rubocop (1.78.0)
230
+ json (~> 2.3)
231
+ language_server-protocol (~> 3.17.0.2)
232
+ lint_roller (~> 1.1.0)
233
+ parallel (~> 1.10)
234
+ parser (>= 3.3.0.2)
235
+ rainbow (>= 2.2.2, < 4.0)
236
+ regexp_parser (>= 2.9.3, < 3.0)
237
+ rubocop-ast (>= 1.45.1, < 2.0)
238
+ ruby-progressbar (~> 1.7)
239
+ unicode-display_width (>= 2.4.0, < 4.0)
240
+ rubocop-ast (1.45.1)
241
+ parser (>= 3.3.7.2)
242
+ prism (~> 1.4)
243
+ rubocop-md (2.0.1)
244
+ lint_roller (~> 1.1)
245
+ rubocop (>= 1.72.1)
246
+ rubocop-minitest (0.38.1)
247
+ lint_roller (~> 1.1)
248
+ rubocop (>= 1.75.0, < 2.0)
249
+ rubocop-ast (>= 1.38.0, < 2.0)
250
+ rubocop-packaging (0.6.0)
251
+ lint_roller (~> 1.1.0)
252
+ rubocop (>= 1.72.1, < 2.0)
253
+ rubocop-performance (1.25.0)
254
+ lint_roller (~> 1.1)
255
+ rubocop (>= 1.75.0, < 2.0)
256
+ rubocop-ast (>= 1.38.0, < 2.0)
257
+ rubocop-rails (2.32.0)
258
+ activesupport (>= 4.2.0)
259
+ lint_roller (~> 1.1)
260
+ rack (>= 1.1)
261
+ rubocop (>= 1.75.0, < 2.0)
262
+ rubocop-ast (>= 1.44.0, < 2.0)
263
+ ruby-progressbar (1.13.0)
264
+ securerandom (0.4.1)
265
+ stringio (3.1.7)
266
+ thor (1.3.2)
267
+ timeout (0.4.3)
268
+ tzinfo (2.0.6)
269
+ concurrent-ruby (~> 1.0)
270
+ unicode-display_width (3.1.4)
271
+ unicode-emoji (~> 4.0, >= 4.0.4)
272
+ unicode-emoji (4.2.0)
273
+ websocket-driver (0.8.0)
274
+ base64
275
+ websocket-extensions (>= 0.1.0)
276
+ websocket-extensions (0.1.5)
277
+ zeitwerk (2.7.3)
278
+
279
+ PLATFORMS
280
+ aarch64-linux-gnu
281
+ aarch64-linux-musl
282
+ arm-linux-gnu
283
+ arm-linux-musl
284
+ arm64-darwin
285
+ x86_64-darwin
286
+ x86_64-linux-gnu
287
+ x86_64-linux-musl
288
+
289
+ DEPENDENCIES
290
+ appraisal
291
+ importmap-rails
292
+ irb
293
+ minitest
294
+ minitest-mock
295
+ minitest-retry
296
+ propshaft
297
+ rails (~> 7.1.0)
298
+ rails-conflicted-credentials!
299
+ rake
300
+ rubocop
301
+ rubocop-md
302
+ rubocop-minitest
303
+ rubocop-packaging
304
+ rubocop-performance
305
+ rubocop-rails
306
+
307
+ BUNDLED WITH
308
+ 2.6.9
@@ -0,0 +1,26 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "minitest"
6
+ gem "irb"
7
+ gem "rake"
8
+ gem "rails", "~> 7.2.0"
9
+
10
+ group :rubocop do
11
+ gem "rubocop"
12
+ gem "rubocop-minitest"
13
+ gem "rubocop-packaging"
14
+ gem "rubocop-performance"
15
+ gem "rubocop-rails"
16
+ gem "rubocop-md"
17
+ end
18
+
19
+ group :test do
20
+ gem "minitest-retry"
21
+ gem "minitest-mock"
22
+ gem "importmap-rails"
23
+ gem "propshaft"
24
+ end
25
+
26
+ gemspec path: "../"
@@ -0,0 +1,302 @@
1
+ PATH
2
+ remote: ..
3
+ specs:
4
+ rails-conflicted-credentials (0.1.3)
5
+ rails (>= 7.1)
6
+
7
+ GEM
8
+ remote: https://rubygems.org/
9
+ specs:
10
+ actioncable (7.2.2.1)
11
+ actionpack (= 7.2.2.1)
12
+ activesupport (= 7.2.2.1)
13
+ nio4r (~> 2.0)
14
+ websocket-driver (>= 0.6.1)
15
+ zeitwerk (~> 2.6)
16
+ actionmailbox (7.2.2.1)
17
+ actionpack (= 7.2.2.1)
18
+ activejob (= 7.2.2.1)
19
+ activerecord (= 7.2.2.1)
20
+ activestorage (= 7.2.2.1)
21
+ activesupport (= 7.2.2.1)
22
+ mail (>= 2.8.0)
23
+ actionmailer (7.2.2.1)
24
+ actionpack (= 7.2.2.1)
25
+ actionview (= 7.2.2.1)
26
+ activejob (= 7.2.2.1)
27
+ activesupport (= 7.2.2.1)
28
+ mail (>= 2.8.0)
29
+ rails-dom-testing (~> 2.2)
30
+ actionpack (7.2.2.1)
31
+ actionview (= 7.2.2.1)
32
+ activesupport (= 7.2.2.1)
33
+ nokogiri (>= 1.8.5)
34
+ racc
35
+ rack (>= 2.2.4, < 3.2)
36
+ rack-session (>= 1.0.1)
37
+ rack-test (>= 0.6.3)
38
+ rails-dom-testing (~> 2.2)
39
+ rails-html-sanitizer (~> 1.6)
40
+ useragent (~> 0.16)
41
+ actiontext (7.2.2.1)
42
+ actionpack (= 7.2.2.1)
43
+ activerecord (= 7.2.2.1)
44
+ activestorage (= 7.2.2.1)
45
+ activesupport (= 7.2.2.1)
46
+ globalid (>= 0.6.0)
47
+ nokogiri (>= 1.8.5)
48
+ actionview (7.2.2.1)
49
+ activesupport (= 7.2.2.1)
50
+ builder (~> 3.1)
51
+ erubi (~> 1.11)
52
+ rails-dom-testing (~> 2.2)
53
+ rails-html-sanitizer (~> 1.6)
54
+ activejob (7.2.2.1)
55
+ activesupport (= 7.2.2.1)
56
+ globalid (>= 0.3.6)
57
+ activemodel (7.2.2.1)
58
+ activesupport (= 7.2.2.1)
59
+ activerecord (7.2.2.1)
60
+ activemodel (= 7.2.2.1)
61
+ activesupport (= 7.2.2.1)
62
+ timeout (>= 0.4.0)
63
+ activestorage (7.2.2.1)
64
+ actionpack (= 7.2.2.1)
65
+ activejob (= 7.2.2.1)
66
+ activerecord (= 7.2.2.1)
67
+ activesupport (= 7.2.2.1)
68
+ marcel (~> 1.0)
69
+ activesupport (7.2.2.1)
70
+ base64
71
+ benchmark (>= 0.3)
72
+ bigdecimal
73
+ concurrent-ruby (~> 1.0, >= 1.3.1)
74
+ connection_pool (>= 2.2.5)
75
+ drb
76
+ i18n (>= 1.6, < 2)
77
+ logger (>= 1.4.2)
78
+ minitest (>= 5.1)
79
+ securerandom (>= 0.3)
80
+ tzinfo (~> 2.0, >= 2.0.5)
81
+ appraisal (2.5.0)
82
+ bundler
83
+ rake
84
+ thor (>= 0.14.0)
85
+ ast (2.4.3)
86
+ base64 (0.3.0)
87
+ benchmark (0.4.1)
88
+ bigdecimal (3.2.2)
89
+ builder (3.3.0)
90
+ concurrent-ruby (1.3.5)
91
+ connection_pool (2.5.3)
92
+ crass (1.0.6)
93
+ date (3.4.1)
94
+ drb (2.2.3)
95
+ erb (5.0.1)
96
+ erubi (1.13.1)
97
+ globalid (1.2.1)
98
+ activesupport (>= 6.1)
99
+ i18n (1.14.7)
100
+ concurrent-ruby (~> 1.0)
101
+ importmap-rails (2.1.0)
102
+ actionpack (>= 6.0.0)
103
+ activesupport (>= 6.0.0)
104
+ railties (>= 6.0.0)
105
+ io-console (0.8.0)
106
+ irb (1.15.2)
107
+ pp (>= 0.6.0)
108
+ rdoc (>= 4.0.0)
109
+ reline (>= 0.4.2)
110
+ json (2.12.2)
111
+ language_server-protocol (3.17.0.5)
112
+ lint_roller (1.1.0)
113
+ logger (1.7.0)
114
+ loofah (2.24.1)
115
+ crass (~> 1.0.2)
116
+ nokogiri (>= 1.12.0)
117
+ mail (2.8.1)
118
+ mini_mime (>= 0.1.1)
119
+ net-imap
120
+ net-pop
121
+ net-smtp
122
+ marcel (1.0.4)
123
+ mini_mime (1.1.5)
124
+ mini_portile2 (2.8.9)
125
+ minitest (6.0.6)
126
+ drb (~> 2.0)
127
+ prism (~> 1.5)
128
+ minitest-mock (5.27.0)
129
+ minitest-retry (0.2.5)
130
+ minitest (>= 5.0)
131
+ net-imap (0.5.9)
132
+ date
133
+ net-protocol
134
+ net-pop (0.1.2)
135
+ net-protocol
136
+ net-protocol (0.2.2)
137
+ timeout
138
+ net-smtp (0.5.1)
139
+ net-protocol
140
+ nio4r (2.7.4)
141
+ nokogiri (1.18.8)
142
+ mini_portile2 (~> 2.8.2)
143
+ racc (~> 1.4)
144
+ nokogiri (1.18.8-aarch64-linux-gnu)
145
+ racc (~> 1.4)
146
+ nokogiri (1.18.8-aarch64-linux-musl)
147
+ racc (~> 1.4)
148
+ nokogiri (1.18.8-arm-linux-gnu)
149
+ racc (~> 1.4)
150
+ nokogiri (1.18.8-arm-linux-musl)
151
+ racc (~> 1.4)
152
+ nokogiri (1.18.8-arm64-darwin)
153
+ racc (~> 1.4)
154
+ nokogiri (1.18.8-x86_64-darwin)
155
+ racc (~> 1.4)
156
+ nokogiri (1.18.8-x86_64-linux-gnu)
157
+ racc (~> 1.4)
158
+ nokogiri (1.18.8-x86_64-linux-musl)
159
+ racc (~> 1.4)
160
+ parallel (1.27.0)
161
+ parser (3.3.8.0)
162
+ ast (~> 2.4.1)
163
+ racc
164
+ pp (0.6.2)
165
+ prettyprint
166
+ prettyprint (0.2.0)
167
+ prism (1.9.0)
168
+ propshaft (1.1.0)
169
+ actionpack (>= 7.0.0)
170
+ activesupport (>= 7.0.0)
171
+ rack
172
+ railties (>= 7.0.0)
173
+ psych (5.2.6)
174
+ date
175
+ stringio
176
+ racc (1.8.1)
177
+ rack (3.1.16)
178
+ rack-session (2.1.1)
179
+ base64 (>= 0.1.0)
180
+ rack (>= 3.0.0)
181
+ rack-test (2.2.0)
182
+ rack (>= 1.3)
183
+ rackup (2.2.1)
184
+ rack (>= 3)
185
+ rails (7.2.2.1)
186
+ actioncable (= 7.2.2.1)
187
+ actionmailbox (= 7.2.2.1)
188
+ actionmailer (= 7.2.2.1)
189
+ actionpack (= 7.2.2.1)
190
+ actiontext (= 7.2.2.1)
191
+ actionview (= 7.2.2.1)
192
+ activejob (= 7.2.2.1)
193
+ activemodel (= 7.2.2.1)
194
+ activerecord (= 7.2.2.1)
195
+ activestorage (= 7.2.2.1)
196
+ activesupport (= 7.2.2.1)
197
+ bundler (>= 1.15.0)
198
+ railties (= 7.2.2.1)
199
+ rails-dom-testing (2.3.0)
200
+ activesupport (>= 5.0.0)
201
+ minitest
202
+ nokogiri (>= 1.6)
203
+ rails-html-sanitizer (1.6.2)
204
+ loofah (~> 2.21)
205
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
206
+ railties (7.2.2.1)
207
+ actionpack (= 7.2.2.1)
208
+ activesupport (= 7.2.2.1)
209
+ irb (~> 1.13)
210
+ rackup (>= 1.0.0)
211
+ rake (>= 12.2)
212
+ thor (~> 1.0, >= 1.2.2)
213
+ zeitwerk (~> 2.6)
214
+ rainbow (3.1.1)
215
+ rake (13.3.0)
216
+ rdoc (6.14.2)
217
+ erb
218
+ psych (>= 4.0.0)
219
+ regexp_parser (2.10.0)
220
+ reline (0.6.1)
221
+ io-console (~> 0.5)
222
+ rubocop (1.78.0)
223
+ json (~> 2.3)
224
+ language_server-protocol (~> 3.17.0.2)
225
+ lint_roller (~> 1.1.0)
226
+ parallel (~> 1.10)
227
+ parser (>= 3.3.0.2)
228
+ rainbow (>= 2.2.2, < 4.0)
229
+ regexp_parser (>= 2.9.3, < 3.0)
230
+ rubocop-ast (>= 1.45.1, < 2.0)
231
+ ruby-progressbar (~> 1.7)
232
+ unicode-display_width (>= 2.4.0, < 4.0)
233
+ rubocop-ast (1.45.1)
234
+ parser (>= 3.3.7.2)
235
+ prism (~> 1.4)
236
+ rubocop-md (2.0.1)
237
+ lint_roller (~> 1.1)
238
+ rubocop (>= 1.72.1)
239
+ rubocop-minitest (0.38.1)
240
+ lint_roller (~> 1.1)
241
+ rubocop (>= 1.75.0, < 2.0)
242
+ rubocop-ast (>= 1.38.0, < 2.0)
243
+ rubocop-packaging (0.6.0)
244
+ lint_roller (~> 1.1.0)
245
+ rubocop (>= 1.72.1, < 2.0)
246
+ rubocop-performance (1.25.0)
247
+ lint_roller (~> 1.1)
248
+ rubocop (>= 1.75.0, < 2.0)
249
+ rubocop-ast (>= 1.38.0, < 2.0)
250
+ rubocop-rails (2.32.0)
251
+ activesupport (>= 4.2.0)
252
+ lint_roller (~> 1.1)
253
+ rack (>= 1.1)
254
+ rubocop (>= 1.75.0, < 2.0)
255
+ rubocop-ast (>= 1.44.0, < 2.0)
256
+ ruby-progressbar (1.13.0)
257
+ securerandom (0.4.1)
258
+ stringio (3.1.7)
259
+ thor (1.3.2)
260
+ timeout (0.4.3)
261
+ tzinfo (2.0.6)
262
+ concurrent-ruby (~> 1.0)
263
+ unicode-display_width (3.1.4)
264
+ unicode-emoji (~> 4.0, >= 4.0.4)
265
+ unicode-emoji (4.2.0)
266
+ useragent (0.16.11)
267
+ websocket-driver (0.8.0)
268
+ base64
269
+ websocket-extensions (>= 0.1.0)
270
+ websocket-extensions (0.1.5)
271
+ zeitwerk (2.7.3)
272
+
273
+ PLATFORMS
274
+ aarch64-linux-gnu
275
+ aarch64-linux-musl
276
+ arm-linux-gnu
277
+ arm-linux-musl
278
+ arm64-darwin
279
+ x86_64-darwin
280
+ x86_64-linux-gnu
281
+ x86_64-linux-musl
282
+
283
+ DEPENDENCIES
284
+ appraisal
285
+ importmap-rails
286
+ irb
287
+ minitest
288
+ minitest-mock
289
+ minitest-retry
290
+ propshaft
291
+ rails (~> 7.2.0)
292
+ rails-conflicted-credentials!
293
+ rake
294
+ rubocop
295
+ rubocop-md
296
+ rubocop-minitest
297
+ rubocop-packaging
298
+ rubocop-performance
299
+ rubocop-rails
300
+
301
+ BUNDLED WITH
302
+ 2.6.9
@@ -0,0 +1,26 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "minitest"
6
+ gem "irb"
7
+ gem "rake"
8
+ gem "rails", "~> 8.0.0"
9
+
10
+ group :rubocop do
11
+ gem "rubocop"
12
+ gem "rubocop-minitest"
13
+ gem "rubocop-packaging"
14
+ gem "rubocop-performance"
15
+ gem "rubocop-rails"
16
+ gem "rubocop-md"
17
+ end
18
+
19
+ group :test do
20
+ gem "minitest-retry"
21
+ gem "minitest-mock"
22
+ gem "importmap-rails"
23
+ gem "propshaft"
24
+ end
25
+
26
+ gemspec path: "../"
@@ -0,0 +1,303 @@
1
+ PATH
2
+ remote: ..
3
+ specs:
4
+ rails-conflicted-credentials (0.1.3)
5
+ rails (>= 7.1)
6
+
7
+ GEM
8
+ remote: https://rubygems.org/
9
+ specs:
10
+ actioncable (8.0.2)
11
+ actionpack (= 8.0.2)
12
+ activesupport (= 8.0.2)
13
+ nio4r (~> 2.0)
14
+ websocket-driver (>= 0.6.1)
15
+ zeitwerk (~> 2.6)
16
+ actionmailbox (8.0.2)
17
+ actionpack (= 8.0.2)
18
+ activejob (= 8.0.2)
19
+ activerecord (= 8.0.2)
20
+ activestorage (= 8.0.2)
21
+ activesupport (= 8.0.2)
22
+ mail (>= 2.8.0)
23
+ actionmailer (8.0.2)
24
+ actionpack (= 8.0.2)
25
+ actionview (= 8.0.2)
26
+ activejob (= 8.0.2)
27
+ activesupport (= 8.0.2)
28
+ mail (>= 2.8.0)
29
+ rails-dom-testing (~> 2.2)
30
+ actionpack (8.0.2)
31
+ actionview (= 8.0.2)
32
+ activesupport (= 8.0.2)
33
+ nokogiri (>= 1.8.5)
34
+ rack (>= 2.2.4)
35
+ rack-session (>= 1.0.1)
36
+ rack-test (>= 0.6.3)
37
+ rails-dom-testing (~> 2.2)
38
+ rails-html-sanitizer (~> 1.6)
39
+ useragent (~> 0.16)
40
+ actiontext (8.0.2)
41
+ actionpack (= 8.0.2)
42
+ activerecord (= 8.0.2)
43
+ activestorage (= 8.0.2)
44
+ activesupport (= 8.0.2)
45
+ globalid (>= 0.6.0)
46
+ nokogiri (>= 1.8.5)
47
+ actionview (8.0.2)
48
+ activesupport (= 8.0.2)
49
+ builder (~> 3.1)
50
+ erubi (~> 1.11)
51
+ rails-dom-testing (~> 2.2)
52
+ rails-html-sanitizer (~> 1.6)
53
+ activejob (8.0.2)
54
+ activesupport (= 8.0.2)
55
+ globalid (>= 0.3.6)
56
+ activemodel (8.0.2)
57
+ activesupport (= 8.0.2)
58
+ activerecord (8.0.2)
59
+ activemodel (= 8.0.2)
60
+ activesupport (= 8.0.2)
61
+ timeout (>= 0.4.0)
62
+ activestorage (8.0.2)
63
+ actionpack (= 8.0.2)
64
+ activejob (= 8.0.2)
65
+ activerecord (= 8.0.2)
66
+ activesupport (= 8.0.2)
67
+ marcel (~> 1.0)
68
+ activesupport (8.0.2)
69
+ base64
70
+ benchmark (>= 0.3)
71
+ bigdecimal
72
+ concurrent-ruby (~> 1.0, >= 1.3.1)
73
+ connection_pool (>= 2.2.5)
74
+ drb
75
+ i18n (>= 1.6, < 2)
76
+ logger (>= 1.4.2)
77
+ minitest (>= 5.1)
78
+ securerandom (>= 0.3)
79
+ tzinfo (~> 2.0, >= 2.0.5)
80
+ uri (>= 0.13.1)
81
+ appraisal (2.5.0)
82
+ bundler
83
+ rake
84
+ thor (>= 0.14.0)
85
+ ast (2.4.3)
86
+ base64 (0.3.0)
87
+ benchmark (0.4.1)
88
+ bigdecimal (3.2.2)
89
+ builder (3.3.0)
90
+ concurrent-ruby (1.3.5)
91
+ connection_pool (2.5.3)
92
+ crass (1.0.6)
93
+ date (3.4.1)
94
+ drb (2.2.3)
95
+ erb (5.0.1)
96
+ erubi (1.13.1)
97
+ globalid (1.2.1)
98
+ activesupport (>= 6.1)
99
+ i18n (1.14.7)
100
+ concurrent-ruby (~> 1.0)
101
+ importmap-rails (2.1.0)
102
+ actionpack (>= 6.0.0)
103
+ activesupport (>= 6.0.0)
104
+ railties (>= 6.0.0)
105
+ io-console (0.8.0)
106
+ irb (1.15.2)
107
+ pp (>= 0.6.0)
108
+ rdoc (>= 4.0.0)
109
+ reline (>= 0.4.2)
110
+ json (2.12.2)
111
+ language_server-protocol (3.17.0.5)
112
+ lint_roller (1.1.0)
113
+ logger (1.7.0)
114
+ loofah (2.24.1)
115
+ crass (~> 1.0.2)
116
+ nokogiri (>= 1.12.0)
117
+ mail (2.8.1)
118
+ mini_mime (>= 0.1.1)
119
+ net-imap
120
+ net-pop
121
+ net-smtp
122
+ marcel (1.0.4)
123
+ mini_mime (1.1.5)
124
+ mini_portile2 (2.8.9)
125
+ minitest (6.0.6)
126
+ drb (~> 2.0)
127
+ prism (~> 1.5)
128
+ minitest-mock (5.27.0)
129
+ minitest-retry (0.2.5)
130
+ minitest (>= 5.0)
131
+ net-imap (0.5.9)
132
+ date
133
+ net-protocol
134
+ net-pop (0.1.2)
135
+ net-protocol
136
+ net-protocol (0.2.2)
137
+ timeout
138
+ net-smtp (0.5.1)
139
+ net-protocol
140
+ nio4r (2.7.4)
141
+ nokogiri (1.18.8)
142
+ mini_portile2 (~> 2.8.2)
143
+ racc (~> 1.4)
144
+ nokogiri (1.18.8-aarch64-linux-gnu)
145
+ racc (~> 1.4)
146
+ nokogiri (1.18.8-aarch64-linux-musl)
147
+ racc (~> 1.4)
148
+ nokogiri (1.18.8-arm-linux-gnu)
149
+ racc (~> 1.4)
150
+ nokogiri (1.18.8-arm-linux-musl)
151
+ racc (~> 1.4)
152
+ nokogiri (1.18.8-arm64-darwin)
153
+ racc (~> 1.4)
154
+ nokogiri (1.18.8-x86_64-darwin)
155
+ racc (~> 1.4)
156
+ nokogiri (1.18.8-x86_64-linux-gnu)
157
+ racc (~> 1.4)
158
+ nokogiri (1.18.8-x86_64-linux-musl)
159
+ racc (~> 1.4)
160
+ parallel (1.27.0)
161
+ parser (3.3.8.0)
162
+ ast (~> 2.4.1)
163
+ racc
164
+ pp (0.6.2)
165
+ prettyprint
166
+ prettyprint (0.2.0)
167
+ prism (1.9.0)
168
+ propshaft (1.1.0)
169
+ actionpack (>= 7.0.0)
170
+ activesupport (>= 7.0.0)
171
+ rack
172
+ railties (>= 7.0.0)
173
+ psych (5.2.6)
174
+ date
175
+ stringio
176
+ racc (1.8.1)
177
+ rack (3.1.16)
178
+ rack-session (2.1.1)
179
+ base64 (>= 0.1.0)
180
+ rack (>= 3.0.0)
181
+ rack-test (2.2.0)
182
+ rack (>= 1.3)
183
+ rackup (2.2.1)
184
+ rack (>= 3)
185
+ rails (8.0.2)
186
+ actioncable (= 8.0.2)
187
+ actionmailbox (= 8.0.2)
188
+ actionmailer (= 8.0.2)
189
+ actionpack (= 8.0.2)
190
+ actiontext (= 8.0.2)
191
+ actionview (= 8.0.2)
192
+ activejob (= 8.0.2)
193
+ activemodel (= 8.0.2)
194
+ activerecord (= 8.0.2)
195
+ activestorage (= 8.0.2)
196
+ activesupport (= 8.0.2)
197
+ bundler (>= 1.15.0)
198
+ railties (= 8.0.2)
199
+ rails-dom-testing (2.3.0)
200
+ activesupport (>= 5.0.0)
201
+ minitest
202
+ nokogiri (>= 1.6)
203
+ rails-html-sanitizer (1.6.2)
204
+ loofah (~> 2.21)
205
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
206
+ railties (8.0.2)
207
+ actionpack (= 8.0.2)
208
+ activesupport (= 8.0.2)
209
+ irb (~> 1.13)
210
+ rackup (>= 1.0.0)
211
+ rake (>= 12.2)
212
+ thor (~> 1.0, >= 1.2.2)
213
+ zeitwerk (~> 2.6)
214
+ rainbow (3.1.1)
215
+ rake (13.3.0)
216
+ rdoc (6.14.2)
217
+ erb
218
+ psych (>= 4.0.0)
219
+ regexp_parser (2.10.0)
220
+ reline (0.6.1)
221
+ io-console (~> 0.5)
222
+ rubocop (1.78.0)
223
+ json (~> 2.3)
224
+ language_server-protocol (~> 3.17.0.2)
225
+ lint_roller (~> 1.1.0)
226
+ parallel (~> 1.10)
227
+ parser (>= 3.3.0.2)
228
+ rainbow (>= 2.2.2, < 4.0)
229
+ regexp_parser (>= 2.9.3, < 3.0)
230
+ rubocop-ast (>= 1.45.1, < 2.0)
231
+ ruby-progressbar (~> 1.7)
232
+ unicode-display_width (>= 2.4.0, < 4.0)
233
+ rubocop-ast (1.45.1)
234
+ parser (>= 3.3.7.2)
235
+ prism (~> 1.4)
236
+ rubocop-md (2.0.1)
237
+ lint_roller (~> 1.1)
238
+ rubocop (>= 1.72.1)
239
+ rubocop-minitest (0.38.1)
240
+ lint_roller (~> 1.1)
241
+ rubocop (>= 1.75.0, < 2.0)
242
+ rubocop-ast (>= 1.38.0, < 2.0)
243
+ rubocop-packaging (0.6.0)
244
+ lint_roller (~> 1.1.0)
245
+ rubocop (>= 1.72.1, < 2.0)
246
+ rubocop-performance (1.25.0)
247
+ lint_roller (~> 1.1)
248
+ rubocop (>= 1.75.0, < 2.0)
249
+ rubocop-ast (>= 1.38.0, < 2.0)
250
+ rubocop-rails (2.32.0)
251
+ activesupport (>= 4.2.0)
252
+ lint_roller (~> 1.1)
253
+ rack (>= 1.1)
254
+ rubocop (>= 1.75.0, < 2.0)
255
+ rubocop-ast (>= 1.44.0, < 2.0)
256
+ ruby-progressbar (1.13.0)
257
+ securerandom (0.4.1)
258
+ stringio (3.1.7)
259
+ thor (1.3.2)
260
+ timeout (0.4.3)
261
+ tzinfo (2.0.6)
262
+ concurrent-ruby (~> 1.0)
263
+ unicode-display_width (3.1.4)
264
+ unicode-emoji (~> 4.0, >= 4.0.4)
265
+ unicode-emoji (4.2.0)
266
+ uri (1.0.3)
267
+ useragent (0.16.11)
268
+ websocket-driver (0.8.0)
269
+ base64
270
+ websocket-extensions (>= 0.1.0)
271
+ websocket-extensions (0.1.5)
272
+ zeitwerk (2.7.3)
273
+
274
+ PLATFORMS
275
+ aarch64-linux-gnu
276
+ aarch64-linux-musl
277
+ arm-linux-gnu
278
+ arm-linux-musl
279
+ arm64-darwin
280
+ x86_64-darwin
281
+ x86_64-linux-gnu
282
+ x86_64-linux-musl
283
+
284
+ DEPENDENCIES
285
+ appraisal
286
+ importmap-rails
287
+ irb
288
+ minitest
289
+ minitest-mock
290
+ minitest-retry
291
+ propshaft
292
+ rails (~> 8.0.0)
293
+ rails-conflicted-credentials!
294
+ rake
295
+ rubocop
296
+ rubocop-md
297
+ rubocop-minitest
298
+ rubocop-packaging
299
+ rubocop-performance
300
+ rubocop-rails
301
+
302
+ BUNDLED WITH
303
+ 2.6.9
@@ -3,7 +3,7 @@
3
3
  module Rails
4
4
  module Conflicted
5
5
  module Credentials
6
- VERSION = "0.1.2"
6
+ VERSION = "0.1.4"
7
7
  end
8
8
  end
9
9
  end
@@ -1,7 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require_relative "credentials/version"
4
- require_relative "../commands/conflicted_credentials/conflicted_credentials_command"
5
4
 
6
5
  module Rails
7
6
  module Conflicted
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails-conflicted-credentials
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matthew Hirst
@@ -15,14 +15,28 @@ dependencies:
15
15
  requirements:
16
16
  - - ">="
17
17
  - !ruby/object:Gem::Version
18
- version: '7.0'
18
+ version: '7.1'
19
19
  type: :runtime
20
20
  prerelease: false
21
21
  version_requirements: !ruby/object:Gem::Requirement
22
22
  requirements:
23
23
  - - ">="
24
24
  - !ruby/object:Gem::Version
25
- version: '7.0'
25
+ version: '7.1'
26
+ - !ruby/object:Gem::Dependency
27
+ name: appraisal
28
+ requirement: !ruby/object:Gem::Requirement
29
+ requirements:
30
+ - - ">="
31
+ - !ruby/object:Gem::Version
32
+ version: '0'
33
+ type: :development
34
+ prerelease: false
35
+ version_requirements: !ruby/object:Gem::Requirement
36
+ requirements:
37
+ - - ">="
38
+ - !ruby/object:Gem::Version
39
+ version: '0'
26
40
  email:
27
41
  - hirst.mat@gmail.com
28
42
  executables: []
@@ -31,12 +45,19 @@ extra_rdoc_files: []
31
45
  files:
32
46
  - ".rspec"
33
47
  - ".rubocop.yml"
48
+ - Appraisals
34
49
  - CHANGELOG.md
35
50
  - CODE_OF_CONDUCT.md
36
51
  - LICENSE
37
52
  - LICENSE.txt
38
53
  - README.md
39
54
  - Rakefile
55
+ - gemfiles/rails_7_1.gemfile
56
+ - gemfiles/rails_7_1.gemfile.lock
57
+ - gemfiles/rails_7_2.gemfile
58
+ - gemfiles/rails_7_2.gemfile.lock
59
+ - gemfiles/rails_8_0.gemfile
60
+ - gemfiles/rails_8_0.gemfile.lock
40
61
  - lib/rails/commands/conflicted_credentials/conflicted_credentials_command.rb
41
62
  - lib/rails/commands/conflicted_credentials/conflicted_credentials_command/conflicted_credentials.rb
42
63
  - lib/rails/conflicted/credentials.rb
@@ -63,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
63
84
  - !ruby/object:Gem::Version
64
85
  version: '0'
65
86
  requirements: []
66
- rubygems_version: 3.6.9
87
+ rubygems_version: 4.0.10
67
88
  specification_version: 4
68
89
  summary: A gem to help editing rails credentials files with git merge conflicts.
69
90
  test_files: []