cucumber 0.10.0 → 0.10.1

data/legacy_features/wire_protocol.feature

@@ -11,7 +11,7 @@ Feature: Wire Protocol
   #
   # Communication is over a TCP socket, which Cucumber connects to when it finds
   # a definition file with the .wire extension in the step_definitions folder
-  # (or other load path).
+  # (or other load path).  Note that these files are rendered with ERB when loaded.
   #
   # Cucumber sends the following request messages out over the wire:
   #
@@ -31,7 +31,7 @@ Feature: Wire Protocol
   # Some messages support more responses - see below for details.
   #
   # A WirePacket flowing in either direction is formatted as a JSON-encoded
-  # string, with a newline character signalling the end of a packet. See the
+  # string, with a newline character signaling the end of a packet. See the
   # specs for Cucumber::WireSupport::WirePacket for more details.
   #
   # These messages are described in detail below, with examples.

data/legacy_features/wire_protocol_erb.feature

@@ -0,0 +1,57 @@
+@wire
+Feature: Wire Protocol with ERB
+  In order to be allow Cucumber to touch my app in intimate places
+  As a developer on server with multiple users
+  I want to be able to configure which port my wire server runs on
+  So that I can avoid port conflicts
+
+  Background:
+    Given a standard Cucumber project directory structure
+    And a file named "features/wired.feature" with:
+      """
+      Feature: High strung
+        Scenario: Wired
+          Given we're all wired
+
+      """
+
+  Scenario: ERB is used in the wire file which references an environment variable that is not set
+      Given a file named "features/step_definitions/server.wire" with:
+        """
+        host: localhost
+        port: <%= ENV['PORT'] || 12345 %>
+        """
+      And there is a wire server running on port 12345 which understands the following protocol:
+        | request                                              | response       |
+        | ["step_matches",{"name_to_match":"we're all wired"}] | ["success",[]] |
+      When I run cucumber --dry-run --no-snippets -f progress
+      And it should pass with
+        """
+        U
+
+        1 scenario (1 undefined)
+        1 step (1 undefined)
+
+        """
+
+
+  Scenario: ERB is used in the wire file which references an environment variable
+      Given I have environment variable PORT set to "16816"
+      And a file named "features/step_definitions/server.wire" with:
+        """
+        host: localhost
+        port: <%= ENV['PORT'] || 12345 %>
+        """
+      And there is a wire server running on port 16816 which understands the following protocol:
+        | request                                              | response       |
+        | ["step_matches",{"name_to_match":"we're all wired"}] | ["success",[]] |
+      When I run cucumber --dry-run --no-snippets -f progress
+      And it should pass with
+        """
+        U
+
+        1 scenario (1 undefined)
+        1 step (1 undefined)
+
+        """
+

data/lib/cucumber/ast/table.rb

@@ -168,9 +168,8 @@ module Cucumber
         @col_names ||= cell_matrix[0].map { |cell| cell.value }
       end
 
-      # Same as #raw, but skips the first (header) row
       def rows
-        raw[1..-1]
+        hashes.map(&:values)
       end
 
       def each_cells_row(&proc) #:nodoc:
@@ -278,6 +277,7 @@ module Cucumber
       def map_column!(column_name, strict=true, &conversion_proc)
         verify_column(column_name.to_s) if strict
         @conversion_procs[column_name.to_s] = conversion_proc
+        self
       end
 
       # Compares +other_table+ to self. If +other_table+ contains columns

data/lib/cucumber/ast/tree_walker.rb

@@ -149,8 +149,8 @@ module Cucumber
 
       # 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

data/lib/cucumber/cli/configuration.rb

@@ -106,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

data/lib/cucumber/cli/options.rb

@@ -240,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
@@ -265,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/feature_file.rb

@@ -6,9 +6,11 @@ require 'gherkin/parser/parser'
 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 be 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
@@ -19,7 +21,7 @@ module Cucumber
         @path = uri
       end
     end
-    
+
     # Parses a file and returns a Cucumber::Ast
     # If +configuration_filters+ contains any filters, the result will
     # be filtered.
@@ -50,13 +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
+    
+    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/console.rb

@@ -125,7 +125,7 @@ module Cucumber
         end
       end
 
-      def embed(file, mime_type)
+      def embed(file, mime_type, label)
         # no-op
       end
 

data/lib/cucumber/formatter/cucumber.css

@@ -2,7 +2,7 @@
 /* Regenerate with rake sass */
 body {
   font-size: 0px;
-  color: #FFFFFF;
+  color: white;
   margin: 0px;
   padding: 0px;
 }
