From a9e55c7e60feaf1aa9c45d2d400709a31b59520c Mon Sep 17 00:00:00 2001 From: Kylo Ginsberg Date: Thu, 1 Sep 2016 12:35:00 -0700 Subject: [PATCH] (maint) Enable rubocop tests to pass again * Pin rubocop to enable spec support for ruby < 2.0 * Add 'Enabled: false' for a number of new rubocop tests. --- .rubocop.yml | 99 ++++++++++++++++++++++++++++++++++++++++++---------- Gemfile | 2 +- 2 files changed, 82 insertions(+), 19 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 8466b96..56eb8da 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -152,9 +152,6 @@ Style/AsciiComments: Style/Attr: Enabled: false -Style/Blocks: - Enabled: false - Style/BracesAroundHashParameters: Enabled: false @@ -219,7 +216,7 @@ Style/SpaceInsideParens: Style/LeadingCommentSpace: Enabled: false -Style/SingleSpaceBeforeFirstArg: +Style/SpaceBeforeFirstArg: Enabled: false Style/SpaceAfterColon: @@ -228,7 +225,7 @@ Style/SpaceAfterColon: Style/SpaceAfterComma: Enabled: false -Style/SpaceAfterControlKeyword: +Style/SpaceAroundKeyword: Enabled: false Style/SpaceAfterMethodName: @@ -276,9 +273,6 @@ Style/Documentation: Style/DefWithParentheses: Enabled: false -Style/DeprecatedHashMethods: - Enabled: false - Style/DotPosition: Enabled: false @@ -310,9 +304,6 @@ Style/EmptyLines: Style/EmptyLinesAroundAccessModifier: Enabled: false -Style/EmptyLinesAroundBody: - Enabled: false - Style/EmptyLiteral: Enabled: false @@ -334,7 +325,10 @@ Style/TrailingWhitespace: Style/StringLiterals: Enabled: false -Style/TrailingComma: +Style/TrailingCommaInLiteral: + Enabled: false + +Style/TrailingCommaInArguments: Enabled: false Style/GlobalVars: @@ -373,9 +367,6 @@ Style/TrivialAccessors: Style/UnlessElse: Enabled: false -Style/UnneededPercentX: - Enabled: false - Style/VariableInterpolation: Enabled: false @@ -478,9 +469,6 @@ Metrics/ParameterLists: Lint/RequireParentheses: Enabled: false -Lint/SpaceBeforeFirstArg: - Enabled: false - Style/ModuleFunction: Enabled: false @@ -492,3 +480,78 @@ Style/IfWithSemicolon: Style/Encoding: Enabled: false + +Style/MultilineOperationIndentation: + Enabled: false + +Style/BlockDelimiters: + Enabled: false + +Style/ExtraSpacing: + Enabled: false + +Style/MultilineHashBraceLayout: + Enabled: false + +Style/MultilineMethodCallBraceLayout: + Enabled: false + +Style/MultilineBlockLayout: + Enabled: false + +Lint/UselessAssignment: + Enabled: false + +Lint/DuplicateMethods: + Enabled: false + +Style/EmptyLinesAroundMethodBody: + Enabled: false + +Style/EmptyLinesAroundModuleBody: + Enabled: false + +Style/EmptyLinesAroundBlockBody: + Enabled: false + +Style/EmptyLinesAroundClassBody: + Enabled: false + +Style/UnneededInterpolation: + Enabled: false + +Style/SymbolProc: + Enabled: false + +Style/ConditionalAssignment: + Enabled: false + +Style/ZeroLengthPredicate: + Enabled: false + +Style/TrailingUnderscoreVariable: + Enabled: false + +Style/StringLiteralsInInterpolation: + Enabled: false + +Style/RedundantParentheses: + Enabled: false + +Style/MutableConstant: + Enabled: false + +Performance/RedundantMatch: + Enabled: false + +Performance/FlatMap: + Enabled: false + +Performance/StringReplacement: + Enabled: false + +Metrics/AbcSize: + Enabled: false + +Metrics/PerceivedComplexity: + Enabled: false diff --git a/Gemfile b/Gemfile index ea00719..bb48c59 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ group :test do gem 'mocha' gem 'puppetlabs_spec_helper' gem 'serverspec' - gem 'rubocop' + gem 'rubocop', '~> 0.41.0' end group :acceptance do