aslakhellesoy-cucumber 0.3.11.6 → 0.3.11.200907091518

data/lib/cucumber/ast/visitor.rb

@@ -64,6 +64,7 @@ module Cucumber
       end
 
       def visit_outline_table(outline_table)
+        @table = outline_table
         outline_table.accept(self)
       end
 
@@ -105,7 +106,7 @@ module Cucumber
         table_cell.accept(self)
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
       end
 
       def announce(announcement)

data/lib/cucumber/cli/configuration.rb

@@ -102,7 +102,9 @@ module Cucumber
             "TAGS must be comma-separated without spaces. Prefix tags with ~ to",
             "exclude features or scenarios having that tag. Tags can be specified",
             "with or without the @ prefix.") do |v|
-            @options[:include_tags], @options[:exclude_tags] = *parse_tags(v)
+            include_tags, exclude_tags = *parse_tags(v)
+            @options[:include_tags] += include_tags
+            @options[:exclude_tags] += exclude_tags
           end
           opts.on("-n NAME", "--name NAME",
             "Only execute the feature elements which match part of the given name.",
@@ -268,7 +270,7 @@ module Cucumber
       end
 
       def files_to_require
-        requires = @options[:require] || feature_dirs
+        requires = @options[:require] || require_dirs
         files = requires.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.gsub(/\/$/, '') # Strip trailing slash.
@@ -310,6 +312,10 @@ module Cucumber
         @paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
       end
 
+      def require_dirs
+        feature_dirs+Dir['vendor/{gems,plugins}/*/cucumber']
+      end
+
       def constantize(camel_cased_word)
         begin
           names = camel_cased_word.split('::')

data/lib/cucumber/cli/language_help_formatter.rb

@@ -1,4 +1,5 @@
 require 'cucumber/formatter/pretty'
+require 'cucumber/parser/i18n/language'
 
 module Cucumber
   module Cli
@@ -18,15 +19,16 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
           [lang, Cucumber::LANGUAGES[lang]['name'], Cucumber::LANGUAGES[lang]['native']]
         end
         table = Ast::Table.new(raw)
-        new(nil, io, {:check_lang=>true}, '').visit_multiline_arg(table)
+        new(nil, io, {:check_lang=>true}).visit_multiline_arg(table)
       end
 
       def self.list_keywords(io, lang)
-        raw = Cucumber::KEYWORD_KEYS.map do |key|
-          [key, Cucumber::LANGUAGES[lang][key]]
+        language = Parser::I18n::Language[lang]
+        raw = Parser::I18n::Language::KEYWORD_KEYS.map do |key|
+          [key, language.keywords(key)]
         end
         table = Ast::Table.new(raw)
-        new(nil, io, {:incomplete => Cucumber.language_incomplete?(lang)}, '').visit_multiline_arg(table)
+        new(nil, io, {:incomplete => language.incomplete?}).visit_multiline_arg(table)
       end
 
       def visit_multiline_arg(table)
@@ -41,10 +43,10 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
         super
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         if @col == 1
           if(@options[:check_lang])
-            @incomplete = Cucumber.language_incomplete?(value)
+            @incomplete = Parser::I18n::Language[value].incomplete?
           end
           status = :comment 
         elsif @incomplete
@@ -52,7 +54,7 @@ http://wiki.github.com/aslakhellesoy/cucumber/spoken-languages
         end
         
         @col += 1
-        super(value, width, status)
+        super(value, status)
       end
     end
   end

data/lib/cucumber/feature_file.rb

@@ -31,7 +31,13 @@ module Cucumber
         require 'open-uri'
         open(@path).read
       else
-        File.open(@path, Cucumber.file_mode('r')).read 
+        begin
+          File.open(@path, Cucumber.file_mode('r')).read 
+        rescue Errno::EACCES => e
+          p = File.expand_path(@path)
+          e.message << "\nCouldn't open #{p}"
+          raise e
+        end
       end
     end
     

data/lib/cucumber/filter.rb

@@ -32,7 +32,7 @@ module Cucumber
     end
 
     def included_by_tags?(syntax_node)
-      @include_tags.empty? || syntax_node.has_tags?(@include_tags)
+      @include_tags.empty? || syntax_node.has_all_tags?(@include_tags)
     end
 
     def excluded_by_tags?(syntax_node)
@@ -47,4 +47,4 @@ module Cucumber
       @name_regexps.nil? || @name_regexps.empty? || @name_regexps.detect{|name_regexp| syntax_node.matches_name?(name_regexp)}
     end
   end
-end
+end

data/lib/cucumber/formatter/html.rb

@@ -214,7 +214,7 @@ module Cucumber
         @outline_row += 1 if @outline_row
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         cell_type = @outline_row == 0 ? :th : :td
         attributes = {:id => "#{@row_id}_#{@col_index}", :class => 'val'}
         attributes[:class] += " #{status}" if status

data/lib/cucumber/formatter/pretty.rb

@@ -13,13 +13,13 @@ module Cucumber
       include Console
       attr_writer :indent
 
-      def initialize(step_mother, io, options, delim='|')
+      def initialize(step_mother, io, options)
         super(step_mother)
         @io = io
         @options = options
-        @delim = delim
         @exceptions = []
         @indent = 0
+        @prefixes = options[:prefixes] || {}
       end
 
       def visit_features(features)
@@ -145,6 +145,7 @@ module Cucumber
 
       def visit_multiline_arg(multiline_arg)
         return if @options[:no_multiline]
+        @table = multiline_arg
         super
       end
 
@@ -154,7 +155,8 @@ module Cucumber
       end
 
       def visit_table_row(table_row)
-        @io.print @delim.indent(@indent)
+        @col_index = 0
+        @io.print '  |'.indent(@indent-2)
         super
         @io.puts
         if table_row.exception && !@exceptions.index(table_row.exception)
@@ -169,13 +171,26 @@ module Cucumber
         @io.flush
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell(cell)
+        super
+        @col_index += 1
+      end
+
+      def visit_table_cell_value(value, status)
         status ||= @status || :passed
-        @io.print(' ' + format_string((value.to_s || '').ljust(width), status) + ::Term::ANSIColor.reset(" #{@delim}"))
+        width = @table.col_width(@col_index)
+        cell_text = value.to_s || ''
+        padded = cell_text + (' ' * (width - cell_text.jlength))
+        prefix = cell_prefix(status)
+        @io.print(' ' + format_string("#{prefix}#{padded}", status) + ::Term::ANSIColor.reset(" |"))
         @io.flush
       end
 
       private
+      
+      def cell_prefix(status)
+        @prefixes[status]
+      end
 
       def print_summary(features)
         print_stats(features)

data/lib/cucumber/formatter/progress.rb

@@ -23,7 +23,7 @@ module Cucumber
         @status = status
       end
 
-      def visit_table_cell_value(value, width, status)
+      def visit_table_cell_value(value, status)
         status ||= @status
         progress(status) unless table_header_cell?(status)
       end

data/lib/cucumber/formatter/steps.rb

@@ -0,0 +1,49 @@
+module Cucumber
+  module Formatter
+    class Steps < Ast::Visitor
+
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @io = io
+        @options = options
+        @step_definition_files = collect_steps(step_mother)
+      end
+
+      def visit_features(features)
+        print_summary
+      end
+
+      private
+
+      def print_summary
+        count = 0
+        @step_definition_files.keys.sort.each do |step_definition_file|
+          @io.puts step_definition_file
+          
+          sources = @step_definition_files[step_definition_file]
+          source_indent = source_indent(sources)
+          sources.sort.each do |file_colon_line, regexp|
+            @io.print "#{regexp}".indent(2)
+            @io.print " # #{file_colon_line}".indent(source_indent - regexp.size)
+            @io.puts
+          end
+          @io.puts
+          count += sources.size
+        end
+        @io.puts "#{count} step definition(s) in #{@step_definition_files.size} source file(s)."
+      end
+
+      def collect_steps(step_mother)
+        step_mother.step_definitions.inject({}) do |step_definitions, step_definition|
+          step_definitions[step_definition.file] ||= []
+          step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp.inspect ]
+          step_definitions
+        end
+      end
+
+      def source_indent(sources)
+        sources.map { |file_colon_line, regexp| regexp.size }.max + 1
+      end
+    end
+  end
+end

