cucumber 0.8.6 → 0.8.7

data/lib/cucumber/cli/options.rb

@@ -24,7 +24,8 @@ 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 prettified JSON'],
+        'json_pretty' => ['Cucumber::Formatter::JsonPretty',  'Prints the feature as pretty JSON'],
+        'tag_cloud'   => ['Cucumber::Formatter::TagCloud',    'Prints a tag cloud of tag usage.'],
         'debug'       => ['Cucumber::Formatter::Debug',       'For developing formatters - prints the calls made to the listeners.']
       }
       max = BUILTIN_FORMATS.keys.map{|s| s.length}.max
@@ -164,7 +165,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.",
@@ -198,8 +199,10 @@ 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.") do
+            "This also omits the loading of your support/env.rb file if it exists.",
+            "Implies --no-snippets.") do
             @options[:dry_run] = true
+            @options[:snippets] = false
           end
           opts.on("-a", "--autoformat DIR",
             "Reformats (pretty prints) feature files and write them to DIRECTORY.",
@@ -228,7 +231,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 or pending steps.") do
+          opts.on("-S", "--strict", "Fail if there are any undefined steps.") do
             @options[:strict] = true
           end
           opts.on("-w", "--wip", "Fail if there are any passing scenarios.") do
@@ -240,9 +243,6 @@ 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,7 +268,6 @@ 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,5 +1,3 @@
-require 'yaml'
-
 module Cucumber
   module Cli
 

data/lib/cucumber/core_ext/proc.rb

@@ -1,7 +1,6 @@
 # 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}"
@@ -15,7 +14,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(PWD)
+      pwd = File.expand_path(Dir.pwd)
       if path.index(pwd)
         path = path[pwd.length+1..-1]
       elsif path =~ /.*\/gems\/(.*\.rb)$/

data/lib/cucumber/feature_file.rb

@@ -2,15 +2,14 @@ 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:
-    DEFAULT_ENCODING = "UTF-8" #:nodoc:
-    COMMENT_OR_EMPTY_LINE_PATTERN = /^\s*#|^\s*$/ #:nodoc:
-    ENCODING_PATTERN = /^\s*#\s*encoding\s*:\s*([^\s]+)/ #:nodoc:
+    LANGUAGE_PATTERN = /language:\s*(.*)/ #:nodoc:
 
-    # The +uri+ argument is the location of the source. It can be a path
+    # The +uri+ argument is the location of the source. It can ba a path 
     # or a path:line1:line2 etc. If +source+ is passed, +uri+ is ignored.
     def initialize(uri, source=nil)
       @source = source
@@ -21,12 +20,12 @@ module Cucumber
         @path = uri
       end
     end
-
+    
     # Parses a file and returns a Cucumber::Ast
-    # If +configuration_filters+ contains any filters, the result will
+    # If +options+ contains tags, the result will
     # be filtered.
-    def parse(configuration_filters, tag_counts)
-      filters = @lines || configuration_filters
+    def parse(options, tag_counts)
+      filters = @lines || options.filters
 
       builder             = Cucumber::Parser::GherkinBuilder.new
       filter_formatter    = filters.empty? ? builder : Gherkin::Formatter::FilterFormatter.new(builder, filters)
@@ -40,7 +39,7 @@ module Cucumber
         ast.language = parser.i18n_language
         ast.file = @path
         ast
-      rescue Gherkin::Lexer::LexingError, Gherkin::Parser::ParseError => e
+      rescue Gherkin::LexingError, Gherkin::Parser::ParseError => e
         e.message.insert(0, "#{@path}: ")
         raise e
       end
@@ -52,50 +51,19 @@ module Cucumber
         open(@path).read
       else
         begin
-          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
+          File.open(@path, Cucumber.file_mode('r')).read 
         rescue Errno::EACCES => e
-          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
+          p = File.expand_path(@path)
+          e.message << "\nCouldn't open #{p}"
           raise e
         end
       end
     end
-
+    
     private
     
-    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
+    # Special PML markup that we want to filter out.
+    CO = %{\\s*<(label|callout)\s+id=".*?"\s*/>\\s*}
+    C_CALLOUT = %r{/\*#{CO}\*/|//#{CO}}o
   end
 end

data/lib/cucumber/formatter/ansicolor.rb

@@ -15,13 +15,15 @@ if Cucumber::IRONRUBY
 end
 
 if Cucumber::WINDOWS_MRI
-  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}
+  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}
     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

data/lib/cucumber/formatter/color_io.rb

@@ -0,0 +1,23 @@
+require 'forwardable'
+
+module Cucumber
+  module Formatter
+    # Adapter to make #puts/#print/#flush work with win32console
+    class ColorIO #:nodoc:
+      extend Forwardable
+      def_delegators :@kernel, :puts, :print # win32console colours only work when sent to Kernel
+      def_delegators :@stdout, :flush, :tty?, :write, :close
+
+      def initialize(kernel, stdout)
+        @kernel = kernel
+        @stdout = stdout
+      end
+
+      # Ensure using << still gets colours in win32console
+      def <<(output)
+        print(output)
+        self
+      end
+    end
+  end
+end

data/lib/cucumber/formatter/console.rb

@@ -26,15 +26,13 @@ module Cucumber
         format_string(line, status)
       end
 
-      def format_string(o, status)
+      def format_string(string, status)
         fmt = format_for(status)
-        o.to_s.split("\n").map do |line|
-          if Proc === fmt
-            fmt.call(line)
-          else
-            fmt % line
-          end
-        end.join("\n")
+        if Proc === fmt
+          fmt.call(string)
+        else
+          fmt % string
+        end
       end
 
       def print_steps(status)
@@ -127,45 +125,43 @@ module Cucumber
         end
       end
 
