aslakhellesoy-cucumber 0.2.0.2 → 0.2.0.3

data/History.txt

@@ -1,11 +1,15 @@
 == 0.2.1 (In Git)
 
 == Bugfixes
+* HTML Formatter doesn't work correctly with scenario Outlines. (#260 Aslak Hellesøy)
 * After blocks are run in reverse order of registration. (#113 Aslak Hellesøy)
 * Snippets are showing 'Ands' (#249 Aslak Hellesøy)
 
 === New features
-* New usage formatter. This is the foundation for editor autocompletion and navigation between steps and step definitions.
+* Snippets use a regexp and block arguments if the step name has "quoted" arguments. (Aslak Hellesøy)
+* Cucumber::Ast::Feature#to_sexp includes the file name. (Aslak Hellesøy)
+* support/env.rb is not loaded when --dry-run is specified. This is to increase performance. (Aslak Hellesøy)
+* New usage formatter. This is the foundation for editor autocompletion and navigation between steps and step definitions. (#209 Aslak Hellesøy)
 
 === Removed features
 * -S/--step-definitions option introduced in 0.2.0 is removed. Use --format usage [--dry-run] [--no-color].

data/Manifest.txt

@@ -158,6 +158,7 @@ examples/self_test/features/sample.feature
 examples/self_test/features/step_definitions/sample_steps.rb
 examples/self_test/features/support/env.rb
 examples/self_test/features/support/tag_count_formatter.rb
+examples/self_test/features/tons_of_cukes.feature
 examples/sinatra/Rakefile
 examples/sinatra/app.rb
 examples/sinatra/features/add.feature
@@ -206,7 +207,6 @@ gem_tasks/features.rake
 gem_tasks/fix_cr_lf.rake
 gem_tasks/flog.rake
 gem_tasks/gemspec.rake
-gem_tasks/jar.rake
 gem_tasks/rspec.rake
 gem_tasks/yard.rake
 lib/autotest/cucumber.rb

data/examples/self_test/features/tons_of_cukes.feature

@@ -0,0 +1,52 @@
+@lots
+Feature: Tons of cukes
+  Scenario: Lots and lots
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes
+    Given '2' cukes

data/features/cucumber_cli.feature

@@ -166,7 +166,7 @@ Feature: Cucumber command line
       """
 
   Scenario: --dry-run
-    When I run cucumber --dry-run --no-snippets features/*.feature
+    When I run cucumber --dry-run --no-snippets features/*.feature --tags ~@lots
     Then it should pass with
       """
       Feature: Calling undefined step

data/features/custom_formatter.feature

@@ -4,8 +4,8 @@ Feature: Custom Formatter
     When I run cucumber --format Tag::Count features
     Then it should fail with
       """
-      | four | one | three | two |
-      | 1    | 1   | 2     | 1   |
+      | four | lots | one | three | two |
+      | 1    | 1    | 1   | 2     | 1   |
 
       """
     

data/features/usage.feature

@@ -22,6 +22,55 @@ Feature: Cucumber command line
        And '10' cukes    # features/background/failing_background.feature:5
        Given '10' cukes  # features/background/passing_background.feature:4
        Given '10' cukes  # features/background/scenario_outline_passing_background.feature:4
+       Given '2' cukes   # features/tons_of_cukes.feature:4
+       Given '2' cukes   # features/tons_of_cukes.feature:5
+       Given '2' cukes   # features/tons_of_cukes.feature:6
+       Given '2' cukes   # features/tons_of_cukes.feature:7
+       Given '2' cukes   # features/tons_of_cukes.feature:8
+       Given '2' cukes   # features/tons_of_cukes.feature:9
+       Given '2' cukes   # features/tons_of_cukes.feature:10
+       Given '2' cukes   # features/tons_of_cukes.feature:11
+       Given '2' cukes   # features/tons_of_cukes.feature:12
+       Given '2' cukes   # features/tons_of_cukes.feature:13
+       Given '2' cukes   # features/tons_of_cukes.feature:14
+       Given '2' cukes   # features/tons_of_cukes.feature:15
+       Given '2' cukes   # features/tons_of_cukes.feature:16
+       Given '2' cukes   # features/tons_of_cukes.feature:17
+       Given '2' cukes   # features/tons_of_cukes.feature:18
+       Given '2' cukes   # features/tons_of_cukes.feature:19
+       Given '2' cukes   # features/tons_of_cukes.feature:20
+       Given '2' cukes   # features/tons_of_cukes.feature:21
+       Given '2' cukes   # features/tons_of_cukes.feature:22
+       Given '2' cukes   # features/tons_of_cukes.feature:23
+       Given '2' cukes   # features/tons_of_cukes.feature:24
+       Given '2' cukes   # features/tons_of_cukes.feature:25
+       Given '2' cukes   # features/tons_of_cukes.feature:26
+       Given '2' cukes   # features/tons_of_cukes.feature:27
+       Given '2' cukes   # features/tons_of_cukes.feature:28
+       Given '2' cukes   # features/tons_of_cukes.feature:29
+       Given '2' cukes   # features/tons_of_cukes.feature:30
+       Given '2' cukes   # features/tons_of_cukes.feature:31
+       Given '2' cukes   # features/tons_of_cukes.feature:32
+       Given '2' cukes   # features/tons_of_cukes.feature:33
+       Given '2' cukes   # features/tons_of_cukes.feature:34
+       Given '2' cukes   # features/tons_of_cukes.feature:35
+       Given '2' cukes   # features/tons_of_cukes.feature:36
+       Given '2' cukes   # features/tons_of_cukes.feature:37
+       Given '2' cukes   # features/tons_of_cukes.feature:38
+       Given '2' cukes   # features/tons_of_cukes.feature:39
+       Given '2' cukes   # features/tons_of_cukes.feature:40
+       Given '2' cukes   # features/tons_of_cukes.feature:41
+       Given '2' cukes   # features/tons_of_cukes.feature:42
+       Given '2' cukes   # features/tons_of_cukes.feature:43
+       Given '2' cukes   # features/tons_of_cukes.feature:44
+       Given '2' cukes   # features/tons_of_cukes.feature:45
+       Given '2' cukes   # features/tons_of_cukes.feature:46
+       Given '2' cukes   # features/tons_of_cukes.feature:47
+       Given '2' cukes   # features/tons_of_cukes.feature:48
+       Given '2' cukes   # features/tons_of_cukes.feature:49
+       Given '2' cukes   # features/tons_of_cukes.feature:50
+       Given '2' cukes   # features/tons_of_cukes.feature:51
+       Given '2' cukes   # features/tons_of_cukes.feature:52
       /^I should have '(.+)' cukes$/      # features/step_definitions/sample_steps.rb:31
        Then I should have '10' cukes      # features/background/failing_background.feature:8
        Then I should have '10' cukes      # features/background/failing_background.feature:11

data/lib/autotest/cucumber_mixin.rb

@@ -1,7 +1,7 @@
 require 'autotest'
 require 'tempfile'
 require 'yaml'
-require File.dirname(__FILE__) + '/../cucumber'
+require 'cucumber'
 
 module Autotest::CucumberMixin
   def self.included(receiver)

data/lib/cucumber/ast/feature.rb

@@ -48,7 +48,7 @@ module Cucumber
       end
 
       def to_sexp
-        sexp = [:feature, @name]
+        sexp = [:feature, @file, @name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/features.rb

@@ -1,10 +1,16 @@
 module Cucumber
   module Ast
     class Features
+      include Enumerable
+
       def initialize
         @features = []
       end
 
+      def each(&proc)
+        @features.each(&proc)
+      end
+
       def add_feature(feature)
         feature.features = self
         @features << feature

data/lib/cucumber/ast/step.rb

@@ -78,6 +78,10 @@ module Cucumber
         @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
       end
 
+      def dom_id
+        @dom_id ||= file_colon_line.gsub(/\//, '_').gsub(/\./, '_').gsub(/:/, '_')
+      end
+
       private
 
       def matched_cells(cells)

data/lib/cucumber/ast/step_invocation.rb

@@ -28,7 +28,7 @@ module Cucumber
         unless @skip_invoke || options[:dry_run] || exception || @step_collection.exception
           @skip_invoke = true
           begin
-            step_mother.current_world.__cucumber_current_step = self
+            step_mother.current_world.__cucumber_current_step = self if step_mother.current_world # Nil in Pure Java
             @step_match.invoke(step_mother.current_world, @multiline_arg)
             status!(:passed)
           rescue Pending => e
@@ -102,6 +102,10 @@ module Cucumber
         @step.file_colon_line
       end
 
+      def dom_id
+        @step.dom_id
+      end
+
       def backtrace_line
         @step.backtrace_line
       end

data/lib/cucumber/ast/table.rb

@@ -264,6 +264,10 @@ module Cucumber
           @cells[0].line
         end
 
+        def dom_id
+          "row_#{line}"
+        end
+
         def status=(status)
           each do |cell|
             cell.status = status

data/lib/cucumber/cli/configuration.rb

@@ -1,7 +1,7 @@
 module Cucumber
   module Cli
     class YmlLoadError < StandardError; end
-  
+
     class Configuration
       FORMATS = %w{pretty profile progress rerun}
       DEFAULT_FORMAT = 'pretty'
@@ -95,6 +95,7 @@ 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 --quiet.") do
             @options[:dry_run] = true
             @quiet = true
@@ -236,7 +237,9 @@ module Cucumber
         end.flatten.uniq
         sorted_files = files.sort { |a,b| (b =~ %r{/support/} || -1) <=>  (a =~ %r{/support/} || -1) }.reject{|f| f =~ /^http/}
         env_files = sorted_files.select {|f| f =~ %r{/support/env.rb} }
-        env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        files = env_files + sorted_files.reject {|f| f =~ %r{/support/env.rb} }
+        files.reject! {|f| f =~ %r{/support/env.rb} } if @options[:dry_run]
+        files
       end
     
       def feature_files

data/lib/cucumber/cli/main.rb

@@ -46,7 +46,18 @@ module Cucumber
         Kernel.exit(failure ? 1 : 0)
       end
 
-      private
+      def load_plain_text_features
+        features = Ast::Features.new
+        parser = Parser::FeatureParser.new
+
+        verbose_log("Features:")
+        configuration.feature_files.each do |f|
+          features.add_feature(parser.parse_file(f))
+          verbose_log("  * #{f}")
+        end
+        verbose_log("\n"*2)
+        features
+      end
 
       def configuration
         return @configuration if @configuration
@@ -55,6 +66,8 @@ module Cucumber
         @configuration.parse!(@args)
         @configuration
       end
+
+      private
     
       def require_files
         verbose_log("Ruby files required:")
@@ -70,19 +83,6 @@ module Cucumber
         verbose_log("\n")
       end
 
-      def load_plain_text_features
-        features = Ast::Features.new
-        parser = Parser::FeatureParser.new
-
-        verbose_log("Features:")
-        configuration.feature_files.each do |f|
-          features.add_feature(parser.parse_file(f))
-          verbose_log("  * #{f}")
-        end
-        verbose_log("\n"*2)
-        features
-      end
-
       def verbose_log(string)
         @out_stream.puts(string) if configuration.verbose?
       end

data/lib/cucumber/formatter/html.rb

@@ -83,37 +83,73 @@ module Cucumber
         @builder.h4("#{keyword} #{name}")
       end
 
-      def visit_steps(scenarios)
+      def visit_steps(steps)
         @builder.ol do
           super
         end
       end
 
+      def visit_step(step)
+        @step_id = step.dom_id
+        @builder.li(:id => @step_id) do
+          super
+        end
+      end
+
       def visit_step_name(keyword, step_match, status, source_indent, background)
-        step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
-        @builder.li("#{keyword} #{step_name}", :class => status)
+        @step_matches ||= []
+        @skip_step = @step_matches.index(step_match)
+        @step_matches << step_match
+
+        unless @skip_step
+          step_name = step_match.format_args(lambda{|param| "<span>#{param}</span>"})
+          @builder.div(:class => status) do |div|
+            div << "#{keyword} #{step_name}"
+          end
+        end
+      end
+
+      def visit_exception(exception, status)
+        @builder.pre(format_exception(e), :class => status)
       end
 
       def visit_multiline_arg(multiline_arg)
+        return if @skip_step
         if Ast::Table === multiline_arg
           @builder.table do
             super
           end
         else
-          @builder.p do
-            super
-          end
+          super
+        end
+      end
+
+      def visit_py_string(string, status)
+        @builder.pre(:class => status) do |pre|
+          pre << string
         end
       end
 
       def visit_table_row(table_row)
-        @builder.tr do
+        @row_id = table_row.dom_id
+        @col_index = 0
+        @builder.tr(:id => @row_id) do
           super
         end
+        if table_row.exception
+          @builder.tr do
+            @builder.td(:colspan => @col_index.to_s, :class => 'failed') do
+              @builder.pre do |pre|
+                pre << format_exception(table_row.exception)
+              end
+            end
+          end
+        end
       end
 
       def visit_table_cell_value(value, width, status)
-        @builder.td(value, :class => status)
+        @builder.td(value, :class => status, :id => "#{@row_id}_#{@col_index}")
+        @col_index += 1
       end
 
       def announce(announcement)
@@ -128,6 +164,9 @@ module Cucumber
         end
       end
 
+      def format_exception(exception)
+        (["#{exception.message} (#{exception.class})"] + exception.backtrace).join("\n")
+      end
     end
   end
 end

data/lib/cucumber/formatter/pretty.rb

@@ -121,16 +121,15 @@ module Cucumber
 
       def visit_step_name(keyword, step_match, status, source_indent, background)
         @step_matches ||= []
-        
         non_failed_background_step_outside_background = !@in_background && background && (status != :failed)
         @skip_step = @step_matches.index(step_match) || non_failed_background_step_outside_background
+        @step_matches << step_match
         
         unless(@skip_step)
           source_indent = nil unless @options[:source]
           formatted_step_name = format_step(keyword, step_match, status, source_indent)
           @io.puts("    " + formatted_step_name)
         end
-        @step_matches << step_match
       end
 
       def visit_multiline_arg(multiline_arg)

data/lib/cucumber/step_definition.rb

@@ -3,6 +3,50 @@ require 'cucumber/core_ext/string'
 require 'cucumber/core_ext/proc'
 
 module Cucumber
+  module StepDefinitionMethods
+    def step_match(name_to_match, name_to_report)
+      if(match = name_to_match.match(regexp))
+        StepMatch.new(self, name_to_match, name_to_report, match.captures)
+      else
+        nil
+      end
+    end
+
+    # Formats the matched arguments of the associated Step. This method
+    # is usually called from visitors, which render output.
+    #
+    # The +format+ can either be a String or a Proc.
+    #
+    # If it is a String it should be a format string according to
+    # <tt>Kernel#sprinf</tt>, for example:
+    #
+    #   '<span class="param">%s</span></tt>'
+    #
+    # If it is a Proc, it should take one argument and return the formatted
+    # argument, for example:
+    #
+    #   lambda { |param| "[#{param}]" }
+    #
+    def format_args(step_name, format)
+      step_name.gzub(regexp, format)
+    end
+
+    def match(step_name)
+      case step_name
+      when String then regexp.match(step_name)
+      when Regexp then regexp == step_name
+      end
+    end
+
+    def backtrace_line
+      "#{file_colon_line}:in `#{regexp.inspect}'"
+    end
+
+    def text_length
+      regexp.inspect.jlength
+    end
+  end
+  
   # A Step Definition holds a Regexp and a Proc, and is created
   # by calling <tt>Given</tt>, <tt>When</tt> or <tt>Then</tt>
   # in the <tt>step_definitions</tt> ruby files - for example:
@@ -14,7 +58,22 @@ module Cucumber
   class StepDefinition
     def self.snippet_text(step_keyword, step_name)
       escaped = Regexp.escape(step_name).gsub('\ ', ' ').gsub('/', '\/')
-      "#{step_keyword} /^#{escaped}$/ do\n  pending\nend"
+      param_pattern = /"([^\"]*)"/
+
+      match = escaped.match(param_pattern)
+      if match
+        n = 0
+        block_args = match.captures.map do |a|
+          n += 1
+          "arg#{n}"
+        end
+        block_arg_string = " |#{block_args.join(", ")}|"
+      else
+        block_arg_string = ""
+      end
+
+      escaped = escaped.gsub(param_pattern, '"([^\\"]*)"')
+      "#{step_keyword} /^#{escaped}$/ do#{block_arg_string}\n  pending\nend"
     end
 
     class MissingProc < StandardError
@@ -23,7 +82,7 @@ module Cucumber
       end
     end
 
-    attr_reader :regexp
+    include StepDefinitionMethods
 
     def initialize(pattern, &proc)
       raise MissingProc if proc.nil?
@@ -34,66 +93,22 @@ module Cucumber
       @regexp, @proc = pattern, proc
     end
 
-    def step_match(name_to_match, name_to_report)
-      if(match = name_to_match.match(@regexp))
-        StepMatch.new(self, name_to_match, name_to_report, match.captures)
-      else
-        nil
-      end
+    def regexp
+      @regexp
     end
 
-    def invoke(world, args, step_name)
+    def invoke(world, args)
       args = args.map{|arg| Ast::PyString === arg ? arg.to_s : arg}
       begin
-        world.cucumber_instance_exec(true, @regexp.inspect, *args, &@proc)
+        world.cucumber_instance_exec(true, regexp.inspect, *args, &@proc)
       rescue Cucumber::ArityMismatchError => e
         e.backtrace.unshift(self.backtrace_line)
         raise e
       end
     end
 
-    #:stopdoc:
-
-    def match(step_name)
-      case step_name
-      when String then @regexp.match(step_name)
-      when Regexp then @regexp == step_name
-      end
-    end
-
-    # Formats the matched arguments of the associated Step. This method
-    # is usually called from visitors, which render output.
-    #
-    # The +format+ can either be a String or a Proc.
-    #
-    # If it is a String it should be a format string according to
-    # <tt>Kernel#sprinf</tt>, for example:
-    #
-    #   '<span class="param">%s</span></tt>'
-    #
-    # If it is a Proc, it should take one argument and return the formatted
-    # argument, for example:
-    #
-    #   lambda { |param| "[#{param}]" }
-    #
-    def format_args(step_name, format)
-      step_name.gzub(@regexp, format)
-    end
-
-    def matched_args(step_name)
-      step_name.match(@regexp).captures
-    end
-
-    def backtrace_line
-      "#{file_colon_line}:in `#{@regexp.inspect}'"
-    end
-
     def file_colon_line
       @proc.file_colon_line
     end
-
-    def text_length
-      @regexp.inspect.jlength
-    end
   end
 end

data/lib/cucumber/step_match.rb

@@ -10,7 +10,7 @@ module Cucumber
     def invoke(world, multiline_arg)
       all_args = @args.dup
       all_args << multiline_arg if multiline_arg
-      @step_definition.invoke(world, all_args, @step_name)
+      @step_definition.invoke(world, all_args)
     end
 
     def format_args(format = lambda{|a| a})

data/lib/cucumber/version.rb

@@ -3,7 +3,7 @@ module Cucumber #:nodoc:
     MAJOR = 0
     MINOR = 2
     TINY  = 0
-    PATCH = 2 # Set to nil for official release
+    PATCH = 3 # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
   end

data/rails_generators/feature/templates/steps.erb

@@ -10,7 +10,7 @@ When /^I delete the (\d+)(?:st|nd|rd|th) <%= singular_name %>$/ do |pos|
 end
 
 Then /^I should see the following <%= plural_name %>:$/ do |<%= plural_name %>|
-  <%= plural_name %>.raw[1..-1].each_with_index do |row, i|
+  <%= plural_name %>.rows.each_with_index do |row, i|
     row.each_with_index do |cell, j|
       response.should have_selector("table > tr:nth-child(#{i+2}) > td:nth-child(#{j+1})") { |td|
         td.inner_text.should == cell

data/spec/cucumber/ast/feature_spec.rb

@@ -9,7 +9,8 @@ module Cucumber
       it "should convert to sexp" do
         feature = create_feature(Object.new)
         feature.to_sexp.should == 
-        [:feature, 
+        [:feature,
+          "features/pretty_printing.feature",
           "Pretty printing", 
           [:comment, "# My feature comment\n"], 
           [:tag, "one"], 

data/spec/cucumber/cli/configuration_spec.rb

@@ -18,7 +18,7 @@ module Cli
     it "should require files in support paths first" do
       File.stub!(:directory?).and_return(true)
       Dir.stub!(:[]).and_return(["/features/step_definitions/foo.rb","/features/support/bar.rb"])
-      
+
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
 
@@ -31,7 +31,7 @@ module Cli
     it "should require env.rb files first" do
       File.stub!(:directory?).and_return(true)
       Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
-      
+
       config = Configuration.new(StringIO.new)
       config.parse!(%w{--require /features})
 
@@ -40,7 +40,19 @@ module Cli
         "/features/support/a_file.rb"
       ]
     end
-    
+
+    it "should not require env.rb files when --dry-run" do
+      File.stub!(:directory?).and_return(true)
+      Dir.stub!(:[]).and_return(["/features/support/a_file.rb","/features/support/env.rb"])
+
+      config = Configuration.new(StringIO.new)
+      config.parse!(%w{--require /features --dry-run})
+
+      config.files_to_require.should == [
+        "/features/support/a_file.rb"
+      ]
+    end
+
     it "should expand args from YAML file" do
       given_cucumber_yml_defined_as({'bongo' => '--require from/yml'})
 

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -33,7 +33,7 @@ with blurb
           parse(%{# My comment
 Feature: hi
 }).to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"]]
         end
         
@@ -45,7 +45,7 @@ Feature: hi
     # When bar
     Then baz
 }).to_sexp.should == 
-          [:feature, "Feature: Hi", 
+          [:feature, nil, "Feature: Hi", 
             [:scenario, 2, "Scenario:", "Hello", 
               [:step, 3, "Given", "foo"],
               [:comment, "# When bar\n"], 
@@ -59,18 +59,18 @@ Feature: hi
 # World
 Feature: hi
 }).to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# Hello\n# World\n"]]
         end
 
         it "should parse a file with no comments" do
           parse("Feature: hi\n").to_sexp.should ==
-          [:feature, "Feature: hi\n"]
+          [:feature, nil, "Feature: hi\n"]
         end
 
         it "should parse a file with only a multiline comment with newlines" do
           parse("# Hello\n\n# World\n").to_sexp.should == 
-          [:feature, "", 
+          [:feature, nil, "", 
             [:comment, "# Hello\n\n# World\n"]]
         end
       end
@@ -78,7 +78,7 @@ Feature: hi
       describe "Tags" do
         it "should parse a file with tags on a feature" do
           parse("# My comment\n@hello @world Feature: hi\n").to_sexp.should ==
-          [:feature, "Feature: hi\n",
+          [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"],
             [:tag, "hello"],
             [:tag, "world"]]
@@ -96,7 +96,7 @@ Feature: hi
 @st3 
    @st4    @ST5  @#^%&ST6**!
   Scenario: Second}).to_sexp.should ==
-          [:feature, "Feature: hi",
+          [:feature, nil, "Feature: hi",
             [:comment, "# FC\n  "],
             [:tag, "ft"],
             [:scenario, 6, 'Scenario:', 'First',
@@ -111,7 +111,7 @@ Feature: hi
       describe "Background" do
         it "should have steps" do
           parse("Feature: Hi\nBackground:\nGiven I am a step\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:background, 2, "Background:",
               [:step, 3, "Given", "I am a step"]]]
         end
@@ -120,7 +120,7 @@ Feature: hi
       describe "Scenarios" do
         it "can be empty" do
           parse("Feature: Hi\n\nScenario: Hello\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 3, "Scenario:", "Hello"]]
         end
 
@@ -134,7 +134,7 @@ Scenario: bar
             
         it "should have steps" do
           parse("Feature: Hi\nScenario: Hello\nGiven I am a step\n").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I am a step"]]]
         end
@@ -145,7 +145,7 @@ Scenario: Hello
 Given I have a table
 |a|b|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a table",
                 [:table,
@@ -166,7 +166,7 @@ Given I have a string
   """
 
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a string",
                 [:py_string, "hello\nworld"]]]]
@@ -182,7 +182,7 @@ Examples:
 |what|
 |green|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 3, "Given", "a <what> cucumber"],
               [:examples, "Examples:", "",
@@ -203,7 +203,7 @@ Examples:
 |a|b|
 |c|d|
 }).to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 4, "Given", "I have a table",
                 [:table, 
@@ -233,7 +233,7 @@ Examples:
 |5|6|
 
 ").to_sexp.should ==
-          [:feature, "Feature: Hi",
+          [:feature, nil, "Feature: Hi",
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 5, "Given", "I have a table",
                 [:table,

data/spec/cucumber/step_definition_spec.rb

@@ -69,5 +69,25 @@ module Cucumber
       end
       step_match("Loud").invoke(world, nil)
     end
+    
+    def unindented(s)
+      s.split("\n")[1..-2].join("\n").indent(-8)
+    end
+    
+    it "should recognise quotes in name and make according regexp" do
+      StepDefinition.snippet_text('Given', 'A "first" arg').should == unindented(%{
+        Given /^A "([^\\"]*)" arg$/ do |arg1|
+          pending
+        end
+      })
+    end
+
+    it "should not use quote group when there are no quotes" do
+      StepDefinition.snippet_text('Given', 'A first arg').should == unindented(%{
+        Given /^A first arg$/ do
+          pending
+        end
+      })
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.0.2
+  version: 0.2.0.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-21 00:00:00 -07:00
+date: 2009-03-24 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -245,6 +245,7 @@ files:
 - examples/self_test/features/step_definitions/sample_steps.rb
 - examples/self_test/features/support/env.rb
 - examples/self_test/features/support/tag_count_formatter.rb
+- examples/self_test/features/tons_of_cukes.feature
 - examples/sinatra/Rakefile
 - examples/sinatra/app.rb
 - examples/sinatra/features/add.feature
@@ -293,7 +294,6 @@ files:
 - gem_tasks/fix_cr_lf.rake
 - gem_tasks/flog.rake
 - gem_tasks/gemspec.rake
-- gem_tasks/jar.rake
 - gem_tasks/rspec.rake
 - gem_tasks/yard.rake
 - lib/autotest/cucumber.rb

data/gem_tasks/jar.rake

@@ -1,67 +0,0 @@
-# http://blog.nicksieger.com/articles/2009/01/10/jruby-1-1-6-gems-in-a-jar
-
-USE_JRUBY_VERSION    = '1.1.6'
-USE_JBEHAVE_VERSION  = '2.1'
-USE_JUNIT_VERSION    = '4.5'
-USE_HAMCREST_VERSION = '1.1'
-CUCUMBER_VERSIONED   = "cucumber-#{Cucumber::VERSION::STRING}"
-
-task :jar => [
-  :clean,
-  'jar:download_jruby',
-  'jar:install_gems',
-  'jar:bundle_gems',
-  'jar:download_jars_deps',
-  'jar:unpack_jar_deps',
-  'jar:bundle_jars',
-  'jar:fix_gem_binaries',
-  'jar:test_jar'
-]
-
-namespace :jar do
-  task :download_jruby do
-    sh "wget http://dist.codehaus.org/jruby/#{USE_JRUBY_VERSION}/jruby-complete-#{USE_JRUBY_VERSION}.jar -O #{CUCUMBER_VERSIONED}.jar"
-  end
-
-  task :install_gems => :gem do
-    mkdir 'pkg/jar_gems'
-    sh "java -jar #{CUCUMBER_VERSIONED}.jar -S gem install -i ./pkg/jar_gems pkg/#{CUCUMBER_VERSIONED}.gem --no-ri --no-rdoc"
-  end
-
-  task :bundle_gems do
-    sh "jar uf #{CUCUMBER_VERSIONED}.jar -C pkg/jar_gems ."
-  end
-
-  task :download_jars_deps do
-    mkdir 'pkg/jar_deps'
-    sh "wget http://repository.codehaus.org/org/jbehave/jbehave-core/#{USE_JBEHAVE_VERSION}/jbehave-core-#{USE_JBEHAVE_VERSION}.jar -O pkg/jar_deps/jbehave-core-#{USE_JBEHAVE_VERSION}.jar"
-    sh "wget http://mirrors.ibiblio.org/pub/mirrors/maven2/junit/junit/#{USE_JUNIT_VERSION}/junit-#{USE_JUNIT_VERSION}.jar -O pkg/jar_deps/junit-#{USE_JUNIT_VERSION}.jar"
-    sh "wget http://hamcrest.googlecode.com/files/hamcrest-all-#{USE_HAMCREST_VERSION}.jar -O pkg/jar_deps/hamcrest-all-#{USE_HAMCREST_VERSION}.jar"
-  end
-
-  task :unpack_jar_deps do
-    Dir.chdir 'pkg/jar_deps' do
-      Dir['*.jar'].each do |jar|
-        sh "jar xvf #{jar}"
-        rm_rf jar
-        rm_rf 'META-INF'
-      end
-    end
-  end
-
-  task :bundle_jars do
-    sh "jar uf #{CUCUMBER_VERSIONED}.jar -C pkg/jar_deps ."
-  end
-  
-  task :fix_gem_binaries do
-    mkdir_p 'pkg/gem_binaries/META-INF/jruby.home'
-    Dir.chdir 'pkg/gem_binaries/META-INF/jruby.home' do
-      sh "jar xvf ../../../../#{CUCUMBER_VERSIONED}.jar bin"
-    end
-    sh "jar uf #{CUCUMBER_VERSIONED}.jar -C pkg/gem_binaries ."
-  end
-
-  task :test_jar do
-    sh "java -cp examples/jbehave/target/classes -jar #{CUCUMBER_VERSIONED}.jar -S cucumber examples/jbehave/features"
-  end
-end