diff --git a/.rubocop.yml b/.rubocop.yml index d95f483be..c73c846aa 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,18 +1,8 @@ +--- inherit_from: .rubocop_todo.yml -require: - - rubocop-performance - - rubocop-rspec - -AllCops: - Exclude: - - Gemfile - - Rakefile - - spec/fixtures/**/* - - vendor/bundle/**/* - NewCops: enable - SuggestExtensions: false - TargetRubyVersion: '2.7' +inherit_gem: + voxpupuli-rubocop: rubocop.yml # Disabled Style/ClassAndModuleChildren: @@ -20,11 +10,3 @@ Style/ClassAndModuleChildren: Layout/LineLength: Max: 200 - -#################################################### -# Cops below here due for deprecation -#################################################### -# ``Rspec/FilePath`` is going to be deprecated in the next major release of rubocop >=3.0.0: see -# As the new cops are already present, e.g., Rspec/SpecFilePathPathFormat, then disabling this in preparation -Gemspec/RequireMFA: - Enabled: false diff --git a/Gemfile b/Gemfile index f513ad7e6..8f954448b 100644 --- a/Gemfile +++ b/Gemfile @@ -32,9 +32,6 @@ group :test do gem 'rake', require: false gem 'rspec', '~> 3.0', require: false - gem 'rubocop', '~> 1.64.0', require: false - gem 'rubocop-performance', '~> 1.16', require: false - gem 'rubocop-rspec', '~> 3.0', require: false gem 'simplecov', require: false gem 'simplecov-console', require: false diff --git a/rspec-puppet.gemspec b/rspec-puppet.gemspec index 0636b332d..56206936f 100644 --- a/rspec-puppet.gemspec +++ b/rspec-puppet.gemspec @@ -19,6 +19,7 @@ Gem::Specification.new do |s| s.files = Dir['CHANGELOG.md', 'LICENSE', 'README.md', 'lib/**/*', 'bin/**/*'] s.add_dependency 'rspec', '~> 3.0' + s.add_development_dependency 'voxpupuli-rubocop', '~> 3.0.0' s.authors = ['Tim Sharpe', 'Puppet, Inc.', 'Community Contributors'] s.email = ['tim@sharpe.id.au', 'modules-team@puppet.com']