cucumber 3.0.0.pre.1 → 3.0.0.pre.2

data/lib/autotest/discover.rb

@@ -2,11 +2,11 @@
 Autotest.add_discovery do
   if File.directory?('features')
     if ENV['AUTOFEATURE'] =~ /true/i
-      "cucumber"
+      'cucumber'
     elsif ENV['AUTOFEATURE'] =~ /false/i
       # noop
     else
-      puts "(Not running features.  To run features in autotest, set AUTOFEATURE=true.)"
+      puts '(Not running features.  To run features in autotest, set AUTOFEATURE=true.)'
     end
   end
 end

data/lib/cucumber/cli/configuration.rb

@@ -3,7 +3,6 @@ require 'logger'
 require 'cucumber/cli/options'
 require 'cucumber/cli/rerun_file'
 require 'cucumber/constantize'
-require 'cucumber/core/gherkin/tag_expression'
 require 'cucumber'
 
 module Cucumber
@@ -28,8 +27,6 @@ module Cucumber
         @options.parse!(args)
         arrange_formats
         raise("You can't use both --strict and --wip") if strict? && wip?
-        # todo: remove
-        @options[:tag_expression] = Cucumber::Core::Gherkin::TagExpression.new(@options[:tag_expressions])
         set_environment_variables
       end
 
@@ -74,7 +71,7 @@ module Cucumber
       end
 
       def snippet_type
-        @options[:snippet_type] || :regexp
+        @options[:snippet_type] || :cucumber_expression
       end
 
       def log
@@ -85,13 +82,8 @@ module Cucumber
         logger
       end
 
-      # todo: remove
-      def tag_expression
-        Cucumber::Core::Gherkin::TagExpression.new(@options[:tag_expressions])
-      end
-
       def tag_limits
-        tag_expression.limits.to_hash
+        @options[:tag_limits]
       end
 
       def tag_expressions
@@ -121,7 +113,7 @@ module Cucumber
       private
 
       class LogFormatter < ::Logger::Formatter
-        def call(severity, time, progname, msg)
+        def call(_severity, _time, _progname, msg)
           msg
         end
       end
@@ -133,8 +125,10 @@ module Cucumber
       end
 
       def arrange_formats
-        @options[:formats] << ['pretty', @out_stream] if @options[:formats].empty?
-        @options[:formats] = @options[:formats].sort_by{|f| f[1] == @out_stream ? -1 : 1}
+        @options[:formats] << ['pretty', {}, @out_stream] if @options[:formats].empty?
+        @options[:formats] = @options[:formats].sort_by do |f|
+          f[2] == @out_stream ? -1 : 1
+        end
         @options[:formats].uniq!
         @options.check_formatter_stream_conflicts()
       end

data/lib/cucumber/cli/main.rb

@@ -24,11 +24,11 @@ module Cucumber
         trap_interrupt
 
         runtime = if existing_runtime
-          existing_runtime.configure(configuration)
-          existing_runtime
-        else
-          Runtime.new(configuration)
-        end
+                    existing_runtime.configure(configuration)
+                    existing_runtime
+                  else
+                    Runtime.new(configuration)
+                  end
 
         runtime.run!
         if Cucumber.wants_to_quit
@@ -47,7 +47,7 @@ module Cucumber
         @err.puts("Couldn't open #{e.path}")
         exit_unable_to_finish
       rescue FeatureFolderNotFoundException => e
-        @err.puts(e.message + ". You can use `cucumber --init` to get started.")
+        @err.puts(e.message + '. You can use `cucumber --init` to get started.')
         exit_unable_to_finish
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @err.puts(e.message)

data/lib/cucumber/cli/options.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
-require 'cucumber/rb_support/rb_language'
+require 'cucumber/glue/registry_and_more'
 require 'cucumber/project_initializer'
 
 module Cucumber
@@ -24,19 +24,18 @@ module Cucumber
         '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'],
