From 31b7cf777b239383ee0d478b63183f005808813d Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sat, 7 Feb 2026 13:35:39 -0500 Subject: [PATCH 1/5] Apply ruby 3.0 rubocop target --- .rubocop.yml | 2 +- spec/spec_helper.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 9b340e9..abeca6a 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,7 +15,7 @@ plugins: AllCops: NewCops: enable - TargetRubyVersion: 2.6 + TargetRubyVersion: 3.0 Exclude: - tmp/**/* - vendor/**/* diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 47b1915..7d16a06 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -6,7 +6,6 @@ # Requires supporting files with custom matchers and macros, etc, # in ./support/ and its subdirectories. Dir[Pathname(__FILE__).dirname.join('support/**/*.rb')] - .sort .each { |f| require f } RSpec.configure do |config| From 4f302db5e8d9b97a780cbd980ca9095aea42d1a5 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sat, 7 Feb 2026 13:56:25 -0500 Subject: [PATCH 2/5] Apply ruby 3.1 rubocop target --- .rubocop.yml | 2 +- features/step_definitions/flatware_steps.rb | 4 ++-- lib/flatware/configuration.rb | 2 +- lib/flatware/sink/signal.rb | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index abeca6a..f1ec978 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,7 +15,7 @@ plugins: AllCops: NewCops: enable - TargetRubyVersion: 3.0 + TargetRubyVersion: 3.1 Exclude: - tmp/**/* - vendor/**/* diff --git a/features/step_definitions/flatware_steps.rb b/features/step_definitions/flatware_steps.rb index 5edd39d..ae263a6 100644 --- a/features/step_definitions/flatware_steps.rb +++ b/features/step_definitions/flatware_steps.rb @@ -28,8 +28,8 @@ def flatware_process all_commands.find { |command| command.commandline.include? 'flatware' } end - def duration(&block) - Benchmark.realtime(&block) + def duration(&) + Benchmark.realtime(&) end end World(Support) diff --git a/lib/flatware/configuration.rb b/lib/flatware/configuration.rb index 7686ab2..9d7b0db 100644 --- a/lib/flatware/configuration.rb +++ b/lib/flatware/configuration.rb @@ -34,7 +34,7 @@ def configuration @configuration ||= Configuration.new end - def configure(&_block) + def configure(&) yield configuration end end diff --git a/lib/flatware/sink/signal.rb b/lib/flatware/sink/signal.rb index 28b958c..e2f75bd 100644 --- a/lib/flatware/sink/signal.rb +++ b/lib/flatware/sink/signal.rb @@ -23,8 +23,8 @@ def listen self end - def self.listen(formatter, &block) - new(formatter, &block).listen + def self.listen(formatter, &) + new(formatter, &).listen end private From 1b56585504c1f4aa7095420debbf1e35192adad1 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sat, 7 Feb 2026 13:58:57 -0500 Subject: [PATCH 3/5] Apply ruby 3.2 rubocop target --- .rubocop.yml | 2 +- lib/flatware/cucumber/formatter.rb | 1 - lib/flatware/cucumber/result.rb | 4 ++-- lib/flatware/sink.rb | 7 +++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index f1ec978..a972280 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -15,7 +15,7 @@ plugins: AllCops: NewCops: enable - TargetRubyVersion: 3.1 + TargetRubyVersion: 3.2 Exclude: - tmp/**/* - vendor/**/* diff --git a/lib/flatware/cucumber/formatter.rb b/lib/flatware/cucumber/formatter.rb index 8b7bb0e..b1dd7bc 100644 --- a/lib/flatware/cucumber/formatter.rb +++ b/lib/flatware/cucumber/formatter.rb @@ -1,7 +1,6 @@ require 'cucumber' require 'flatware/sink' require 'ostruct' -require 'set' module Flatware module Cucumber diff --git a/lib/flatware/cucumber/result.rb b/lib/flatware/cucumber/result.rb index 75acc86..a963459 100644 --- a/lib/flatware/cucumber/result.rb +++ b/lib/flatware/cucumber/result.rb @@ -9,8 +9,8 @@ def initialize(progress) end class << self - def step(*args) - step = StepResult.new(*args) + def step(*) + step = StepResult.new(*) new step.progress, [step] end diff --git a/lib/flatware/sink.rb b/lib/flatware/sink.rb index 2227ac8..a8301ec 100644 --- a/lib/flatware/sink.rb +++ b/lib/flatware/sink.rb @@ -1,5 +1,4 @@ require 'drb/drb' -require 'set' require 'flatware/sink/signal' module Flatware @@ -62,10 +61,10 @@ def finished(job) check_finished! end - def method_missing(name, *args) + def method_missing(name, *) super unless formatter.respond_to?(name) - Flatware.log(name, *args) - formatter.send(name, *args) + Flatware.log(name, *) + formatter.send(name, *) end def respond_to_missing?(name, include_all) From 9823becaaa6b1dd5fce4c9546f30c014ebd3b650 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sat, 7 Feb 2026 14:05:30 -0500 Subject: [PATCH 4/5] Drop support for rspec version 3.6 --- .github/workflows/ruby.yml | 4 +--- Appraisals | 2 +- flatware-rspec.gemspec | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index e6d2b8e..e32893d 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -19,11 +19,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rspec-minor-versions: [6, 7, 8, 9, 10, 11, 12, 13] + rspec-minor-versions: [7, 8, 9, 10, 11, 12, 13] ruby-versions: ["3.2", "3.3", "3.4", "4.0"] exclude: - - ruby-versions: 4.0 - rspec-minor-versions: 6 - ruby-versions: 4.0 rspec-minor-versions: 7 env: diff --git a/Appraisals b/Appraisals index 466579c..b928909 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ # vim: ft=ruby -(6..13).each do |minor| +(7..13).each do |minor| appraise "rspec 3.#{minor}" do gem 'rspec', "3.#{minor}.0" end diff --git a/flatware-rspec.gemspec b/flatware-rspec.gemspec index dad20c2..b3906da 100644 --- a/flatware-rspec.gemspec +++ b/flatware-rspec.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.required_ruby_version = ['>= 3.2', '< 4.1'] s.require_paths = ['lib'] s.add_dependency %(flatware), Flatware::VERSION - s.add_dependency %(rspec), '>= 3.6' + s.add_dependency %(rspec), '>= 3.7' # s.metadata['rubygems_mfa_required'] = 'true' end From 510714a32880a75394bf80e46951ea960a593dbb Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sat, 7 Feb 2026 14:06:40 -0500 Subject: [PATCH 5/5] Drop support for rspec version 3.7 --- .github/workflows/ruby.yml | 5 +---- Appraisals | 2 +- flatware-rspec.gemspec | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index e32893d..04fce4b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -19,11 +19,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rspec-minor-versions: [7, 8, 9, 10, 11, 12, 13] + rspec-minor-versions: [8, 9, 10, 11, 12, 13] ruby-versions: ["3.2", "3.3", "3.4", "4.0"] - exclude: - - ruby-versions: 4.0 - rspec-minor-versions: 7 env: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rspec_3.${{ matrix.rspec-minor-versions }}.gemfile diff --git a/Appraisals b/Appraisals index b928909..44665e0 100644 --- a/Appraisals +++ b/Appraisals @@ -1,6 +1,6 @@ # vim: ft=ruby -(7..13).each do |minor| +(8..13).each do |minor| appraise "rspec 3.#{minor}" do gem 'rspec', "3.#{minor}.0" end diff --git a/flatware-rspec.gemspec b/flatware-rspec.gemspec index b3906da..8422dbf 100644 --- a/flatware-rspec.gemspec +++ b/flatware-rspec.gemspec @@ -24,6 +24,6 @@ Gem::Specification.new do |s| s.required_ruby_version = ['>= 3.2', '< 4.1'] s.require_paths = ['lib'] s.add_dependency %(flatware), Flatware::VERSION - s.add_dependency %(rspec), '>= 3.7' + s.add_dependency %(rspec), '>= 3.8' # s.metadata['rubygems_mfa_required'] = 'true' end