-      def embed(file, mime_type, label)
+      def embed(file, mime_type)
         # no-op
       end
 
-      #define @delayed_messages = [] in your Formatter if you want to
+      #define @delayed_announcements = [] in your Formatter if you want to
       #activate this feature
-      def puts(*messages)
-        if @delayed_messages
-          @delayed_messages += messages
+      def announce(announcement)
+        if @delayed_announcements
+          @delayed_announcements << announcement
         else
           if @io
             @io.puts
-            messages.each do |message|
-              @io.puts(format_string(message, :tag))
-            end
+            @io.puts(format_string(announcement, :tag))
             @io.flush
           end
         end
       end
 
-      def print_messages
-        @delayed_messages.each {|message| print_message(message)}
-        empty_messages
+      def print_announcements()
+        @delayed_announcements.each {|ann| print_announcement(ann)}
+        empty_announcements
       end
 
-      def print_table_row_messages
-        return if @delayed_messages.empty?
-        @io.print(format_string(@delayed_messages.join(', '), :tag).indent(2))
+      def print_table_row_announcements
+        return if @delayed_announcements.empty?
+        @io.print(format_string(@delayed_announcements.join(', '), :tag).indent(2))
         @io.flush
-        empty_messages
+        empty_announcements
       end
 
-      def print_message(message)
-        @io.puts(format_string(message, :tag).indent(@indent))
+      def print_announcement(announcement)
+        @io.puts(format_string(announcement, :tag).indent(@indent))
         @io.flush
       end
 
-      def empty_messages
-        @delayed_messages = []
+      def empty_announcements
+        @delayed_announcements = []
       end
 
     private

data/lib/cucumber/formatter/cucumber.css

@@ -2,7 +2,7 @@
 /* Regenerate with rake sass */
 body {
   font-size: 0px;
-  color: white;
+  color: #FFFFFF;
   margin: 0px;
   padding: 0px;
 }
@@ -10,11 +10,11 @@ body {
 .cucumber, td, th {
   font: normal 11px "Lucida Grande", Helvetica, sans-serif;
   background: white;
-  color: black;
+  color: #000000;
 }
 .cucumber #cucumber-header, td #cucumber-header, th #cucumber-header {
-  background: #65c400;
-  color: white;
+  background: #65C400;
+  color: #FFFFFF;
   height: 6em;
 }
 .cucumber #cucumber-header #expand-collapse p, td #cucumber-header #expand-collapse p, th #cucumber-header #expand-collapse p {
@@ -25,8 +25,8 @@ body {
   font-size: 11px;
   padding: 3px;
   margin: 0;
-  background: #65c400;
-  color: white;
+  background: #65C400;
+  color: #FFFFFF;
   font-weight: bold;
 }
 .cucumber h1, td h1, th h1 {
@@ -62,23 +62,19 @@ body {
 .cucumber .step_file a, td .step_file a, th .step_file a {
   color: #999999;
 }
-.cucumber .scenario_file, td .scenario_file, th .scenario_file {
-  float: right;
-  color: #999999;
-}
 .cucumber .tag, td .tag, th .tag {
   font-weight: bold;
-  color: #246ac1;
+  color: #246AC1;
 }
 .cucumber .backtrace, td .backtrace, th .backtrace {
   margin-top: 0;
   margin-bottom: 0;
   margin-left: 1em;
-  color: black;
+  color: #000000;
 }
 .cucumber a, td a, th a {
   text-decoration: none;
-  color: #be5c00;
+  color: #BE5C00;
 }
 .cucumber a:hover, td a:hover, th a:hover {
   text-decoration: underline;
@@ -88,7 +84,7 @@ body {
 }
 .cucumber a div.examples, td a div.examples, th a div.examples {
   margin: 5px 0px 5px 15px;
-  color: black;
+  color: #000000;
 }
 .cucumber .outline table, td .outline table, th .outline table {
   margin: 0px 0px 5px 10px;
@@ -133,12 +129,6 @@ body {
   background: #fcfb98;
   color: #131313;
 }
-.cucumber table td.message, td table td.message, th table td.message {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
-  color: #001111;
-}
 .cucumber ol, td ol, th ol {
   list-style: none;
   margin: 0px;
@@ -185,13 +175,6 @@ body {
   background: #fcfb98;
   color: #131313;
 }
-.cucumber ol li.message, td ol li.message, th ol li.message {
-  border-left: 5px solid aqua;
-  border-bottom: 1px solid aqua;
-  background: #e0ffff;
-  color: #001111;
-  margin-left: 10px;
-}
 .cucumber #summary, td #summary, th #summary {
   margin: 0px;
   padding: 5px 10px;
@@ -215,7 +198,7 @@ body {
   padding: 0.1em 0 0.2em 0;
 }
 .ruby .keyword {
-  color: #ff6600;
+  color: #FF6600;
 }
 .ruby .constant {
   color: #339999;
@@ -233,13 +216,13 @@ body {
   color: white;
 }
 .ruby .string {
-  color: #66ff00;
+  color: #66FF00;
 }
 .ruby .ident {
   color: white;
 }
 .ruby .method {
-  color: #ffcc00;
+  color: #FFCC00;
 }
 .ruby .number {
   color: white;
@@ -248,13 +231,13 @@ body {
   color: white;
 }
 .ruby .comment {
-  color: #9933cc;
+  color: #9933CC;
 }
 .ruby .symbol {
   color: white;
 }
 .ruby .regex {
-  color: #44b4cc;
+  color: #44B4CC;
 }
 .ruby .punct {
   color: white;
@@ -274,6 +257,6 @@ body {
 .ruby .linenum {
   width: 75px;
   padding: 0.1em 1em 0.2em 0;
-  color: black;
-  background: #fffbd3;
+  color: #000000;
+  background: #FFFBD3;
 }