Skip to content

Commit

Permalink
Merge pull request #8 from alphagov/fix-rubocop-version-specificity
Browse files Browse the repository at this point in the history
Fix RuboCop version specificity
  • Loading branch information
theseanything authored Nov 28, 2019
2 parents 6d99b5f + afeb7b4 commit 3bbb6a4
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 2.0.0

* Use specific version for RuboCop
* Update RuboCop to 0.77

# 1.0.0

* Allow importing of Ruby and Rails rules seperately
Expand Down
8 changes: 4 additions & 4 deletions config/gds-ruby-styleguide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Layout/TrailingWhitespace:
Enabled: true

# Supports --auto-correct
Layout/TrailingBlankLines:
Layout/TrailingEmptyLines:
Description: Checks trailing blank lines and final newline.
Enabled: true
EnforcedStyle: final_newline
Expand Down Expand Up @@ -245,7 +245,7 @@ Style/TrivialAccessors:
ExactNameMatch: true
AllowPredicates: true
AllowDSLWriters: false
Whitelist:
AllowedMethod:
- to_ary
- to_a
- to_c
Expand Down Expand Up @@ -282,7 +282,7 @@ Lint/RescueException:
## Collections

# Supports --auto-correct
Layout/AlignArray:
Layout/ArrayAlignment:
Description: Align the elements of an array literal if they span more than one line.
Enabled: true

Expand Down Expand Up @@ -323,7 +323,7 @@ Layout/MultilineMethodCallIndentation:
## Strings

# Supports --auto-correct
Lint/StringConversionInInterpolation:
Lint/RedundantStringCoercion:
Description: Checks for Object#to_s usage in string interpolation.
Enabled: true

Expand Down
2 changes: 1 addition & 1 deletion config/other-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Security/Eval:
Description: 'The use of eval represents a serious security risk.'
Enabled: true

Lint/HandleExceptions:
Lint/SuppressedException:
Description: "Don't suppress exception."
Enabled: true

Expand Down
8 changes: 4 additions & 4 deletions config/other-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ Style/Alias:
Description: 'Use alias_method instead of alias.'
Enabled: false

Layout/AlignHash:
Layout/HashAlignment:
Description: >-
Align the elements of a hash literal if they span more than
one line.
Enabled: false

Layout/AlignParameters:
Layout/ParameterAlignment:
Description: >-
Align the parameters of a method call if they span more
than one line.
Expand Down Expand Up @@ -168,13 +168,13 @@ Style/IfWithSemicolon:
Description: 'Never use if x; .... Use the ternary operator instead.'
Enabled: false

Layout/IndentFirstArrayElement:
Layout/FirstArrayElementIndentation:
Description: >-
Checks the indentation of the first element in an array
literal.
Enabled: false

Layout/IndentFirstHashElement:
Layout/FirstHashElementIndentation:
Description: 'Checks the indentation of the first key in a hash literal.'
Enabled: false

Expand Down
4 changes: 2 additions & 2 deletions rubocop-govuk.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "rubocop-govuk"
spec.version = "1.0.0"
spec.version = "2.0.0"
spec.authors = ["Government Digital Service"]
spec.email = ["govuk-dev@digital.cabinet-office.gov.uk"]

Expand All @@ -15,7 +15,7 @@ Gem::Specification.new do |spec|

spec.add_development_dependency "rake", "~> 12.0"

spec.add_dependency "rubocop", "~> 0.76"
spec.add_dependency "rubocop", "0.77"
spec.add_dependency "rubocop-rails", "~> 2"
spec.add_dependency "rubocop-rspec", "~> 1.28"
end

0 comments on commit 3bbb6a4

Please sign in to comment.