Refactor/final 9 2 tidies (#1753)

* Tidy up cli options to be a bit neater

* Add changelog

* Update docs in docs/ dir

* AF: RSpec/EmptyLineAfterFinalLet

* Remove redundant jruby profiles

* Remove legacy tag

* Reintroduce required tag

Author: luke-hill

.rubocop_todo.yml

@@ -71,16 +71,16 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/cucumber/formatter/json.rb'
     - 'lib/cucumber/multiline_argument/data_table.rb'
 
-# Offense count: 14
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-# AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
-Naming/MethodParameterName:
-  Exclude:
-    - 'lib/cucumber/cli/options.rb'
-    - 'lib/cucumber/formatter/ansicolor.rb'
-    - 'lib/cucumber/formatter/console.rb'
-    - 'lib/cucumber/gherkin/formatter/ansi_escapes.rb'
-    - 'lib/cucumber/multiline_argument/data_table.rb'
+## Offense count: 14
+## Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+## AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
+#Naming/MethodParameterName:
+#  Exclude:
+#    - 'lib/cucumber/cli/options.rb'
+#    - 'lib/cucumber/formatter/ansicolor.rb'
+#    - 'lib/cucumber/formatter/console.rb'
+#    - 'lib/cucumber/gherkin/formatter/ansi_escapes.rb'
+#    - 'lib/cucumber/multiline_argument/data_table.rb'
 
 # Offense count: 8
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.

CHANGELOG.md

@@ -9,10 +9,13 @@ This document is formatted according to the principles of [Keep A CHANGELOG](htt
 Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blob/master/CONTRIBUTING.md) for more info on how to contribute to Cucumber.
 
 ## [Unreleased]
+### Changed
+- Updated cucumber dependencies (Specifically cucumber-core) ([luke-hill](https://github.com/luke-hill))
 
-## [9.1.2] - 2024-01-23
-### Added
+### Removed
+- Some legacy JRuby local testing profiles are now removed ([luke-hill](https://github.com/luke-hill))
 
+## [9.1.2] - 2024-01-23
 ### Changed
 - Moved all CCK step definition/miscellaneous file logic from CCK gem to this repo.
 All logic contained in [compatibility](./compatibility) ([luke-hill](https://github.com/luke-hill))
@@ -23,8 +26,6 @@ All logic contained in [compatibility](./compatibility) ([luke-hill](https://git
 (This fixes an issue in cucumber-wire when passing legacy steps down the wire)
 ([#1746](https://github.com/cucumber/cucumber-ruby/pull/1746) [luke-hill](https://github.com/luke-hill))
 
-### Removed
-
 ## [9.1.1] - 2024-01-04
 ### Changed
 - Updated dependencies to slightly more permissive / up to date versions ([luke-hill](https://github.com/luke-hill))

cucumber.yml

@@ -11,8 +11,6 @@ else
 end
 %>
 default:     <%= std_opts %> --tags "not @jruby"
-jruby:       <%= std_opts %>
-jruby_win:   <%= std_opts %>
 windows_mri: <%= std_opts %> --tags "not @jruby" --tags "not @needs-many-fonts"
 wip:         --wip <%= wip_opts %> features
 none:        --format pretty

docs/jruby-limitations.md

@@ -1,12 +1,13 @@
 # Cucumber and JRuby limitations
 
-`cucumber` can be executed on `JRuby` (tested with `9.2`), although some of the features
+`cucumber` can be executed on `JRuby` (tested with `9.4`), although some of the features
 are not available on this platform.
 
 ## Defining steps with native languages
 
 There are currently three languages (Russian, Ukrainian and Uzbek) for which the step definition
 can not be written in native language.
+
 That means, for example, that you can not write the following code:
 
 ```ruby

docs/vscode-example-launch-configuration.md

@@ -2,22 +2,21 @@
 
 ### Ruby Extension
 
-Install and configure the
-[ruby extension](https://marketplace.visualstudio.com/items?itemName=rebornix.Ruby)
+Install and configure the [ruby extension](https://marketplace.visualstudio.com/items?itemName=rebornix.Ruby)
 
 ### Use `debase` and `ruby-debug-ide` gems locally
 
 Make sure to use a `Gemfile.local` file with `debase` and `ruby-debug-ide` gems.
 
-~~~ruby
+```ruby
 # Include the regular Gemfile
 eval File.read('Gemfile')
 
 group :development do
   gem 'debase', require: false
   gem 'ruby-debug-ide', require: false
 end 
-~~~
+```
 
 Execute `bundle config set --local gemfile Gemfile.local` to use it per default,
 then `bundle install`.

lib/cucumber/cli/options.rb

@@ -116,10 +116,10 @@ def parse!(args)
           opts.on('-f FORMAT', '--format FORMAT', *format_msg, *FORMAT_HELP) do |v|
             add_option :formats, [*parse_formats(v), @out_stream]
           end
-          opts.on('--init', *init_msg) { |_v| initialize_project }
+          opts.on('--init', *init_msg) { initialize_project }
           opts.on('-o', '--out [FILE|DIR|URL]', *out_msg) { |v| out_stream v }
-          opts.on('-t TAG_EXPRESSION', '--tags TAG_EXPRESSION', *tags_msg) { |v| add_tag v }
-          opts.on('-n NAME', '--name NAME', *name_msg) { |v| add_option :name_regexps, /#{v}/ }
+          opts.on('-t TAG_EXPRESSION', '--tags TAG_EXPRESSION', *tags_msg) { |v| add_tag(v) }
+          opts.on('-n NAME', '--name NAME', *name_msg) { |v| add_option(:name_regexps, /#{v}/) }
           opts.on('-e', '--exclude PATTERN', *exclude_msg) { |v| add_option :excludes, Regexp.new(v) }
           opts.on(PROFILE_SHORT_FLAG, "#{PROFILE_LONG_FLAG} PROFILE", *profile_short_flag_msg) { |v| add_profile v }
           opts.on(NO_PROFILE_SHORT_FLAG, NO_PROFILE_LONG_FLAG, *no_profile_short_flag_msg) { |_v| disable_profile_loading }
@@ -301,9 +301,9 @@ def parse_formats(value)
         [formatter, options_hash]
       end
 
-      def out_stream(v)
+      def out_stream(value)
         @options[:formats] << ['pretty', {}, nil] if @options[:formats].empty?
-        @options[:formats][-1][2] = v
+        @options[:formats][-1][2] = value
       end
 
       def tags_msg
@@ -455,7 +455,7 @@ def set_dry_run_and_duration
       end
 
       def exit_ok(text)
-        @out_stream.puts text
+        @out_stream.puts(text)
         Kernel.exit(0)
       end
 
@@ -483,22 +483,11 @@ def extract_environment_variables
         end
       end
 
-      def disable_profile_loading?
-        @disable_profile_loading
-      end
-
       def merge_profiles
-        if @disable_profile_loading
-          @out_stream.puts 'Disabling profiles...'
-          return
-        end
+        return @out_stream.puts 'Disabling profiles...' if @disable_profile_loading
 
         @profiles << @default_profile if default_profile_should_be_used?
-
-        @profiles.each do |profile|
-          merge_with_profile(profile)
-        end
-
+        @profiles.each { |profile| merge_with_profile(profile) }
         @options[:profiles] = @profiles
       end
 

spec/cucumber/cli/main_spec.rb

@@ -15,6 +15,7 @@ module Cli
       let(:stdout) { StringIO.new }
       let(:stderr) { StringIO.new }
       let(:kernel) { double(:kernel) }
+
       subject { described_class.new(args, stdout, stderr, kernel) }
 
       describe '#execute!' do

spec/cucumber/configuration_spec.rb

@@ -15,6 +15,7 @@ module Cucumber
 
     describe 'with custom user options' do
       let(:user_options) { { autoload_code_paths: ['foo/bar/baz'] } }
+
       subject { described_class.new(user_options) }
 
       it 'allows you to override the defaults' do

spec/cucumber/hooks_spec.rb

@@ -22,12 +22,14 @@ module Hooks
     describe BeforeHook do
       subject { described_class.new(location) }
       let(:location) { Cucumber::Core::Test::Location.new('hooks.rb', 1) }
+
       it_behaves_like 'a source node'
     end
 
     describe AfterHook do
       subject { described_class.new(location) }
       let(:location) { Cucumber::Core::Test::Location.new('hooks.rb', 1) }
+
       it_behaves_like 'a source node'
     end
   end