cucumber 0.8.3 → 0.8.4

data/gem_tasks/examples.rake

@@ -1,7 +1,7 @@
 desc 'Run all exmples'
 task :examples do
   Dir['examples/*'].each do |example_dir|
-    next if !File.directory?(example_dir) || %w{examples/junit examples/i18n examples/python examples/ruby2python examples/self_test examples/steps_library examples/tickets}.index(example_dir)
+    next if !File.directory?(example_dir) || %w{examples/i18n examples/python examples/ruby2python}.index(example_dir)
     puts "Running #{example_dir}"
     Dir.chdir(example_dir) do
       sh "rake cucumber"

data/lib/cucumber/ast/feature.rb

@@ -73,11 +73,6 @@ module Cucumber
         "#{@file}:#{line}"
       end
 
-      def tag_locations(tag)
-        init
-        @feature_elements.select{|feature_element| feature_element.tagged_with?(tag)}
-      end
-
       def short_name
         first_line = name.split(/\n/)[0]
         if first_line =~ /#{language.keywords('feature')}:(.*)/

data/lib/cucumber/ast/feature_element.rb

@@ -1,5 +1,5 @@
 require 'enumerator'
-require 'gherkin/parser/tag_expression'
+require 'gherkin/tag_expression'
 
 module Cucumber
   module Ast
@@ -58,17 +58,13 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        Gherkin::Parser::TagExpression.new(hook.tag_expressions).eval(source_tag_names)
+        Gherkin::TagExpression.new(hook.tag_expressions).eval(source_tag_names)
       end
 
       def source_tag_names
         (@tags.tag_names.to_a + (@feature ? @feature.source_tag_names.to_a : [])).uniq
       end
 
-      def tagged_with?(tag)
-        source_tag_names.index(tag)
-      end
-
       def language
         @feature.language if @feature
       end

data/lib/cucumber/ast/features.rb

@@ -30,11 +30,6 @@ module Cucumber
         end
         @duration = Time.now - start
       end
-
-      def tag_locations(tag)
-        @features.map{|feature| feature.tag_locations(tag)}.flatten
-      end
-
     end
   end
 end

data/lib/cucumber/ast/table.rb

@@ -39,9 +39,6 @@ module Cucumber
           @rows = []
         end
 
-        def location(uri, offset)
-        end
-
         def row(row, line_number)
           @rows << row
         end
@@ -64,7 +61,7 @@ module Cucumber
       def self.parse(text, uri, offset)
         builder = Builder.new
         lexer = Gherkin::I18nLexer.new(builder)
-        lexer.scan(text, uri, offset)
+        lexer.scan(text)
         new(builder.rows)
       end
 

data/lib/cucumber/ast/tags.rb

@@ -1,4 +1,4 @@
-require 'gherkin/parser/tag_expression'
+require 'gherkin/tag_expression'
 
 module Cucumber
   module Ast
@@ -17,7 +17,7 @@ module Cucumber
       end
 
       def accept_hook?(hook)
-        Gherkin::Parser::TagExpression.new(hook.tag_expressions).eval(@tag_names)
+        Gherkin::TagExpression.new(hook.tag_expressions).eval(@tag_names)
       end
 
       def to_sexp

data/lib/cucumber/cli/configuration.rb

@@ -1,7 +1,7 @@
 require 'logger'
 require 'cucumber/cli/options'
 require 'cucumber/constantize'
-require 'gherkin/parser/tag_expression'
+require 'gherkin/tag_expression'
 
 module Cucumber
   module Cli
@@ -26,7 +26,7 @@ module Cucumber
         arrange_formats
         raise("You can't use both --strict and --wip") if strict? && wip?
 
-        @options[:tag_expression] = Gherkin::Parser::TagExpression.new(@options[:tag_expressions])
+        @options[:tag_expression] = Gherkin::TagExpression.new(@options[:tag_expressions])
         return @args.replace(@options.expanded_args_without_drb) if drb?
 
         set_environment_variables

data/lib/cucumber/cli/drb_client.rb

@@ -29,7 +29,7 @@ module Cucumber
           # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
           begin
             DRb.start_service("druby://localhost:0")
-          rescue SocketError
+          rescue SocketError, Errno::EADDRNOTAVAIL
             # Ruby-1.8.7 on snow leopard doesn't like localhost:0 - but just :0
             # seems to work just fine
             DRb.start_service("druby://:0")

data/lib/cucumber/cli/main.rb