data/lib/cucumber/parser/feature.rb

@@ -55,6 +55,10 @@ module Cucumber
         def has_tags?(tag_names)
           tags.has_tags?(tag_names)
         end
+
+        def has_all_tags?(tag_names)
+          tags.has_all_tags?(tag_names)
+        end
         
         def build(filter)
           if(filter.nil? || feature_elements.accept?(filter) || (!bg.empty? && filter.accept?(bg)))
@@ -211,6 +215,10 @@ module Cucumber
           ts.elements.detect{|e| e.tag.line == line}
         end
 
+        def has_all_tags?(tags)
+          (tags & tag_names) == tags
+        end
+
         def has_tags?(tags)
           (tag_names & tags).any?
         end
@@ -491,6 +499,11 @@ module Cucumber
           feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.tags
+          feature_tags.has_all_tags?(tag_names)
+        end
+
         def build
           Ast::Background.new(
             comment.build, 
@@ -688,6 +701,11 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        end
+
         def matches_name?(regexp_to_match)
           name.build =~ regexp_to_match
         end
@@ -826,6 +844,11 @@ module Cucumber
           tags.has_tags?(tag_names) || feature_tags.has_tags?(tag_names)
         end
 
+        def has_all_tags?(tag_names)
+          feature_tags = self.parent.parent.tags
+          tags.has_all_tags?(tag_names) || feature_tags.has_all_tags?(tag_names)
+        end
+
         def matches_name?(regexp_to_match)
           outline_matches_name?(regexp_to_match) || examples_sections.matches_name?(regexp_to_match)
         end
@@ -1162,6 +1185,10 @@ module Cucumber
           true
         end
 
+        def has_all_tags?(tag_names)
+          true
+        end
+
         def outline_at_line?(line)
           true
         end

data/lib/cucumber/parser/i18n/language.rb

@@ -32,34 +32,37 @@ module Cucumber
 
         alias_step_definitions(Cucumber::LANGUAGES['en'])
 
-        attr_reader :parser
-
         def initialize(lang)
           @keywords = Cucumber::LANGUAGES[lang]
           raise "Language not supported: #{lang.inspect}" if @keywords.nil?
           @keywords['grammar_name'] = @keywords['name'].gsub(/\s/, '')
+        end
+        
+        def parser
+          return @parser if @parser
           i18n_tt = File.expand_path(File.dirname(__FILE__) + '/../i18n.tt')
           template = File.open(i18n_tt, Cucumber.file_mode('r')).read
           erb = ERB.new(template)
           grammar = erb.result(binding)
           Treetop.load_from_string(grammar)
-          @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
           self.class.alias_step_definitions(@keywords)
+          @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
         end
 
         def parse(source, path, filter)
-          feature = @parser.parse_or_fail(source, path, filter)
+          feature = parser.parse_or_fail(source, path, filter)
           feature.language = self if feature
           feature
         end
 
         def keywords(key, raw=false)
           return @keywords[key] if raw
+          return nil unless @keywords[key]
           values = @keywords[key].split('|')
           values.map{|value| "'#{value}'"}.join(" / ")
         end
 
-        def language_incomplete?
+        def incomplete?
           KEYWORD_KEYS.detect{|key| @keywords[key].nil?}
         end
 

data/lib/cucumber/rake/task.rb

@@ -194,6 +194,7 @@ module Cucumber
           result = []
           result += feature_list.to_a if feature_list
           result += FileList[feature_pattern].to_a if feature_pattern
+          result = make_command_line_safe(result)
           FileList[result]
         end
       end
@@ -208,6 +209,11 @@ module Cucumber
           FileList[result]
         end
       end
+
+      private
+      def make_command_line_safe(list)
+        list.map{|string| string.gsub(' ', '\ ')}
+      end
     end
 
     class FeatureTask < Task

data/lib/cucumber/step_match.rb

@@ -34,7 +34,7 @@ module Cucumber
   end
   
   class NoStepMatch
-    attr_reader :step_definition
+    attr_reader :step_definition, :name
 
     def initialize(step, name)
       @step = step

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 3
     TINY  = 11
-    PATCH = 6 # Set to nil for official release
+    PATCH = 200907091518 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/cucumber/templates/env.rb

@@ -23,4 +23,5 @@ end
 
 require 'cucumber/rails/rspec'
 require 'webrat/core/matchers'
+require 'cucumber/webrat/table_locator' # Lets you do table.diff!(table_at('#my_table').to_a)
 <% end -%>

data/rails_generators/feature/templates/feature.erb

@@ -25,7 +25,7 @@ Feature: Manage <%= plural_name %>
 <% end -%>
     When I delete the 3rd <%= singular_name %>
     Then I should see the following <%= plural_name %>:
-      |<%= named_args.map(&:name).join('|') %>|
+      |<%= named_args.map{|arg| arg.name.humanize}.join('|') %>|
 <% [1,2,4].each do |n| -%>
       |<%= named_args.map{|arg| arg.value(n)}.join('|') %>|
 <% end -%>

data/rails_generators/feature/templates/steps.erb

@@ -9,12 +9,6 @@ When /^I delete the (\d+)(?:st|nd|rd|th) <%= singular_name %>$/ do |pos|
   end
 end
 
-Then /^I should see the following <%= plural_name %>:$/ do |<%= plural_name %>|
-  <%= plural_name %>.rows.each_with_index do |row, i|
-    row.each_with_index do |cell, j|
-      response.should have_selector("table > tr:nth-child(#{i+2}) > td:nth-child(#{j+1})") { |td|
-        td.inner_text.should == cell
-      }
-    end
-  end
+Then /^I should see the following <%= plural_name %>:$/ do |expected_<%= plural_name %>_table|
+  expected_<%= plural_name %>_table.diff!(table_at('table').to_a)
 end

data/spec/cucumber/ast/table_spec.rb

@@ -168,6 +168,150 @@ module Cucumber
 
       end
       
+      describe "diff!" do
+        it "should detect a complex diff" do
+          t1 = table(%{
+            | 1         | 22          | 333         | 4444         |
+            | 55555     | 666666      | 7777777     | 88888888     |
+            | 999999999 | 0000000000  | 01010101010 | 121212121212 |
+            | 4000      | ABC         | DEF         | 50000        |
+          })
+          
+          t2 = table(%{
+            | a     | 4444     | 1         | 
+            | bb    | 88888888 | 55555     | 
+            | ccc   | xxxxxxxx | 999999999 | 
+            | dddd  | 4000     | 300       |
+            | e     | 50000    | 4000      |
+          })
+          lambda{t1.diff!(t2)}.should raise_error
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     1         | (-) 22         | (-) 333         |     4444         | (+) a    |
+            |     55555     | (-) 666666     | (-) 7777777     |     88888888     | (+) bb   |
+            | (-) 999999999 | (-) 0000000000 | (-) 01010101010 | (-) 121212121212 | (+)      |
+            | (+) 999999999 | (+)            | (+)             | (+) xxxxxxxx     | (+) ccc  |
+            | (+) 300       | (+)            | (+)             | (+) 4000         | (+) dddd |
+            |     4000      | (-) ABC        | (-) DEF         |     50000        | (+) e    |
+          }
+        end
+
+        it "should not change table when diffed with identical" do
+          t = table(%{
+            |a|b|c|
+            |d|e|f|
+            |g|h|i|
+          })
+          t.diff!(t.dup)
+          t.to_s(:indent => 12, :color => false).should == %{
+            |     a |     b |     c |
+            |     d |     e |     f |
+            |     g |     h |     i |
+          }
+        end
+
+        it "should inspect missing and surplus cells" do
+          t1 = Table.new([
+            ['name',  'male', 'lastname', 'swedish'],
+            ['aslak', 'true', 'hellesøy', 'false']
+          ])
+          t2 = Table.new([
+            ['name',  'male', 'lastname', 'swedish'],
+            ['aslak', true,   'hellesøy', false]
+          ])
+          lambda{t1.diff!(t2)}.should raise_error
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     name  |     male       |     lastname |     swedish     |
+            | (-) aslak | (-) (i) "true" | (-) hellesøy | (-) (i) "false" |
+            | (+) aslak | (+) (i) true   | (+) hellesøy | (+) (i) false   |
+          }
+        end
+
+        it "should allow column mapping before diffing" do
+          t1 = Table.new([
+            ['name',  'male'],
+            ['aslak', 'true']
+          ])
+          t1.map_column!('male') { |m| m == 'true' }
+          t2 = Table.new([
+            ['name',  'male'],
+            ['aslak', true]
+          ])
+          t1.diff!(t2)
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     name  |     male |
+            |     aslak |     true |
+          }
+        end
+
+        it "should allow header mapping before diffing" do
+          t1 = Table.new([
+            ['Name',  'Male'],
+            ['aslak', 'true']
+          ])
+          t1.map_headers!('Name' => 'name', 'Male' => 'male')
+          t1.map_column!('male') { |m| m == 'true' }
+          t2 = Table.new([
+            ['name',  'male'],
+            ['aslak', true]
+          ])
+          t1.diff!(t2)
+          t1.to_s(:indent => 12, :color => false).should == %{
+            |     name  |     male |
+            |     aslak |     true |
+          }
+        end
+        
+        describe "raising" do
+          before do
+            @t = table(%{
+              | a | b |
+              | c | d |
+            })
+          end
+          
+          it "should raise on missing rows" do
+            t = table(%{
+              | a | b |
+            })
+            lambda { @t.dup.diff!(t) }.should raise_error
+            lambda { @t.dup.diff!(t, :missing_row => false) }.should_not raise_error
+          end
+
+          it "should raise on surplus rows" do
+            t = table(%{
+              | a | b |
+              | c | d |
+              | e | f |
+            })
+            lambda { @t.dup.diff!(t) }.should raise_error
+            lambda { @t.dup.diff!(t, :surplus_row => false) }.should_not raise_error
+          end
+
+          it "should raise on missing columns" do
+            t = table(%{
+              | a |
+              | c |
+            })
+            lambda { @t.dup.diff!(t) }.should raise_error
+            lambda { @t.dup.diff!(t, :missing_col => false) }.should_not raise_error
+          end
+
+          it "should not raise on surplus columns" do
+            t = table(%{
+              | a | b | x |
+              | c | d | y |
+            })
+            lambda { @t.dup.diff!(t) }.should_not raise_error
+            lambda { @t.dup.diff!(t, :surplus_col => true) }.should raise_error
+          end
+        end
+
+        def table(text, file=nil, line_offset=0)
+          @table_parser ||= Parser::TableParser.new
+          @table_parser.parse_or_fail(text.strip, file, line_offset)
+        end
+      end
+      
       it "should convert to sexp" do
         @table.to_sexp.should == 
           [:table,