cucumber 0.3.3 → 0.3.4

data/gem_tasks/features.rake

@@ -2,5 +2,9 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "--format progress"
+  t.cucumber_opts = %w{--format progress}
+end
+
+Cucumber::Rake::Task.new('pretty') do |t|
+  t.cucumber_opts = %w{--format pretty}
 end

data/lib/cucumber.rb

@@ -40,8 +40,8 @@ module Cucumber
     end
     
     def alias_step_definitions(lang) #:nodoc:
-      keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword]}
-      alias_steps(keywords)
+      keywords = %w{given when then and but}.map{|keyword| keyword_hash(lang)[keyword].split('|')}
+      alias_steps(keywords.flatten)
     end
     
     # Sets up additional method aliases for Given, When and Then.

data/lib/cucumber/cli/configuration.rb

@@ -3,7 +3,7 @@ module Cucumber
     class YmlLoadError < StandardError; end
 
     class Configuration
-      FORMATS = %w{pretty profile progress rerun}
+      FORMATS = %w{pretty profile progress rerun junit}
       DEFAULT_FORMAT = 'pretty'
 
       attr_reader :paths
@@ -15,6 +15,7 @@ module Cucumber
 
         @paths          = []
         @options        = default_options
+
         @active_format  = DEFAULT_FORMAT
       end
 
@@ -47,7 +48,7 @@ module Cucumber
             %{Run with "--language help" to see all languages},
             %{Run with "--language LANG help" to list keywords for LANG}) do |v|
             if v == 'help'
-              list_languages
+              list_languages_and_exit
             elsif args==['help']
               list_keywords_and_exit(v)
             else
@@ -65,10 +66,11 @@ module Cucumber
             @options[:formats][v] = @out_stream
             @active_format = v
           end
-          opts.on("-o", "--out FILE",
-            "Write output to a file instead of STDOUT. This option",
+          opts.on("-o", "--out [FILE|DIR]",
+            "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.") do |v|
+            "default format if no format is specified. Check the specific",
+            "formatter's docs to see whether to pass a file or a dir.") do |v|
             @options[:formats][@active_format] = v
           end
           opts.on("-t TAGS", "--tags TAGS",
@@ -197,10 +199,12 @@ module Cucumber
         return Formatter::Pretty.new(step_mother, nil, @options) if @options[:autoformat]
         formatters = @options[:formats].map do |format, out|
           if String === out # file name
-            out = File.open(out, Cucumber.file_mode('w'))
-            at_exit do
-              out.flush
-              out.close
+            unless File.directory?(out)
+              out = File.open(out, Cucumber.file_mode('w'))
+              at_exit do
+                out.flush
+                out.close
+              end
             end
           end
 
@@ -208,7 +212,8 @@ module Cucumber
             formatter_class = formatter_class(format)
             formatter_class.new(step_mother, out, @options)
           rescue Exception => e
-            exit_with_error("Error creating formatter: #{format}", e)
+            e.message << "\nError creating formatter: #{format}"
+            raise e
           end
         end
 
@@ -225,6 +230,7 @@ module Cucumber
           when 'progress' then Formatter::Progress
           when 'rerun'    then Formatter::Rerun
           when 'usage'    then Formatter::Usage
+          when 'junit'    then Formatter::JUnit
         else
           constantize(format)
         end
@@ -244,7 +250,6 @@ module Cucumber
         files
       end
 
-
       def feature_files
         potential_feature_files = @paths.map do |path|
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
@@ -278,7 +283,7 @@ module Cucumber
 
       def parse_args_from_profile(profile)
         unless cucumber_yml.has_key?(profile)
-          return(exit_with_error <<-END_OF_ERROR)
+          raise(<<-END_OF_ERROR)
 Could not find profile: '#{profile}'
 
 Defined profiles in cucumber.yml:
@@ -288,16 +293,16 @@ Defined profiles in cucumber.yml:
 
         args_from_yml = cucumber_yml[profile] || ''
 
-        if !args_from_yml.is_a?(String)
-          exit_with_error "Profiles must be defined as a String.  The '#{profile}' profile was #{args_from_yml.inspect} (#{args_from_yml.class}).\n"
-        elsif args_from_yml =~ /^\s*$/
-          exit_with_error "The 'foo' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n"
-        else
-          parse!(args_from_yml.split(' '))
+        case(args_from_yml)
+          when String
+            raise "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
+            args_from_yml = args_from_yml.split(' ')
+          when Array
+            raise "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the 'foo' profile in cucumber.yml.\n" if args_from_yml.empty?
+          else
+            raise "The '#{profile}' profile in cucumber.yml was a #{args_from_yml.class}. It must be a String or Array"
         end
-
-      rescue YmlLoadError => e
-        exit_with_error(e.message)
+        parse!(args_from_yml)
       end
 
       def cucumber_yml
@@ -322,13 +327,13 @@ Defined profiles in cucumber.yml:
 
       def list_keywords_and_exit(lang)
         unless Cucumber::LANGUAGES[lang]
-          exit_with_error("No language with key #{lang}")
+          raise("No language with key #{lang}")
         end
         LanguageHelpFormatter.list_keywords(@out_stream, lang)
         Kernel.exit
       end
 
-      def list_languages
+      def list_languages_and_exit
         LanguageHelpFormatter.list_languages(@out_stream)
         Kernel.exit
       end
@@ -347,15 +352,6 @@ Defined profiles in cucumber.yml:
           :diff_enabled => true
         }
       end
