Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/235695
Change subject: WIP rubocop: do not run for upstream code ...................................................................... WIP rubocop: do not run for upstream code WIP because I do not know if I have excluded the correct folders. Please see related Fabricator task for details. Also updated RuboCop to the latest version and regenerated `.rubocop_todo.yml` file. Bug: T102020 Change-Id: I703e35c37cb66f4f725f1857851e2d7e42e91063 --- M .rubocop.yml M .rubocop_todo.yml M Gemfile M Gemfile.lock 4 files changed, 263 insertions(+), 143 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/95/235695/1 diff --git a/.rubocop.yml b/.rubocop.yml index 20db88e..27124bd 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,8 +4,23 @@ # https://www.mediawiki.org/wiki/Manual:Coding_conventions/Ruby#Base_configuration AllCops: - # Only enforce rules that have an entry in the style guide StyleGuideCopsOnly: true + Exclude: + # https://phabricator.wikimedia.org/T102020#1589214 + - 'modules/cdh/**/*' + - 'modules/jmxtrans/**/*' + - 'modules/kafka/**/*' + - 'modules/kafkatee/**/*' + - 'modules/mariadb/**/*' + - 'modules/nginx/**/*' + - 'modules/varnishkafka/**/*' + - 'modules/wikimetrics/**/*' + - 'modules/zookeeper/**/*' + # https://phabricator.wikimedia.org/T102020#1592844 + - 'modules/mysql/**/*' + - 'modules/stdlib/**/*' + # https://phabricator.wikimedia.org/T102020#1598160 + - 'modules/rsync/**/*' # Uncomment when lines are 100 characters or less # Metrics/LineLength: @@ -20,10 +35,8 @@ Style/SignalException: Enabled: false -# Pick one and stay consistent Style/StringLiterals: EnforcedStyle: single_quotes -# EnforcedStyle: double_quotes Style/TrivialAccessors: ExactNameMatch: true diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2169a83..c2a60b3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,65 +1,95 @@ -# This configuration was generated by `rubocop --auto-gen-config` -# on 2015-07-15 14:53:38 -0500 using RuboCop version 0.32.0. +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2015-09-03 11:44:34 +0200 using RuboCop version 0.33.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: 13 +# Offense count: 6 # Configuration parameters: AllowSafeAssignment. Lint/AssignmentInCondition: - Enabled: false + Exclude: + - 'modules/puppetmaster/files/puppetstoredconfigclean.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' + - 'modules/wmflib/lib/puppet/parser/functions/secret.rb' # Offense count: 2 Lint/HandleExceptions: - Enabled: false + Exclude: + - 'modules/trebuchet/lib/puppet/provider/package/trebuchet.rb' + - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb' + +# Offense count: 2 +Lint/RescueException: + Exclude: + - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' # Offense count: 3 -Lint/RescueException: - Enabled: false - -# Offense count: 5 # Cop supports --auto-correct. Lint/UnusedBlockArgument: - Enabled: false + Exclude: + - 'modules/base/files/monitoring/check_puppetrun' + - 'modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb' -# Offense count: 3 +# Offense count: 2 # Cop supports --auto-correct. Lint/UnusedMethodArgument: - Enabled: false + Exclude: + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' + - 'modules/wmflib/lib/hiera/mwcache.rb' -# Offense count: 15 +# Offense count: 10 Lint/UselessAssignment: - Enabled: false + Exclude: + - 'modules/base/files/monitoring/check_puppetrun' + - 'modules/ganeti/lib/facter/ganeti.rb' + - 'modules/puppet_statsd/lib/puppet/reports/statsd.rb' + - 'modules/puppetmaster/files/puppetstoredconfigclean.rb' + - 'modules/service/Rakefile' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/puppet/parser/functions/validate_array_re.rb' -# Offense count: 467 +# Offense count: 182 # Configuration parameters: AllowURI, URISchemes. Metrics/LineLength: - Max: 213 + Max: 158 -# Offense count: 3 +# Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. Style/AlignParameters: - Enabled: false + Exclude: + - 'modules/base/lib/puppet/parser/functions/pick_initscript.rb' -# Offense count: 40 +# Offense count: 12 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. Style/AndOr: - Enabled: false + Exclude: + - 'modules/base/files/monitoring/check_puppetrun' + - 'modules/base/lib/facter/lldp.rb' + - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb' + - 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb' + - 'modules/trebuchet/lib/puppet/provider/package/trebuchet.rb' + - 'modules/wmflib/lib/hiera/backend/mwyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' + - 'modules/wmflib/lib/puppet/parser/functions/os_version.rb' -# Offense count: 2 +# Offense count: 1 Style/AsciiComments: - Enabled: false + Exclude: + - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' -# Offense count: 130 +# Offense count: 58 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods. Style/BlockDelimiters: Enabled: false -# Offense count: 25 +# Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep. Style/CaseIndentation: @@ -67,38 +97,46 @@ # Offense count: 4 Style/ClassAndModuleCamelCase: - Enabled: false + Exclude: + - 'modules/wmflib/lib/hiera/backend/mwyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' # Offense count: 4 Style/ClassVars: - Enabled: false + Exclude: + - 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb' -# Offense count: 3 +# Offense count: 2 # Cop supports --auto-correct. Style/ColonMethodCall: - Enabled: false + Exclude: + - 'modules/base/lib/facter/physicalcorecount.rb' + - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' # Offense count: 2 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerBackticks. Style/CommandLiteral: - Enabled: false + Exclude: + - 'modules/apt/lib/facter/apt.rb' + - 'modules/ganeti/lib/facter/ganeti.rb' -# Offense count: 2 -# Cop supports --auto-correct. -# Configuration parameters: Keywords. -Style/CommentAnnotation: - Enabled: false - -# Offense count: 2 +# Offense count: 1 # Cop supports --auto-correct. Style/DefWithParentheses: - Enabled: false + Exclude: + - 'utils/hiera_lookup' -# Offense count: 9 +# Offense count: 8 # Cop supports --auto-correct. Style/DeprecatedHashMethods: - Enabled: false + Exclude: + - 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb' + - 'modules/wmflib/lib/puppet/parser/functions/ipresolve.rb' + - 'modules/wmflib/lib/puppet/parser/functions/os_version.rb' + - 'modules/wmflib/lib/puppet/parser/functions/ssl_ciphersuite.rb' # Offense count: 16 # Cop supports --auto-correct. @@ -107,169 +145,235 @@ Enabled: false # Offense count: 2 -Style/DoubleNegation: - Enabled: false - -# Offense count: 7 # Cop supports --auto-correct. Style/EmptyLiteral: - Enabled: false + Exclude: + - 'modules/admin/lib/puppet/parser/functions/unique_users.rb' + - 'modules/wmflib/lib/puppet/parser/functions/array_concat.rb' # Offense count: 1 # Configuration parameters: Exclude. Style/FileName: - Enabled: false + Exclude: + - 'modules/bacula/spec/defines/mysql-bpipe_spec.rb' # Offense count: 1 # Configuration parameters: EnforcedStyle, SupportedStyles. Style/For: Enabled: false -# Offense count: 96 +# Offense count: 80 # Configuration parameters: EnforcedStyle, SupportedStyles. Style/FormatString: - Enabled: false + Exclude: + - 'modules/backup/Rakefile' + - 'modules/bacula/Rakefile' + - 'modules/base/Rakefile' + - 'modules/base/lib/facter/lldp.rb' + - 'modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb' + - 'modules/install_server/Rakefile' + - 'modules/mirrors/Rakefile' + - 'modules/nrpe/Rakefile' + - 'modules/osm/Rakefile' + - 'modules/postgresql/Rakefile' + - 'modules/servermon/Rakefile' + - 'modules/squid3/Rakefile' + - 'modules/strongswan/Rakefile' + - 'modules/wmflib/Rakefile' # Offense count: 8 # Configuration parameters: AllowedVariables. Style/GlobalVars: - Enabled: false + Exclude: + - 'utils/expanderb.rb' + - 'utils/hiera_lookup' -# Offense count: 3 +# Offense count: 1 # Configuration parameters: MinBodyLength. Style/GuardClause: - Enabled: false + Exclude: + - 'utils/hiera_lookup' -# Offense count: 785 +# Offense count: 364 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues. Style/HashSyntax: Enabled: false -# Offense count: 33 +# Offense count: 23 # Cop supports --auto-correct. # Configuration parameters: MaxLineLength. Style/IfUnlessModifier: Enabled: false -# Offense count: 275 +# Offense count: 265 # Cop supports --auto-correct. # Configuration parameters: Width. Style/IndentationWidth: Enabled: false -# Offense count: 67 -# Cop supports --auto-correct. -Style/Lambda: - Enabled: false - -# Offense count: 8 +# Offense count: 6 # Cop supports --auto-correct. Style/LeadingCommentSpace: - Enabled: false + Exclude: + - 'modules/base/lib/facter/lldp.rb' + - 'modules/base/spec/defines/service_unit_spec.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' + - 'modules/wmflib/lib/hiera/mwcache.rb' -# Offense count: 21 +# Offense count: 15 # Cop supports --auto-correct. Style/MethodCallParentheses: - Enabled: false + Exclude: + - 'modules/base/lib/facter/physicalcorecount.rb' + - 'modules/base/spec/defines/service_unit_spec.rb' + - 'modules/install_server/spec/classes/install_server_preseed_server_spec.rb' + - 'modules/squid3/spec/classes/squid3_spec.rb' + - 'modules/wmflib/lib/puppet/parser/functions/ipresolve.rb' + - 'modules/wmflib/lib/puppet/parser/functions/secret.rb' + - 'modules/wmflib/spec/functions/role_spec.rb' + - 'modules/wmflib/spec/hiera/proxy_backend_spec.rb' + - 'modules/wmflib/spec/hiera/role_backend_spec.rb' + - 'utils/hiera_lookup' -# Offense count: 38 +# Offense count: 1 # Cop supports --auto-correct. Style/MultilineIfThen: - Enabled: false + Exclude: + - 'modules/ganeti/lib/facter/ganeti.rb' -# Offense count: 23 +# Offense count: 19 # Cop supports --auto-correct. Style/NegatedIf: Enabled: false # Offense count: 1 Style/NestedTernaryOperator: - Enabled: false + Exclude: + - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb' -# Offense count: 16 +# Offense count: 6 # Cop supports --auto-correct. Style/Not: - Enabled: false + Exclude: + - 'modules/base/files/monitoring/check_puppetrun' + - 'modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb' + - 'modules/puppetmaster/files/puppetstoredconfigclean.rb' + - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' + - 'modules/wmflib/lib/puppet/parser/functions/role.rb' + - 'utils/hiera_lookup' -# Offense count: 7 +# Offense count: 3 # Cop supports --auto-correct. Style/NumericLiterals: - MinDigits: 11 + MinDigits: 6 # Offense count: 1 # Cop supports --auto-correct. Style/ParallelAssignment: - Enabled: false + Exclude: + - 'modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb' -# Offense count: 6 +# Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: AllowSafeAssignment. Style/ParenthesesAroundCondition: - Enabled: false + Exclude: + - 'modules/wmflib/lib/puppet/parser/functions/ipresolve.rb' -# Offense count: 21 +# Offense count: 8 # Cop supports --auto-correct. # Configuration parameters: PreferredDelimiters. Style/PercentLiteralDelimiters: - Enabled: false - -# Offense count: 3 -# Cop supports --auto-correct. -Style/PerlBackrefs: - Enabled: false - -# Offense count: 3 -# Configuration parameters: NamePrefix, NamePrefixBlacklist. -Style/PredicateName: - Enabled: false + Exclude: + - 'modules/apt/lib/facter/apt.rb' + - 'modules/base/lib/facter/initsystem.rb' + - 'modules/base/lib/facter/lldp.rb' + - 'modules/ganeti/lib/facter/ganeti.rb' # Offense count: 2 # Cop supports --auto-correct. -Style/RedundantBegin: - Enabled: false +Style/PerlBackrefs: + Exclude: + - 'modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb' + +# Offense count: 2 +# Configuration parameters: NamePrefix, NamePrefixBlacklist. +Style/PredicateName: + Exclude: + - 'modules/wmflib/lib/puppet/parser/functions/ipresolve.rb' # Offense count: 15 # Cop supports --auto-correct. # Configuration parameters: AllowMultipleReturnValues. Style/RedundantReturn: - Enabled: false + Exclude: + - 'modules/ganglia/lib/puppet/parser/functions/ganglia_aggregator_config.rb' + - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb' + - 'modules/wmflib/lib/hiera/backend/mwyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' + - 'modules/wmflib/lib/hiera/mwcache.rb' + - 'modules/wmflib/lib/puppet/parser/functions/ipresolve.rb' -# Offense count: 27 +# Offense count: 20 # Cop supports --auto-correct. Style/RedundantSelf: - Enabled: false + Exclude: + - 'modules/puppet_statsd/lib/puppet/reports/statsd.rb' + - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' + - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' -# Offense count: 32 +# Offense count: 22 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes. Style/RegexpLiteral: - Enabled: false + Exclude: + - 'modules/bacula/spec/classes/bacula_client_spec.rb' + - 'modules/bacula/spec/classes/bacula_director_spec.rb' + - 'modules/bacula/spec/classes/bacula_storage_spec.rb' + - 'modules/bacula/spec/defines/fileset_spec.rb' + - 'modules/bacula/spec/defines/storage_device_spec.rb' + - 'modules/servermon/spec/classes/servermon_app_spec.rb' + - 'modules/trebuchet/lib/puppet/provider/package/trebuchet.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' + - 'utils/hiera_lookup' -# Offense count: 5 +# Offense count: 6 Style/RescueModifier: - Enabled: false - -# Offense count: 2 -# Cop supports --auto-correct. -Style/SelfAssignment: - Enabled: false + Exclude: + - 'modules/librenms/lib/puppet/parser/functions/phpdump.rb' + - 'modules/wmflib/lib/puppet/parser/functions/ordered_json.rb' + - 'modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb' + - 'modules/wmflib/lib/puppet/parser/functions/php_ini.rb' + - 'modules/wmflib/lib/puppet/parser/functions/require_package.rb' # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: AllowAsExpressionSeparator. Style/Semicolon: - Enabled: false + Exclude: + - 'modules/wmflib/lib/puppet/parser/functions/ordered_yaml.rb' -# Offense count: 188 +# Offense count: 22 # Cop supports --auto-correct. Style/SpaceAfterComma: - Enabled: false - -# Offense count: 1 -# Cop supports --auto-correct. -Style/SpaceAfterNot: - Enabled: false + Exclude: + - 'modules/base/lib/facter/labsproject.rb' + - 'modules/base/lib/facter/physicalcorecount.rb' + - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb' + - 'modules/puppet_statsd/lib/puppet/reports/statsd.rb' + - 'modules/puppetmaster/lib/puppet/reports/logstash.rb' + - 'modules/strongswan/spec/functions/ipresolve_spec.rb' + - 'modules/wmflib/lib/hiera/backend/mwyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/nuyaml_backend.rb' + - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' + - 'modules/wmflib/lib/hiera/backend/role_backend.rb' + - 'modules/wmflib/lib/hiera/mwcache.rb' + - 'modules/wmflib/spec/hiera/proxy_backend_spec.rb' + - 'modules/wmflib/spec/hiera/role_backend_spec.rb' # Offense count: 6 # Cop supports --auto-correct. @@ -277,72 +381,75 @@ Style/SpaceAroundEqualsInParameterDefault: Enabled: false -# Offense count: 74 +# Offense count: 12 # Cop supports --auto-correct. # Configuration parameters: MultiSpaceAllowedForOperators. Style/SpaceAroundOperators: - Enabled: false + Exclude: + - 'modules/labstore/lib/puppet/parser/functions/mount_nfs_volume.rb' + - 'modules/librenms/lib/puppet/parser/functions/phpdump.rb' + - 'modules/wmflib/lib/hiera/backend/proxy_backend.rb' + - 'modules/wmflib/spec/hiera/role_backend_spec.rb' -# Offense count: 107 +# Offense count: 38 # Cop supports --auto-correct. Style/SpaceInsideBrackets: Enabled: false -# Offense count: 161 +# Offense count: 36 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SupportedStyles. Style/SpaceInsideHashLiteralBraces: Enabled: false -# Offense count: 86 +# Offense count: 7 # Cop supports --auto-correct. Style/SpaceInsideParens: - Enabled: false - -# Offense count: 4 -# Cop supports --auto-correct. -Style/SpaceInsideRangeLiteral: - Enabled: false + Exclude: + - 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb' + - 'utils/expanderb.rb' # Offense count: 4 # Cop supports --auto-correct. Style/SpecialGlobalVars: - Enabled: false + Exclude: + - 'modules/puppetmaster/files/puppetstoredconfigclean.rb' + - 'utils/expanderb.rb' -# Offense count: 1108 +# Offense count: 153 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. Style/StringLiterals: Enabled: false -# Offense count: 50 +# Offense count: 49 # Cop supports --auto-correct. Style/Tab: - Enabled: false + Exclude: + - 'modules/apt/lib/facter/apt.rb' + - 'modules/git/spec/defines/user_spec.rb' + - 'utils/expanderb.rb' -# Offense count: 8 +# Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. Style/TrailingBlankLines: - Enabled: false + Exclude: + - 'modules/base/lib/facter/labsproject.rb' -# Offense count: 135 +# Offense count: 116 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles. Style/TrailingComma: Enabled: false -# Offense count: 23 -# Cop supports --auto-correct. -Style/TrailingWhitespace: - Enabled: false - # Offense count: 1 Style/UnlessElse: - Enabled: false + Exclude: + - 'modules/base/files/monitoring/check_puppetrun' -# Offense count: 85 +# Offense count: 8 # Cop supports --auto-correct. # Configuration parameters: WordRegex. Style/WordArray: - MinSize: 7 + MinSize: 3 diff --git a/Gemfile b/Gemfile index 12b38d6..280177f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem 'rubocop', '~> 0.32.0', require: false +gem 'rubocop', '~> 0.33.0', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 812c6d1..9bfcecd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,14 @@ GEM remote: https://rubygems.org/ specs: - ast (2.0.0) - astrolabe (1.3.0) - parser (>= 2.2.0.pre.3, < 3.0) - parser (2.3.0.pre.2) + ast (2.1.0) + astrolabe (1.3.1) + parser (~> 2.2) + parser (2.2.2.6) ast (>= 1.1, < 3.0) powerpack (0.1.1) rainbow (2.0.0) - rubocop (0.32.0) + rubocop (0.33.0) astrolabe (~> 1.3) parser (>= 2.2.2.5, < 3.0) powerpack (~> 0.1) @@ -20,4 +20,4 @@ ruby DEPENDENCIES - rubocop (~> 0.32.0) + rubocop (~> 0.33.0) -- To view, visit https://gerrit.wikimedia.org/r/235695 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I703e35c37cb66f4f725f1857851e2d7e42e91063 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Zfilipin <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
