Skip to content

Commit a6bdce4

Browse files
committed
Update dev gems and houndci
1 parent 155cddd commit a6bdce4

File tree

5 files changed

+84
-65
lines changed

5 files changed

+84
-65
lines changed

.hound.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ruby:
2-
config_file: .rubocop.yml
31
rubocop:
4-
version: 0.59.2
2+
config_file: .rubocop.yml
3+
version: 1.5.2

.rubocop.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ inherit_gem:
33
- config/rails.yml
44

55
AllCops:
6+
SuggestExtensions: false
67
TargetRubyVersion: 2.5
78
Exclude:
89
- 'ext/**/*'
@@ -33,7 +34,7 @@ Metrics/ClassLength:
3334
Metrics/CyclomaticComplexity:
3435
Enabled: false
3536

36-
Metrics/LineLength:
37+
Layout/LineLength:
3738
Enabled: false
3839

3940
Metrics/MethodLength:

Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ group :development, :test do
6060
gem 'capybara', '~> 2.17'
6161
gem 'factory_girl_rails', '~> 4.5.0'
6262
gem 'poltergeist', '~> 1.8.1'
63-
gem 'rspec', '~> 3.5.0'
63+
gem 'rspec', '~> 3.10'
6464
gem 'rspec-activemodel-mocks', '~> 1.0.0'
65-
gem 'rspec-core', '~> 3.5.2'
66-
gem 'rspec-rails', '~> 3.5.1'
65+
gem 'rspec-core', '~> 3.10'
66+
gem 'rspec-rails', '~> 4.0'
6767
gem 'rails-controller-testing'
6868
# gem 'selenium-webdriver', '~> 2.44.0'
6969
gem 'irb'
@@ -77,8 +77,8 @@ group :development, :test do
7777
gem 'launchy' # for capybara's save_and_open_page
7878
gem 'mimic', '~> 0.4.3'
7979
gem 'railroady' # for doc/diagrams
80-
gem 'rubocop', '~> 0.59.2', require: false
81-
gem 'rubocop-rails_config', '~> 0.2.4'
80+
gem 'rubocop', '~> 1.5.2', require: false
81+
gem 'rubocop-rails_config', '~> 1.1'
8282
gem 'ruby-prof', '~> 0.12.2' # for performance tests
8383
gem 'simplecov'
8484
end

Gemfile.lock