@@ -10,11 +10,11 @@ body {
 .cucumber, td, th {
   font: normal 11px "Lucida Grande", Helvetica, sans-serif;
   background: white;
-  color: #000000;
+  color: black;
 }
 .cucumber #cucumber-header, td #cucumber-header, th #cucumber-header {
-  background: #65C400;
-  color: #FFFFFF;
+  background: #65c400;
+  color: white;
   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: #FFFFFF;
+  background: #65c400;
+  color: white;
   font-weight: bold;
 }
 .cucumber h1, td h1, th h1 {
@@ -62,19 +62,23 @@ 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: #000000;
+  color: black;
 }
 .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;
@@ -84,7 +88,7 @@ body {
 }
 .cucumber a div.examples, td a div.examples, th a div.examples {
   margin: 5px 0px 5px 15px;
-  color: #000000;
+  color: black;
 }
 .cucumber .outline table, td .outline table, th .outline table {
   margin: 0px 0px 5px 10px;
@@ -211,7 +215,7 @@ body {
   padding: 0.1em 0 0.2em 0;
 }
 .ruby .keyword {
-  color: #FF6600;
+  color: #ff6600;
 }
 .ruby .constant {
   color: #339999;
@@ -229,13 +233,13 @@ body {
   color: white;
 }
 .ruby .string {
-  color: #66FF00;
+  color: #66ff00;
 }
 .ruby .ident {
   color: white;
 }
 .ruby .method {
-  color: #FFCC00;
+  color: #ffcc00;
 }
 .ruby .number {
   color: white;
@@ -244,13 +248,13 @@ body {
   color: white;
 }
 .ruby .comment {
-  color: #9933CC;
+  color: #9933cc;
 }
 .ruby .symbol {
   color: white;
 }
 .ruby .regex {
-  color: #44B4CC;
+  color: #44b4cc;
 }
 .ruby .punct {
   color: white;
@@ -270,6 +274,6 @@ body {
 .ruby .linenum {
   width: 75px;
   padding: 0.1em 1em 0.2em 0;
-  color: #000000;
-  background: #FFFBD3;
+  color: black;
+  background: #fffbd3;
 }

data/lib/cucumber/formatter/cucumber.sass

@@ -1,271 +1,247 @@
 /* cucumber.css is generated from cucumber.sass */
 /* Regenerate with rake sass */
 
-!step_left           = 5px "solid"
-!step_bottom         = 1px "solid"
+$step_left: 5px solid
+$step_bottom: 1px solid
 
-!failed              = #FFFBD3
-!failed_border       = #C20000
-!failed_text         = #C20000
+$failed: #fffbd3
+$failed_border: #c20000
+$failed_text: #c20000
 
-!passed              = #DBFFB4
-!passed_border       = #65C400
-!passed_text         = #3D7700
+$passed: #dbffb4
+$passed_border: #65c400
+$passed_text: #3d7700
 
-!skipped             = #E0FFFF
-!skipped_border      = #00FFFF
-!skipped_text        = #001111
+$skipped: #e0ffff
+$skipped_border: aqua
+$skipped_text: #001111
 
-!pending             = #FCFB98
-!pending_border      = #FAF834
-!pending_text        = #131313
+$pending: #fcfb98
+$pending_border: #faf834
+$pending_text: #131313
 
-!undefined           = #FCFB98
-!undefined_border    = #FAF834
-!undefined_text      = #131313
+$undefined: #fcfb98
+$undefined_border: #faf834
+$undefined_text: #131313
 
-!announcement        = #E0FFFF
-!announcement_border = #00FFFF
-!announcement_text   = #001111
+$announcement: #e0ffff
+$announcement_border: aqua
+$announcement_text: #001111
 
 body
-  :font-size 0px
-  :color #FFFFFF
-  :margin 0px
-  :padding 0px
+  font-size: 0px
+  color: white
+  margin: 0px
+  padding: 0px
 
 .cucumber,td,th
-  :font normal 11px "Lucida Grande", Helvetica, sans-serif
-  :background white
-  :color #000000
-  
+  font: normal 11px "Lucida Grande", Helvetica, sans-serif
+  background: white
+  color: black
   #cucumber-header
-    :background #65C400
-    :color #FFFFFF
-    :height 6em
-    
+    background: #65c400
+    color: white
+    height: 6em
     #expand-collapse
       p
-        :float right
-        :margin 0 0 0 10px
-    
+        float: right
+        margin: 0 0 0 10px
   .scenario
     h3
-      :font-size 11px
-      :padding 3px
-      :margin 0
-      :background #65C400
-      :color #FFFFFF
-      :font-weight bold
-  
+      font-size: 11px
+      padding: 3px
+      margin: 0
+      background: #65c400
+      color: white
+      font-weight: bold
   h1
-    :margin 0px 10px 0px 10px
-    :padding 10px
-    :font-family "Lucida Grande", Helvetica, sans-serif
-    :font-size 2em
-    :position absolute
-  
+    margin: 0px 10px 0px 10px
+    padding: 10px
+    font-family: "Lucida Grande", Helvetica, sans-serif
+    font-size: 2em
+    position: absolute
   h4
-    :margin-bottom 2px
-
+    margin-bottom: 2px
   div.feature
-    :padding 2px
-    :margin 0px 10px 5px 10px
-
+    padding: 2px
+    margin: 0px 10px 5px 10px
   div.examples
-    :padding 0em 0em 0em 1em
-
+    padding: 0em 0em 0em 1em
   .stats
-    :margin 2em
-
+    margin: 2em
   .summary
     ul.features
       li
-        :display inline
-   
+        display: inline
   .step_name
-    :float left
-        
+    float: left
   .step_file
-    :text-align right
-    :color #999999
+    text-align: right
+    color: #999999
     a
-      :color #999999
-    
-
+      color: #999999
+  .scenario_file
+    float: right
+    color: #999999
   .tag
-    :font-weight bold
-    :color #246AC1
-    
+    font-weight: bold
+    color: #246ac1
   .backtrace
-    :margin-top 0
-    :margin-bottom 0
-    :margin-left 1em
-    :color #000000
-
+    margin-top: 0
+    margin-bottom: 0
+    margin-left: 1em
+    color: black
   a
-    :text-decoration none
-    :color #BE5C00
-
+    text-decoration: none
+    color: #be5c00
     &:hover
-      :text-decoration underline
+      text-decoration: underline
     &:visited
-      :font-weight normal
-
+      font-weight: normal
     div.examples
-      :margin 5px 0px 5px 15px
-      :color #000000
-      
+      margin: 5px 0px 5px 15px
+      color: black
   .outline
     table
-      :margin 0px 0px 5px 10px
-
+      margin: 0px 0px 5px 10px
   table
-    :border-collapse collapse
+    border-collapse: collapse
     td
-      :padding 3px 3px 3px 5px
+      padding: 3px 3px 3px 5px
     td.failed, td.passed, td.skipped, td.pending, td.undefined
-      :padding-left 18px
-      :padding-right 10px
+      padding-left: 18px
+      padding-right: 10px
     td.failed
-      :border-left= !step_left !failed_border
-      :border-bottom= !step_bottom !failed_border
-      :background= !failed
-      :color= !failed_text
+      border-left: $step_left $failed_border
+      border-bottom: $step_bottom $failed_border
+      background: $failed
+      color: $failed_text
     td.passed
-      :border-left= !step_left !passed_border
-      :border-bottom= !step_bottom !passed_border
-      :background= !passed
-      :color= !passed_text
+      border-left: $step_left $passed_border
+      border-bottom: $step_bottom $passed_border
+      background: $passed
+      color: $passed_text
     td.skipped
-      :border-left= !step_left !skipped_border
-      :border-bottom= !step_bottom !skipped_border
-      :background= !skipped
-      :color= !skipped_text
+      border-left: $step_left $skipped_border
+      border-bottom: $step_bottom $skipped_border
+      background: $skipped
+      color: $skipped_text
     td.pending
-      :border-left= !step_left !pending_border
-      :border-bottom= !step_bottom !pending_border
-      :background= !pending
-      :color= !pending_text
+      border-left: $step_left $pending_border
+      border-bottom: $step_bottom $pending_border
+      background: $pending
+      color: $pending_text
     td.undefined
-      :border-left= !step_left !undefined_border
-      :border-bottom= !step_bottom !undefined_border
-      :background= !undefined
-      :color= !undefined_text
+      border-left: $step_left $undefined_border
+      border-bottom: $step_bottom $undefined_border
+      background: $undefined
+      color: $undefined_text
     td.announcement
-      :border-left= !step_left !announcement_border
-      :border-bottom= !step_bottom !announcement_border
-      :background= !announcement
-      :color= !announcement_text
-
+      border-left: $step_left $announcement_border
+      border-bottom: $step_bottom $announcement_border
+      background: $announcement
+      color: $announcement_text
   ol
-    :list-style none
-    :margin 0px
-    :padding 0px
-    
+    list-style: none
+    margin: 0px
+    padding: 0px
     li.step
-      :padding 3px 3px 3px 18px
-      :margin 5px 0px 5px 5px
+      padding: 3px 3px 3px 18px
+      margin: 5px 0px 5px 5px
     li
-      :margin 0em 0em 0em 1em
-      :padding 0em 0em 0em 0.2em        
+      margin: 0em 0em 0em 1em
+      padding: 0em 0em 0em 0.2em
       span.param
-        :font-weight bold      
+        font-weight: bold
     li.failed
-      :border-left= !step_left !failed_border
-      :border-bottom= !step_bottom !failed_border
-      :background= !failed
-      :color= !failed_text
+      border-left: $step_left $failed_border
+      border-bottom: $step_bottom $failed_border
+      background: $failed
+      color: $failed_text
     li.passed
-      :border-left= !step_left !passed_border
-      :border-bottom= !step_bottom !passed_border
-      :background= !passed
-      :color= !passed_text
+      border-left: $step_left $passed_border
+      border-bottom: $step_bottom $passed_border
+      background: $passed
+      color: $passed_text
     li.skipped
-      :border-left= !step_left !skipped_border
-      :border-bottom= !step_bottom !skipped_border
-      :background= !skipped
-      :color= !skipped_text
+      border-left: $step_left $skipped_border
+      border-bottom: $step_bottom $skipped_border
+      background: $skipped
+      color: $skipped_text
     li.pending
-      :border-left= !step_left !pending_border
-      :border-bottom= !step_bottom !pending_border
-      :background= !pending
-      :color= !pending_text
+      border-left: $step_left $pending_border
+      border-bottom: $step_bottom $pending_border
+      background: $pending
+      color: $pending_text
     li.undefined
-      :border-left= !step_left !undefined_border
-      :border-bottom= !step_bottom !undefined_border
-      :background= !undefined
-      :color= !undefined_text
+      border-left: $step_left $undefined_border
+      border-bottom: $step_bottom $undefined_border
+      background: $undefined
+      color: $undefined_text
     li.announcement
-      :border-left= !step_left !announcement_border
-      :border-bottom= !step_bottom !announcement_border
-      :background= !announcement
-      :color= !announcement_text
-      :margin-left= 10px
-            
+      border-left: $step_left $announcement_border
+      border-bottom: $step_bottom $announcement_border
+      background: $announcement
+      color: $announcement_text
+      margin-left: 10px
   #summary
-    :margin 0px
-    :padding 5px 10px
-    :text-align right
-    :top 0px
-    :right 0px
-    :float right
-
+    margin: 0px
+    padding: 5px 10px
+    text-align: right
+    top: 0px
+    right: 0px
+    float: right
     p
-      :margin 0 0 0 2px
-
+      margin: 0 0 0 2px
     #totals
-      :font-size 1.2em      
-      
-.ruby
-  :font-size 12px
-  :font-family monospace
-  :color white
-  :background black
-  :padding 0.1em 0 0.2em 0
+      font-size: 1.2em
 
-  .keyword 
-    :color #FF6600
+.ruby
+  font-size: 12px
+  font-family: monospace
+  color: white
+  background: black
+  padding: 0.1em 0 0.2em 0
+  .keyword
+    color: #ff6600
   .constant
-    :color #339999
+    color: #339999
   .attribute
-    :color white
+    color: white
   .global
-    :color white
+    color: white
   .module
-    :color white
+    color: white
   .class
-    :color white
+    color: white
   .string
-    :color #66FF00
+    color: #66ff00
   .ident
-    :color white
+    color: white
   .method
-    :color #FFCC00
+    color: #ffcc00
   .number
-    :color white
+    color: white
   .char
-    :color white
+    color: white
   .comment
-    :color #9933CC
+    color: #9933cc
   .symbol
-    :color white
+    color: white
   .regex
-    :color #44B4CC
+    color: #44b4cc
   .punct
-    :color white
+    color: white
   .escape
-    :color white
-  .interp 
-    :color white
-  .expr 
-    :color white
-
+    color: white
+  .interp
+    color: white
+  .expr
+    color: white
   .offending
-    :background #333333
+    background: #333333
   .linenum
-    :width 75px
-    :padding 0.1em 1em 0.2em 0
-    :color #000000
-    :background #FFFBD3
-
+    width: 75px
+    padding: 0.1em 1em 0.2em 0
+    color: black
+    background: #fffbd3