Bump rubocop
Use old style for Style/PercentLiteralDelimiters for now. Maybe we can change this in the future, because the ruby style guide suggests to use `[]`. See: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
This commit is contained in:
parent
46a67f4ffa
commit
3eab161119
3 changed files with 13 additions and 8 deletions
15
.rubocop.yml
15
.rubocop.yml
|
|
@ -189,6 +189,16 @@ Style/EmptyLineBetweenDefs:
|
||||||
Style/NumericPredicate:
|
Style/NumericPredicate:
|
||||||
EnforcedStyle: comparison
|
EnforcedStyle: comparison
|
||||||
|
|
||||||
|
# Old defaults from rubocop < 0.48.1 (Maybe change this in the future?)
|
||||||
|
Style/PercentLiteralDelimiters:
|
||||||
|
PreferredDelimiters:
|
||||||
|
default: '()'
|
||||||
|
'%i': '()'
|
||||||
|
'%I': '()'
|
||||||
|
'%r': '{}'
|
||||||
|
'%w': '()'
|
||||||
|
'%W': '()'
|
||||||
|
|
||||||
### backward compatibility
|
### backward compatibility
|
||||||
|
|
||||||
# only with ruby >= 2.3
|
# only with ruby >= 2.3
|
||||||
|
|
@ -207,8 +217,3 @@ Performance/RegexpMatch:
|
||||||
Rails/HttpPositionalArguments:
|
Rails/HttpPositionalArguments:
|
||||||
Exclude:
|
Exclude:
|
||||||
- "spec/controllers/diaspora_federation/rails4_spec.rb"
|
- "spec/controllers/diaspora_federation/rails4_spec.rb"
|
||||||
|
|
||||||
# remove with next rubocop update, see https://github.com/bbatsov/rubocop/issues/4172
|
|
||||||
Style/MixinGrouping:
|
|
||||||
Exclude:
|
|
||||||
- "spec/**/*"
|
|
||||||
|
|
|
||||||
2
Gemfile
2
Gemfile
|
|
@ -19,7 +19,7 @@ group :development do
|
||||||
# code style
|
# code style
|
||||||
gem "pronto", "0.8.2", require: false
|
gem "pronto", "0.8.2", require: false
|
||||||
gem "pronto-rubocop", "0.8.1", require: false
|
gem "pronto-rubocop", "0.8.1", require: false
|
||||||
gem "rubocop", "0.48.0", require: false
|
gem "rubocop", "0.48.1", require: false
|
||||||
|
|
||||||
# automatic test runs
|
# automatic test runs
|
||||||
gem "guard-rspec", require: false
|
gem "guard-rspec", require: false
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,7 @@ GEM
|
||||||
rspec-mocks (~> 3.5.0)
|
rspec-mocks (~> 3.5.0)
|
||||||
rspec-support (~> 3.5.0)
|
rspec-support (~> 3.5.0)
|
||||||
rspec-support (3.5.0)
|
rspec-support (3.5.0)
|
||||||
rubocop (0.48.0)
|
rubocop (0.48.1)
|
||||||
parser (>= 2.3.3.1, < 3.0)
|
parser (>= 2.3.3.1, < 3.0)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
|
|
@ -253,7 +253,7 @@ DEPENDENCIES
|
||||||
rspec-collection_matchers (~> 1.1.2)
|
rspec-collection_matchers (~> 1.1.2)
|
||||||
rspec-json_expectations (~> 2.1)
|
rspec-json_expectations (~> 2.1)
|
||||||
rspec-rails (~> 3.5.1)
|
rspec-rails (~> 3.5.1)
|
||||||
rubocop (= 0.48.0)
|
rubocop (= 0.48.1)
|
||||||
simplecov (= 0.13.0)
|
simplecov (= 0.13.0)
|
||||||
simplecov-rcov (= 0.2.3)
|
simplecov-rcov (= 0.2.3)
|
||||||
spring
|
spring
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue