From 8822521d4ed9404fa0995125c0e86648bbd2124f Mon Sep 17 00:00:00 2001 From: Tim 'bastelfreak' Meusel Date: Tue, 11 Jul 2023 10:16:15 +0200 Subject: [PATCH 1/3] fakefs: Allow 2.x --- beaker-rspec.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beaker-rspec.gemspec b/beaker-rspec.gemspec index 62ea05a..394387a 100644 --- a/beaker-rspec.gemspec +++ b/beaker-rspec.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.require_paths = ['lib'] # Testing dependencies - s.add_development_dependency 'fakefs', '>= 0.6', '< 2' + s.add_development_dependency 'fakefs', '>= 0.6', '< 3' s.add_development_dependency 'minitest', '~> 5.4' s.add_development_dependency 'rake', '~> 13.0' s.add_development_dependency 'voxpupuli-rubocop', '~> 1.3' From 5f50a73ae5c78f83c67d213587321e11f2083ca6 Mon Sep 17 00:00:00 2001 From: Tim 'bastelfreak' Meusel Date: Tue, 11 Jul 2023 10:22:37 +0200 Subject: [PATCH 2/3] use rake task from voxpupuli-rubocop --- Rakefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Rakefile b/Rakefile index 975b365..cb196b6 100644 --- a/Rakefile +++ b/Rakefile @@ -20,14 +20,7 @@ else end begin - require 'rubocop/rake_task' + require 'voxpupuli/rubocop/rake' rescue LoadError - # RuboCop is an optional group -else - RuboCop::RakeTask.new(:rubocop) do |task| - # These make the rubocop experience maybe slightly less terrible - task.options = ['--display-cop-names', '--display-style-guide', '--extra-details'] - # Use Rubocop's Github Actions formatter if possible - task.formatters << 'github' if ENV['GITHUB_ACTIONS'] == 'true' - end + # the voxpupuli-rubocop gem is optional end From 4509e716b880a4129a41060c81c5a65798c1b966 Mon Sep 17 00:00:00 2001 From: Tim 'bastelfreak' Meusel Date: Tue, 11 Jul 2023 10:22:44 +0200 Subject: [PATCH 3/3] rubocop: autofix --- lib/beaker-rspec/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/beaker-rspec/spec_helper.rb b/lib/beaker-rspec/spec_helper.rb index 3305ee1..abc8311 100644 --- a/lib/beaker-rspec/spec_helper.rb +++ b/lib/beaker-rspec/spec_helper.rb @@ -32,7 +32,7 @@ debug: ENV['BEAKER_DEBUG'] || ENV['BEAKER_debug'] || ENV.fetch('RS_DEBUG', nil), destroy: ENV['BEAKER_DESTROY'] || ENV['BEAKER_destroy'] || ENV.fetch('RS_DESTROY', nil), optionsfile: ENV['BEAKER_OPTIONS_FILE'] || ENV['BEAKER_options_file'] || ENV.fetch('RS_OPTIONS_FILE', nil), - }.delete_if { |_key, value| value.nil? } + }.compact # combine defaults and env_vars to determine overall options options = defaults.merge(env_vars)