aslakhellesoy-cucumber 0.0.1 → 0.1.1

data/gem_tasks/treetop.rake

@@ -1,26 +1,20 @@
-class StoryCompiler
+class FeatureCompiler
   def compile
     require 'yaml'
     require 'erb'
     tt = PLATFORM =~ /win32/ ? 'tt.bat' : 'tt'
-    template = ERB.new(IO.read(File.dirname(__FILE__) + '/../lib/cucumber/parser/story_parser.treetop.erb'))
-    langs = YAML.load_file(File.dirname(__FILE__) + '/../lib/cucumber/parser/languages.yml')
-    langs.each do |lang, words|
-      grammar_file = File.dirname(__FILE__) + "/../lib/cucumber/parser/story_parser_#{lang}.treetop"
 
-      STDOUT.write("Generating and compiling grammar for #{lang}...")
+    template = ERB.new(IO.read(File.dirname(__FILE__) + '/../lib/cucumber/treetop_parser/feature.treetop.erb'))
+    langs = YAML.load_file(File.dirname(__FILE__) + '/../lib/cucumber/languages.yml')
+
+    langs.each do |lang, words|
+      grammar_file = File.dirname(__FILE__) + "/../lib/cucumber/treetop_parser/feature_#{lang}.treetop"
       grammar = template.result(binding)
-      
-      # http://groups.google.com/group/treetop-dev/browse_thread/thread/c8a8ced33da07f73
-      # http://github.com/vic/treetop/commit/5cec030a1c363e06783f98e4b45ce6ab121996ab
-      grammar = "module Cucumber\nmodule Parser\n#{grammar}\nend\nend"
-      
       File.open(grammar_file, "wb") do |io|
         io.write(grammar)
       end
-      system "#{tt} #{grammar_file}"
+      sh "#{tt} #{grammar_file}"
       FileUtils.rm(grammar_file)
-      STDOUT.puts("Done!")
     end
   end
 end
@@ -28,6 +22,6 @@ end
 namespace :treetop do
   desc 'Compile the grammar'
   task :compile do
-    StoryCompiler.new.compile
+    FeatureCompiler.new.compile
   end
 end

data/lib/cucumber.rb

@@ -5,13 +5,20 @@ require 'treetop/runtime'
 require 'treetop/ruby_extensions'
 require 'cucumber/version'
 require 'cucumber/step_methods'
-require 'cucumber/ruby_tree'
+require 'cucumber/tree'
 require 'cucumber/executor'
 require 'cucumber/step_mother'
 require 'cucumber/formatters'
-require 'cucumber/parser/story_parser'
+require 'cucumber/treetop_parser/feature_parser'
 require 'cucumber/cli'
 
 module Cucumber
-  
+  class << self
+    attr_reader :language
+    
+    def load_language(lang)
+      require 'yaml'
+      @language = YAML.load_file(File.dirname(__FILE__) + '/cucumber/languages.yml')[lang]
+    end
+  end  
 end

data/lib/cucumber/cli.rb

@@ -4,11 +4,11 @@ require 'cucumber'
 module Cucumber
   class CLI
     class << self
-      attr_writer :step_mother, :stories
+      attr_writer :step_mother, :features
     
       def execute
         @execute_called = true
-        parse(ARGV).execute!(@step_mother, @stories)
+        parse(ARGV).execute!(@step_mother, @features)
       end
       
       def execute_called?
@@ -31,46 +31,58 @@ module Cucumber
       @options = { :require => nil, :lang => 'en', :format => 'pretty', :dry_run => false }
       @args.options do |opts|
         opts.banner = "Usage: cucumber [options] FILES|DIRS"
-        opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR", "Require files before executing the stories.",
+        opts.on("-r LIBRARY|DIR", "--require LIBRARY|DIR", "Require files before executing the features.",
           "If this option is not specified, all *.rb files that",
-          "are siblings or below the stories will be autorequired") do |v|
+          "are siblings or below the features will be autorequired") do |v|
           @options[:require] ||= []
           @options[:require] << v
         end
         opts.on("-l LINE", "--line LANG", "Only execute the scenario at the given line") do |v|
           @options[:line] = v
         end
