Skip to content

Commit

Permalink
Chore: Update to the most recent config files
Browse files Browse the repository at this point in the history
  • Loading branch information
jfelchner committed Dec 15, 2019
1 parent cb29e50 commit 0e53231
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 34 deletions.
9 changes: 6 additions & 3 deletions .overcommit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,9 @@ PreCommit:
FileSize:
enabled: true
size_limit_bytes: 1_000_000
exclude:
- 'db/structure.sql'
- 'db/schema.rb'

FixMe:
enabled: true
Expand Down Expand Up @@ -481,7 +484,7 @@ PostCheckout:
enabled: true

GitLfs:
enabled: true
enabled: false
flags:
- 'post-checkout'

Expand Down Expand Up @@ -509,7 +512,7 @@ PostCommit:
enabled: false

GitLfs:
enabled: true
enabled: false
flags:
- 'post-commit'

Expand Down Expand Up @@ -537,7 +540,7 @@ PostMerge:
enabled: false

GitLfs:
enabled: true
enabled: false
flags:
- 'post-merge'

Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
inherit_from:
- '.rubocop_core.yml'
- '.rubocop_performance.yml'
- '.rubocop_rails.yml'
- '.rubocop_rspec.yml'
- '.rubocop_local.yml'

Expand Down
59 changes: 36 additions & 23 deletions .rubocop_core.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Last updated to rubocop 0.71.0
# Last updated to rubocop 0.76.0

AllCops:
Include:
Expand Down Expand Up @@ -105,6 +105,9 @@ Gemspec/OrderedDependencies:
Gemspec/RequiredRubyVersion:
Enabled: true

Gemspec/RubyVersionGlobalsUsage:
Enabled: true

################################################################################
# LAYOUT
################################################################################
Expand Down Expand Up @@ -207,8 +210,6 @@ Layout/ClosingHeredocIndentation:

Layout/ClosingParenthesisIndentation:
Enabled: true
Exclude:
- '**/spec/**/*_spec.rb'

Layout/CommentIndentation:
Enabled: true
Expand Down Expand Up @@ -336,8 +337,6 @@ Layout/IndentFirstArgument:
Enabled: true
EnforcedStyle: 'consistent_relative_to_receiver'
IndentationWidth: ~
Exclude:
- '**/spec/**/*_spec.rb'

Layout/IndentFirstArrayElement:
Enabled: true
Expand Down Expand Up @@ -387,9 +386,8 @@ Layout/MultilineHashBraceLayout:
Layout/MultilineHashKeyLineBreaks:
Enabled: true

# https://github.com/rubocop-hq/rubocop/issues/6936
Layout/MultilineMethodArgumentLineBreaks:
Enabled: false
Enabled: true
Exclude:
- 'Gemfile'
- 'config/routes.rb'
Expand Down Expand Up @@ -682,6 +680,9 @@ Lint/SafeNavigationWithEmpty:
Lint/ScriptPermission:
Enabled: true

Lint/SendWithMixinArgument:
Enabled: true

Lint/ShadowedArgument:
Enabled: true
IgnoreImplicitReferences: false
Expand All @@ -704,16 +705,16 @@ Lint/UnderscorePrefixedVariableName:
Lint/UnifiedInteger:
Enabled: true

Lint/UnneededCopDisableDirective:
Lint/RedundantCopDisableDirective:
Enabled: true

Lint/UnneededCopEnableDirective:
Lint/RedundantCopEnableDirective:
Enabled: true

Lint/UnneededRequireStatement:
Lint/RedundantRequireStatement:
Enabled: true

Lint/UnneededSplatExpansion:
Lint/RedundantSplatExpansion:
Enabled: true

Lint/UnreachableCode:
Expand Down Expand Up @@ -843,6 +844,7 @@ Metrics/LineLength:
- "^\\s+expect\\([^\\)]+\\)+\\.(not_)?to\\s+[^\\s]+\\s+'[^']+'$" # RSpec expectation line for a single-quoted string
- "^\\s+expect\\([^\\)]+\\)+\\.(not_)?to\\s+[^\\s]+\\s+Time\\.(new|utc).*" # RSpec expectation line for a Time
- "^\\s+expect\\([^\\)]+\\)+\\.(not_)?to\\s+[^\\s]+\\s+\\\"[^\\\"]+\\\"$" # RSpec expectation line for a double-quoted string
- "^\\s+expect\\([^\\)]+\\)+\\.(not_)?to\\s+match\\(/[^/]+/\\)$" # RSpec expectation line for a regex
- "^\\s+return\\s+.*(if|unless)" # Short circuiting returns
- '^\s*((private|public|protected)\s+)?def\s+[\w\._]+\(?' # Method definitions
- '^\s+belongs_to\s+.*' # Rails belongs_to relationships
Expand Down Expand Up @@ -938,6 +940,7 @@ Naming/MemoizedInstanceVariableName:
Naming/MethodName:
Enabled: true
EnforcedStyle: 'snake_case'
IgnoredPatterns: []

Naming/PredicateName:
Enabled: true
Expand Down Expand Up @@ -982,6 +985,7 @@ Naming/UncommunicativeMethodParamName:
- 'io'
- 'ip'
- 'on'
- 'os'
- 'to'
ForbiddenNames: []

