cucumber 3.1.2 → 4.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef34be35b9337e5d78fe68a0b9e642e96a5bc8e
-  data.tar.gz: 5331fac4008b678c3bdc18ec18f4df77e3e67bfb
+  metadata.gz: 272094a2efb99945d2d0e3e6a91bae0b855428d0
+  data.tar.gz: 400106f2e8a065a57bb9d85171b5fa7e98999d3a
 SHA512:
-  metadata.gz: 560857486693d265017f21421942be4bc737f852d2972cd5a76c93f678ffe4ac06a0fd58e91f52b7ccb2d5c63156c2af13cb2e11e2bdaf9e194e516ddd663387
-  data.tar.gz: e3ecdbb8d5a93e5e20d0e72a46be9ccb10021b12caa7d023cd3f16e845882331231764fb772cf7d1935c4db724166dbbe3eb40bbda33a4a84760ff7bd296e54a
+  metadata.gz: 7e4c314d1e1b30f1d8e5ef171a7fb5ca1120bd9cd9c2ec2f1e353f7ee38d74ddc04771a8506c62ef4e71c9b58aeb6f28dccd3d2d979f2119dcc10b30c2ca7d2e
+  data.tar.gz: 854f93e0396ebc737e6f5f525028654042b96387b90c12ae7b41f65cd76e03668cf50c9a0a9517455f080a76b5c21a4825b3fe2f51b353471a91e45f47cb5139

data/CHANGELOG.md

@@ -10,6 +10,74 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 
 ----
 