-        opts.on("-a LANG", "--language LANG", "Specify language for stories (Default: #{@options[:lang]})") do |v|
+        opts.on("-a LANG", "--language LANG", "Specify language for features (Default: #{@options[:lang]})") do |v|
           @options[:lang] = v
         end
-        opts.on("-f FORMAT", "--format FORMAT", "How to format stories (Default: #{@options[:format]})") do |v|
+        opts.on("-f FORMAT", "--format FORMAT", "How to format features (Default: #{@options[:format]})") do |v|
           @options[:format] = v
         end
         opts.on("-d", "--dry-run", "Invokes formatters without executing the steps.") do
           @options[:dry_run] = true
         end
+        opts.on_tail("--version", "Show version") do
+          puts VERSION::STRING
+          exit
+        end
+        opts.on_tail("--help", "You're looking at it") do
+          puts opts.help
+          exit
+        end
       end.parse!
+      
       # Whatever is left after option parsing
       @files = @args.map do |path|
         path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
-        File.directory?(path) ? Dir["#{path}/**/*.story"] : path
+        File.directory?(path) ? Dir["#{path}/**/*.feature"] : path
       end.flatten
     end
     
-    def execute!(step_mother, stories)
+    def execute!(step_mother, features)
+      Cucumber.load_language(@options[:lang])
       $executor = Executor.new(formatter, step_mother)
       require_files
-      load_plain_text_stories(stories)
+      load_plain_text_features(features)
       $executor.line = @options[:line].to_i if @options[:line]
-      $executor.visit_stories(stories)
+      $executor.visit_features(features)
       exit 1 if $executor.failed
     end
     
   private
     
-    # Requires files - typically step files and ruby story files.
+    # Requires files - typically step files and ruby feature files.
     def require_files
-      require "cucumber/parser/story_parser_#{@options[:lang]}"
+      require "cucumber/treetop_parser/feature_#{@options[:lang]}"
+      require "cucumber/treetop_parser/feature_parser"
+
       requires = @options[:require] || @args.map{|f| File.directory?(f) ? f : File.dirname(f)}.uniq
       libs = requires.map do |path| 
         path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
@@ -86,10 +98,10 @@ module Cucumber
       end
     end
     
-    def load_plain_text_stories(stories)
-      parser = Parser::StoryParser.new
+    def load_plain_text_features(features)
+      parser = TreetopParser::FeatureParser.new
       @files.each do |f|
-        stories << Parser::StoryNode.parse(f, parser)
+        features << parser.parse_feature(f)
       end
     end
     
@@ -105,13 +117,11 @@ module Cucumber
   end
 end
 
-# Hook the toplevel StepMother to the CLI
-# TODO: Hook in a RubyStories object on toplevel for pure ruby stories
 extend Cucumber::StepMethods
 Cucumber::CLI.step_mother = step_mother
 
-extend(Cucumber::RubyTree)
-Cucumber::CLI.stories = stories
+extend(Cucumber::Tree)
+Cucumber::CLI.features = features
 
 at_exit do
   Cucumber::CLI.execute unless Cucumber::CLI.execute_called?

data/lib/cucumber/core_ext/proc.rb

@@ -1,22 +1,30 @@
 module Cucumber
+  class ArgCountError < StandardError
+  end
+
   module CoreExt
     # Proc extension that allows a proc to be called in the context of any object.
     # Also makes it possible to tack a name onto a Proc.
     module CallIn
       attr_accessor :name
       
-      def call_in(obj, *args, &proc)
+      def call_in(obj, *args)
         obj.extend(mod)
-#        raise ArgCountError.new("The #{name} block takes #{arity2} arguments, but there are #{args.length} matched variables") if args.length != arity2
-        obj.__send__(meth, *args, &proc)
+        a = arity == -1 ? 0 : arity
+        if self != Tree::Step::PENDING && args.length != a
+          # We have to manually raise when the block has arity -1 (no pipes)
+          raise ArgCountError.new("wrong number of arguments (#{args.length} for 0)")
+        else
+          obj.__send__(meth, *args)
+        end
       end
 
       def arity2
         arity == -1 ? 0 : arity
       end
-      
+
       def backtrace_line
-        inspect.match(/[\d\w]+@(.*)>/)[1] + ":in `#{name}'"
+        to_s.match(/[\d\w]+@(.*)>/)[1] + ":in `#{name}'"
       end
       
       def meth

