cucumber 0.3.104 → 0.4.0.rc1

data/features/usage_and_stepdefs_formatter.feature

@@ -6,7 +6,8 @@ Feature: Cucumber command line
   @mri186
   Scenario: List usage of step definitions
     When I run cucumber features --format usage --dry-run
-    Then it should pass with
+    Then STDERR should be empty
+    And it should pass with
       """
       -------------------------------------UU-U--------------UUUUU---------U-------U--------------U-UU-------------------------------------------------UU
       
@@ -139,7 +140,8 @@ Feature: Cucumber command line
     @mri186
     Scenario: --format steps
       When I run cucumber features --format stepdefs --dry-run
-      Then it should pass with
+      Then STDERR should be empty
+      And it should pass with
         """
         -------------------------------------UU-U--------------UUUUU---------U-------U--------------U-UU-------------------------------------------------UU
         

data/gem_tasks/contributors.rake

@@ -1,3 +1,4 @@
+# encoding: utf-8
 task :contributors do
   contributors = `git log --pretty=short --no-merges | git shortlog -ne | egrep -ve '^ +' | egrep -ve '^$'`
   puts contributors.split("\n").length
@@ -9,4 +10,4 @@ task :codeswarm do
   sh "sed -e 's/Aslak\ Hellesøy@.BEKK.no/aslak.hellesoy@gmail.com/g' .git/.code_swarm/log.xml > tmp.xml && mv tmp.xml .git/.code_swarm/log.xml"
   sh "sed -e 's/josephwilk@joesniff.co.uk/joe@josephwilk.net/g' .git/.code_swarm/log.xml > tmp.xml && mv tmp.xml .git/.code_swarm/log.xml"
   sh "code_swarm"
-end
+end

data/lib/cucumber/ast/background.rb

@@ -26,12 +26,24 @@ module Cucumber
         return if $cucumber_interrupted
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_background_name(@keyword, @name, file_colon_line(@line), source_indent(first_line_length))
-        visitor.step_mother.before(hook_context)
-        visitor.visit_steps(@step_invocations)
-        @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
-        visitor.step_mother.after(hook_context) if @failed || @feature_elements.empty?
+        with_visitor(hook_context, visitor) do
+          visitor.step_mother.before(hook_context)
+          visitor.visit_steps(@step_invocations)
+          @failed = @step_invocations.detect{|step_invocation| step_invocation.exception}
+          visitor.step_mother.after(hook_context) if @failed || @feature_elements.empty?
+        end
       end
-
+      
+      def with_visitor(scenario, visitor)
+        if self != scenario && scenario.respond_to?(:with_visitor)
+          scenario.with_visitor(visitor) do
+            yield
+          end
+        else
+          yield
+        end
+      end
+      
       def accept_hook?(hook)
         if hook_context != self
           hook_context.accept_hook?(hook)

data/lib/cucumber/ast/outline_table.rb

@@ -45,6 +45,12 @@ module Cucumber
       end
 
       class ExampleRow < Cells #:nodoc:
+        class InvalidForHeaderRowError < NoMethodError
+          def initialize(*args)
+            super 'This is a header row and cannot pass or fail'
+          end
+        end
+        
         attr_reader :scenario_outline # https://rspec.lighthouseapp.com/projects/16211/tickets/342
 
         def create_step_invocations!(scenario_outline)
@@ -113,6 +119,7 @@ module Cucumber
         
         # Returns true if one or more steps failed
         def failed?
+          raise InvalidForHeaderRowError if header?
           @step_invocations.failed? || !!@scenario_exception
         end
 
@@ -134,7 +141,7 @@ module Cucumber
         def name
           "| #{@cells.collect{|c| c.value }.join(' | ')} |"
         end
-
+        
         private
 
         def header?

data/lib/cucumber/ast/scenario.rb

@@ -92,7 +92,6 @@ module Cucumber
         sexp
       end
       
-      private
       
       def with_visitor(visitor)
         @current_visitor = visitor
@@ -100,6 +99,8 @@ module Cucumber
         @current_visitor = nil
       end
       
+      private
+      
       def skip_hooks?
         @background.failed? || @executed
       end

