From 06c4789dc58b6719620ab1a344cee17618526591 Mon Sep 17 00:00:00 2001 From: Richard Monette Date: Mon, 18 Mar 2019 14:51:26 -0400 Subject: [PATCH] update Rubocop for trailing comma styles --- .rubocop.yml | 17 ++++--- .rubocop_todo.yml | 116 ++++++++++++++++++++++++++++++++++++---------- Gemfile | 2 +- 3 files changed, 103 insertions(+), 32 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index a622ef1..6a306a1 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,4 +1,6 @@ -inherit_from: ./.rubocop_todo.yml +inherit_from: + - .rubocop_todo.yml + - ./.rubocop_todo.yml AllCops: Exclude: @@ -29,7 +31,7 @@ Lint/ParenthesesAsGroupedExpression: Lint/UnusedBlockArgument: Enabled: false -Lint/EndAlignment: +Layout/EndAlignment: EnforcedStyleAlignWith: variable Lint/UnusedMethodArgument: @@ -59,7 +61,7 @@ Style/BracesAroundHashParameters: Style/NumericLiterals: Enabled: false -Layout/SpaceInsideBrackets: +Layout/SpaceInsideArrayLiteralBrackets: Enabled: false Layout/SpaceBeforeBlockBraces: @@ -71,7 +73,10 @@ Style/Documentation: Style/ClassAndModuleChildren: Enabled: false -Style/TrailingCommaInLiteral: +Style/TrailingCommaInArrayLiteral: + Enabled: false + +Style/TrailingCommaInHashLiteral: Enabled: false Layout/IndentHash: @@ -104,7 +109,7 @@ Style/SymbolLiteral: Performance/Count: Enabled: false -Style/ConstantName: +Naming/ConstantName: Enabled: false Layout/CaseIndentation: @@ -122,6 +127,6 @@ Style/TrivialAccessors: Style/WordArray: Enabled: false -Style/MethodName: +Naming/MethodName: Exclude: - 'example/server/liquid_servlet.rb' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index bd80b38..6868a7a 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,14 +1,22 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2019-02-03 21:12:39 +0530 using RuboCop version 0.49.1. +# on 2019-03-19 11:04:37 -0400 using RuboCop version 0.53.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: Include, TreatCommentsAsGroupSeparators. +# Include: **/*.gemspec +Gemspec/OrderedDependencies: + Exclude: + - 'liquid.gemspec' + # Offense count: 5 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. +# Configuration parameters: EnforcedStyle. # SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent Layout/IndentHeredoc: Exclude: @@ -17,7 +25,7 @@ Layout/IndentHeredoc: # Offense count: 6 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. +# Configuration parameters: EnforcedStyle. # SupportedStyles: symmetrical, new_line, same_line Layout/MultilineMethodCallBraceLayout: Exclude: @@ -26,38 +34,65 @@ Layout/MultilineMethodCallBraceLayout: # Offense count: 2 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. +# Configuration parameters: EnforcedStyle. # SupportedStyles: runtime_error, standard_error Lint/InheritException: Exclude: - 'lib/liquid/interrupts.rb' -# Offense count: 51 +# Offense count: 1 +# Configuration parameters: CheckForMethodsWithNoSideEffects. +Lint/Void: + Exclude: + - 'lib/liquid/parse_context.rb' + +# Offense count: 54 Metrics/AbcSize: Max: 56 -# Offense count: 11 +# Offense count: 12 Metrics/CyclomaticComplexity: Max: 12 -# Offense count: 639 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. -# URISchemes: http, https -Metrics/LineLength: - Max: 294 - -# Offense count: 108 +# Offense count: 112 # Configuration parameters: CountComments. Metrics/MethodLength: Max: 37 -# Offense count: 7 +# Offense count: 8 Metrics/PerceivedComplexity: Max: 11 +# Offense count: 52 +# Configuration parameters: Blacklist. +# Blacklist: END, (?-mix:EO[A-Z]{1}) +Naming/HeredocDelimiterNaming: + Exclude: + - 'test/integration/assign_test.rb' + - 'test/integration/capture_test.rb' + - 'test/integration/trim_mode_test.rb' + +# Offense count: 23 +# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames. +# AllowedNames: io, id +Naming/UncommunicativeMethodParamName: + Exclude: + - 'example/server/example_servlet.rb' + - 'lib/liquid/condition.rb' + - 'lib/liquid/context.rb' + - 'lib/liquid/standardfilters.rb' + - 'lib/liquid/tags/if.rb' + - 'lib/liquid/utils.rb' + - 'lib/liquid/variable.rb' + - 'test/integration/filter_test.rb' + - 'test/integration/standard_filter_test.rb' + - 'test/integration/tags/for_tag_test.rb' + - 'test/integration/template_test.rb' + - 'test/unit/condition_unit_test.rb' + # Offense count: 10 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. +# Configuration parameters: EnforcedStyle. # SupportedStyles: prefer_alias, prefer_alias_method Style/Alias: Exclude: @@ -69,14 +104,23 @@ Style/Alias: - 'lib/liquid/tags/include.rb' - 'lib/liquid/variable.rb' +# Offense count: 22 +Style/CommentedKeyword: + Enabled: false + # Offense count: 1 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions. +# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions. # SupportedStyles: assign_to_condition, assign_inside_condition Style/ConditionalAssignment: Exclude: - 'lib/liquid/errors.rb' +# Offense count: 1 +Style/DateTime: + Exclude: + - 'test/unit/context_unit_test.rb' + # Offense count: 2 # Cop supports --auto-correct. Style/EmptyCaseCondition: @@ -86,7 +130,7 @@ Style/EmptyCaseCondition: # Offense count: 5 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles. +# Configuration parameters: EnforcedStyle. # SupportedStyles: compact, expanded Style/EmptyMethod: Exclude: @@ -96,11 +140,28 @@ Style/EmptyMethod: - 'test/integration/tags/include_tag_test.rb' - 'test/unit/context_unit_test.rb' +# Offense count: 3 +# Cop supports --auto-correct. +Style/Encoding: + Exclude: + - 'lib/liquid/version.rb' + - 'liquid.gemspec' + - 'test/integration/standard_filter_test.rb' + # Offense count: 2 -# Configuration parameters: SupportedStyles. -# SupportedStyles: annotated, template +# Cop supports --auto-correct. +Style/ExpandPathArguments: + Exclude: + - 'Rakefile' + - 'liquid.gemspec' + +# Offense count: 7 +# Configuration parameters: EnforcedStyle. +# SupportedStyles: annotated, template, unannotated Style/FormatStringToken: - EnforcedStyle: template + Exclude: + - 'test/integration/filter_test.rb' + - 'test/integration/hash_ordering_test.rb' # Offense count: 14 # Configuration parameters: MinBodyLength. @@ -121,7 +182,7 @@ Style/GuardClause: # Offense count: 1 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles. +# Configuration parameters: EnforcedStyle, MinBodyLength. # SupportedStyles: skip_modifier_ifs, always Style/Next: Exclude: @@ -129,7 +190,7 @@ Style/Next: # Offense count: 4 # Cop supports --auto-correct. -# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles. +# Configuration parameters: AutoCorrect, EnforcedStyle. # SupportedStyles: predicate, comparison Style/NumericPredicate: Exclude: @@ -166,14 +227,14 @@ Style/Semicolon: # Offense count: 7 # Cop supports --auto-correct. -# Configuration parameters: MinSize, SupportedStyles. +# Configuration parameters: MinSize. # SupportedStyles: percent, brackets Style/SymbolArray: EnforcedStyle: brackets # Offense count: 2 # Cop supports --auto-correct. -# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment. +# Configuration parameters: EnforcedStyle, AllowSafeAssignment. # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex Style/TernaryParentheses: Exclude: @@ -188,7 +249,12 @@ Style/UnneededPercentQ: # Offense count: 1 # Cop supports --auto-correct. -# Configuration parameters: MaxLineLength. Style/WhileUntilModifier: Exclude: - 'lib/liquid/tags/case.rb' + +# Offense count: 640 +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# URISchemes: http, https +Metrics/LineLength: + Max: 294 diff --git a/Gemfile b/Gemfile index bdeefac..6e3136d 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ group :benchmark, :test do end group :test do - gem 'rubocop', '~> 0.49.0' + gem 'rubocop', '~> 0.53.0' platform :mri do gem 'liquid-c', github: 'Shopify/liquid-c', ref: '9168659de45d6d576fce30c735f857e597fa26f6'