@@ -55,17 +55,12 @@ module Cucumber
         features = step_mother.load_plain_text_features(configuration.feature_files)
         step_mother.load_code_files(configuration.step_defs_to_load)
 
-        tag_excess = tag_excess(features)
-        configuration.options[:tag_excess] = tag_excess # Hack to make it available in console.rb - later: stick on Run instance.
-
         runner = configuration.build_runner(step_mother, @out_stream)
         step_mother.visitor = runner # Needed to support World#announce
         
         runner.visit_features(features)
 
-        failure = if tag_excess.any?
-          true
-        elsif configuration.wip?
+        failure = if configuration.wip?
           step_mother.scenarios(:passed).any?
         else
           step_mother.scenarios(:failed).any? ||
@@ -76,17 +71,6 @@ module Cucumber
         true
       end
 
-      def tag_excess(features)
-        configuration.options[:tag_expression].limits.map do |tag_name, tag_limit|
-          tag_locations = features.tag_locations(tag_name)
-          if tag_limit && (tag_locations.length > tag_limit)
-            [tag_name, tag_limit, tag_locations]
-          else
-            nil
-          end
-        end.compact
-      end
-
       def configuration
         return @configuration if @configuration
 

data/lib/cucumber/cli/options.rb

@@ -1,6 +1,5 @@
 require 'cucumber/cli/profile_loader'
 require 'cucumber/formatter/ansicolor'
-require 'gherkin/parser/tag_expression'
 
 module Cucumber
   module Cli

data/lib/cucumber/cli/profile_loader.rb

@@ -52,7 +52,7 @@ Defined profiles in cucumber.yml:
       def cucumber_yml
         return @cucumber_yml if @cucumber_yml
         unless cucumber_yml_defined?
-          raise(ProfilesNotDefinedError,"cucumber.yml was not found.  Please refer to cucumber's documentation on defining profiles in cucumber.yml.  You must define a 'default' profile to use the cucumber command without any arguments.\nType 'cucumber --help' for usage.\n")
+          raise(ProfilesNotDefinedError,"cucumber.yml was not found.  Current directory is #{Dir.pwd}.  Please refer to cucumber's documentation on defining profiles in cucumber.yml.  You must define a 'default' profile to use the cucumber command without any arguments.\nType 'cucumber --help' for usage.\n")
         end
 
         require 'erb'

data/lib/cucumber/feature_file.rb

@@ -1,6 +1,6 @@
 require 'cucumber/parser/gherkin_builder'
-require 'gherkin/parser/filter_listener'
-require 'gherkin/parser/formatter_listener'
+require 'gherkin/formatter/filter_formatter'
+require 'gherkin/formatter/tag_count_formatter'
 require 'gherkin/parser/parser'
 require 'gherkin/i18n_lexer'
 
@@ -24,21 +24,19 @@ module Cucumber
     # Parses a file and returns a Cucumber::Ast
     # If +options+ contains tags, the result will
     # be filtered.
-    def parse(step_mother, options)
+    def parse(options, tag_counts)
       filters = @lines || options.filters
 
-      builder            = Cucumber::Parser::GherkinBuilder.new
-      formatter_listener = Gherkin::Parser::FormatterListener.new(builder)
-      filter_listener    = Gherkin::Parser::FilterListener.new(formatter_listener, filters)
-      parser             = Gherkin::Parser::Parser.new(filter_listener, true, "root")
-      lexer              = Gherkin::I18nLexer.new(parser, false)
+      builder             = Cucumber::Parser::GherkinBuilder.new
+      filter_formatter    = filters.empty? ? builder : Gherkin::Formatter::FilterFormatter.new(builder, filters)
+      tag_count_formatter = Gherkin::Formatter::TagCountFormatter.new(filter_formatter, tag_counts)
+      parser              = Gherkin::Parser::Parser.new(tag_count_formatter, true, "root", false)
 
       begin
-        s = ENV['FILTER_PML_CALLOUT'] ? source.gsub(C_CALLOUT, '') : source
-        lexer.scan(s, @path, 0)
+        parser.parse(source, @path, 0)
         ast = builder.ast
         return nil if ast.nil? # Filter caused nothing to match
-        ast.language = lexer.i18n_language
+        ast.language = parser.i18n_language
         ast.file = @path
         ast
       rescue Gherkin::LexingError, Gherkin::Parser::ParseError => e

data/lib/cucumber/formatter/console.rb

@@ -125,17 +125,6 @@ module Cucumber
         end
       end
 