+74-55
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ GEM
5454
public_suffix (>= 2.0.2, < 5.0)
5555
andand (1.3.3)
5656
arel (9.0.0)
57-
argon2 (2.0.2)
58-
ffi (~> 1.9)
59-
ffi-compiler (>= 0.1)
57+
argon2 (2.0.3)
58+
ffi (~> 1.14)
59+
ffi-compiler (~> 1.0)
6060
ast (2.4.1)
6161
autoprefixer-rails (10.1.0.0)
6262
execjs
6363
bootstrap (4.5.3)
6464
autoprefixer-rails (>= 9.1.0)
6565
popper_js (>= 1.14.3, < 2)
6666
sassc-rails (>= 2.0.0)
67-
brakeman (4.10.0)
67+
brakeman (4.10.1)
6868
builder (3.2.4)
6969
bundler-audit (0.7.0.1)
7070
bundler (>= 1.2.0, < 3)
@@ -91,7 +91,7 @@ GEM
9191
diff-lcs (1.4.4)
9292
digest-crc (0.6.3)
9393
rake (>= 12.0.0, < 14.0.0)
94-
docile (1.3.3)
94+
docile (1.3.4)
9595
domain_name (0.5.20190701)
9696
unf (>= 0.0.5, < 1.0.0)
9797
doorkeeper (5.4.0)
@@ -104,16 +104,18 @@ GEM
104104
factory_girl_rails (4.5.0)
105105
factory_girl (~> 4.5.0)
106106
railties (>= 3.0.0)
107-
faraday (1.1.0)
107+
faraday (1.3.0)
108+
faraday-net_http (~> 1.0)
108109
multipart-post (>= 1.2, < 3)
109110
ruby2_keywords
110-
ffi (1.14.1)
111+
faraday-net_http (1.0.0)
112+
ffi (1.14.2)
111113
ffi-compiler (1.0.1)
112114
ffi (>= 1.0.0)
113115
rake
114116
flamegraph (0.9.5)
115-
font-awesome-rails (4.7.0.5)
116-
railties (>= 3.2, < 6.1)
117+
font-awesome-rails (4.7.0.6)
118+
railties (>= 3.2, < 6.2)
117119
globalid (0.4.2)
118120
activesupport (>= 4.2.0)
119121
google-api-client (0.52.0)
@@ -127,7 +129,7 @@ GEM
127129
signet (~> 0.12)
128130
google-spreadsheet-ruby (0.3.1)
129131
google_drive (>= 0.3.0)
130-
google_drive (3.0.5)
132+
google_drive (3.0.6)
131133
google-api-client (>= 0.11.0, < 1.0.0)
132134
googleauth (>= 0.5.0, < 1.0.0)
133135
nokogiri (>= 1.5.3, < 2.0.0)
@@ -144,17 +146,16 @@ GEM
144146
http-cookie (1.0.3)
145147
domain_name (~> 0.5)
146148
httpclient (2.8.3)
147-
i18n (1.8.5)
149+
i18n (1.8.7)
148150
concurrent-ruby (~> 1.0)
149151
io-console (0.5.6)
150-
irb (1.2.8)
152+
irb (1.3.0)
151153
reline (>= 0.1.5)
152-
jaro_winkler (1.5.4)
153154
jquery-rails (4.4.0)
154155
rails-dom-testing (>= 1, < 3)
155156
railties (>= 4.2.0)
156157
thor (>= 0.14, < 2.0)
157-
json (2.4.1)
158+
json (2.5.1)
158159
json-schema (2.7.0)
159160
addressable (>= 2.4)
160161
jwt (2.2.2)
@@ -185,7 +186,7 @@ GEM
185186
sinatra
186187
thin
187188
mini_mime (1.0.2)
188-
mini_portile2 (2.4.0)
189+
mini_portile2 (2.5.0)
189190
minitest (5.14.2)
190191
multi_json (1.15.0)
191192
multipart-post (2.1.1)
@@ -195,8 +196,9 @@ GEM
195196
netrc (0.11.0)
196197
newrelic_rpm (6.14.0)
197198
nio4r (2.5.4)
198-
nokogiri (1.10.10)
199-
mini_portile2 (~> 2.4.0)
199+
nokogiri (1.11.0)
200+
mini_portile2 (~> 2.5.0)
201+
racc (~> 1.4)
200202
os (1.1.1)
201203
paperclip (6.1.0)
202204
activemodel (>= 4.2.0)
@@ -205,7 +207,7 @@ GEM
205207
mimemagic (~> 0.3.0)
206208
terrapin (~> 0.6.0)
207209
parallel (1.20.1)
208-
parser (2.7.2.0)
210+
parser (3.0.0.0)
209211
ast (~> 2.4.1)
210212
pdfkit (0.8.4.3.2)
211213
pg (1.2.3)
@@ -218,7 +220,6 @@ GEM
218220
multi_json (~> 1.0)
219221
websocket-driver (>= 0.2.0)
220222
popper_js (1.16.0)
221-
powerpack (0.1.3)
222223
pry (0.13.1)
223224
coderay (~> 1.1)
224225
method_source (~> 1.0)
@@ -228,6 +229,7 @@ GEM
228229
pry-rails (0.3.9)
229230
pry (>= 0.10.4)
230231
public_suffix (4.0.6)
232+
racc (1.5.2)
231233
rack (2.2.3)
232234
rack-attack (6.3.1)
233235
rack (>= 1.0, < 3)
@@ -277,7 +279,8 @@ GEM
277279
connection_pool (~> 2.1)
278280
redis (>= 3.0, < 5.0)
279281
redis (4.2.5)
280-
reline (0.1.10)
282+
regexp_parser (2.0.3)
283+
reline (0.2.0)
281284
io-console (~> 0.5)
282285
representable (3.0.4)
283286
declarative (< 0.1.0)
@@ -295,46 +298,62 @@ GEM
295298
netrc (~> 0.8)
296299
retriable (3.1.2)
297300
rexml (3.2.4)
298-
rspec (3.5.0)
299-
rspec-core (~> 3.5.0)
300-
rspec-expectations (~> 3.5.0)
301-
rspec-mocks (~> 3.5.0)
301+
rspec (3.10.0)
302+
rspec-core (~> 3.10.0)
303+
rspec-expectations (~> 3.10.0)
304+
rspec-mocks (~> 3.10.0)
302305
rspec-activemodel-mocks (1.0.3)
303306
activemodel (>= 3.0)
304307
activesupport (>= 3.0)
305308
rspec-mocks (>= 2.99, < 4.0)
306-
rspec-core (3.5.4)
307-
rspec-support (~> 3.5.0)
308-
rspec-expectations (3.5.0)
309+
rspec-core (3.10.1)
310+
rspec-support (~> 3.10.0)
311+
rspec-expectations (3.10.1)
309312
diff-lcs (>= 1.2.0, < 2.0)
310-
rspec-support (~> 3.5.0)
311-
rspec-mocks (3.5.0)
313+
rspec-support (~> 3.10.0)
314+
rspec-mocks (3.10.1)
312315
diff-lcs (>= 1.2.0, < 2.0)
313-
rspec-support (~> 3.5.0)
314-
rspec-rails (3.5.2)
315-
actionpack (>= 3.0)
316-
activesupport (>= 3.0)
317-
railties (>= 3.0)
318-
rspec-core (~> 3.5.0)
319-
rspec-expectations (~> 3.5.0)
320-
rspec-mocks (~> 3.5.0)
321-
rspec-support (~> 3.5.0)
322-
rspec-support (3.5.0)
323-
rubocop (0.59.2)
324-
jaro_winkler (~> 1.5.1)
316+
rspec-support (~> 3.10.0)
317+
rspec-rails (4.0.2)
318+
actionpack (>= 4.2)
319+
activesupport (>= 4.2)
320+
railties (>= 4.2)
321+
rspec-core (~> 3.10)
322+
rspec-expectations (~> 3.10)
323+
rspec-mocks (~> 3.10)
324+
rspec-support (~> 3.10)
325+
rspec-support (3.10.1)
326+
rubocop (1.5.2)
325327
parallel (~> 1.10)
326-
parser (>= 2.5, != 2.5.1.1)
327-
powerpack (~> 0.1)
328+
parser (>= 2.7.1.5)
328329
rainbow (>= 2.2.2, < 4.0)
330+
regexp_parser (>= 1.8, < 3.0)
331+
rexml
332+
rubocop-ast (>= 1.2.0, < 2.0)
329333
ruby-progressbar (~> 1.7)
330-
unicode-display_width (~> 1.0, >= 1.0.1)
331-
rubocop-rails_config (0.2.6)
332-
railties (>= 3.0)
333-
rubocop (~> 0.56)
334+
unicode-display_width (>= 1.4.0, < 2.0)
335+
rubocop-ast (1.4.0)
336+
parser (>= 2.7.1.5)
337+
rubocop-packaging (0.5.1)
338+
rubocop (>= 0.89, < 2.0)
339+
rubocop-performance (1.9.2)
340+
rubocop (>= 0.90.0, < 2.0)
341+
rubocop-ast (>= 0.4.0)
342+
rubocop-rails (2.9.1)
343+
activesupport (>= 4.2.0)
344+
rack (>= 1.1)
345+
rubocop (>= 0.90.0, < 2.0)
346+
rubocop-rails_config (1.1.3)
347+
railties (>= 5.0)
348+
rubocop (>= 1.0)
349+
rubocop-ast (>= 1.0.1)
350+
rubocop-packaging (~> 0.5)
351+
rubocop-performance (~> 1.3)
352+
rubocop-rails (~> 2.0)
334353
ruby-kafka (0.7.10)
335354
digest-crc
336355
ruby-prof (0.12.2)
337-
ruby-progressbar (1.10.1)
356+
ruby-progressbar (1.11.0)
338357
ruby2_keywords (0.0.2)
339358
sass (3.7.4)
340359
sass-listen (~> 4.0.0)
@@ -360,7 +379,7 @@ GEM
360379
faraday (>= 0.17.3, < 2.0)
361380
jwt (>= 1.5, < 3.0)
362381
multi_json (~> 1.10)
363-
simplecov (0.20.0)
382+
simplecov (0.21.0)
364383
docile (~> 1.1)
365384
simplecov-html (~> 0.11)
366385
simplecov_json_formatter (~> 0.1)
@@ -403,7 +422,7 @@ GEM
403422
websocket-driver (0.7.3)
404423
websocket-extensions (>= 0.1.0)
405424
websocket-extensions (0.1.5)
406-
xml-simple (1.1.7)
425+
xml-simple (1.1.8)
407426
xpath (3.2.0)
408427
nokogiri (~> 1.8)
409428

@@ -458,12 +477,12 @@ DEPENDENCIES
458477
redis (~> 4.2)
459478
responders (~> 3.0)
460479
rest-client (~> 2.1)
461-
rspec (~> 3.5.0)
480+
rspec (~> 3.10)
462481
rspec-activemodel-mocks (~> 1.0.0)
463-
rspec-core (~> 3.5.2)
464-
rspec-rails (~> 3.5.1)
465-
rubocop (~> 0.59.2)
466-
rubocop-rails_config (~> 0.2.4)
482+
rspec-core (~> 3.10)
483+
rspec-rails (~> 4.0)
484+
rubocop (~> 1.5.2)
485+
rubocop-rails_config (~> 1.1)
467486
ruby-kafka (~> 0.7.10)
468487
ruby-prof (~> 0.12.2)
469488
sass-rails (~> 5.0)

config/environments/production.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
9595
# the I18n.default_locale when a translation cannot be found).
96-
config.i18n.fallbacks = true
96+
config.i18n.fallbacks = [I18n.default_locale]
9797

9898
# Send deprecation notices to registered listeners.
9999
config.active_support.deprecation = :notify

0 commit comments

Comments
 (0)