data/lib/cucumber/executor.rb

@@ -4,9 +4,6 @@ module Cucumber
   class Pending < StandardError
   end
 
-  class ArgCountError < StandardError
-  end
-
   class Executor
     attr_reader :failed
     
@@ -36,16 +33,16 @@ module Cucumber
       @after_procs << proc
     end
 
-    def visit_stories(stories)
-      raise "Line number can only be specified when there is 1 story. There were #{stories.length}." if @line && stories.length != 1
-      @step_mother.visit_stories(stories)
-      @formatter.visit_stories(stories) if @formatter.respond_to?(:visit_stories)
-      stories.accept(self)
+    def visit_features(features)
+      raise "Line number can only be specified when there is 1 feature. There were #{features.length}." if @line && features.length != 1
+      @step_mother.visit_features(features)
+      @formatter.visit_features(features) if @formatter.respond_to?(:visit_features)
+      features.accept(self)
       @formatter.dump
     end
 
-    def visit_story(story)
-      story.accept(self)
+    def visit_feature(feature)
+      feature.accept(self)
     end
 
     def visit_header(header)
@@ -64,6 +61,7 @@ module Cucumber
         @before_procs.each{|p| p.call_in(@world, *[])}
         scenario.accept(self)
         @after_procs.each{|p| p.call_in(@world, *[])}
+        @formatter.scenario_executed(scenario) if @formatter.respond_to?(:scenario_executed)
       end
     end
 

data/lib/cucumber/formatters/ansicolor.rb

@@ -5,7 +5,7 @@ rescue LoadError
   STDERR.puts "You must gem install win32console to get coloured output on this ruby platform (#{PLATFORM})"
   ::Term::ANSIColor.coloring = false
 end
-::Term::ANSIColor.coloring = false if PLATFORM =~ /java/ || !STDOUT.tty?
+::Term::ANSIColor.coloring = false if !STDOUT.tty?
 
 module Cucumber
   module Formatters
@@ -80,7 +80,7 @@ module Cucumber
         colors = color_string.split(",").reverse
         define_method(m) do |*s|
           clear + colors.inject(s[0]) do |memo, color|
-            s[0].nil? ? __send__(color) + memo.to_s : __send__(color, memo)
+            s[0].nil? ? __send__(color) + memo.to_s : __send__(color, memo.to_s)
           end
         end
       end

data/lib/cucumber/formatters/html_formatter.rb

@@ -6,7 +6,7 @@ module Cucumber
         @errors = []
       end
 
-      def visit_stories(stories)
+      def visit_features(features)
         # IMPORTANT NOTICE ABOUT JQUERY BELOW. THE ORIGINAL BACKSLASHES (\) HAVE
         # BEEN REPLACED BY DOUBLE BACKSLASHES (\\) IN THIS FILE TO MAKE SURE THEY
         # ARE PRINTED PROPERLY WITH ONLY ONE BACKSLASH (\).