-      def print_tag_limit_warnings(features)
-        first_tag = true
-        @options[:tag_excess].each do |tag_name, tag_limit, tag_locations|
-          @io.puts if first_tag
-          first_tag = false
-          @io.puts format_string("#{tag_name} occurred #{tag_locations.length} times, but the limit was set to #{tag_limit}", :failed)
-          tag_locations.each {|tag_location| @io.puts format_string("  #{tag_location.file_colon_line}", :failed)}
-          @io.flush
-        end
-      end
-
       def embed(file, mime_type)
         # no-op
       end

data/lib/cucumber/formatter/json.rb

@@ -69,7 +69,7 @@ module Cucumber
 
       def step_name(keyword, step_match, status, source_indent, background)
         @current_step[:status]          = status
-        @current_step[:keyword]         = "#{keyword}"
+        @current_step[:keyword]         = keyword
         @current_step[:name]            = "#{step_match.name || step_match.format_args}"
         @current_step[:file_colon_line] = step_match.file_colon_line
       end

data/lib/cucumber/formatter/pretty.rb

@@ -231,7 +231,6 @@ module Cucumber
         print_stats(features, @options.custom_profiles)
         print_snippets(@options)
         print_passing_wip(@options)
-        print_tag_limit_warnings(features)
       end
     end
   end

data/lib/cucumber/formatter/progress.rb

@@ -68,7 +68,6 @@ module Cucumber
         print_stats(features, @options.custom_profiles)
         print_snippets(@options)
         print_passing_wip(@options)
-        print_tag_limit_warnings(features)
       end
 
       CHARS = {

data/lib/cucumber/parser/gherkin_builder.rb

@@ -13,23 +13,23 @@ module Cucumber
         @feature || @multiline_arg
       end
 
-      def feature(comments, tags, keyword, name, description, uri)
+      def feature(statement, uri)
         @feature = Ast::Feature.new(
           nil, 
-          Ast::Comment.new(comments.join("\n")), 
-          Ast::Tags.new(nil, tags),
-          keyword,
-          legacy_name_for(name, description),
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
+          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}),
+          statement.keyword,
+          legacy_name_for(statement.name, statement.description),
           []
         )
       end
 
-      def background(comments, keyword, name, description, line)
+      def background(statement)
         @background = Ast::Background.new(
-          Ast::Comment.new(comments.join("\n")), 
-          line, 
-          keyword, 
-          legacy_name_for(name, description), 
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
+          statement.line, 
+          statement.keyword, 
+          legacy_name_for(statement.name, statement.description), 
           steps=[]
         )
         @feature.background = @background
@@ -37,14 +37,14 @@ module Cucumber
         @step_container = @background
       end
 
-      def scenario(comments, tags, keyword, name, description, line)
+      def scenario(statement)
         scenario = Ast::Scenario.new(
           @background, 
-          Ast::Comment.new(comments.join("\n")), 
-          Ast::Tags.new(nil, tags), 
-          line, 
-          keyword, 
-          legacy_name_for(name, description), 
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
+          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
+          statement.line, 
+          statement.keyword, 
+          legacy_name_for(statement.name, statement.description), 
           steps=[]
         )
         @feature.add_feature_element(scenario)
@@ -52,14 +52,14 @@ module Cucumber
         @step_container = scenario
       end
 
-      def scenario_outline(comments, tags, keyword, name, description, line)
+      def scenario_outline(statement)
         scenario_outline = Ast::ScenarioOutline.new(
           @background, 
-          Ast::Comment.new(comments.join("\n")), 
-          Ast::Tags.new(nil, tags), 
-          line, 
-          keyword, 
-          legacy_name_for(name, description), 
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
+          Ast::Tags.new(nil, statement.tags.map{|tag| tag.name}), 
+          statement.line, 
+          statement.keyword, 
+          legacy_name_for(statement.name, statement.description), 
           steps=[],
           example_sections=[]
         )
@@ -71,17 +71,23 @@ module Cucumber
         @step_container = scenario_outline
       end
 
-      def examples(comments, tags, keyword, name, description, line, examples_table)
-        examples_fields = [Ast::Comment.new(comments.join("\n")), line, keyword, legacy_name_for(name, description), matrix(examples_table)]
+      def examples(statement, examples_rows)
+        examples_fields = [
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
+          statement.line, 
+          statement.keyword, 
+          legacy_name_for(statement.name, statement.description), 
+          matrix(examples_rows)
+        ]
         @step_container.add_examples(examples_fields)
       end
 
