cucumber 0.8.5 → 0.8.6

data/lib/cucumber/ast/tree_walker.rb

@@ -2,11 +2,11 @@ module Cucumber
   module Ast
     # Walks the AST, executing steps and notifying listeners
     class TreeWalker
-      attr_accessor :options #:nodoc:
+      attr_accessor :configuration #:nodoc:
       attr_reader   :step_mother #:nodoc:
 
-      def initialize(step_mother, listeners = [], options = {}, io = STDOUT)
-        @step_mother, @listeners, @options, @io = step_mother, listeners, options, io
+      def initialize(step_mother, listeners = [], configuration = Cucumber::Configuration.default)
+        @step_mother, @listeners, @configuration = step_mother, listeners, configuration
       end
 
       def visit_features(features)
@@ -122,7 +122,7 @@ module Cucumber
         broadcast(exception, status)
       end
 
-      def visit_py_string(string)
+      def visit_doc_string(string)
         broadcast(string)
       end
 
@@ -142,15 +142,15 @@ module Cucumber
         broadcast(value, status)
       end
 
-      # Print +announcement+. This method can be called from within StepDefinitions.
-      def announce(announcement)
-        broadcast(announcement)
+      # Print +messages+. This method can be called from within StepDefinitions.
+      def puts(*messages)
+        broadcast(*messages)
       end
 
       # Embed +file+ of +mime_type+ in the formatter. This method can be called from within StepDefinitions.
       # For most formatters this is a no-op.
-      def embed(file, mime_type)
-        broadcast(file, mime_type)
+      def embed(file, mime_type, label)
+        broadcast(file, mime_type, label)
       end
       
       private
@@ -171,48 +171,10 @@ module Cucumber
       def send_to_all(message, *args)
         @listeners.each do |listener|
           if listener.respond_to?(message)
-            if legacy_listener?(listener)
-              warn_legacy(listener)
-              legacy_invoke(listener, message, *args)
-            else
-              listener.__send__(message, *args)
-            end
+            listener.__send__(message, *args)
           end
         end
       end