-
-      def exit_with_error(error_message, e=nil)
-        @error_stream.puts(error_message)
-        if e
-          @error_stream.puts("#{e.message} (#{e.class})")
-          @error_stream.puts(e.backtrace.join("\n"))
-        end
-        Kernel.exit 1
-      end
     end
 
   end

data/lib/cucumber/cli/main.rb

@@ -42,8 +42,6 @@ module Cucumber
 
         failure = step_mother.steps(:failed).any? || 
           (configuration.strict? && step_mother.steps(:undefined).any?)
-
-        Kernel.exit(failure ? 1 : 0)
       end
 
       def load_plain_text_features

data/lib/cucumber/core_ext/proc.rb

@@ -2,15 +2,15 @@
 class Proc
   PROC_PATTERN = /[\d\w]+@(.*):(.*)>/
   
-  if Proc.new{}.to_s =~ PROC_PATTERN
-    def backtrace_line(name)
-      "#{file_colon_line}:in `#{name}'"
-    end
+  def to_comment_line
+    "# #{file_colon_line}"
+  end
 
-    def to_comment_line
-      "# #{file_colon_line}"
-    end
+  def backtrace_line(name)
+    "#{file_colon_line}:in `#{name}'"
+  end
 
+  if Proc.new{}.to_s =~ PROC_PATTERN
     def file_colon_line
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
@@ -22,12 +22,8 @@ class Proc
     # This Ruby implementation doesn't implement Proc#to_s correctly
     STDERR.puts "*** THIS RUBY IMPLEMENTATION DOESN'T REPORT FILE AND LINE FOR PROCS ***"
     
-    def backtrace_line
-      nil
-    end
-
-    def to_comment_line
-      ""
+    def file_colon_line
+      "UNKNOWN:-1"
     end
   end
 end 

data/lib/cucumber/formatter.rb

@@ -1 +1 @@
-%w{color_io pretty progress profile rerun html usage}.each{|n| require "cucumber/formatter/#{n}"}
+%w{color_io pretty progress profile rerun html usage junit}.each{|n| require "cucumber/formatter/#{n}"}

data/lib/cucumber/formatter/html.rb

@@ -27,6 +27,7 @@ module Cucumber
         )
         @builder.html(:xmlns => 'http://www.w3.org/1999/xhtml') do
           @builder.head do
+            @builder.meta(:content => 'text/html;charset=utf-8')
             @builder.title 'Cucumber'
             inline_css
           end

data/lib/cucumber/formatter/junit.rb

@@ -0,0 +1,78 @@
+begin
+  require 'builder'
+rescue LoadError
+  gem 'builder'
+  require 'builder'
+end
+
+module Cucumber
+  module Formatter
+    class JUnit < Cucumber::Ast::Visitor
+
+      def initialize(step_mother, io, options)
+        super(step_mother)
+        @reportdir = io
+        raise "You *must* specify --out DIR for the junit formatter" unless @reportdir
+        raise "Use --out DIR (not --out FILE) for the junit formatter" if File === @reportdir
+      end
+
+      def visit_feature(feature)
+        @failures = @errors = @tests = 0
+        @builder = Builder::XmlMarkup.new( :indent => 2 )
+        super
+
+        @testsuite = Builder::XmlMarkup.new( :indent => 2 )
+        @testsuite.instruct!
+        @testsuite.testsuite(
+          :failures => @failures,
+          :errors => @errors,
+          :tests => @tests,
+          :name => @feature_name ) do
+          @testsuite << @builder.target!
+        end
+
+        File.open(@feature_filename, 'w') { |file| file.write(@testsuite.target!) }
+      end
+
+      def visit_feature_name(name)
+        lines = name.split(/\r?\n/)
+        @feature_name = lines[0].sub(/Feature\:/, '').strip
+        @feature_filename = convert_to_file_name(@feature_name)
+      end
+
+      def visit_scenario_name(keyword, name, file_colon_line, source_indent)
+        @scenario = name
+      end
+
+      def visit_steps(steps)
+        @steps_failed = false
+        super
+        @failures += 1 if @steps_failed
+        @tests += 1
+      end
+
+      def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        step_name = keyword + " " + step_match.format_args(lambda{|param| "*#{param}*"})
+        @builder.testcase(:classname => "#{@feature_name}.#{@scenario}", :name => step_name) do
+          if status != :passed
+            @builder.failure(:message => step_name) do
+              @builder.text!(format_exception(exception)) if exception
+            end
+            @steps_failed = true
+          end
+        end
+      end
+
+      private
+
+      def convert_to_file_name(feature_name)
+        File.join(@reportdir, "TEST-" + feature_name.gsub(/[^\w_\.]/, '_') + ".xml")
+      end
+
+      def format_exception(exception)
+        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+      end
+    end
+
+  end
+end