-      def step(comments, keyword, name, line, multiline_arg, status, exception, arguments, stepdef_location)
-        @table_owner = Ast::Step.new(line, keyword, name)
+      def step(statement, multiline_arg, result)
+        @table_owner = Ast::Step.new(statement.line, statement.keyword, statement.name)
         multiline_arg = rubify(multiline_arg)
         case(multiline_arg)
-        when String
-          @table_owner.multiline_arg = Ast::PyString.new(multiline_arg)
+        when Gherkin::Formatter::Model::PyString
+          @table_owner.multiline_arg = Ast::PyString.new(multiline_arg.value)
         when Array
           @table_owner.multiline_arg = Ast::Table.new(matrix(multiline_arg))
         end

data/lib/cucumber/rspec/doubles.rb

@@ -0,0 +1,16 @@
+require 'rspec/core'
+
+RSpec.configuration.configure_mock_framework
+World(RSpec::Core::MockFrameworkAdapter)
+
+Before do
+  _setup_mocks
+end
+
+After do
+  begin
+    _verify_mocks
+  ensure
+    _teardown_mocks
+  end
+end

data/lib/cucumber/step_mother.rb

@@ -39,6 +39,12 @@ module Cucumber
     end
   end
 
+  class TagExcess < StandardError
+    def initialize(messages)
+      super(messages.join("\n"))
+    end
+  end
+
   # This is the meaty part of Cucumber that ties everything together.
   class StepMother
     include Constantize
@@ -55,11 +61,12 @@ module Cucumber
     def load_plain_text_features(feature_files)
       features = Ast::Features.new
 
+      tag_counts = {}
       start = Time.new
       log.debug("Features:\n")
       feature_files.each do |f|
         feature_file = FeatureFile.new(f)
-        feature = feature_file.parse(self, options)
+        feature = feature_file.parse(options, tag_counts)
         if feature
           features.add_feature(feature)
           log.debug("  * #{f}\n")
@@ -67,9 +74,26 @@ module Cucumber
       end
       duration = Time.now - start
       log.debug("Parsing feature files took #{format_duration(duration)}\n\n")
+      
+      check_tag_limits(tag_counts)
+      
       features
     end
 
+    def check_tag_limits(tag_counts)
+      error_messages = []
+      options[:tag_expression].limits.each do |tag_name, tag_limit|
+        tag_locations = (tag_counts[tag_name] || [])
+        tag_count = tag_locations.length
+        if tag_count > tag_limit
+          error = "#{tag_name} occurred #{tag_count} times, but the limit was set to #{tag_limit}\n  " +
+            tag_locations.join("\n  ")
+          error_messages << error
+        end
+      end
+      raise TagExcess.new(error_messages) if error_messages.any?
+    end
+
     def load_code_files(step_def_files)
       log.debug("Code:\n")
       step_def_files.each do |step_def_file|
@@ -191,8 +215,8 @@ module Cucumber
     #   })
     def invoke_steps(steps_text, i18n, file_colon_line)
       file, line = file_colon_line.split(':')
-      lexer = i18n.lexer(Gherkin::Parser::Parser.new(StepInvoker.new(self), true, 'steps'))
-      lexer.scan(steps_text, file, line.to_i)
+      parser = Gherkin::Parser::Parser.new(StepInvoker.new(self), true, 'steps')
+      parser.parse(steps_text, file, line.to_i)
     end
 
     class StepInvoker
@@ -200,37 +224,19 @@ module Cucumber
         @step_mother = step_mother
       end
 
-      def location(uri, offset)
-      end
-
-      def step(keyword, name, line)
-        invoke
-        @name = name
-      end
-
-      def py_string(string, line)
-        @multiline = Ast::PyString.new(string)
-      end
-
-      def row(row, line)
-        @rows ||= []
-        @rows << row
+      def step(statement, multiline_arg, result)
+        cucumber_multiline_arg = case(multiline_arg)
+        when Gherkin::Formatter::Model::PyString
+          multiline_arg.value
+        when Array
+          Ast::Table.new(multiline_arg.map{|row| row.cells})
+        else
+          nil
+        end
+        @step_mother.invoke(*[statement.name, cucumber_multiline_arg].compact) 
       end
 
       def eof
-        invoke
-      end
-
-      private
-      
-      def invoke
-        if @name
-          @multiline = Ast::Table.new(@rows) if @multiline.nil? && @rows
-          @step_mother.invoke(*[@name, @multiline].compact) 
-          @name = nil
-          @multiline = nil
-          @rows = nil
-        end
       end
     end