-
-      def legacy_listener?(listener)
-        listener.respond_to?(:feature_name) && 
-        (listener.method(:feature_name) rescue false) && 
-        listener.method(:feature_name).arity == 1
-      end
-
-      def warn_legacy(listener)
-        @warned_listeners ||= []
-        unless @warned_listeners.index(listener)
-          warn("#{listener.class} is using a deprecated formatter API. Starting with Cucumber 0.7.0 the signatures\n" + 
-          "that have changed are:\n" +
-          "  feature_name(keyword, name)  # Two arguments. The keyword argument will not contain a colon.\n" +
-          "  scenario_name(keyword, name, file_colon_line, source_indent)  # The keyword argument will not contain a colon.\n" +
-          "  examples_name(keyword, name)  # The keyword argument will not contain a colon.\n"
-          )
-        end
-        @warned_listeners << listener
-      end
-
-      def legacy_invoke(listener, message, *args)
-        case message.to_sym
-        when :feature_name
-          listener.feature_name("#{args[0]}: #{args[1]}")
-        when :scenario_name, :examples_name
-          args_with_colon = args.dup
-          args_with_colon[0] += ':'
-          listener.__send__(message, *args_with_colon)
-        else
-          listener.__send__(message, *args)
-        end
-      end
-
       def extract_method_name_from(call_stack)
         call_stack[0].match(/in `(.*)'/).captures[0]
       end

data/lib/cucumber/cli/configuration.rb

@@ -12,7 +12,7 @@ module Cucumber
     class Configuration
       include Constantize
 
-      attr_reader :options, :out_stream
+      attr_reader :out_stream
 
       def initialize(out_stream = STDOUT, error_stream = STDERR)
         @out_stream   = out_stream
@@ -56,8 +56,16 @@ module Cucumber
         @options[:drb_port].to_i if @options[:drb_port]
       end
 
-      def build_runner(step_mother, io)
-        Ast::TreeWalker.new(step_mother, formatters(step_mother), @options, io)
+      def dry_run?
+        @options[:dry_run]
+      end
+
+      def expand?
+        @options[:expand]
+      end
+
+      def build_tree_walker(step_mother)
+        Ast::TreeWalker.new(step_mother, formatters(step_mother), self)
       end
 
       def formatter_class(format)
@@ -98,7 +106,7 @@ module Cucumber
           path = path.gsub(/\\/, '/') # In case we're on windows. Globs don't work with backslashes.
           path = path.chomp('/')
           if File.directory?(path)
-            Dir["#{path}/**/*.feature"]
+            Dir["#{path}/**/*.feature"].sort
           elsif path[0..0] == '@' and # @listfile.txt
               File.file?(path[1..-1]) # listfile.txt is a file
             IO.read(path[1..-1]).split
@@ -121,7 +129,27 @@ module Cucumber
         logger.level = Logger::DEBUG if self.verbose?
         logger
       end
-
+      
+      def tag_expression
+        Gherkin::TagExpression.new(@options[:tag_expressions])
+      end
+      
+      def filters
+        @options.filters
+      end
+      
+      def formats
+        @options[:formats]
+      end
+      
+      def options
+        warn("Deprecated: Configuration#options will be removed from the next release of Cucumber. Please use the configuration object directly instead.")
+        @options
+      end
+      
+      def paths
+        @options[:paths].empty? ? ['features'] : @options[:paths]
+      end
     private
 
       def formatters(step_mother)
@@ -151,9 +179,6 @@ module Cucumber
         end
       end
 
-      def paths
-        @options[:paths].empty? ? ['features'] : @options[:paths]
-      end
 
       def set_environment_variables
         @options[:env_vars].each do |var, value|

data/lib/cucumber/cli/main.rb

@@ -9,7 +9,6 @@ require 'cucumber'
 require 'logger'
 require 'cucumber/parser'
 require 'cucumber/feature_file'
-require 'cucumber/formatter/color_io'
 require 'cucumber/cli/configuration'
 require 'cucumber/cli/drb_client'
 
@@ -17,55 +16,32 @@ module Cucumber
   module Cli
     class Main
       class << self
-        def step_mother
-          @step_mother ||= StepMother.new
-        end
-
         def execute(args)
-          new(args).execute!(step_mother)
+          new(args).execute!
         end
       end
 
       def initialize(args, out_stream = STDOUT, error_stream = STDERR)
         @args         = args
-        if Cucumber::WINDOWS_MRI
-          @out_stream   = out_stream == STDOUT ? Formatter::ColorIO.new(Kernel, STDOUT) : out_stream
-        else
-          @out_stream   = out_stream
-        end
+        @out_stream   = out_stream
 
         @error_stream = error_stream
         @configuration = nil
       end
 
-      def execute!(step_mother)
+      def execute!(existing_runtime = nil)
         trap_interrupt
-        if configuration.drb?
-          begin
-            return DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)
-          rescue DRbClientError => e
-            @error_stream.puts "WARNING: #{e.message} Running features locally:"
-          end
-        end
-        step_mother.options = configuration.options
-        step_mother.log = configuration.log
-
-        step_mother.load_code_files(configuration.support_to_load)
-        step_mother.after_configuration(configuration)
-        features = step_mother.load_plain_text_features(configuration.feature_files)
-        step_mother.load_code_files(configuration.step_defs_to_load)
-
-        runner = configuration.build_runner(step_mother, @out_stream)
-        step_mother.visitor = runner # Needed to support World#announce
+        return @drb_output if run_drb_client
         
-        runner.visit_features(features)
-
-        failure = if configuration.wip?
-          step_mother.scenarios(:passed).any?
+        runtime = if existing_runtime
+          existing_runtime.configure(configuration)
+          existing_runtime
         else
-          step_mother.scenarios(:failed).any? ||
-          (configuration.strict? && (step_mother.steps(:undefined).any? || step_mother.steps(:pending).any?))
+          Runtime.new(configuration)
         end
+
+        runtime.run!
+        runtime.results.failure?
       rescue ProfilesNotDefinedError, YmlLoadError, ProfileNotFound => e
         @error_stream.puts e.message
         true
@@ -76,10 +52,19 @@ module Cucumber
 
         @configuration = Configuration.new(@out_stream, @error_stream)
         @configuration.parse!(@args)
+        Cucumber.logger = @configuration.log
         @configuration
       end
 
       private
+      
+      def run_drb_client
+        return false unless configuration.drb?
+        @drb_output = DRbClient.run(@args, @error_stream, @out_stream, configuration.drb_port)
+        true
+      rescue DRbClientError => e
+        @error_stream.puts "WARNING: #{e.message} Running features locally:"
+      end
 
       def trap_interrupt
         trap('INT') do

data/lib/cucumber/cli/options.rb

@@ -24,8 +24,7 @@ module Cucumber
                                                               "#{INDENT}the usage formatter, except that steps are not printed."],
         'junit'       => ['Cucumber::Formatter::Junit',       'Generates a report similar to Ant+JUnit.'],
         'json'        => ['Cucumber::Formatter::Json',        'Prints the feature as JSON'],
-        'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as pretty JSON'],
-        'tag_cloud'   => ['Cucumber::Formatter::TagCloud',    'Prints a tag cloud of tag usage.'],
+        'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as prettified JSON'],
         'debug'       => ['Cucumber::Formatter::Debug',       'For developing formatters - prints the calls made to the listeners.']
       }
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
@@ -165,7 +164,7 @@ module Cucumber
             "This represents the boolean expression (@foo || !@bar) && @zap.",
             "\n",
             "Beware that if you want to use several negative tags to exclude several tags",
-            "you have to use logical AND: --tags ~@fixme --tags @buggy.",
+            "you have to use logical AND: --tags ~@fixme --tags ~@buggy.",
             "\n",
             "Positive tags can be given a threshold to limit the number of occurrences.", 
             "Example: --tags @qa:3 will fail if there are more than 3 occurrences of the @qa tag.",
@@ -199,10 +198,8 @@ module Cucumber
             Term::ANSIColor.coloring = v
           end
           opts.on("-d", "--dry-run", "Invokes formatters without executing the steps.",
-            "This also omits the loading of your support/env.rb file if it exists.",
-            "Implies --no-snippets.") do
+            "This also omits the loading of your support/env.rb file if it exists.") do
             @options[:dry_run] = true
-            @options[:snippets] = false
           end
           opts.on("-a", "--autoformat DIR",
             "Reformats (pretty prints) feature files and write them to DIRECTORY.",
@@ -231,7 +228,7 @@ module Cucumber
           opts.on("-b", "--backtrace", "Show full backtrace for all errors.") do
             Cucumber.use_full_backtrace = true
           end
-          opts.on("-S", "--strict", "Fail if there are any undefined steps.") do
+          opts.on("-S", "--strict", "Fail if there are any undefined or pending steps.") do
             @options[:strict] = true
           end
           opts.on("-w", "--wip", "Fail if there are any passing scenarios.") do
@@ -243,6 +240,9 @@ module Cucumber
           opts.on("-g", "--guess", "Guess best match for Ambiguous steps.") do
             @options[:guess] = true
           end
+          opts.on("-l", "--lines LINES", "Run given line numbers. Equivalent to FILE:LINE syntax") do |lines|
+            @options[:lines] = lines
+          end
           opts.on("-x", "--expand", "Expand Scenario Outline Tables in output.") do
             @options[:expand] = true
           end
@@ -268,6 +268,7 @@ module Cucumber
           @options[:snippets] = true if @options[:snippets].nil?
           @options[:source]   = true if @options[:source].nil?
         end
+        @args.map! { |a| "#{a}:#{@options[:lines]}" } if @options[:lines]
 
         extract_environment_variables
         @options[:paths] = @args.dup #whatver is left over

data/lib/cucumber/cli/profile_loader.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Cucumber
   module Cli
 

data/lib/cucumber/core_ext/proc.rb

@@ -1,6 +1,7 @@
 # Proc extension to get more location info out of a proc
 class Proc #:nodoc:
   PROC_PATTERN = /[\d\w]+@(.+):(\d+).*>/
+  PWD = Dir.pwd
   
   def to_comment_line
     "# #{file_colon_line}"
@@ -14,7 +15,7 @@ class Proc #:nodoc:
     def file_colon_line
       path, line = *to_s.match(PROC_PATTERN)[1..2]
       path = File.expand_path(path)
-      pwd = File.expand_path(Dir.pwd)
+      pwd = File.expand_path(PWD)
       if path.index(pwd)
         path = path[pwd.length+1..-1]
       elsif path =~ /.*\/gems\/(.*\.rb)$/

data/lib/cucumber/feature_file.rb

@@ -2,14 +2,15 @@ require 'cucumber/parser/gherkin_builder'
 require 'gherkin/formatter/filter_formatter'
 require 'gherkin/formatter/tag_count_formatter'
 require 'gherkin/parser/parser'
-require 'gherkin/i18n_lexer'
 
 module Cucumber
   class FeatureFile
     FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/ #:nodoc:
-    LANGUAGE_PATTERN = /language:\s*(.*)/ #:nodoc:
+    DEFAULT_ENCODING = "UTF-8" #:nodoc:
+    COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/ #:nodoc:
+    ENCODING_PATTERN = /^\s*#\s*encoding\s*:\s*([^\s]+)/ #:nodoc:
 
-    # The +uri+ argument is the location of the source. It can ba a path 
+    # The +uri+ argument is the location of the source. It can be a path
     # or a path:line1:line2 etc. If +source+ is passed, +uri+ is ignored.
     def initialize(uri, source=nil)
       @source = source
@@ -20,12 +21,12 @@ module Cucumber
         @path = uri
       end
     end
-    
+
     # Parses a file and returns a Cucumber::Ast
-    # If +options+ contains tags, the result will
+    # If +configuration_filters+ contains any filters, the result will
     # be filtered.
-    def parse(options, tag_counts)
-      filters = @lines || options.filters
+    def parse(configuration_filters, tag_counts)
+      filters = @lines || configuration_filters
 
       builder             = Cucumber::Parser::GherkinBuilder.new
       filter_formatter    = filters.empty? ? builder : Gherkin::Formatter::FilterFormatter.new(builder, filters)
@@ -39,7 +40,7 @@ module Cucumber
         ast.language = parser.i18n_language
         ast.file = @path
         ast
-      rescue Gherkin::LexingError, Gherkin::Parser::ParseError => e
+      rescue Gherkin::Lexer::LexingError, Gherkin::Parser::ParseError => e
         e.message.insert(0, "#{@path}: ")
         raise e
       end
@@ -51,19 +52,50 @@ module Cucumber
         open(@path).read
       else
         begin
-          File.open(@path, Cucumber.file_mode('r')).read 
+          source = File.open(@path, Cucumber.file_mode('r', DEFAULT_ENCODING)).read
+          encoding = encoding_for(source)
+          if(DEFAULT_ENCODING.downcase != encoding.downcase)
+            # Read the file again - it's explicitly declaring a different encoding
+            source = File.open(@path, Cucumber.file_mode('r', encoding)).read
+            source = to_default_encoding(source, encoding)
+          end
+          source
         rescue Errno::EACCES => e
-          p = File.expand_path(@path)
-          e.message << "\nCouldn't open #{p}"
+          e.message << "\nCouldn't open #{File.expand_path(@path)}"
+          raise e
+        rescue Errno::ENOENT => e
+          # special-case opening features, because this could be a new user:
+          if(@path == 'features')
+            STDERR.puts("You don't have a 'features' directory.  Please create one to get started.",
+                        "See http://cukes.info/ for more information.")
+            exit 1
+          end
           raise e
         end
       end
     end
-    
+
     private
     
-    # Special PML markup that we want to filter out.
-    CO = %{\\s*<(label|callout)\s+id=".*?"\s*/>\\s*}
-    C_CALLOUT = %r{/\*#{CO}\*/|//#{CO}}o
+    def encoding_for(source)
+      encoding = DEFAULT_ENCODING
+      source.each_line do |line|
+        break unless COMMENT_OR_EMPTY_LINE_PATTERN =~ line
+        if ENCODING_PATTERN =~ line
+          encoding = $1
+          break
+        end
+      end
+      encoding
+    end
+
+    def to_default_encoding(string, encoding)
+      if string.respond_to?(:encode)
+        string.encode(DEFAULT_ENCODING)
+      else
+        require 'iconv'
+        Iconv.new(DEFAULT_ENCODING, encoding).iconv(string)
+      end
+    end
   end
 end

data/lib/cucumber/formatter/ansicolor.rb

@@ -15,15 +15,13 @@ if Cucumber::IRONRUBY
 end
 
 if Cucumber::WINDOWS_MRI
-  begin
-    require 'Win32/Console/ANSI'
-  rescue LoadError
-    STDERR.puts %{*** WARNING: You must "gem install win32console" (1.2.0 or higher) to get coloured output on MRI/Windows}
+  unless ENV['ANSICON']
+    STDERR.puts %{*** WARNING: You must use ANSICON 1.31 or higher (http://adoxa.110mb.com/ansicon) to get coloured output on Windows}
     Term::ANSIColor.coloring = false
   end
 end
 
-Term::ANSIColor.coloring = false if !STDOUT.tty? && !ENV.has_key?("AUTOTEST")
+Term::ANSIColor.coloring = false if !STDOUT.tty? && !ENV.has_key?('AUTOTEST')
 
 module Cucumber
   module Formatter