data/lib/cucumber/ast/step.rb

@@ -18,6 +18,11 @@ module Cucumber
         false
       end
 
+      def status
+        # Step always has status skipped, because Step is always in a ScenarioOutline
+        :skipped
+      end
+
       def step_invocation
         StepInvocation.new(self, @name, @multiline_arg, [])
       end
@@ -107,7 +112,7 @@ module Cucumber
         name_with_arguments_replaced = @name
         argument_hash.each do |name, value|
           value ||= ''
-          name_with_arguments_replaced = name_with_arguments_replaced.gsub(name, value) if value
+          name_with_arguments_replaced = name_with_arguments_replaced.gsub(name, value)
         end
         name_with_arguments_replaced
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -1,4 +1,5 @@
 require 'cucumber/step_match'
+require 'cucumber/ast/table'
 
 module Cucumber
   module Ast
@@ -38,7 +39,15 @@ module Cucumber
       end
 
       def visit_step_result(visitor)
-        visitor.visit_step_result(keyword, @step_match, @multiline_arg, @status, @reported_exception, source_indent, @background)
+        visitor.visit_step_result(
+          keyword,
+          @step_match,
+          (@different_table || @multiline_arg),
+          @status,
+          @reported_exception,
+          source_indent,
+          @background
+        )
       end
 
       def invoke(step_mother, options)
@@ -55,6 +64,10 @@ module Cucumber
           rescue Undefined => e
             failed(options, e, false)
             status!(:undefined)
+          rescue Cucumber::Ast::Table::Different => e
+            @different_table = e.table
+            failed(options, e, false)
+            status!(:failed)
           rescue Exception => e
             failed(options, e, false)
             status!(:failed)

data/lib/cucumber/ast/table.rb

@@ -20,6 +20,15 @@ module Cucumber
     # This will store <tt>[['a', 'b'], ['c', 'd']]</tt> in the <tt>data</tt> variable.
     #
     class Table
+      class Different < StandardError
+        attr_reader :table
+        
+        def initialize(table)
+          super('Tables were not identical')
+          @table = table
+        end
+      end
+      
       include Enumerable
       
       NULL_CONVERSIONS = Hash.new(lambda{ |cell_value| cell_value }).freeze
@@ -83,7 +92,7 @@ module Cucumber
       def hashes
         @hashes ||= cells_rows[1..-1].map do |row|
           row.to_hash
-        end.freeze
+        end
       end
       
       # Converts this table into a Hash where the first column is
@@ -101,7 +110,7 @@ module Cucumber
       def rows_hash
         return @rows_hash if @rows_hash
         verify_table_width(2)
-        @rows_hash = self.transpose.hashes[0].freeze
+        @rows_hash = self.transpose.hashes[0]
       end
 
       # Gets the raw data of this table. For example, a Table built from
@@ -139,6 +148,21 @@ module Cucumber
         nil
       end
 
+      # Matches +pattern+ against the header row of the table.
+      # This is used especially for argument transforms.
+      #
+      # Example:
+      #  | column_1_name | column_2_name |
+      #  | x             | y             |
+      #
+      #  table.match(/table:column_1_name,column_2_name/) #=> non-nil
+      #  
+      # Note: must use 'table:' prefix on match
+      def match(pattern)
+        header_to_match = "table:#{headers.join(',')}"
+        pattern.match(header_to_match)
+      end
+
       # For testing only
       def to_sexp #:nodoc:
         [:table, *cells_rows.map{|row| row.to_sexp}]
@@ -316,7 +340,7 @@ module Cucumber
           insert_row_pos  && options[:surplus_row] ||
           missing_col     && options[:missing_col] ||
           surplus_col     && options[:surplus_col]
-        raise 'Tables were not identical' if should_raise
+        raise Different.new(self) if should_raise
       end
 
       def to_hash(cells) #:nodoc:
@@ -370,7 +394,7 @@ module Cucumber
       def headers #:nodoc:
         raw.first
       end
-
+      
       def header_cell(col) #:nodoc:
         cells_rows[0][col]
       end
@@ -451,7 +475,7 @@ module Cucumber
       def columns #:nodoc:
         @columns ||= cell_matrix.transpose.map do |cell_row|
           @cells_class.new(self, cell_row)
