cucumber 0.1.13 → 0.1.14

data/lib/autotest/cucumber_mixin.rb

@@ -122,10 +122,6 @@ module Autotest::CucumberMixin
     else
       scenario_args = scenarios_to_run.map { |s| "-s '#{s}'" }.join(' ')
     end
-    return "#{$CUCUMBER_RUBY} #{cucumber} #{args} #{scenario_args}"
-  end
-  
-  def cucumber
-    File.file?("script/cucumber") ? "script/cucumber" : "cucumber"
+    return "#{Cucumber::RUBY_BINARY} #{Cucumber::BINARY} #{args} #{scenario_args}"
   end
 end

data/lib/cucumber.rb

@@ -17,24 +17,3 @@ require 'cucumber/cli'
 require 'cucumber/broadcaster'
 require 'cucumber/world'
 require 'cucumber/core_ext/exception'
-
-module Cucumber
-  LANGUAGE_FILE = File.expand_path(File.dirname(__FILE__) + '/cucumber/languages.yml')
-
-  class << self
-    attr_reader :language
-    
-    def load_language(lang)
-      @language = config[lang]
-    end
-    
-    def languages
-      config.keys.sort
-    end
-    
-    def config
-      require 'yaml'
-      @config ||= YAML.load_file(LANGUAGE_FILE)
-    end
-  end  
-end

data/lib/cucumber/cli.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'cucumber'
+require 'ostruct'
 
 module Cucumber
   class YmlLoadError < StandardError; end
@@ -344,7 +345,7 @@ Defined profiles in cucumber.yml:
     def enable_diffing
       if defined?(::Spec)
         require 'spec/expectations/differs/default'
-        options = ::Spec::Runner::Options.new(nil, nil)
+        options = OpenStruct.new(:diff_format => :unified, :context_lines => 3)
         ::Spec::Expectations.differ = ::Spec::Expectations::Differs::Default.new(options)
       end
     end

data/lib/cucumber/core_ext/string.rb

@@ -20,7 +20,7 @@ class String
     s
   end
 
-  if ($CUCUMBER_JRUBY && $CUCUMBER_RAILS)
+  if (Cucumber::JRUBY && Cucumber::RAILS) || Cucumber::RUBY_1_9
     # Workaround for http://tinyurl.com/55uu3u 
     alias jlength length
   else

data/lib/cucumber/formatters/ansicolor.rb

@@ -5,7 +5,7 @@ gem 'term-ansicolor'
 $LOAD_PATH.each{|path| $LOAD_PATH.unshift($LOAD_PATH.delete(path)) if path =~ /term-ansicolor/}
 require 'term/ansicolor'
 
-if $CUCUMBER_WINDOWS_MRI
+if Cucumber::WINDOWS_MRI
   begin
     require 'Win32/Console/ANSI'
   rescue LoadError
@@ -14,23 +14,26 @@ if $CUCUMBER_WINDOWS_MRI
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty? || ($CUCUMBER_WINDOWS && !$CUCUMBER_WINDOWS_MRI)
+Term::ANSIColor.coloring = false if !STDOUT.tty? || (Cucumber::WINDOWS && !Cucumber::WINDOWS_MRI)
 
 module Cucumber
   module Formatters
     # Defines aliases for coloured output. You can tweak the colours by defining
-    # a <tt>$CUCUMBER_COLORS</tt> variable in your shell, very much like you can
+    # a <tt>CUCUMBER_COLORS</tt> variable in your shell, very much like you can
     # tweak the familiar POSIX command <tt>ls</tt> with
     # <a href="http://mipsisrisc.com/rambling/2008/06/27/lscolorsls_colors-now-with-linux-support/">$LSCOLORS/$LS_COLORS</a>
     #
     # The colours that you can change are:
     #
+    # * <tt>missing</tt>       - defaults to <tt>yellow</tt>
     # * <tt>pending</tt>       - defaults to <tt>yellow</tt>
     # * <tt>pending_param</tt> - defaults to <tt>yellow,bold</tt>
     # * <tt>failed</tt>        - defaults to <tt>red</tt>
     # * <tt>failed_param</tt>  - defaults to <tt>red,bold</tt>
     # * <tt>passed</tt>        - defaults to <tt>green</tt>
     # * <tt>passed_param</tt>  - defaults to <tt>green,bold</tt>
+    # * <tt>outline</tt>       - defaults to <tt>cyan</tt>
+    # * <tt>outline_param</tt> - defaults to <tt>cyan,bold</tt>
     # * <tt>skipped</tt>       - defaults to <tt>cyan</tt>
     # * <tt>skipped_param</tt> - defaults to <tt>cyan,bold</tt>
     # * <tt>comment</tt>       - defaults to <tt>grey</tt>