+## [In Git](https://github.com/cucumber/cucumber-ruby/compare/v4.0.0.rc.1...master) (Not released)
+
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Added
+
+### Improved
+
+## [4.0.0.rc.1](https://github.com/cucumber/cucumber-ruby/compare/v3.1.2...v4.0.0.rc.1) (2018-09-29)
+
+### Added
+
+* Added support for new `Rule` keyword. [Read more here.](https://github.com/cucumber/cucumber/blob/master/gherkin/CHANGELOG.md#6013---2018-09-25)
+* Added new `dots` formatter. This is the first step of a larger strategy to move the formatters to a new architecture where they delegate to shared executables via messages.
+
+### Changed
+
+* Use Gherkin v6.
+  ([#1313](https://github.com/cucumber/cucumber-ruby/pull/1313)
+   [brasmusson](https://github.com/brasmusson))
+* Do not apply Before and After Hooks to Test Cases with no Test Steps.
+  ([#1311](https://github.com/cucumber/cucumber-ruby/pull/1311)
+   [brasmusson](https://github.com/brasmusson))
+* Pass the registry to the Wire plugin.
+  ([#1309](https://github.com/cucumber/cucumber-ruby/pull/1309)
+   [brasmusson](https://github.com/brasmusson))
+* Adapt to using the Gherkin compiler and Pickles in the core.
+  ([#1309](https://github.com/cucumber/cucumber-ruby/pull/1309)
+   [brasmusson](https://github.com/brasmusson))
+* Let the Pretty Formatter use events.
+  ([#1305](https://github.com/cucumber/cucumber-ruby/pull/1305)
+   [brasmusson](https://github.com/brasmusson))
+
+### Removed
+
+* Remove the support of old style tag expressions.
+  ([#1314](https://github.com/cucumber/cucumber-ruby/pull/1314),
+   [brasmusson](https://github.com/brasmusson))
+* Remove the Legacy API for Formatters.
+  ([#1230](https://github.com/cucumber/cucumber-ruby/pull/1230),
+   [#839](https://github.com/cucumber/cucumber-ruby/issues/839)
+   [brasmusson](https://github.com/brasmusson))
+* Remove the JSON Pretty Formatter (which was the same as the JSON formatter).
+  ([brasmusson](https://github.com/brasmusson))
+* Remove the HTML Formatter.
+  ([#1306](https://github.com/cucumber/cucumber-ruby/pull/1306)
+   [brasmusson](https://github.com/brasmusson))
+
+### Fixed
+
+*  Wire protocol compatibility for docstrings.
+  ([#1183](https://github.com/cucumber/cucumber-ruby/issues/1183))
+* Let the Rerun Formatter handle flaky scenarios.
+  ([#1310](https://github.com/cucumber/cucumber-ruby/pull/1310)
+   [brasmusson](https://github.com/brasmusson))
+
+### Improved
+
+* Code style changes completed as per backlog of Rubocop TODO file. ([#1021](https://github.com/cucumber/cucumber-ruby/issues/1021) [@jaysonesmith](https://github.com/jaysonesmith))
+
 ## [3.1.2](https://github.com/cucumber/cucumber-ruby/compare/v3.1.1...v3.1.2) (2018-07-13)
 
 ### Changed
@@ -89,13 +157,6 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 * Fix the printing of newlines in the rerun formatter - a problem introduced in [#1162](https://github.com/cucumber/cucumber-ruby/issues/1162) ([#1207](https://github.com/cucumber/cucumber-ruby/issues/1207) [@brasmusson](https://github.com/brasmusson))
 * Handle the `--retry` option in profiles ([#1050](https://github.com/cucumber/cucumber-ruby/issues/1050) [@brasmusson](https://github.com/brasmusson))
 
-### Improved
-
-* Exclude the legacy_api from rubocop, regenerate Rubocop Todo ([@jaysonesmith](https://github.com/jaysonesmith), [@brasmusson](https://github.com/brasmusson))
-* Review and handle excluded/ignored cops ([#1208](https://github.com/cucumber/cucumber-ruby/pull/1208) [@jaysonesmith](https://github.com/jaysonesmith))
-* Fix SymbolProc issues ([#1212](https://github.com/cucumber/cucumber-ruby/pull/1212) [@jaysonesmith](https://github.com/jaysonesmith))
-* Fix TrailingBlankLines ([#1211](https://github.com/cucumber/cucumber-ruby/pull/1211) [@jaysonesmith](https://github.com/jaysonesmith))
-
 ## [3.0.1](https://github.com/cucumber/cucumber-ruby/compare/v3.0.0...3.0.1) (2017-09-29)
 
 ### Fixed
@@ -131,12 +192,6 @@ Please visit [cucumber/CONTRIBUTING.md](https://github.com/cucumber/cucumber/blo
 * Refactor: Extract HTMLBuilder#string_to_embed method to DRY up code ([#1187](https://github.com/cucumber/cucumber-ruby/pulls/1187) [@danascheider](https://github.com/danascheider))
 * As per [#251](https://github.com/cucumber/cucumber/issues/251): renamed History.md to CHANGELOG.md, added contributing message at beginning, and misc formatting. ([#1185](https://github.com/cucumber/cucumber-ruby/issues/1185) [jaysonesmith](https://github.com/jaysonesmith))
 * Use past tense in event names (`xStarting` -> `xStarted`) ([#1166](https://github.com/cucumber/cucumber-ruby/issues/1166) @brasmusson).
-* Fix Lint/DeprecatedClassMethods ([#1172](https://github.com/cucumber/cucumber-ruby/issues/1172) [jaysonesmith](https://github.com/jaysonesmith))
-* Fix Lint/DuplicateMethods ([#1173](https://github.com/cucumber/cucumber-ruby/issues/1173) [jaysonesmith](https://github.com/jaysonesmith))
-* Fix Metrics/LineLength ([#1175](https://github.com/cucumber/cucumber-ruby/issues/1175), [#1175](https://github.com/cucumber/cucumber-ruby/issues/1175), [#1176](https://github.com/cucumber/cucumber-ruby/issues/1176) [jaysonesmith](https://github.com/jaysonesmith))
-* Fix Style/AlignArray ([#1177](https://github.com/cucumber/cucumber-ruby/issues/1177) [jaysonesmith](https://github.com/jaysonesmith))
-* Fix Style/AndOr ([#1178](https://github.com/cucumber/cucumber-ruby/issues/1178) [jaysonesmith](https://github.com/jaysonesmith))
-* Fix Multiple Cops ([#1179](https://github.com/cucumber/cucumber-ruby/issues/1179) [jaysonesmith](https://github.com/jaysonesmith))
 
 ## [3.0.0.pre.2](https://github.com/cucumber/cucumber-ruby/compare/v2.4.0...v3.0.0.pre.2)
 

data/CONTRIBUTING.md

@@ -67,6 +67,7 @@ Now release it
     bundle update
     bundle exec rake
     git commit -m "Release X.Y.Z"
+    # Make sure you run gem signin as the cukebot@cucumber.io user before running the following step. Credentials can be found in 1Password
     rake release
 
 ## Gaining Release Karma

data/bin/cucumber

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 file_name = File.dirname(__FILE__) + '/../lib'
-$:.unshift(file_name) unless $:.include?(file_name)
+$LOAD_PATH.unshift(file_name) unless $LOAD_PATH.include?(file_name)
 
 require 'simplecov_setup'
 require 'cucumber/rspec/disable_option_parser'

data/lib/autotest/cucumber_mixin.rb

@@ -7,7 +7,7 @@ require 'cucumber/cli/profile_loader'
 
 module Autotest::CucumberMixin
   def self.included(receiver)
-    receiver::ALL_HOOKS << [:run_features, :ran_features]
+    receiver::ALL_HOOKS << %i[run_features ran_features]
   end
 
   attr_accessor :features_to_run
@@ -23,12 +23,10 @@ module Autotest::CucumberMixin
     reset_features
     add_sigint_handler
 
-    self.last_mtime = Time.now if $f
-
     loop do # ^c handler
       begin
         get_to_green
-        if self.tainted then
+        if tainted
           rerun_all_tests
           rerun_all_features if all_good
         else
@@ -39,7 +37,7 @@ module Autotest::CucumberMixin
         # time a file is changed to see if anything breaks.
         reset_features
       rescue Interrupt
-        break if self.wants_to_quit
+        break if wants_to_quit
         reset
         reset_features
       end
@@ -51,12 +49,13 @@ module Autotest::CucumberMixin
     features_to_run == ''
   end
 
-  def get_to_green
-    begin
+  def get_to_green # rubocop:disable Naming/AccessorMethodName
+    loop do
       super
       run_features
       wait_for_changes unless all_features_good
-    end until all_features_good
+      break if all_features_good
+    end
   end
 
   def rerun_all_features
@@ -71,67 +70,71 @@ module Autotest::CucumberMixin
   def run_features
     hook :run_features
     Tempfile.open('autotest-cucumber') do |dirty_features_file|
-      cmd = self.make_cucumber_cmd(self.features_to_run, dirty_features_file.path)
+      cmd = make_cucumber_cmd(features_to_run, dirty_features_file.path)
       break if cmd.empty?
-      puts cmd unless $q
       old_sync = $stdout.sync
       $stdout.sync = true
       self.results = []
       line = []
       begin
-        open("| #{cmd}", 'r') do |f|
+        open("| #{cmd}", 'r') do |f| # rubocop:disable Security/Open
           until f.eof?
             c = f.getc || break
-            if RUBY_VERSION >= '1.9' then
-              print c
-            else
-              putc c
-            end
+            put_command(c)
             line << c
-            if c == ?\n then
-              self.results << if RUBY_VERSION >= '1.9' then
-                                line.join
-                              else
-                                line.pack 'c*'
-                              end
-              line.clear
-            end
+            next unless c == "\n"
+            results << join_line
+            line.clear
           end
         end
       ensure
         $stdout.sync = old_sync
       end
       self.features_to_run = dirty_features_file.read.strip
-      self.tainted = true unless self.features_to_run == ''
+      self.tainted = true unless features_to_run == ''
     end
     hook :ran_features
   end
 
-  def make_cucumber_cmd(features_to_run, dirty_features_filename)
-    return '' if features_to_run == ''
+  def put_command(cmd)
+    RUBY_VERSION >= '1.9' ? print(cmd) : putcmd(c)
+  end
+
+  def join_line
+    RUBY_VERSION >= '1.9' ? line.join : line.pack('c*')
+  end
+
+  def make_cucumber_cmd(features_to_run, _dirty_features_filename)
+    return '' if features_to_run.empty?
 
     profile_loader = Cucumber::Cli::ProfileLoader.new
 
-    profile ||= 'autotest-all' if profile_loader.has_profile?('autotest-all') && features_to_run == :all
-    profile ||= 'autotest'     if profile_loader.has_profile?('autotest')
-    profile ||= nil
+    profile = profile(profile_loader)
+
+    args = created_args(features_to_run, profile)
 
+    "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args}"
+  end
+
+  def profile(profile_loader)
+    profile ||= 'autotest-all' if profile_loader.profile?('autotest-all') && features_to_run == :all
+    profile ||= 'autotest'     if profile_loader.profile?('autotest')
+    profile || nil
+  end
+
+  def created_args(features_to_run, profile)
     args = if profile
              ['--profile', profile]
            else
-             %w{--format} << (features_to_run == :all ? 'progress' : 'pretty')
+             %w[--format] << (features_to_run == :all ? 'progress' : 'pretty')
            end
     # No --color option as some IDEs (Netbeans) don't output them very well (1 failed step)
-    args += %w{--format rerun --out} << dirty_features_filename
+    args += %w[--format rerun --out] << dirty_features_filename
     args << (features_to_run == :all ? '' : features_to_run)
 
-    # Unless I do this, all the steps turn up undefined during the rerun...
-    unless features_to_run == :all
-      args << 'features/step_definitions' << 'features/support'
-    end
-
-    args = args.join(' ')
+    # All steps becom undefined during rerun unless the following is run.
+    args << 'features/step_definitions' << 'features/support' unless features_to_run == :all
 
-    return "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args}"
+    args.join(' ')
   end
 end

data/lib/cucumber/cli/configuration.rb

@@ -20,7 +20,7 @@ module Cucumber
       def initialize(out_stream = STDOUT, error_stream = STDERR)
         @out_stream   = out_stream
         @error_stream = error_stream
-        @options = Options.new(@out_stream, @error_stream, :default_profile => 'default')
+        @options = Options.new(@out_stream, @error_stream, default_profile: 'default')
       end
 
       def parse!(args)
@@ -64,7 +64,7 @@ module Cucumber
       end
 
       def fail_fast?
-        !!@options[:fail_fast]
+        @options[:fail_fast]
       end
 
       def retry_attempts
@@ -79,7 +79,7 @@ module Cucumber
         logger = Logger.new(@out_stream)
         logger.formatter = LogFormatter.new
         logger.level = Logger::INFO
-        logger.level = Logger::DEBUG if self.verbose?
+        logger.level = Logger::DEBUG if verbose?
         logger
       end
 
@@ -131,7 +131,7 @@ module Cucumber
           f[2] == @out_stream ? -1 : 1
         end
         @options[:formats].uniq!
-        @options.check_formatter_stream_conflicts()
+        @options.check_formatter_stream_conflicts
       end
     end
   end

data/lib/cucumber/cli/main.rb

@@ -24,22 +24,15 @@ module Cucumber
       def execute!(existing_runtime = nil)
         trap_interrupt
 
-        runtime = if existing_runtime
-                    existing_runtime.configure(configuration)
-                    existing_runtime
-                  else
-                    Runtime.new(configuration)
-                  end
+        runtime = runtime(existing_runtime)
 
         runtime.run!
         if Cucumber.wants_to_quit
           exit_unable_to_finish
+        elsif runtime.failure?
+          exit_tests_failed
         else
-          if runtime.failure?
-            exit_tests_failed
-          else
-            exit_ok
-          end
+          exit_ok
         end
       rescue SystemExit => e
         @kernel.exit(e.status)
@@ -56,7 +49,7 @@ module Cucumber
       rescue Errno::EACCES, Errno::ENOENT => e
         @err.puts("#{e.message} (#{e.class})")
         exit_unable_to_finish
-      rescue Exception => e
+      rescue Exception => e # rubocop:disable Lint/RescueException
         @err.puts("#{e.message} (#{e.class})")
         @err.puts(e.backtrace.join("\n"))
         exit_unable_to_finish
@@ -95,6 +88,12 @@ module Cucumber
           STDERR.puts "\nExiting... Interrupt again to exit immediately."
         end
       end
+
+      def runtime(existing_runtime)
+        return Runtime.new(configuration) unless existing_runtime
+        existing_runtime.configure(configuration)
+        existing_runtime
+      end
     end
   end
 end

data/lib/cucumber/cli/options.rb

@@ -10,25 +10,22 @@ module Cucumber
   module Cli
     class Options
       INDENT = ' ' * 53
-      # rubocop:disable Layout/MultilineOperationIndentation
       BUILTIN_FORMATS = {
-        'html'        => ['Cucumber::Formatter::Html',        'Generates a nice looking HTML report.'],
         'pretty'      => ['Cucumber::Formatter::Pretty',      'Prints the feature as is - in colours.'],
         'progress'    => ['Cucumber::Formatter::Progress',    'Prints one character per scenario.'],
+        'dots'        => ['Cucumber::Formatter::Dots',        'Simple progress output to console'],
         'rerun'       => ['Cucumber::Formatter::Rerun',       'Prints failing files with line numbers.'],
-        'usage'       => ['Cucumber::Formatter::Usage',       "Prints where step definitions are used.\n" +
-                                                              "#{INDENT}The slowest step definitions (with duration) are\n" +
-                                                              "#{INDENT}listed first. If --dry-run is used the duration\n" +
-                                                              "#{INDENT}is not shown, and step definitions are sorted by\n" +
+        'usage'       => ['Cucumber::Formatter::Usage',       "Prints where step definitions are used.\n" \
+                                                              "#{INDENT}The slowest step definitions (with duration) are\n" \
+                                                              "#{INDENT}listed first. If --dry-run is used the duration\n" \
+                                                              "#{INDENT}is not shown, and step definitions are sorted by\n" \
                                                               "#{INDENT}filename instead."],
-        'stepdefs'    => ['Cucumber::Formatter::Stepdefs',    "Prints All step definitions with their locations. Same as\n" +
+        'stepdefs'    => ['Cucumber::Formatter::Stepdefs',    "Prints All step definitions with their locations. Same as\n" \
                                                               "#{INDENT}the usage formatter, except that steps are not printed."],
         'junit'       => ['Cucumber::Formatter::Junit',       'Generates a report similar to Ant+JUnit.'],
         'json'        => ['Cucumber::Formatter::Json',        'Prints the feature as JSON'],
-        'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as prettified JSON'],
         'summary'     => ['Cucumber::Formatter::Summary',     'Summary output of feature and scenarios']
-      }
-      # rubocop:enable Layout/MultilineOperationIndentation
+      }.freeze
       max = BUILTIN_FORMATS.keys.map(&:length).max
       FORMAT_HELP_MSG = [
         'Use --format rerun --out rerun.txt to write out failing',
@@ -41,24 +38,24 @@ module Cucumber
         'foo/bar_zap.rb. You can place the file with this relative',
         'path underneath your features/support directory or anywhere',
         "on Ruby's LOAD_PATH, for example in a Ruby gem."
-      ]
+      ].freeze
 
       FORMAT_HELP = (BUILTIN_FORMATS.keys.sort.map do |key|
         "  #{key}#{' ' * (max - key.length)} : #{BUILTIN_FORMATS[key][1]}"
       end) + FORMAT_HELP_MSG
-      PROFILE_SHORT_FLAG = '-p'
-      NO_PROFILE_SHORT_FLAG = '-P'
-      PROFILE_LONG_FLAG = '--profile'
-      NO_PROFILE_LONG_FLAG = '--no-profile'
-      FAIL_FAST_FLAG = '--fail-fast'
-      RETRY_FLAG = '--retry'
+      PROFILE_SHORT_FLAG = '-p'.freeze
+      NO_PROFILE_SHORT_FLAG = '-P'.freeze
+      PROFILE_LONG_FLAG = '--profile'.freeze
+      NO_PROFILE_LONG_FLAG = '--no-profile'.freeze
+      FAIL_FAST_FLAG = '--fail-fast'.freeze
+      RETRY_FLAG = '--retry'.freeze
       OPTIONS_WITH_ARGS = [
         '-r', '--require', '--i18n-keywords', '-f', '--format', '-o',
         '--out', '-t', '--tags', '-n', '--name', '-e', '--exclude',
         PROFILE_SHORT_FLAG, PROFILE_LONG_FLAG, RETRY_FLAG, '-l',
         '--lines', '--port', '-I', '--snippet-type'
-      ]
-      ORDER_TYPES = %w{defined random}
+      ].freeze
+      ORDER_TYPES = %w[defined random].freeze
       TAG_LIMIT_MATCHER = /(?<tag_name>\@\w+):(?<limit>\d+)/x
 
       def self.parse(args, out_stream, error_stream, options = {})
@@ -87,19 +84,17 @@ module Cucumber
         @options[key] = value
       end
 
-      def parse!(args) # rubocop:disable Metrics/AbcSize
+      def parse!(args) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         @args = args
         @expanded_args = @args.dup
 
         @args.extend(::OptionParser::Arguable)
 
-        @args.options do |opts|
+        @args.options do |opts| # rubocop:disable Metrics/BlockLength
           opts.banner = banner
           opts.on('-r LIBRARY|DIR', '--require LIBRARY|DIR', *require_files_msg) { |lib| require_files(lib) }
 
-          if Cucumber::JRUBY
-            opts.on('-j DIR', '--jars DIR', 'Load all the jars under DIR') { |jars| load_jars(jars) }
-          end
+          opts.on('-j DIR', '--jars DIR', 'Load all the jars under DIR') { |jars| load_jars(jars) } if Cucumber::JRUBY
 
           opts.on("#{RETRY_FLAG} ATTEMPTS", *retry_msg) { |v| set_option :retry, v.to_i }
           opts.on('--i18n-languages', *i18n_languages_msg) { list_languages_and_exit }
@@ -108,13 +103,13 @@ module Cucumber
           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) { |_v| initialize_project }
           opts.on('-o', '--out [FILE|DIR]', *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('-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 }
+          opts.on(NO_PROFILE_SHORT_FLAG, NO_PROFILE_LONG_FLAG, *no_profile_short_flag_msg) { |_v| disable_profile_loading }
           opts.on('-c', '--[no-]color', *color_msg) { |v| color v }
           opts.on('-d', '--dry-run', *dry_run_msg) { set_dry_run_and_duration }
           opts.on('-m', '--no-multiline', "Don't print multiline strings and tables under steps.") { set_option :no_multiline }
@@ -140,11 +135,9 @@ module Cucumber
   [random]      Shuffle scenarios before running.
 Specify SEED to reproduce the shuffling from a previous run.
   e.g. --order random:5738
-TEXT
+                  TEXT
             @options[:order], @options[:seed] = *order.split(':')
-            unless ORDER_TYPES.include?(@options[:order])
-              fail "'#{@options[:order]}' is not a recognised order type. Please use one of #{ORDER_TYPES.join(", ")}."
-            end
+            raise "'#{@options[:order]}' is not a recognised order type. Please use one of #{ORDER_TYPES.join(', ')}." unless ORDER_TYPES.include?(@options[:order])
           end
 
           opts.on_tail('--version', 'Show version.') { exit_ok(Cucumber::VERSION) }
@@ -156,7 +149,7 @@ TEXT
         extract_environment_variables
         @options[:paths] = @args.dup # whatver is left over
 
-        check_formatter_stream_conflicts()
+        check_formatter_stream_conflicts
 
         merge_profiles
 
@@ -171,7 +164,7 @@ TEXT
         @options[:filters] ||= []
       end
 
-      def check_formatter_stream_conflicts()
+      def check_formatter_stream_conflicts
         streams = @options[:formats].uniq.map { |(_, _, stream)| stream }
         return if streams == streams.uniq
         raise 'All but one formatter must use --out, only one can print to each stream (or STDOUT)'
@@ -219,7 +212,7 @@ TEXT
       def i18n_keywords_msg
         [
           'List keywords for in a particular language',
-          %{Run with "--i18n help" to see all languages}
+          %(Run with "--i18n help" to see all languages)
         ]
       end
 
@@ -357,7 +350,7 @@ TEXT
       def language(lang)
         require 'gherkin/dialect'
 
-        return indicate_invalid_language_and_exit(lang) unless ::Gherkin::DIALECTS.keys.include? lang
+        return indicate_invalid_language_and_exit(lang) unless ::Gherkin::DIALECTS.key?(lang)
         list_keywords_and_exit(lang)
       end
 
@@ -366,7 +359,7 @@ TEXT
       end
 
       def non_stdout_formats
-        @options[:formats].select { |_, _, output| output != @out_stream }
+        @options[:formats].reject { |_, _, output| output == @out_stream }
       end
 
       def add_option(option, value)
@@ -374,8 +367,8 @@ TEXT
       end
 
       def add_tag(value)
-        warn("Deprecated: Found tags option '#{value}'. Support for '~@tag' will be removed from the next release of Cucumber. Please use 'not @tag' instead.") if value.include?('~')
-        warn("Deprecated: Found tags option '#{value}'. Support for '@tag1,@tag2' will be removed from the next release of Cucumber. Please use '@tag or @tag2' instead.") if value.include?(',')
+        raise("Found tags option '#{value}'. '~@tag' is no longer supported, use 'not @tag' instead.") if value.include?('~')
+        raise("Found tags option '#{value}'. '@tag1,@tag2' is no longer supported, use '@tag or @tag2' instead.") if value.include?(',')
         @options[:tag_expressions] << value.gsub(/(@\w+)(:\d+)?/, '\1')
         add_tag_limits(value)
       end
@@ -387,9 +380,7 @@ TEXT
       end
 
       def add_tag_limit(tag_limits, tag_name, limit)
-        if tag_limits[tag_name] && tag_limits[tag_name] != limit
-          raise "Inconsistent tag limits for #{tag_name}: #{tag_limits[tag_name]} and #{limit}"
-        end
+        raise "Inconsistent tag limits for #{tag_name}: #{tag_limits[tag_name]} and #{limit}" if tag_limits[tag_name] && tag_limits[tag_name] != limit
         tag_limits[tag_name] = limit
       end
 
@@ -436,7 +427,7 @@ TEXT
       def extract_environment_variables
         @args.delete_if do |arg|
           if arg =~ /^(\w+)=(.*)$/
-            @options[:env_vars][$1] = $2
+            @options[:env_vars][Regexp.last_match(1)] = Regexp.last_match(2)
             true
           end
         end
@@ -465,8 +456,8 @@ TEXT
         profile_args = profile_loader.args_from(profile)
         profile_options = Options.parse(
           profile_args, @out_stream, @error_stream,
-          :skip_profile_information => true,
-          :profile_loader => profile_loader
+          skip_profile_information: true,
+          profile_loader: profile_loader
         )
         reverse_merge(profile_options)
       end
@@ -474,14 +465,14 @@ TEXT
       def default_profile_should_be_used?
         @profiles.empty? &&
           profile_loader.cucumber_yml_defined? &&
-          profile_loader.has_profile?(@default_profile)
+          profile_loader.profile?(@default_profile)
       end
 
       def profile_loader
         @profile_loader ||= ProfileLoader.new
       end
 
-      def reverse_merge(other_options)
+      def reverse_merge(other_options) # rubocop:disable Metrics/AbcSize
         @options = other_options.options.merge(@options)
         @options[:require] += other_options[:require]
         @options[:excludes] += other_options[:excludes]
@@ -510,7 +501,7 @@ TEXT
           @options[:formats] = stdout_formats[0..0] + non_stdout_formats
         end
 
-        @options[:retry] = other_options[:retry] if @options[:retry] == 0
+        @options[:retry] = other_options[:retry] if @options[:retry].zero?
 
         self
       end
@@ -546,7 +537,7 @@ TEXT
             ['but (code)', to_code_keywords_string(language.but_keywords)]
           ]
         )
-        @out_stream.write(data.to_s({ color: false, prefixes: Hash.new('') }))
+        @out_stream.write(data.to_s(color: false, prefixes: Hash.new('')))
         Kernel.exit(0)
       end
 
@@ -557,7 +548,7 @@ TEXT
             [key, ::Gherkin::DIALECTS[key].fetch('name'), ::Gherkin::DIALECTS[key].fetch('native')]
           end
         )
-        @out_stream.write(data.to_s({ color: false, prefixes: Hash.new('') }))
+        @out_stream.write(data.to_s(color: false, prefixes: Hash.new('')))
         Kernel.exit(0)
       end
 
@@ -571,20 +562,20 @@ TEXT
 
       def default_options
         {
-          :strict       => Cucumber::Core::Test::Result::StrictConfiguration.new,
-          :require      => [],
-          :dry_run      => false,
-          :formats      => [],
-          :excludes     => [],
-          :tag_expressions => [],
-          :tag_limits   => {},
-          :name_regexps => [],
-          :env_vars     => {},
-          :diff_enabled => true,
-          :snippets     => true,
-          :source       => true,
-          :duration     => true,
-          :retry        => 0
+          strict: Cucumber::Core::Test::Result::StrictConfiguration.new,
+          require: [],
+          dry_run: false,
+          formats: [],
+          excludes: [],
+          tag_expressions: [],
+          tag_limits: {},
+          name_regexps: [],
+          env_vars: {},
+          diff_enabled: true,
+          snippets: true,
+          source: true,
+          duration: true,
+          retry: 0
         }
       end
     end