cucumber 0.6.2 → 0.6.3

data/lib/cucumber/ast/table.rb

@@ -429,8 +429,8 @@ module Cucumber
       private
 
       TO_S_PREFIXES = Hash.new('    ')
-      TO_S_PREFIXES[:comment]   = ['(+) ']
-      TO_S_PREFIXES[:undefined] = ['(-) ']
+      TO_S_PREFIXES[:comment]   = '(+) '
+      TO_S_PREFIXES[:undefined] = '(-) '
 
       protected
 

data/lib/cucumber/cli/configuration.rb

@@ -83,7 +83,7 @@ module Cucumber
         files.reject! {|f| !File.file?(f)}
         files.reject! {|f| File.extname(f) == '.feature' }
         files.reject! {|f| f =~ /^http/}
-        files      
+        files.sort
       end
       
       def step_defs_to_load

data/lib/cucumber/cli/drb_client.rb

@@ -9,24 +9,35 @@ module Cucumber
     class DRbClient
       DEFAULT_PORT = 8990
 
-      def self.run(args, error_stream, out_stream, port = nil)
-        port ||= ENV["CUCUMBER_DRB"] || DEFAULT_PORT
-
-        # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
-        begin
-          DRb.start_service("druby://localhost:0")
-        rescue SocketError
-        # Ruby-1.8.7 on snow leopard doesn't like localhost:0 - but just :0
-        # seems to work just fine
-          DRb.start_service("druby://:0")
+      class << self
+
+        def run(args, error_stream, out_stream, port = nil)
+          port ||= ENV["CUCUMBER_DRB"] || DEFAULT_PORT
+
+          setup_support_for_io_streams_over_drb
+
+          feature_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port}")
+          cloned_args = [] # I have no idea why this is needed, but if the regular args are sent then DRb magically transforms it into a DRb object - not an array
+          args.each { |arg| cloned_args << arg }
+          feature_server.run(cloned_args, error_stream, out_stream)
+        rescue DRb::DRbConnError => e
+          raise DRbClientError, "No DRb server is running."
         end
-        feature_server = DRbObject.new_with_uri("druby://127.0.0.1:#{port}")
-        cloned_args = [] # I have no idea why this is needed, but if the regular args are sent then DRb magically transforms it into a DRb object - not an array
-        args.each { |arg| cloned_args << arg }
-        feature_server.run(cloned_args, error_stream, out_stream)
-      rescue DRb::DRbConnError => e
-        raise DRbClientError, "No DRb server is running."
+
+        private
+        def setup_support_for_io_streams_over_drb
+          # See http://redmine.ruby-lang.org/issues/show/496 as to why we specify localhost:0
+          begin
+            DRb.start_service("druby://localhost:0")
+          rescue SocketError
+            # Ruby-1.8.7 on snow leopard doesn't like localhost:0 - but just :0
+            # seems to work just fine
+            DRb.start_service("druby://:0")
+          end
+        end
+
       end
+
     end
   end
 end

data/lib/cucumber/cli/profile_loader.rb

@@ -22,7 +22,8 @@ Defined profiles in cucumber.yml:
         case(args_from_yml)
           when String
             raise YmlLoadError, "The '#{profile}' profile in cucumber.yml was blank.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml =~ /^\s*$/
-            args_from_yml = args_from_yml.split(' ')
+            require 'shellwords'
+            args_from_yml = Shellwords.shellwords(args_from_yml)
           when Array
             raise YmlLoadError, "The '#{profile}' profile in cucumber.yml was empty.  Please define the command line arguments for the '#{profile}' profile in cucumber.yml.\n" if args_from_yml.empty?
           else
@@ -51,7 +52,7 @@ Defined profiles in cucumber.yml:
         require 'erb'
         require 'yaml'
         begin
-          @cucumber_erb = ERB.new(IO.read(cucumber_file)).result
+          @cucumber_erb = ERB.new(IO.read(cucumber_file)).result(binding)
         rescue Exception => e
           raise(YmlLoadError,"cucumber.yml was found, but could not be parsed with ERB.  Please refer to cucumber's documentation on correct profile usage.\n#{$!.inspect}")
         end

data/lib/cucumber/core_ext/proc.rb

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

data/lib/cucumber/formatter/console.rb