@@ -66,9 +69,11 @@ module Cucumber
           h[$1] + ',bold'
         end
       end.merge({
+        'missing' => 'yellow',
         'pending' => 'yellow',
         'failed'  => 'red',
         'passed'  => 'green',
+        'outline' => 'cyan',
         'skipped' => 'cyan',
         'comment' => 'grey',
         'tag'     => 'blue'

data/lib/cucumber/formatters/pretty_formatter.rb

@@ -19,6 +19,8 @@ module Cucumber
         @last_executed_was_row = false
         @pending_messages = {}
         @forced_pending_step_count = 0
+        
+        @total_scenario_count = 0
       end
 
       def feature_executing(feature)
@@ -81,6 +83,7 @@ module Cucumber
           @io.puts
           output_failing_step(@failed.last)
         end
+        @total_scenario_count += 1
       end
 
       def step_passed(step, regexp, args)
@@ -100,14 +103,13 @@ module Cucumber
       end
 
       def step_failed(step, regexp, args)
+        @scenario_failed = true
         if step.row?
           args = step.visible_args if step.outline?
           @failed << step
-          @scenario_failed = true
           print_failed_args(args)
         else
           @failed << step
-          @scenario_failed = true
           @io.print failed("    #{step.keyword} #{step.format(regexp){|param| failed_param(param) << failed}}")
           if @options[:source]
             @io.print padding_spaces(step)
@@ -176,13 +178,16 @@ module Cucumber
 
         print_pending_messages if @pending_messages.any?
 
-        @io.puts pending("#{@pending_scenarios.length} scenarios pending") if @pending_scenarios.any?
+        @io.puts dump_count(@total_scenario_count, "scenario")
+
+        @io.puts pending(dump_count(@pending_scenarios.length, "scenario", "pending")) if @pending_scenarios.any?
+
+        @io.puts passed(dump_count(@passed.length, "step", "passed"))   if @passed.any?
+        @io.puts passed(dump_count(@failed.length, "step", "failed"))   if @failed.any?
+        @io.puts passed(dump_count(@skipped.length, "step", "skipped")) if @skipped.any?
 
-        @io.puts passed("#{@passed.length} steps passed")           if @passed.any?
-        @io.puts failed("#{@failed.length} steps failed")           if @failed.any?
-        @io.puts skipped("#{@skipped.length} steps skipped")        if @skipped.any?
         if @pending_steps.any?
-          @io.print pending("#{@pending_steps.length} steps pending") 
+          @io.print pending(dump_count(@pending_steps.length, "step", "pending")) 
           @io.print pending(" (#{number_of_unimplemented_steps} with no step definition)") if number_of_unimplemented_steps > 0
           @io.puts
         end
@@ -191,6 +196,10 @@ module Cucumber
 
         print_snippets if @options[:snippets]
       end
+      
+      def dump_count(count, what, state=nil)
+        return [count, "#{what}#{count == 1 ? '' : 's'}", state].compact.join(" ")
+      end
 
       def print_pending_messages
         @io.puts "Pending Notes:"
@@ -199,7 +208,7 @@ module Cucumber
         end
         @io.puts
       end
-
+      
       def print_snippets
         snippets = @pending_steps
         snippets.delete_if {|snippet| snippet.row? || @step_mother.has_step_definition?(snippet.name)}

data/lib/cucumber/formatters/unicode.rb

@@ -2,25 +2,25 @@
 require 'cucumber/platform'
 require 'cucumber/formatters/ansicolor'
 
-$KCODE='u'
+$KCODE='u' unless Cucumber::RUBY_1_9
 
-if $CUCUMBER_WINDOWS_MRI && `chcp` =~ /Active code page: (\d+)/
+if Cucumber::WINDOWS_MRI && `chcp` =~ /Active code page: (\d+)/
   codepage = $1.to_i
   codepages = (1251..1252)
 
   if codepages.include?(codepage)
-    $CUCUMBER_CODEPAGE = "cp#{codepage}"
+    Cucumber::CODEPAGE = "cp#{codepage}"
   
     require 'iconv'
     module Kernel
       alias cucumber_print print
       def print(*a)
-        cucumber_print *Iconv.iconv($CUCUMBER_CODEPAGE, "UTF-8", *a)
+        cucumber_print *Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a)
       end
 
       alias cucumber_puts puts
       def puts(*a)
-        cucumber_puts *Iconv.iconv($CUCUMBER_CODEPAGE, "UTF-8", *a)
+        cucumber_puts *Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a)
       end
     end
   end