-        'debug'       => ['Cucumber::Formatter::Debug',       'For developing formatters - prints the calls made to the listeners.'],
         'summary'       => ['Cucumber::Formatter::Summary',   'Summary output of feature and scenarios']
       }
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
-      FORMAT_HELP_MSG = ["Use --format rerun --out rerun.txt to write out failing",
-        "features. You can rerun them with cucumber @rerun.txt.",
-        "FORMAT can also be the fully qualified class name of",
+      FORMAT_HELP_MSG = ['Use --format rerun --out rerun.txt to write out failing',
+        'features. You can rerun them with cucumber @rerun.txt.',
+        'FORMAT can also be the fully qualified class name of',
         "your own custom formatter. If the class isn't loaded,",
-        "Cucumber will attempt to require a file with a relative",
-        "file name that is the underscore name of the class name.",
-        "Example: --format Foo::BarZap -> Cucumber will look for",
-        "foo/bar_zap.rb. You can place the file with this relative",
-        "path underneath your features/support directory or anywhere",
+        'Cucumber will attempt to require a file with a relative',
+        'file name that is the underscore name of the class name.',
+        'Example: --format Foo::BarZap -> Cucumber will look for',
+        '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."
       ]
 
@@ -49,12 +48,13 @@ module Cucumber
       NO_PROFILE_LONG_FLAG = '--no-profile'
       FAIL_FAST_FLAG = '--fail-fast'
       RETRY_FLAG = '--retry'
-      OPTIONS_WITH_ARGS = ['-r', '--require', '--i18n', '-f', '--format', '-o', '--out',
+      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}
+      TAG_LIMIT_MATCHER = /(?<tag_name>\@\w+):(?<limit>\d+)/x
 
       def self.parse(args, out_stream, error_stream, options = {})
         new(out_stream, error_stream, options).parse!(args)
@@ -82,7 +82,7 @@ module Cucumber
         @options[key] = value
       end
 
-      def parse!(args)
+      def parse!(args) # rubocop:disable Metrics/AbcSize
         @args = args
         @expanded_args = @args.dup
 
@@ -90,54 +90,57 @@ module Cucumber
 
         @args.options do |opts|
           opts.banner = banner
-          opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR", *require_files_msg) {|lib| require_files(lib) }
+          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) }
+            opts.on('-j DIR', '--jars DIR', 'Load all the jars under DIR') {|jars| load_jars(jars) }
           end
 
           opts.on("#{RETRY_FLAG} ATTEMPTS", *retry_msg) {|v| set_option :retry, v.to_i }
