Skip to content

Commit

Permalink
Update config
Browse files Browse the repository at this point in the history
  • Loading branch information
tjwp committed Jul 2, 2021
1 parent 4c3db06 commit e66d106
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 23 deletions.
24 changes: 2 additions & 22 deletions rubocop.yml
Expand Up @@ -338,25 +338,10 @@ Naming/HeredocDelimiterNaming:

Naming/InclusiveLanguage:
Enabled: true
CheckIdentifiers: true
CheckConstants: true
CheckVariables: true
# CheckStrings is false in the rubocop defaults
CheckStrings: true
CheckSymbols: true
CheckComments: true
CheckFilepaths: true
FlaggedTerms:
whitelist:
Regex: !ruby/regexp '/white[-_\s]?list/'
Suggestions:
- allowlist
- permit
blacklist:
Regex: !ruby/regexp '/black[-_\s]?list/'
Suggestions:
- denylist
- block
AllowedRegex:
- 'web_console.whitelisted_ips'
master:
Suggestions:
- primary
Expand All @@ -365,11 +350,6 @@ Naming/InclusiveLanguage:
- !ruby/regexp '/master[_\s\.]key/' # Rails master key
- 'blob/master/'
- 'origin/master'
slave:
Suggestions:
- replica
- secondary
- follower

Naming/MemoizedInstanceVariableName:
Enabled: false
Expand Down
50 changes: 49 additions & 1 deletion test/fixtures/full_config.yml
Expand Up @@ -595,6 +595,16 @@ Layout/LeadingEmptyLines:
Enabled: false
VersionAdded: '0.57'
VersionChanged: '0.77'
Layout/LineEndStringConcatenationIndentation:
Description: Checks the indentation of the next line after a line that ends with
a string literal and a backslash.
Enabled: pending
VersionAdded: '1.18'
EnforcedStyle: aligned
SupportedStyles:
- aligned
- indented
IndentationWidth:
Layout/LineLength:
Description: Checks that line length does not exceed the configured limit.
StyleGuide: "#max-line-length"
Expand Down Expand Up @@ -1845,6 +1855,43 @@ Naming/HeredocDelimiterNaming:
VersionAdded: '0.50'
ForbiddenDelimiters:
- !ruby/regexp /(^|\s)(EO[A-Z]{1}|END)(\s|$)/
Naming/InclusiveLanguage:
Description: Recommend the use of inclusive language instead of problematic terms.
Enabled: true
VersionAdded: '1.18'
CheckIdentifiers: true
CheckConstants: true
CheckVariables: true
CheckStrings: false
CheckSymbols: true
CheckComments: true
CheckFilepaths: true
FlaggedTerms:
whitelist:
Regex: !ruby/regexp /white[-_\s]?list/
Suggestions:
- allowlist
- permit
AllowedRegex:
- web_console.whitelisted_ips
blacklist:
Regex: !ruby/regexp /black[-_\s]?list/
Suggestions:
- denylist
- block
slave:
Suggestions:
- replica
- secondary
- follower
master:
Suggestions:
- primary
- leader
AllowedRegex:
- !ruby/regexp /master[_\s\.]key/
- blob/master/
- origin/master
Naming/MemoizedInstanceVariableName:
Description: Memoized method name should match memo instance variable name.
Enabled: false
Expand Down Expand Up @@ -3403,7 +3450,8 @@ Style/StringConcatenation:
Enabled: false
Safe: false
VersionAdded: '0.89'
VersionChanged: '1.6'
VersionChanged: '1.18'
Mode: aggressive
Style/StringHashKeys:
Description: Prefer symbols instead of strings as hash keys.
StyleGuide: "#symbols-as-keys"
Expand Down

0 comments on commit e66d106

Please sign in to comment.