@@ -68,7 +68,7 @@ module Cucumber
         if !@failures.empty?
           @io.puts format_string("Failing Scenarios:", :failed)
           @failures.each do |failure|
-            profiles_string = (profiles.map{|profile| "-p #{profile} " }).flatten unless profiles.empty?
+            profiles_string = profiles.empty? ? '' : (profiles.map{|profile| "-p #{profile}" }).join(' ') + ' '
             @io.puts format_string("cucumber #{profiles_string}" + failure.file_colon_line, :failed) +
             format_string(" # Scenario: " + failure.name, :comment)
           end
@@ -145,9 +145,11 @@ module Cucumber
         if @delayed_announcements
           @delayed_announcements << announcement
         else
-          @io.puts
-          @io.puts(format_string(announcement, :tag))
-          @io.flush
+          if @io
+            @io.puts
+            @io.puts(format_string(announcement, :tag))
+            @io.flush
+          end
         end
       end
 

data/lib/cucumber/formatter/cucumber.css

@@ -48,6 +48,16 @@ body {
 .cucumber .summary ul.features li, td .summary ul.features li, th .summary ul.features li {
   display: inline;
 }
+.cucumber .step_name, td .step_name, th .step_name {
+  float: left;
+}
+.cucumber .step_file, td .step_file, th .step_file {
+  text-align: right;
+  color: #999999;
+}
+.cucumber .step_file a, td .step_file a, th .step_file a {
+  color: #999999;
+}
 .cucumber .tag, td .tag, th .tag {
   font-weight: bold;
   color: #246AC1;

data/lib/cucumber/formatter/cucumber.sass

@@ -73,6 +73,16 @@ body
     ul.features
       li
         :display inline
+   
+  .step_name
+    :float left
+        
+  .step_file
+    :text-align right
+    :color #999999
+    a
+      :color #999999
+    
 
   .tag
     :font-weight bold

data/lib/cucumber/formatter/html.rb

@@ -328,124 +328,137 @@ module Cucumber
 
       protected
 
-        def build_exception_detail(exception)
-          backtrace = Array.new
-          @builder.div(:class => 'message') do
-            message = exception.message
-            if defined?(RAILS_ROOT) && message.include?('Exception caught')
-              matches = message.match(/Showing <i>(.+)<\/i>(?:.+)#(\d+)/)
-              backtrace += ["#{RAILS_ROOT}/#{matches[1]}:#{matches[2]}"]
-              message = message.match(/<code>([^(\/)]+)<\//m)[1]
-            end
-            @builder.pre do 
-              @builder.text!(message)
-            end
+      def build_exception_detail(exception)
+        backtrace = Array.new
+        @builder.div(:class => 'message') do
+          message = exception.message
+          if defined?(RAILS_ROOT) && message.include?('Exception caught')
+            matches = message.match(/Showing <i>(.+)<\/i>(?:.+)#(\d+)/)
+            backtrace += ["#{RAILS_ROOT}/#{matches[1]}:#{matches[2]}"]
+            message = message.match(/<code>([^(\/)]+)<\//m)[1]
           end
-          @builder.div(:class => 'backtrace') do
-            @builder.pre do
-              backtrace = exception.backtrace
-              backtrace.delete_if { |x| x =~ /\/gems\/(cucumber|rspec)/ }
-              @builder << backtrace_line(backtrace.join("\n"))
-            end
+          @builder.pre do 
+            @builder.text!(message)
           end
-          extra = extra_failure_content(backtrace)
-          @builder << extra unless extra == ""
         end
-
-        def set_scenario_color(status)
-          if status == :undefined
-            set_scenario_color_pending
-          end
-          if status == :failed
-            set_scenario_color_failed
+        @builder.div(:class => 'backtrace') do
+          @builder.pre do
+            backtrace = exception.backtrace
+            backtrace.delete_if { |x| x =~ /\/gems\/(cucumber|rspec)/ }
+            @builder << backtrace_line(backtrace.join("\n"))
           end
         end
-        
-        def set_scenario_color_failed
-          @builder.script do
-            @builder.text!("makeRed('cucumber-header');") unless @header_red
-            @header_red = true
-            @builder.text!("makeRed('scenario_#{@scenario_number}');") unless @scenario_red
-            @scenario_red = true
-          end
+        extra = extra_failure_content(backtrace)
+        @builder << extra unless extra == ""
+      end
+
+      def set_scenario_color(status)
+        if status == :undefined
+          set_scenario_color_pending
         end
-        
-        def set_scenario_color_pending
-          @builder.script do
-            @builder.text!("makeYellow('cucumber-header');") unless @header_red
-            @builder.text!("makeYellow('scenario_#{@scenario_number}');") unless @scenario_red
-          end         
-        end
-
-        def get_step_count(features)
-          count = 0
-          features = features.instance_variable_get("@features")
-          features.each do |feature|
-            #get background steps
-            if feature.instance_variable_get("@background")
-              background = feature.instance_variable_get("@background").instance_variable_get("@steps").instance_variable_get("@steps")
-              count += background.size
-            end
-            #get scenarios
-            feature.instance_variable_get("@feature_elements").each do |scenario|
-              #get steps
-              steps = scenario.instance_variable_get("@steps").instance_variable_get("@steps")
-              count += steps.size
-
-              #get example table
-              examples = scenario.instance_variable_get("@examples_array")
-              unless examples.nil?
-                examples.each do |example|
-                  example_matrix = example.instance_variable_get("@outline_table").instance_variable_get("@cell_matrix")
-                  count += example_matrix.size
-                end
+        if status == :failed
+          set_scenario_color_failed
+        end
+      end
+      
+      def set_scenario_color_failed
+        @builder.script do
+          @builder.text!("makeRed('cucumber-header');") unless @header_red
+          @header_red = true
+          @builder.text!("makeRed('scenario_#{@scenario_number}');") unless @scenario_red
+          @scenario_red = true
+        end
+      end
+      
+      def set_scenario_color_pending
+        @builder.script do
+          @builder.text!("makeYellow('cucumber-header');") unless @header_red
+          @builder.text!("makeYellow('scenario_#{@scenario_number}');") unless @scenario_red
+        end         
+      end
+
+      def get_step_count(features)
+        count = 0
+        features = features.instance_variable_get("@features")
+        features.each do |feature|
+          #get background steps
+          if feature.instance_variable_get("@background")
+            background = feature.instance_variable_get("@background").instance_variable_get("@steps").instance_variable_get("@steps")
+            count += background.size
+          end
+          #get scenarios
+          feature.instance_variable_get("@feature_elements").each do |scenario|
+            #get steps
+            steps = scenario.instance_variable_get("@steps").instance_variable_get("@steps")
+            count += steps.size
+
+            #get example table
+            examples = scenario.instance_variable_get("@examples_array")
+            unless examples.nil?
+              examples.each do |example|
+                example_matrix = example.instance_variable_get("@outline_table").instance_variable_get("@cell_matrix")
+                count += example_matrix.size
               end
+            end
 
-              #get multiline step tables
-              steps.each do |step|
-                multi_arg = step.instance_variable_get("@multiline_arg")
-                next if multi_arg.nil?
-                matrix = multi_arg.instance_variable_get("@cell_matrix")
-                count += matrix.size unless matrix.nil?
-              end
+            #get multiline step tables
+            steps.each do |step|
+              multi_arg = step.instance_variable_get("@multiline_arg")
+              next if multi_arg.nil?
+              matrix = multi_arg.instance_variable_get("@cell_matrix")
+              count += matrix.size unless matrix.nil?
             end
           end
-          return count
         end
+        return count
+      end
 
-        def build_step(keyword, step_match, status)
-          step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
-          @builder.div do |div|
-            @builder.span(keyword, :class => 'keyword')
-            @builder.text!(' ')
-            @builder.span(:class => 'step val') do |name|
-              name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
-            end
+      def build_step(keyword, step_match, status)
+        step_name = step_match.format_args(lambda{|param| %{<span class="param">#{param}</span>}})
+        @builder.div(:class => 'step_name') do |div|
+          @builder.span(keyword, :class => 'keyword')
+          @builder.text!(' ')
+          @builder.span(:class => 'step val') do |name|
+            name << h(step_name).gsub(/&lt;span class=&quot;(.*?)&quot;&gt;/, '<span class="\1">').gsub(/&lt;\/span&gt;/, '</span>')
+          end            
+        end
+        
+        step_file = step_match.file_colon_line
+        step_file.gsub(/^([^:]*\.rb):(\d*)/) do
+          if ENV['TM_PROJECT_DIRECTORY']
+            step_file = "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
           end
         end
-
-        def build_cell(cell_type, value, attributes)
-          @builder.__send__(cell_type, attributes) do
-            @builder.div do
-              @builder.span(value,:class => 'step param')
-            end
+        
+        @builder.div(:class => 'step_file') do |div|
+          @builder.span do
+            @builder << step_file
           end
         end
+      end
 
-        def inline_css
-          @builder.style(:type => 'text/css') do
-            @builder << File.read(File.dirname(__FILE__) + '/cucumber.css')
+      def build_cell(cell_type, value, attributes)
+        @builder.__send__(cell_type, attributes) do
+          @builder.div do
+            @builder.span(value,:class => 'step param')
           end
         end
+      end
 
-        def inline_js
-          @builder.script(:type => 'text/javascript') do
-            @builder << inline_js_content
-          end
+      def inline_css
+        @builder.style(:type => 'text/css') do
+          @builder << File.read(File.dirname(__FILE__) + '/cucumber.css')
         end
+      end
+
+      def inline_js
+        @builder.script(:type => 'text/javascript') do
+          @builder << inline_js_content
+        end
+      end
 
-        def inline_js_content
-          <<-EOF
+      def inline_js_content
+        <<-EOF
       function moveProgressBar(percentDone) {
       document.getElementById("cucumber-header").style.width = percentDone +"%";
       }
@@ -459,113 +472,111 @@ module Cucumber
       document.getElementById(element_id).style.color = '#000000';
       }
       EOF
-        end
+      end
 
-        def move_progress
-          @builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
-        end
+      def move_progress
+        @builder << " <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
+      end
 
-        def percent_done
-          result = 100.0
-          if @step_count != 0
-            result = ((@step_number).to_f / @step_count.to_f * 1000).to_i / 10.0
-          end
-          result
+      def percent_done
+        result = 100.0
+        if @step_count != 0
+          result = ((@step_number).to_f / @step_count.to_f * 1000).to_i / 10.0
         end
+        result
+      end
 
-        def format_exception(exception)
-          (["#{exception.message}"] + exception.backtrace).join("\n")
-        end
+      def format_exception(exception)
+        (["#{exception.message}"] + exception.backtrace).join("\n")
+      end
 
-        def backtrace_line(line)
-          line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*)/) do
-            if ENV['TM_PROJECT_DIRECTORY']
-              "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
-            else
-              line
-            end
+      def backtrace_line(line)
+        line.gsub(/^([^:]*\.(?:rb|feature|haml)):(\d*)/) do
+          if ENV['TM_PROJECT_DIRECTORY']
+            "<a href=\"txmt://open?url=file://#{File.expand_path($1)}&line=#{$2}\">#{$1}:#{$2}</a> "
+          else
+            line
           end
         end
+      end
 
-        def print_stats(features)
-          @builder <<  "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{format_duration(features.duration)} seconds</strong>\";</script>"
-          @builder <<  "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{print_stat_string(features)}\";</script>"
-        end
+      def print_stats(features)
+        @builder <<  "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{format_duration(features.duration)} seconds</strong>\";</script>"
+        @builder <<  "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{print_stat_string(features)}\";</script>"
+      end
 
-        def print_stat_string(features)
-          string = String.new
-          string << dump_count(@step_mother.scenarios.length, "scenario")
-          scenario_count = print_status_counts{|status| @step_mother.scenarios(status)}
-          string << scenario_count if scenario_count
-          string << "<br />"
-          string << dump_count(@step_mother.steps.length, "step")
-          step_count = print_status_counts{|status| @step_mother.steps(status)}
-          string << step_count if step_count
-        end
+      def print_stat_string(features)
+        string = String.new
+        string << dump_count(@step_mother.scenarios.length, "scenario")
+        scenario_count = print_status_counts{|status| @step_mother.scenarios(status)}
+        string << scenario_count if scenario_count
+        string << "<br />"
+        string << dump_count(@step_mother.steps.length, "step")
+        step_count = print_status_counts{|status| @step_mother.steps(status)}
+        string << step_count if step_count
+      end
 
-        def print_status_counts
-          counts = [:failed, :skipped, :undefined, :pending, :passed].map do |status|
-            elements = yield status
-            elements.any? ? "#{elements.length} #{status.to_s}" : nil
-          end.compact
-          return " (#{counts.join(', ')})" if counts.any?
-        end
+      def print_status_counts
+        counts = [:failed, :skipped, :undefined, :pending, :passed].map do |status|
+          elements = yield status
+          elements.any? ? "#{elements.length} #{status.to_s}" : nil
+        end.compact
+        return " (#{counts.join(', ')})" if counts.any?
+      end
 
-        def dump_count(count, what, state=nil)
-          [count, state, "#{what}#{count == 1 ? '' : 's'}"].compact.join(" ")
-        end
+      def dump_count(count, what, state=nil)
+        [count, state, "#{what}#{count == 1 ? '' : 's'}"].compact.join(" ")
+      end
 
-        def create_builder(io)
-          OrderedXmlMarkup.new(:target => io, :indent => 0)
-        end
-    end
-  end
-end
+      def create_builder(io)
+        OrderedXmlMarkup.new(:target => io, :indent => 0)
+      end
 
+      class SnippetExtractor #:nodoc:
+        class NullConverter; def convert(code, pre); code; end; end #:nodoc:
+        begin; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end
 
-class SnippetExtractor #:nodoc:
-  class NullConverter; def convert(code, pre); code; end; end #:nodoc:
-  begin; require 'syntax/convertors/html'; @@converter = Syntax::Convertors::HTML.for_syntax "ruby"; rescue LoadError => e; @@converter = NullConverter.new; end
+        def snippet(error)
+          raw_code, line = snippet_for(error[0])
+          highlighted = @@converter.convert(raw_code, false)
+          highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
+          post_process(highlighted, line)
+        end
 
-  def snippet(error)
-    raw_code, line = snippet_for(error[0])
-    highlighted = @@converter.convert(raw_code, false)
-    highlighted << "\n<span class=\"comment\"># gem install syntax to get syntax highlighting</span>" if @@converter.is_a?(NullConverter)
-    post_process(highlighted, line)
-  end
+        def snippet_for(error_line)
+          if error_line =~ /(.*):(\d+)/
+            file = $1
+            line = $2.to_i
+            [lines_around(file, line), line]
+          else
+            ["# Couldn't get snippet for #{error_line}", 1]
+          end
+        end
 
-  def snippet_for(error_line)
-    if error_line =~ /(.*):(\d+)/
-      file = $1
-      line = $2.to_i
-      [lines_around(file, line), line]
-    else
-      return snippet_for()
-      ["# Couldn't get snippet for #{error_line}", 1]
-    end
-  end
+        def lines_around(file, line)
+          if File.file?(file)
+            lines = File.open(file).read.split("\n")
+            min = [0, line-3].max
+            max = [line+1, lines.length-1].min
+            selected_lines = []
+            selected_lines.join("\n")
+            lines[min..max].join("\n")
+          else
+            "# Couldn't get snippet for #{file}"
+          end
+        end
 
-  def lines_around(file, line)
-    if File.file?(file)
-      lines = File.open(file).read.split("\n")
-      min = [0, line-3].max
-      max = [line+1, lines.length-1].min
-      selected_lines = []
-      selected_lines.join("\n")
-      lines[min..max].join("\n")
-    else
-      "# Couldn't get snippet for #{file}"
-    end
-  end
+        def post_process(highlighted, offending_line)
+          new_lines = []
+          highlighted.split("\n").each_with_index do |line, i|
+            new_line = "<span class=\"linenum\">#{offending_line+i-2}</span>#{line}"
+            new_line = "<span class=\"offending\">#{new_line}</span>" if i == 2
+            new_lines << new_line
+          end
+          new_lines.join("\n")
+        end
 
-  def post_process(highlighted, offending_line)
-    new_lines = []
-    highlighted.split("\n").each_with_index do |line, i|
-      new_line = "<span class=\"linenum\">#{offending_line+i-2}</span>#{line}"
-      new_line = "<span class=\"offending\">#{new_line}</span>" if i == 2
-      new_lines << new_line
+      end
     end
-    new_lines.join("\n")
   end
-
-end
+end