-        end.freeze
+        end
       end
 
       def new_cell(raw_cell, line) #:nodoc:
@@ -551,7 +575,7 @@ module Cucumber
         end
 
         def to_hash #:nodoc:
-          @to_hash ||= @table.to_hash(self).freeze
+          @to_hash ||= @table.to_hash(self)
         end
 
         def value(n) #:nodoc:

data/lib/cucumber/cli/configuration.rb

@@ -109,7 +109,7 @@ module Cucumber
           end
         end.flatten.uniq
         remove_excluded_files_from(potential_feature_files)
-        potential_feature_files
+        potential_feature_files.sort
       end
       
       def feature_dirs

data/lib/cucumber/cli/language_help_formatter.rb

@@ -1,5 +1,6 @@
 require 'cucumber/formatter/pretty'
 require 'cucumber/parser/natural_language'
+require 'cucumber/formatter/unicode'
 
 module Cucumber
   module Cli
@@ -13,25 +14,37 @@ Please help us complete the translation by translating the missing words in
 Then contribute back to the Cucumber project. Details here:
 http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
 }
+      
+      class << self
+        def list_languages(io)
+          raw = Cucumber::LANGUAGES.keys.sort.map do |lang|
+            [
+              lang, 
+              Cucumber::LANGUAGES[lang]['name'], 
+              Cucumber::LANGUAGES[lang]['native']
+            ]
+          end
 
-      def self.list_languages(io)
-        raw = Cucumber::LANGUAGES.keys.sort.map do |lang|
-          [lang, Cucumber::LANGUAGES[lang]['name'], Cucumber::LANGUAGES[lang]['native']]
+          print_table io, raw, :check_lang => true
         end
-        table = Ast::Table.new(raw)
-        formatter = new(nil, io, {:check_lang=>true})
-        Ast::TreeWalker.new(nil, [formatter]).visit_multiline_arg(table)
-      end
 
-      def self.list_keywords(io, lang)
-        language = Parser::NaturalLanguage.get(nil, lang)
-        raw = Parser::NaturalLanguage::KEYWORD_KEYS.map do |key|
-          [key, language.keywords(key)]
+        def list_keywords(io, lang)
+          language = Parser::NaturalLanguage.get(nil, lang)
+          raw = Parser::NaturalLanguage::KEYWORD_KEYS.map do |key|
+            [key, language.keywords(key)]
+          end
+          
+          print_table io, raw, :incomplete => language.incomplete?
         end
-        table = Ast::Table.new(raw)
-        new(nil, io, {:incomplete => language.incomplete?}).visit_multiline_arg(table)
+      
+        private
+          def print_table(io, raw, options)
+            table = Ast::Table.new(raw)
+            formatter = new(nil, io, options)
+            Ast::TreeWalker.new(nil, [formatter]).visit_multiline_arg(table)
+          end
       end
-
+      
       def before_visit_multiline_arg(table)
         if @options[:incomplete]
           @io.puts(format_string(INCOMPLETE, :failed))

data/lib/cucumber/cli/options.rb

