diff --git a/Gemfile b/Gemfile index 23cd13761af36c55d663e8d3be555fed2e666028..320432dcbe3d5689dca00bffb1750e6f589894a9 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,6 @@ source 'https://rubygems.org' -gem 'rubocop', '= 1.48.1', require: false +gem 'rubocop', '= 1.50.0', require: false gem 'rubocop-performance', '= 1.16.0', require: false gem 'rubocop-rspec', '= 2.19.0', require: false diff --git a/config_defaults.yml b/config_defaults.yml index e746a3791062292edd313fc8788792c65b3db0b8..d142bb8b25a43f65f812ecc53b385279263545f1 100644 --- a/config_defaults.yml +++ b/config_defaults.yml @@ -532,7 +532,7 @@ Gemfile: - gem: 'puppet-debugger' version: '~> 1.0' - gem: 'rubocop' - version: '= 1.48.1' + version: '= 1.50.0' - gem: 'rubocop-performance' version: '= 1.16.0' - gem: 'rubocop-rspec' diff --git a/moduleroot/.rubocop.yml.erb b/moduleroot/.rubocop.yml.erb index dcc56ae5ea6668aa3e0d1877df13de6478711230..5a2ba4ea820c073cc7818d2eec2f22d45c9d6d1f 100644 --- a/moduleroot/.rubocop.yml.erb +++ b/moduleroot/.rubocop.yml.erb @@ -35,7 +35,7 @@ profile = @configs['profiles'][@configs['selected_profile']] configs = defaults.dup DeepMerge::deep_merge!(profile['configs'], configs, knockout_prefix: "--", preserve_unmergeables: false) -default_version = '1.48.1' +default_version = '1.50.0' # rubocop's dependencies have native extensions and are not available on windows currently # to preserve the dynamic behaviour, and still work in its current state, this workaround diff --git a/rubocop/defaults-1.48.1.yml b/rubocop/defaults-1.50.0.yml similarity index 99% rename from rubocop/defaults-1.48.1.yml rename to rubocop/defaults-1.50.0.yml index ac678012de7bbed8a076e3e339a744c9696466b9..0be5f59d822b934306666c526b94fcd5388c2847 100644 --- a/rubocop/defaults-1.48.1.yml +++ b/rubocop/defaults-1.50.0.yml @@ -519,6 +519,7 @@ - Lint/DeprecatedConstants - Lint/DuplicateBranch - Lint/DuplicateMagicComment +- Lint/DuplicateMatchPattern - Lint/DuplicateRegexpCharacterClassElement - Lint/EmptyBlock - Lint/EmptyClass @@ -589,6 +590,7 @@ - Style/CollectionCompact - Style/ComparableClamp - Style/ConcatArrayLiterals +- Style/DataInheritance - Style/DirEmpty - Style/DocumentDynamicEvalDefinition - Style/EmptyHeredoc @@ -623,6 +625,7 @@ - Style/RedundantEach - Style/RedundantHeredocDelimiterQuotes - Style/RedundantInitialize +- Style/RedundantLineContinuation - Style/RedundantSelfAssignmentBranch - Style/RedundantStringEscape - Style/SelectByRegexp