rubocop-govuk 0.1.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea13069e9462a76562c091c00c17818e93821431d3fc8140510ca2b88b0d1976
-  data.tar.gz: 5de135b58161e61cf90723a7e74ed7f97e8db68bebc16978362919a1e35913c3
+  metadata.gz: c985f0a7349aa6c850b6bd513842493da5f81e61591eedcf9cf4ce9d380fa8b9
+  data.tar.gz: ef566e0f80e0370ebec6e7fc1ee067d4fc14c098197ea9b0785b9fc100c196bc
 SHA512:
-  metadata.gz: b302840f07cdda1742e5372c82d0c3ce677bc4a2bbbb97c032e87cb131e50a5d8e025fa48692695df90a28d9ef95e90ecb18a70fed2fef00e9a5470ff4a6a5d5
-  data.tar.gz: cbc2fa6b2c0540cb4e2dacfe23af188ad02e45f21ffd47248544be59661a74099d08191da1fb525312c3f57b2a806836fe5e77a8586f00c161f8d925d8783bf2
+  metadata.gz: e5a787cce9b118ce1198c3d22ab475219098a9f52f6199777ca26278951ea7e5b975b26ac4a344f7c2f0a67f187d3794358cfc520600fdf0512fadbaf6d5a7ca
+  data.tar.gz: f6bdfd64f7c72676934547775707132425480acebb0fcc71174830eb29d1c170fc5e4a3e42d548f5916a9bd900db3e36f4e02326d9ae9f99b7dfe62bf72a7245

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+# 3.1.0
+
+* Fix deprecation warning for AllCops/Excludes => AllCops/Exclude (#17)
+* Exclude `config.ru` from linter checks (#18)
+
+# 3.0.0
+
+* Update Rubocop to 0.80.1
+  * This deletes the Style/BracesAroundHashParameters cop for future
+    Ruby 3 compatibility.
+* Exclude `bin` directory and `db/schema.rb` from linter checks (#14)
+
+# 2.0.0
+
+* Use specific version for RuboCop
+* Update RuboCop to 0.77
+
+# 1.0.0
+
+* Allow importing of Ruby and Rails rules seperately
+
+# 0.2.0
+
+* Disable the Style/FormatStringToken cop
+
 # 0.1.0
 
 * Initial release with previous work from `govuk-lint`

data/README.md

@@ -5,16 +5,29 @@ This repository provides common RuboCop rules for use with GOV.UK Ruby projects
 ## Installation
 
 Add `rubocop-govuk` to your Gemfile and then run `bundle install`:
+
 ```ruby
 # Gemfile
 gem 'rubocop-govuk'
 ```
 
 Inherit rules from the gem by adding the following to your project's RuboCop config:
+
+```yaml
+# .rubocop.yml
+inherit_gem:
+  rubocop-govuk: 
+    - config/default.yml
+```
+
+or if you also need Rails specific rules:
+
 ```yaml
-# .rubocop
+# .rubocop.yml
 inherit_gem:
-  rubocop-govuk: config/all.yml
+  rubocop-govuk: 
+    - config/default.yml
+    - config/rails.yml
 ```
 
 ## Usage

data/config/{all.yml → default.yml}

@@ -1,4 +1,8 @@
 AllCops:
+  Exclude:
+    - 'bin/**'
+    - 'config.ru'
+
   DisplayCopNames:
     Description: 'Display cop names in offense messages'
     Enabled: true
@@ -11,12 +15,9 @@ AllCops:
     Description: 'Display style guide URLs in offense messages.'
     Enabled: true
 
-require: rubocop-rails
-
 inherit_from:
   - gds-ruby-styleguide.yml
   - other-lint.yml
-  - other-rails.yml
   - other-style.yml
   - other-metrics.yml
   - other-excludes.yml

data/config/gds-ruby-styleguide.yml

@@ -55,7 +55,7 @@ Layout/IndentationConsistency:
   Description: Keep indentation straight.
   Enabled: true
 
-Metrics/LineLength:
+Layout/LineLength:
   Description: Limit lines to 80 characters.
   Enabled: false
   Max: 80
@@ -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
@@ -245,7 +245,7 @@ Style/TrivialAccessors:
   ExactNameMatch: true
   AllowPredicates: true
   AllowDSLWriters: false
-  Whitelist:
+  AllowedMethods:
   - to_ary
   - to_a
   - to_c
@@ -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
 
@@ -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
 

data/config/other-excludes.yml

@@ -11,3 +11,6 @@ Metrics/BlockLength:
 
 Bundler/DuplicatedGem:
   Enabled: false
+
+Style/FormatStringToken:
+  Enabled: false

data/config/other-lint.yml

@@ -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
 

data/config/other-style.yml

@@ -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.
@@ -58,10 +58,6 @@ Style/BlockDelimiters:
     Prefer {...} over do...end for single-line blocks.
   Enabled: false
 
-Style/BracesAroundHashParameters:
-  Description: 'Enforce braces style inside hash parameters.'
-  Enabled: true
-
 Style/CaseEquality:
   Description: 'Avoid explicit use of the case equality operator(===).'
   Enabled: false
@@ -168,13 +164,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
 

data/config/{other-rails.yml → rails.yml}

@@ -2,8 +2,15 @@
 
 # By default Rails is switched off so this can be used by non-Rails apps,
 # this can be enabled in a local .rubocop.yml file
+
+require: rubocop-rails
+
+AllCops:
+  Exclude:
+    - 'db/schema.rb'
+
 Rails:
-  Enabled: false
+  Enabled: true
 
 Rails/ActionFilter:
   Description: 'Enforces consistent use of action filter methods.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-govuk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Government Digital Service
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: 0.80.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: 0.80.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -76,13 +76,13 @@ files:
 - CHANGELOG.md
 - LICENSE.md
 - README.md
-- config/all.yml
+- config/default.yml
 - config/gds-ruby-styleguide.yml
 - config/other-excludes.yml
 - config/other-lint.yml
 - config/other-metrics.yml
-- config/other-rails.yml
 - config/other-style.yml
+- config/rails.yml
 homepage: https://github.com/alphagov/rubocop-govuk
 licenses:
 - MIT