@@ -8,7 +8,8 @@ module Cucumber
         'pretty'    => ['Cucumber::Formatter::Pretty',   'Prints the feature as is - in colours.'],
         'pdf'       => ['Cucumber::Formatter::Pdf',      "Generates a PDF report. You need to have the\n" + 
                                                          "#{' ' * 51}prawn gem installed. Will pick up logo from\n" + 
-                                                         "#{' ' * 51}features/support/logo.png if present."],
+                                                         "#{' ' * 51}features/support/logo.png or\n" +
+                                                         "#{' ' * 51}features/support/logo.jpg if present."],
         'progress'  => ['Cucumber::Formatter::Progress', 'Prints one character per scenario.'],
         'rerun'     => ['Cucumber::Formatter::Rerun',    'Prints failing files with line numbers.'],
         'usage'     => ['Cucumber::Formatter::Usage',    "Prints where step definitions are used.\n" +

data/lib/cucumber/cli/profile_loader.rb

@@ -32,11 +32,12 @@ Defined profiles in cucumber.yml:
       end
 
       def cucumber_yml_defined?
-        @defined ||= File.exist?('cucumber.yml')
+        cucumber_file && File.exist?(cucumber_file)
       end
 
     private
 
+      # Loads the profile, processing it through ERB and YAML, and returns it as a hash.
       def cucumber_yml
         return @cucumber_yml if @cucumber_yml
         unless cucumber_yml_defined?
@@ -45,9 +46,9 @@ Defined profiles in cucumber.yml:
 
         require 'erb'
         require 'yaml'
-        begin 
-          @cucumber_erb = ERB.new(IO.read('cucumber.yml')).result
-        rescue Exception => e 
+        begin
+          @cucumber_erb = ERB.new(IO.read(cucumber_file)).result
+        rescue Exception => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed with ERB.  Please refer to cucumber's documentation on correct profile usage.\n#{$!.inspect}")
         end
 
@@ -64,6 +65,13 @@ Defined profiles in cucumber.yml:
         return @cucumber_yml
       end
 
+      # Locates cucumber.yml file. The file can end in .yml or .yaml,
+      # and be located in the current directory (eg. project root) or
+      # in a .config/ or config/ subdirectory of the current directory.
+      def cucumber_file
+        @cucumber_file ||= Dir.glob('{,.config/,config/}cucumber{.yml,.yaml}').first
+      end
+
     end
   end
 end

data/lib/cucumber/core_ext/instance_exec.rb

@@ -8,6 +8,29 @@ module Cucumber
 end
 
 class Object #:nodoc:
+  unless defined? instance_exec # 1.9
+    # http://eigenclass.org/hiki/bounded+space+instance_exec
+    module InstanceExecHelper #:nodoc:
+    end
+    include InstanceExecHelper
+    def instance_exec(*args, &block)
+      begin
+        old_critical, Thread.critical = Thread.critical, true
+        n = 0
+        n += 1 while respond_to?(mname="__instance_exec#{n}")
+        InstanceExecHelper.module_eval{ define_method(mname, &block) }
+      ensure
+        Thread.critical = old_critical
+      end
+      begin
+        ret = send(mname, *args)
+      ensure
+        InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+      end
+      ret
+    end
+  end
+
   # TODO: Move most of this stuff out to an InstanceExecutor class.
   def cucumber_instance_exec(check_arity, pseudo_method, *args, &block)
     cucumber_run_with_backtrace_filtering(pseudo_method) do
@@ -51,7 +74,7 @@ class Object #:nodoc:
     end
   end
 
-  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4
+  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::RUBY_1_8_7 || Cucumber::JRUBY) ? -3 : -4
 
   def replace_instance_exec_invocation_line!(backtrace, instance_exec_invocation_line, pseudo_method)
     return if Cucumber.use_full_backtrace
@@ -59,7 +82,11 @@ class Object #:nodoc:
     instance_exec_pos = backtrace.index(instance_exec_invocation_line)
     if instance_exec_pos
       replacement_line = instance_exec_pos + INSTANCE_EXEC_OFFSET
-      backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
+      if Cucumber::RUBY_1_8_7
+        backtrace[replacement_line] += ":in `#{pseudo_method}'" if pseudo_method
+      else
+        backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
+      end
       backtrace[replacement_line+1..-1] = nil
 
       backtrace.compact!
@@ -68,27 +95,4 @@ class Object #:nodoc:
       # before we get here (injecting erb stacktrace and such)
     end
   end
-
-  unless defined? instance_exec # 1.9
-    # http://eigenclass.org/hiki/bounded+space+instance_exec
-    module InstanceExecHelper #:nodoc:
-    end
-    include InstanceExecHelper
-    def instance_exec(*args, &block)
-      begin
-        old_critical, Thread.critical = Thread.critical, true
-        n = 0
-        n += 1 while respond_to?(mname="__instance_exec#{n}")
-        InstanceExecHelper.module_eval{ define_method(mname, &block) }
-      ensure
-        Thread.critical = old_critical
-      end
-      begin
-        ret = send(mname, *args)
-      ensure
-        InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
-      end
-      ret
-    end
-  end
 end