@@ -205,19 +205,19 @@ div.auto_complete ul li.selected {
   <body>
     <div id="container">
 HTML
-        stories.accept(self)
+        features.accept(self)
         @io.puts "    </div>"
       end
 
-      def visit_story(story)
-        @io.puts "      <dl class=\"story new\">"
-        story.accept(self)
+      def visit_feature(feature)
+        @io.puts "      <dl class=\"feature new\">"
+        feature.accept(self)
         @io.puts "        </dd>"
         @io.puts "      </dl>"
       end
       
       def visit_header(header)
-        @io.puts "        <dt>Story: #{header}</dt>"
+        @io.puts "        <dt>Feature: #{header}</dt>"
       end
 
       def visit_narrative(narrative)

data/lib/cucumber/formatters/pretty_formatter.rb

@@ -16,23 +16,43 @@ module Cucumber
       end
     
       def header_executing(header)
-        @io.puts if @story_newline
-        @story_newline = true
-        # TODO: i18n Story
-        @io.puts passed("Story: #{header}")
-      end
-    
-      def narrative_executing(narrative)
-        @io.puts passed(narrative)
+        @io.puts if @feature_newline
+        @feature_newline = true
+        @io.puts passed(header)
+        @io.puts
       end
   
       def scenario_executing(scenario)
+        @scenario_failed = false
+        if scenario.row?
+          @io.print "    |"
+        else
+          # TODO: i18n Secnario
+          @io.puts passed("  Scenario: #{scenario.name}")
+        end
+      end
+
+      def scenario_executed(scenario)
         @io.puts
-        # TODO: i18n Secnario
-        @io.puts passed("  Scenario: #{scenario.name}")
+        if !scenario.row? && scenario.table_header
+          @io.print "    |"
+          scenario.table_header.each { |h| @io.print h ; @io.print "|" }
+          @io.puts
+        elsif scenario.row? && @scenario_failed
+          @io.puts
+          step_failed(@failed.last) 
+        end
       end
-  
+
       def step_executed(step)
+        if step.row?
+          row_step_executed(step)
+        else
+          regular_step_executed(step)
+        end
+      end
+      
+      def regular_step_executed(step)
         case(step.error)
         when Pending
           @pending << step
@@ -42,23 +62,56 @@ module Cucumber
           @io.puts passed("    #{step.keyword} #{step.gzub{|param| passed_param(param) << passed}}") 
         else
           @failed << step
+          @scenario_failed = true
           @io.puts failed("    #{step.keyword} #{step.gzub{|param| failed_param(param) << failed}}") 
-          @io.puts failed("      #{step.error.message.split("\n").join(INDENT)}")
-          @io.puts failed("      #{step.error.backtrace.join(INDENT)}")
+          step_failed(step)
+        end
+      end
+      
+      def step_failed(step)
+        @io.puts failed("      #{step.error.message.split("\n").join(INDENT)} (#{step.error.class})")
+        @io.puts failed("      #{step.error.backtrace.join(INDENT)}")
+      end
+
+      def row_step_executed(step)
+        case(step.error)
+        when Pending
+          @pending << step
+          step.args.each { |arg| @io.print pending(arg) ; @io.print "|" }
+        when NilClass
+          @passed << step
+          step.args.each { |arg| @io.print passed(arg) ; @io.print "|" }
+        else
+          @failed << step
+          @scenario_failed = true
+          step.args.each { |arg| @io.print failed(arg) ; @io.print "|" }
         end
       end
 
       def step_skipped(step)
         @skipped << step
-        @io.puts skipped("    #{step.keyword} #{step.gzub{|param| skipped_param(param) << skipped}}") 
+        if step.row?
+          step.args.each { |arg| @io.print skipped(arg) ; @io.print "|" }
+        else
+          @io.puts skipped("    #{step.keyword} #{step.gzub{|param| skipped_param(param) << skipped}}") 
+        end
       end
     
       def dump
         @io.puts
         @io.puts passed("#{@passed.length} steps passed") unless @passed.empty?
         @io.puts failed("#{@failed.length} steps failed") unless @failed.empty?
-        @io.puts pending("#{@pending.length} steps pending") unless @pending.empty?
         @io.puts skipped("#{@skipped.length} steps skipped") unless @skipped.empty?
+        @io.puts pending("#{@pending.length} steps pending") unless @pending.empty?
+
+        unless @pending.empty?
+          @io.puts "\nYou can use these snippets to implement pending steps:\n\n"
+          
+          @pending.each do |step|
+            @io.puts "#{step.keyword} /#{step.name}/ do\nend\n\n" unless step.row?
+          end
+        end
+
         @io.print reset
       end
     end

data/lib/cucumber/{parser/languages.yml → languages.yml}

@@ -2,7 +2,6 @@
 # http://www.iana.org/assignments/language-subtag-registry
 # http://ftp.ics.uci.edu/pub/ietf/http/related/iso639.txt (Use this I think)
 "en":
-  story: Story
   scenario: Scenario
   given_scenario: GivenScenario
   given: Given
@@ -10,7 +9,6 @@
   then: Then
   and: And
 "no":
-  story: Historie
   scenario: Scenario
   given_scenario: GittScenario
   given: Gitt
@@ -18,7 +16,6 @@
   then: Så
   and: Og
 "fr":
-  story: Histoire
   scenario: Scenario
   given_scenario: SoitScenario
   given: Soit
@@ -26,7 +23,6 @@
   then: Alors
   and: Et
 "pt":
-  story: Relato
   scenario: Escenario
   given_scenario: DadoElEscenario
   given: Dado