nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update rubocop to 0.80.1 and rubocop-rails to 2.4.1

Browse source
This commit is contained in:
Jonne Haß 2020-03-20 15:10:33 +01:00
parent 9b6bc59854
commit 813e6d4781
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.rubocop.yml
View file

@ -12,7 +12,7 @@ Rails/HttpPositionalArguments:
Enabled: false Enabled: false
# Commonly used screens these days easily fit more than 80 characters. # Commonly used screens these days easily fit more than 80 characters.
Metrics/LineLength: Layout/LineLength:
Max: 120 Max: 120
# Too short methods lead to extraction of single-use methods, which can make # Too short methods lead to extraction of single-use methods, which can make
@ -62,7 +62,7 @@ Style/SymbolArray:
Enabled: true Enabled: true
# Most readable form. # Most readable form.
Layout/AlignHash: Layout/HashAlignment:
EnforcedHashRocketStyle: table EnforcedHashRocketStyle: table
EnforcedColonStyle: table EnforcedColonStyle: table
@ -84,7 +84,6 @@ Style/CollectionMethods:
# inject seems more common in the community. # inject seems more common in the community.
reduce: "inject" reduce: "inject"
# Either allow this style or don't. Marking it as safe with parenthesis # Either allow this style or don't. Marking it as safe with parenthesis
# is silly. Let's try to live without them for now. # is silly. Let's try to live without them for now.
Style/ParenthesesAroundCondition: Style/ParenthesesAroundCondition:
@ -111,7 +110,7 @@ Style/SignalException:
# Suppressing exceptions can be perfectly fine, and be it to avoid to # Suppressing exceptions can be perfectly fine, and be it to avoid to
# explicitly type nil into the rescue since that's what you want to return, # explicitly type nil into the rescue since that's what you want to return,
# or suppressing LoadError for optional dependencies # or suppressing LoadError for optional dependencies
Lint/HandleExceptions: Lint/SuppressedException:
Enabled: false Enabled: false
Layout/SpaceInsideBlockBraces: Layout/SpaceInsideBlockBraces:
@ -174,3 +173,13 @@ Style/NumericPredicate:
# Reset some HoundCI changes back to Rubocop defaults # Reset some HoundCI changes back to Rubocop defaults
Layout/DotPosition: Layout/DotPosition:
EnforcedStyle: leading EnforcedStyle: leading
# Not enabled by default but good
Style/HashEachMethods:
Enabled: true
# TODO: Enable with Ruby 2.5
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: false

4
Gemfile
View file

@ -254,8 +254,8 @@ group :development do
gem "pronto-haml", "0.10.0", require: false gem "pronto-haml", "0.10.0", require: false
gem "pronto-rubocop", "0.10.0", require: false gem "pronto-rubocop", "0.10.0", require: false
gem "pronto-scss", "0.10.0", require: false gem "pronto-scss", "0.10.0", require: false
gem "rubocop", "0.72.0", require: false gem "rubocop", "0.80.1", require: false
gem "rubocop-rails", "2.1.0", require: false gem "rubocop-rails", "2.4.1", require: false
# Preloading environment # Preloading environment

12
Gemfile.lock
View file

@ -618,6 +618,7 @@ GEM
responders (2.4.1) responders (2.4.1)
actionpack (>= 4.2.0, < 6.0) actionpack (>= 4.2.0, < 6.0)
railties (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0)
rexml (3.2.4)
rotp (2.1.2) rotp (2.1.2)
rqrcode (0.10.1) rqrcode (0.10.1)
chunky_png (~> 1.0) chunky_png (~> 1.0)
@ -643,14 +644,15 @@ GEM
rspec-mocks (~> 3.9.0) rspec-mocks (~> 3.9.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.9.0)
rspec-support (3.9.2) rspec-support (3.9.2)
rubocop (0.72.0) rubocop (0.80.1)
jaro_winkler (~> 1.5.1) jaro_winkler (~> 1.5.1)
parallel (~> 1.10) parallel (~> 1.10)
parser (>= 2.6) parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0) rainbow (>= 2.2.2, < 4.0)
rexml
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7) unicode-display_width (>= 1.4.0, < 1.7)
rubocop-rails (2.1.0) rubocop-rails (2.4.1)
rack (>= 1.1) rack (>= 1.1)
rubocop (>= 0.72.0) rubocop (>= 0.72.0)
ruby-oembed (0.12.0) ruby-oembed (0.12.0)
@ -906,8 +908,8 @@ DEPENDENCIES
rqrcode (= 0.10.1) rqrcode (= 0.10.1)
rspec-json_expectations (~> 2.1) rspec-json_expectations (~> 2.1)
rspec-rails (= 3.9.1) rspec-rails (= 3.9.1)
rubocop (= 0.72.0) rubocop (= 0.80.1)
rubocop-rails (= 2.1.0) rubocop-rails (= 2.4.1)
ruby-oembed (= 0.12.0) ruby-oembed (= 0.12.0)
rubyzip (= 1.3.0) rubyzip (= 1.3.0)
sass-rails (= 5.0.7) sass-rails (= 5.0.7)