Expand Down Expand Up @@ -1131,7 +1135,8 @@ Style/ConditionalAssignment:
SingleLineConditionsOnly: false

Style/ConstantVisibility:
Enabled: true
# This seems broken
Enabled: false

Style/Copyright:
# Copyrights at the Top of Files are Noisy
Expand Down Expand Up @@ -1194,6 +1199,10 @@ Style/EvalWithLocation:
Style/EvenOdd:
Enabled: true

Style/FloatDivision:
Enabled: true
EnforcedStyle: 'right_coerce'

Style/For:
Enabled: true
EnforcedStyle: 'each'
Expand Down Expand Up @@ -1229,9 +1238,11 @@ Style/IdenticalConditionalBranches:

Style/IfInsideElse:
Enabled: true
AllowIfModifier: false

Style/IfUnlessModifier:
Enabled: true
# Disabled Until https://github.com/rubocop-hq/rubocop/issues/3534 Is Addressed
Enabled: false
Exclude:
- '**/config/initializers/*.rb'

Expand Down Expand Up @@ -1294,13 +1305,14 @@ Style/MethodCalledOnDoEndBlock:
Style/MethodCallWithArgsParentheses:
# Would Require a *lot* of Effort Adding Ignored Methods
Enabled: false
AllowParenthesesInMultilineCall: true
AllowParenthesesInChaining: true
AllowParenthesesInCamelCaseMethod: true
AllowParenthesesInChaining: true
AllowParenthesesInMultilineCall: true
IgnoreMacros: true
IncludedMacros: []
IgnoredMethods:
- 'puts'
IgnoredPatterns: []
IncludedMacros: []

Style/MethodCallWithoutArgsParentheses:
Enabled: true
Expand Down Expand Up @@ -1364,6 +1376,9 @@ Style/MultilineMethodSignature:
Style/MultilineTernaryOperator:
Enabled: true

Style/MultilineWhenThen:
Enabled: true

Style/MultipleComparison:
Enabled: true

Expand Down Expand Up @@ -1435,10 +1450,8 @@ Style/NumericLiterals:

Style/NumericPredicate:
Enabled: true
EnforcedStyle: 'predicate'
EnforcedStyle: 'comparison'
IgnoredMethods: []
Exclude:
- '**/spec/**/*_spec.rb'

Style/OneLineConditional:
Enabled: true
Expand Down Expand Up @@ -1676,16 +1689,16 @@ Style/TrivialAccessors:
Style/UnlessElse:
Enabled: true

Style/UnneededCapitalW:
Style/RedundantCapitalW:
Enabled: true

Style/UnneededCondition:
Style/RedundantCondition:
Enabled: true

Style/UnneededInterpolation:
Style/RedundantInterpolation:
Enabled: true

Style/UnneededPercentQ:
Style/RedundantPercentQ:
Enabled: true

Style/UnpackFirst:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_performance.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Last updated to 1.3.0
# Last updated to 1.5.0

require:
- 'rubocop-performance'
Expand Down
16 changes: 14 additions & 2 deletions .rubocop_rspec.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Last updated to 1.33.0
# Last updated to 1.36.0

require:
- 'rubocop-rspec'
Expand Down Expand Up @@ -48,6 +48,9 @@ RSpec/BeforeAfterAll:
- 'spec/rails_helper.rb'
- 'spec/support/**/*.rb'

RSpec/ContextMethod:
Enabled: true

RSpec/ContextWording:
Enabled: true
Prefixes:
Expand Down Expand Up @@ -83,6 +86,10 @@ RSpec/EmptyExampleGroup:
Enabled: false
CustomIncludeMethods: []

RSpec/EmptyLineAfterExample:
Enabled: true
AllowConsecutiveOneLiners: true

RSpec/EmptyLineAfterExampleGroup:
Enabled: true

Expand Down Expand Up @@ -141,6 +148,9 @@ RSpec/HookArgument:
RSpec/HooksBeforeExamples:
Enabled: true

RSpec/ImplicitBlockExpectation:
Enabled: true

RSpec/ImplicitExpect:
Enabled: true
EnforcedStyle: 'is_expected'
Expand Down Expand Up @@ -168,6 +178,9 @@ RSpec/IteratedExpectation:
RSpec/LeadingSubject:
Enabled: true

RSpec/LeakyConstantDeclaration:
Enabled: true

RSpec/LetBeforeExamples:
Enabled: true

Expand All @@ -193,7 +206,6 @@ RSpec/MultipleDescribes:

RSpec/MultipleExpectations:
Enabled: false
AggregateFailuresByDefault: true
Max: 5

RSpec/MultipleSubjects:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.3
2.6.5
8 changes: 5 additions & 3 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by opening an issue or contacting one or more of the project
maintainers.

This Code of Conduct is adapted from the [Contributor
Covenant](http://contributor-covenant.org), version 1.2.0, available at
[http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
This Code of Conduct is adapted from the [Contributor Covenant][1], version
1.2.0, available at [here][2].

[1]: http://contributor-covenant.org
[2]: http://contributor-covenant.org/version/1/2/0/
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2010-2016 The Kompanee, Ltd
Copyright (c) 2010-2019 The Kompanee, Ltd

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit 0e53231

Please sign in to comment.