data/lib/cucumber/languages.yml

@@ -161,6 +161,21 @@
   and: Y
   but: Pero
   space_after_keyword: true
+"cat":
+  name: Catalan
+  native: català
+  encoding: UTF-8
+  background: Rerefons
+  feature: Característica
+  scenario: Escenari
+  scenario_outline: Esquema de l\'escenari
+  examples: Exemples
+  given: Donat
+  when: Quan
+  then: Aleshores
+  and: I
+  but: Però
+  space_after_keyword: true
 "et":
   name: Estonian
   native: eesti keel
@@ -270,7 +285,7 @@
   name: Japanese
   native: 日本語
   encoding: UTF-8
-  feature: フィーチャ
+  feature: フィーチャ|機能
   background: 背景
   scenario: シナリオ
   scenario_outline: シナリオアウトライン|シナリオテンプレート|テンプレ|シナリオテンプレ
@@ -279,15 +294,17 @@
   when: もし
   then: ならば
   and: かつ
-  but: しかし
+  but: しかし|但し
   space_after_keyword: false
 "lt":
   name: Lithuanian
   native: lietuvių kalba
   encoding: UTF-8
-  feature: Sąvybė
+  feature: Savybė
+  background: Kontekstas
   scenario: Scenarijus
-  examples: Pavyzdžių
+  scenario_outline: Scenarijaus šablonas
+  examples: Pavyzdžiai|Scenarijai|Variantai
   given: Duota
   when: Kai
   then: Tada
@@ -498,3 +515,18 @@
   and: И
   but: Но
   space_after_keyword: true
+"vi":
+  name: Vietnamese
+  native: Tiếng Việt
+  encoding: UTF-8
+  feature: Tính năng
+  background: Bối cảnh
+  scenario: Kịch bản
+  scenario_outline: Khung kịch bản
+  examples: Dữ liệu
+  given: Cho
+  when: Khi
+  then: Thì
+  and: Và
+  but: Nhưng
+  space_after_keyword: true

data/lib/cucumber/parser/feature.rb

@@ -481,15 +481,19 @@ module Cucumber
       end
 
       module Background1
-
         def matches_name?(regexp_to_match)
           name.build =~ regexp_to_match
         end
 
-       def has_tags?(tag_names)
-         feature_tags = self.parent.tags
-         feature_tags.has_tags?(tag_names)
-       end
+        def at_line?(line)
+          background_keyword.line == line ||
+          steps.at_line?(line)
+        end
+
+        def has_tags?(tag_names)
+          feature_tags = self.parent.tags
+          feature_tags.has_tags?(tag_names)
+        end
 
         def build
           Ast::Background.new(
@@ -499,7 +503,7 @@ module Cucumber
             name.build, 
             steps.build
           )
-         end
+        end
       end
 
       def _nt_background

data/lib/cucumber/parser/feature.tt

@@ -76,27 +76,31 @@ module Cucumber
       end
 
       rule background
-         comment white background_keyword space* name:lines_to_keyword? (eol+ / eof) steps {
+        comment white background_keyword space* name:lines_to_keyword? (eol+ / eof) steps {
+          def matches_name?(regexp_to_match)
+            name.build =~ regexp_to_match
+          end
 
-           def matches_name?(regexp_to_match)
-             name.build =~ regexp_to_match
-           end
+          def at_line?(line)
+            background_keyword.line == line ||
+            steps.at_line?(line)
+          end
 
           def has_tags?(tag_names)
             feature_tags = self.parent.tags
             feature_tags.has_tags?(tag_names)
           end
 
-           def build
-             Ast::Background.new(
-               comment.build, 
-               background_keyword.line,
-               background_keyword.text_value,
-               name.build, 
-               steps.build
-             )
-            end
-          }
+          def build
+            Ast::Background.new(
+              comment.build, 
+              background_keyword.line,
+              background_keyword.text_value,
+              name.build, 
+              steps.build
+            )
+          end
+        }
       end
 
       rule feature_elements