-          opts.on("--i18n LANG", *i18n_msg) {|lang| set_language lang }
-          opts.on(FAIL_FAST_FLAG, "Exit immediately following the first failing scenario") { set_option :fail_fast }
-          opts.on("-f FORMAT", "--format FORMAT", *format_msg, *FORMAT_HELP) {|v| add_option :formats, [v, @out_stream] }
+          opts.on('--i18n-languages', *i18n_languages_msg) { list_languages_and_exit }
+          opts.on('--i18n-keywords LANG', *i18n_keywords_msg) {|lang| set_language lang }
+          opts.on(FAIL_FAST_FLAG, 'Exit immediately following the first failing scenario') { set_option :fail_fast }
+          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("-o", "--out [FILE|DIR]", *out_msg) {|v| set_out_stream v }
-          opts.on("-t TAG_EXPRESSION", "--tags TAG_EXPRESSION", *tags_msg) {|v| add_option :tag_expressions, 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('-o', '--out [FILE|DIR]', *out_msg) {|v| set_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("-c", "--[no-]color", *color_msg) {|v| set_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 }
-          opts.on("-s", "--no-source", "Don't print the file and line of the step definition with the steps.") { set_option :source, false }
-          opts.on("-i", "--no-snippets", "Don't print snippets for pending steps.") { set_option :snippets, false }
-          opts.on("-I", "--snippet-type TYPE", *snippet_type_msg) {|v| set_option :snippet_type, v.to_sym }
-          opts.on("-q", "--quiet", "Alias for --no-snippets --no-source.") { shut_up }
-          opts.on("--no-duration", "Don't print the duration at the end of the summary") { set_option :duration, false }
-          opts.on("-b", "--backtrace", "Show full backtrace for all errors.") { Cucumber.use_full_backtrace = true }
-          opts.on("-S", "--strict", "Fail if there are any undefined or pending steps.") { set_option :strict }
-          opts.on("-w", "--wip", "Fail if there are any passing scenarios.") { set_option :wip }
-          opts.on("-v", "--verbose", "Show the files and features loaded.") { set_option :verbose }
-          opts.on("-g", "--guess", "Guess best match for Ambiguous steps.") { set_option :guess }
-          opts.on("-l", "--lines LINES", *lines_msg) {|lines| set_option :lines, lines }
-          opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") { set_option :expand }
-
-          opts.on("--order TYPE[:SEED]", "Run examples in the specified order. Available types:",
+          opts.on('-c', '--[no-]color', *color_msg) {|v| set_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 }
+          opts.on('-s', '--no-source', "Don't print the file and line of the step definition with the steps.") { set_option :source, false }
+          opts.on('-i', '--no-snippets', "Don't print snippets for pending steps.") { set_option :snippets, false }
+          opts.on('-I', '--snippet-type TYPE', *snippet_type_msg) {|v| set_option :snippet_type, v.to_sym }
+          opts.on('-q', '--quiet', 'Alias for --no-snippets --no-source.') { shut_up }
+          opts.on('--no-duration', "Don't print the duration at the end of the summary") { set_option :duration, false }
+          opts.on('-b', '--backtrace', 'Show full backtrace for all errors.') { Cucumber.use_full_backtrace = true }
+          opts.on('-S', '--strict', 'Fail if there are any undefined or pending steps.') { set_option :strict }
+          opts.on('-w', '--wip', 'Fail if there are any passing scenarios.') { set_option :wip }
+          opts.on('-v', '--verbose', 'Show the files and features loaded.') { set_option :verbose }
+          opts.on('-g', '--guess', 'Guess best match for Ambiguous steps.') { set_option :guess }
+          opts.on('-l', '--lines LINES', *lines_msg) {|lines| set_option :lines, lines }
+          opts.on('-x', '--expand', 'Expand Scenario Outline Tables in output.') { set_option :expand }
+
+          opts.on('--order TYPE[:SEED]', 'Run examples in the specified order. Available types:',
             *<<-TEXT.split("\n")) do |order|
   [defined]     Run scenarios in the order they were defined (default).
   [random]      Shuffle scenarios before running.
 Specify SEED to reproduce the shuffling from a previous run.
   e.g. --order random:5738
 TEXT
-            @options[:order], @options[:seed] = *order.split(":")
+            @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
           end
 
-          opts.on_tail("--version", "Show version.") { exit_ok(Cucumber::VERSION) }
-          opts.on_tail("-h", "--help", "You're looking at it.") { exit_ok(opts.help) }
+          opts.on_tail('--version', 'Show version.') { exit_ok(Cucumber::VERSION) }
+          opts.on_tail('-h', '--help', "You're looking at it.") { exit_ok(opts.help) }
         end.parse!
 
         @args.map! { |a| "#{a}:#{@options[:lines]}" } if @options[:lines]
@@ -161,34 +164,33 @@ TEXT
       end
 
       def check_formatter_stream_conflicts()
-        streams = @options[:formats].uniq.map { |(_, stream)| stream }
-        if streams != streams.uniq
-          raise "All but one formatter must use --out, only one can print to each stream (or STDOUT)"
-        end
+        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)'
       end
 
       def to_hash
         Hash(@options)
       end
 
-    protected
+      protected
 
       attr_reader :options, :profiles, :expanded_args
       protected :options, :profiles, :expanded_args
 
-    private
+      private
 
       def color_msg
         [
-          "Whether or not to use ANSI color in the output. Cucumber decides",
-          "based on your platform and the output destination if not specified."
+          'Whether or not to use ANSI color in the output. Cucumber decides',
+          'based on your platform and the output destination if not specified.'
         ]
       end
 
       def dry_run_msg
         [
-          "Invokes formatters without executing the steps.",
-          "This also omits the loading of your support/env.rb file if it exists."
+          'Invokes formatters without executing the steps.',
+          'This also omits the loading of your support/env.rb file if it exists.'
         ]
       end
 
@@ -197,12 +199,18 @@ TEXT
       end
 
       def format_msg
-        [ "How to format features (Default: pretty). Available formats:" ]
+        [ 'How to format features (Default: pretty). Available formats:' ]
+      end
+
+      def i18n_languages_msg
+        [
+          'List all available languages'
+        ]
       end
 
-      def i18n_msg
+      def i18n_keywords_msg
         [
-          "List keywords for in a particular language",
+          'List keywords for in a particular language',
           %{Run with "--i18n help" to see all languages}
         ]
       end
@@ -215,7 +223,7 @@ TEXT
       end
 
       def lines_msg
-        [ "Run given line numbers. Equivalent to FILE:LINE syntax" ]
+        [ 'Run given line numbers. Equivalent to FILE:LINE syntax' ]
       end
 
       def no_profile_short_flag_msg
@@ -226,96 +234,104 @@ TEXT
 
       def profile_short_flag_msg
         [
-          "Pull commandline arguments from cucumber.yml which can be defined as",
+          'Pull commandline arguments from cucumber.yml which can be defined as',
           "strings or arrays.  When a 'default' profile is defined and no profile",
-          "is specified it is always used. (Unless disabled, see -P below.)",
-          "When feature files are defined in a profile and on the command line",
-          "then only the ones from the command line are used."
+          'is specified it is always used. (Unless disabled, see -P below.)',
+          'When feature files are defined in a profile and on the command line',
+          'then only the ones from the command line are used.'
         ]
       end
 
       def retry_msg
-        [ "Specify the number of times to retry failing tests (default: 0)" ]
+        [ 'Specify the number of times to retry failing tests (default: 0)' ]
       end
 
       def name_msg
         [
-          "Only execute the feature elements which match part of the given name.",
-          "If this option is given more than once, it will match against all the",
-          "given names."
+          'Only execute the feature elements which match part of the given name.',
+          'If this option is given more than once, it will match against all the',
+          'given names.'
         ]
       end
 
+      def parse_formats(v)
+        formatter, *formatter_options = v.split(',')
+        options_hash = Hash[formatter_options.map { |s| s.split('=') }]
+        [formatter, options_hash]
+      end
+
       def set_out_stream(v)
-        @options[:formats] << ['pretty', nil] if @options[:formats].empty?
-        @options[:formats][-1][1] = v
+        @options[:formats] << ['pretty', {}, nil] if @options[:formats].empty?
+        @options[:formats][-1][2] = v
       end
 
       def tags_msg
         [
-          "Only execute the features or scenarios with tags matching TAG_EXPRESSION.",
-          "Scenarios inherit tags declared on the Feature level. The simplest",
-          "TAG_EXPRESSION is simply a tag. Example: --tags @dev. When a tag in a tag",
-          "expression starts with a ~, this represents boolean NOT. Example: --tags ~@dev.",
-          "A tag expression can have several tags separated by a comma, which represents",
-          "logical OR. Example: --tags @dev,@wip. The --tags option can be specified",
-          "several times, and this represents logical AND. Example: --tags @foo,~@bar --tags @zap.",
-          "This represents the boolean expression (@foo || !@bar) && @zap.",
+          'Only execute the features or scenarios with tags matching TAG_EXPRESSION.',
+          'Scenarios inherit tags declared on the Feature level. The simplest',
+          'TAG_EXPRESSION is simply a tag. Example: --tags @dev. To represent',
+          "boolean NOT preceed the tag with 'not '. Example: --tags 'not @dev'.",
+          'A tag expression can have several tags separated by an or which represents',
+          "logical OR. Example: --tags '@dev or @wip'. The --tags option can be specified",
+          'A tag expression can have several tags separated by an and which represents',
+          "logical AND. Example: --tags '@dev and @wip'. The --tags option can be specified",
+          'several times, and this also represents logical AND.',
+          "Example: --tags '@foo or not @bar' --tags @zap. This represents the boolean",
+          'expression (@foo || !@bar) && @zap.',
           "\n",
-          "Beware that if you want to use several negative tags to exclude several tags",
-          "you have to use logical AND: --tags ~@fixme --tags ~@buggy.",
+          'Beware that if you want to use several negative tags to exclude several tags',
+          "you have to use logical AND: --tags 'not @fixme and not @buggy'.",
           "\n",
-          "Positive tags can be given a threshold to limit the number of occurrences.",
-          "Example: --tags @qa:3 will fail if there are more than 3 occurrences of the @qa tag.",
-          "This can be practical if you are practicing Kanban or CONWIP."
+          'Tags can be given a threshold to limit the number of occurrences.',
+          'Example: --tags @qa:3 will fail if there are more than 3 occurrences of the @qa tag.',
+          'This can be practical if you are practicing Kanban or CONWIP.'
         ]
       end
 
       def out_msg
         [
-          "Write output to a file/directory instead of STDOUT. This option",
-          "applies to the previously specified --format, or the",
-          "default format if no format is specified. Check the specific",
+          'Write output to a file/directory instead of STDOUT. This option',
+          'applies to the previously specified --format, or the',
+          'default format if no format is specified. Check the specific',
           "formatter's docs to see whether to pass a file or a dir."
         ]
       end
 
       def require_files_msg
         [
-          "Require files before executing the features. If this",
-          "option is not specified, all *.rb files that are",
-          "siblings or below the features will be loaded auto-",
-          "matically. Automatic loading is disabled when this",
-          "option is specified, and all loading becomes explicit.",
-          "Files under directories named \"support\" are always",
-          "loaded first.",
-          "This option can be specified multiple times."
+          'Require files before executing the features. If this',
+          'option is not specified, all *.rb files that are',
+          'siblings or below the features will be loaded auto-',
+          'matically. Automatic loading is disabled when this',
+          'option is specified, and all loading becomes explicit.',
+          'Files under directories named "support" are always',
+          'loaded first.',
+          'This option can be specified multiple times.'
         ]
       end
 
       def snippet_type_msg
         [
-          "Use different snippet type (Default: regexp). Available types:",
-          Cucumber::RbSupport::RbLanguage.cli_snippet_type_options
+          'Use different snippet type (Default: cucumber_expression). Available types:',
+          Cucumber::Glue::RegistryAndMore.cli_snippet_type_options
         ].flatten
       end
 
       def banner
-        ["Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+", "",
-          "Examples:",
-          "cucumber examples/i18n/en/features",
-          "cucumber @rerun.txt (See --format rerun)",
-          "cucumber examples/i18n/it/features/somma.feature:6:98:113",
-          "cucumber -s -i http://rubyurl.com/eeCl", "", "",
+        ['Usage: cucumber [options] [ [FILE|DIR|URL][:LINE[:LINE]*] ]+', '',
+          'Examples:',
+          'cucumber examples/i18n/en/features',
+          'cucumber @rerun.txt (See --format rerun)',
+          'cucumber examples/i18n/it/features/somma.feature:6:98:113',
+          'cucumber -s -i http://rubyurl.com/eeCl', '', ''
         ].join("\n")
       end
 
       def require_files(v)
         @options[:require] << v
-        if(Cucumber::JRUBY && File.directory?(v))
-          require 'java'
-          $CLASSPATH << v
-        end
+        return unless Cucumber::JRUBY && File.directory?(v)
+        require 'java'
+        $CLASSPATH << v
       end
 
       def require_jars(jars)
@@ -325,13 +341,8 @@ TEXT
       def set_language(lang)
         require 'gherkin/dialect'
 
-        if lang == 'help'
-          list_languages_and_exit
-        elsif !::Gherkin::DIALECTS.keys.include? lang
-          indicate_invalid_language_and_exit(lang)
-        else
-          list_keywords_and_exit(lang)
-        end
+        return indicate_invalid_language_and_exit(lang) unless ::Gherkin::DIALECTS.keys.include? lang
+        list_keywords_and_exit(lang)
       end
 
       def disable_profile_loading
@@ -339,13 +350,33 @@ TEXT
       end
 
       def non_stdout_formats
-        @options[:formats].select {|format, output| output != @out_stream }
+        @options[:formats].select { |_, _, output| output != @out_stream }
       end
 
       def add_option(option, value)
         @options[option] << value
       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?(',')
+        @options[:tag_expressions] << value.gsub(/(@\w+)(:\d+)?/, '\1')
+        add_tag_limits(value)
+      end
+
+      def add_tag_limits(value)
+        value.split(/[, ]/).map { |part| TAG_LIMIT_MATCHER.match(part) }.compact.each do |matchdata|
+          add_tag_limit(@options[:tag_limits], matchdata[:tag_name], matchdata[:limit].to_i)
+        end
+      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
+        tag_limits[tag_name] = limit
+      end
+
       def set_color(color)
         Cucumber::Term::ANSIColor.coloring = color
       end
@@ -379,7 +410,7 @@ TEXT
       end
 
       def stdout_formats
-        @options[:formats].select {|format, output| output == @out_stream }
+        @options[:formats].select { |_, _, output| output == @out_stream }
       end
 
       def extract_environment_variables
@@ -397,7 +428,7 @@ TEXT
 
       def merge_profiles
         if @disable_profile_loading
-          @out_stream.puts "Disabling profiles..."
+          @out_stream.puts 'Disabling profiles...'
           return
         end
 
@@ -436,6 +467,7 @@ TEXT
         @options[:excludes] += other_options[:excludes]
         @options[:name_regexps] += other_options[:name_regexps]
         @options[:tag_expressions] += other_options[:tag_expressions]
+        merge_tag_limits(@options[:tag_limits], other_options[:tag_limits])
         @options[:env_vars] = other_options[:env_vars].merge(@options[:env_vars])
         if @options[:paths].empty?
           @options[:paths] = other_options[:paths]
@@ -461,6 +493,10 @@ TEXT
         self
       end
 
+      def merge_tag_limits(option_limits, other_limits)
+        other_limits.each { |key, value| add_tag_limit(option_limits, key, value) }
+      end
+
       def indicate_invalid_language_and_exit(lang)
         @out_stream.write("Invalid language '#{lang}'. Available languages are:\n")
         list_languages_and_exit
@@ -470,21 +506,21 @@ TEXT
         require 'gherkin/dialect'
         language = ::Gherkin::Dialect.for(lang)
         data = Cucumber::MultilineArgument::DataTable.from(
-          [["feature", to_keywords_string(language.feature_keywords)],
-          ["background", to_keywords_string(language.background_keywords)],
-          ["scenario", to_keywords_string(language.scenario_keywords)],
-          ["scenario_outline", to_keywords_string(language.scenario_outline_keywords)],
-          ["examples", to_keywords_string(language.examples_keywords)],
-          ["given", to_keywords_string(language.given_keywords)],
-          ["when", to_keywords_string(language.when_keywords)],
-          ["then", to_keywords_string(language.then_keywords)],
-          ["and", to_keywords_string(language.and_keywords)],
-          ["but", to_keywords_string(language.but_keywords)],
-          ["given (code)", to_code_keywords_string(language.given_keywords)],
-          ["when (code)", to_code_keywords_string(language.when_keywords)],
-          ["then (code)", to_code_keywords_string(language.then_keywords)],
-          ["and (code)", to_code_keywords_string(language.and_keywords)],
-          ["but (code)", to_code_keywords_string(language.but_keywords)]])
+          [['feature', to_keywords_string(language.feature_keywords)],
+          ['background', to_keywords_string(language.background_keywords)],
+          ['scenario', to_keywords_string(language.scenario_keywords)],
+          ['scenario_outline', to_keywords_string(language.scenario_outline_keywords)],
+          ['examples', to_keywords_string(language.examples_keywords)],
+          ['given', to_keywords_string(language.given_keywords)],
+          ['when', to_keywords_string(language.when_keywords)],
+          ['then', to_keywords_string(language.then_keywords)],
+          ['and', to_keywords_string(language.and_keywords)],
+          ['but', to_keywords_string(language.but_keywords)],
+          ['given (code)', to_code_keywords_string(language.given_keywords)],
+          ['when (code)', to_code_keywords_string(language.when_keywords)],
+          ['then (code)', to_code_keywords_string(language.then_keywords)],
+          ['and (code)', to_code_keywords_string(language.and_keywords)],
+          ['but (code)', to_code_keywords_string(language.but_keywords)]])
         @out_stream.write(data.to_s({ color: false, prefixes: Hash.new('') }))
         Kernel.exit(0)
       end
@@ -515,6 +551,7 @@ TEXT
           :formats      => [],
           :excludes     => [],
           :tag_expressions  => [],
+          :tag_limits   => {},
           :name_regexps => [],
           :env_vars     => {},
           :diff_enabled => true,