data/lib/cucumber/platform.rb

@@ -2,9 +2,31 @@
 # in various places.
 require 'rbconfig'
 
-$CUCUMBER_JRUBY       = defined?(JRUBY_VERSION)
-$CUCUMBER_IRONRUBY    = Config::CONFIG['sitedir'] =~ /IronRuby/
-$CUCUMBER_WINDOWS     = Config::CONFIG['host_os'] =~ /mswin|mingw/
-$CUCUMBER_WINDOWS_MRI = $CUCUMBER_WINDOWS && !$CUCUMBER_JRUBY && !$CUCUMBER_IRONRUBY
-$CUCUMBER_RAILS       = defined?(Rails)
-$CUCUMBER_RUBY        = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+module Cucumber
+  LANGUAGE_FILE = File.expand_path(File.dirname(__FILE__) + '/languages.yml')
+  BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
+  JRUBY         = defined?(JRUBY_VERSION)
+  IRONRUBY      = Config::CONFIG['sitedir'] =~ /IronRuby/
+  WINDOWS       = Config::CONFIG['host_os'] =~ /mswin|mingw/
+  WINDOWS_MRI   = WINDOWS && !JRUBY && !IRONRUBY
+  RAILS         = defined?(Rails)
+  RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+  RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
+
+  class << self
+    attr_reader :language
+    
+    def load_language(lang)
+      @language = config[lang]
+    end
+    
+    def languages
+      config.keys.sort
+    end
+    
+    def config
+      require 'yaml'
+      @config ||= YAML.load_file(LANGUAGE_FILE)
+    end
+  end  
+end

data/lib/cucumber/rails/rspec.rb

@@ -1,4 +1,4 @@
-require 'spec'
+require 'spec/expectations'
 require 'spec/rails'
 
 # Hack to stop RSpec from dumping the summary

data/lib/cucumber/rails/world.rb

@@ -15,7 +15,7 @@ ActionController::Base.class_eval do
     perform_action_without_rescue
   end
 end
-Dispatcher.class_eval do
+ActionController::Dispatcher.class_eval do
   def self.failsafe_response(output, status, exception = nil)
     raise exception
   end

data/lib/cucumber/rake/task.rb

@@ -1,3 +1,5 @@
+require 'cucumber/platform'
+
 module Cucumber
   module Rake
     # Defines a task for running features.
@@ -5,7 +7,6 @@ module Cucumber
       LIB    = File.expand_path(File.dirname(__FILE__) + '/../..')
 
       attr_accessor :libs
-      attr_accessor :binary
       attr_accessor :step_list
       attr_accessor :step_pattern
       attr_accessor :feature_list
@@ -24,7 +25,6 @@ module Cucumber
 
         @feature_pattern = "features/**/*.feature" if feature_pattern.nil? && feature_list.nil?
         @step_pattern    = "features/**/*.rb"      if step_pattern.nil? && step_list.nil?
-        @binary        ||= File.expand_path(File.dirname(__FILE__) + '/../../../bin/cucumber')
         define_task
       end
 
@@ -37,7 +37,7 @@ module Cucumber
 
       def arguments_for_ruby_execution(task_args = nil)
         lib_args     = ['"%s"' % ([LIB] + libs).join(File::PATH_SEPARATOR)]
-        cucumber_bin = ['"%s"' % binary]
+        cucumber_bin = ['"%s"' % Cucumber::BINARY]
         cuc_opts     = [(ENV['CUCUMBER_OPTS'] || cucumber_opts)]
 
         step_files(task_args).each do |step_file|

data/lib/cucumber/treetop_parser/feature.treetop.erb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ar.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_cy.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_da.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_de.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_en-lol.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_en-tx.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_en.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_es.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_et.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_fr.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_id.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_it.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ja.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_lt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_nl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_no.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_parser.rb

@@ -20,7 +20,9 @@ module Cucumber
       end
       
       def parse_feature(file)
-        ast = parse(IO.read(file))
+        gherkin = IO.read(file)
+        gherkin = gherkin.force_encoding('utf-8') if Cucumber::RUBY_1_9
+        ast = parse(gherkin)
         if ast.nil?
           raise SyntaxError.new(file, self)
         else

data/lib/cucumber/treetop_parser/feature_pl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_pt.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ro.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ro2.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser

data/lib/cucumber/treetop_parser/feature_ru.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Cucumber
 # :stopdoc:
 module TreetopParser