cucumber 0.6.3 → 0.6.4

data/lib/cucumber/parser/feature.tt

@@ -278,38 +278,6 @@ module Cucumber
         (step_keyword) / scenario_keyword / scenario_outline_keyword / table / tag / comment_line
       end
 
-      rule py_string
-        open_py_string s:(!close_py_string .)* close_py_string {
-          def at_line?(line)
-            line >= open_py_string.line && line <= close_py_string.line
-          end
-
-          def build
-            Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
-          end
-        }
-      end
-
-      rule open_py_string
-        indent:space* '"""' space* eol {
-          def indentation
-            indent.text_value.length
-          end
-
-          def line
-            indent.line
-          end
-        }
-      end
-
-      rule close_py_string
-        eol space* quotes:'"""' white {
-          def line
-            quotes.line
-          end
-        }
-      end
-
       rule white
         (space / eol)*
       end

data/lib/cucumber/parser/i18n.tt

@@ -1,9 +1,10 @@
 module Cucumber
   module Parser
     module I18n
-      grammar <%= keywords('grammar_name')[0] %>
+      grammar <%= @grammar_name %>
         include Feature
         include Table
+        include PyString
 
         rule feature
           feature_sub

data/lib/cucumber/parser/natural_language.rb

@@ -23,7 +23,7 @@ module Cucumber
       def initialize(step_mother, lang)
         @keywords = Cucumber::LANGUAGES[lang]
         raise "Language not supported: #{lang.inspect}" if @keywords.nil?
-        @keywords['grammar_name'] = @keywords['name'].gsub(/\s/, '')
+        @grammar_name = lang.gsub(/[\s-]/, '').upcase
         register_adverbs(step_mother) if step_mother
         @parser = nil
       end
@@ -45,9 +45,8 @@ module Cucumber
         # effectively breaking any other library that relies on ERB behavig the way it _should_.
         # This is a workaround hack until this has been fixed in Rails.
         grammar = "" + grammar # Make SafeBuffer a String again.
-
         Treetop.load_from_string(grammar)
-        @parser = Parser::I18n.const_get("#{@keywords['grammar_name']}Parser").new
+        @parser = Parser::I18n.const_get("#{@grammar_name}Parser").new
         def @parser.inspect
           "#<#{self.class.name}>"
         end
@@ -92,13 +91,17 @@ module Cucumber
         keywords('and', space)
       end
 
+      def given_keyword
+        keywords('given', false)[1] # The 0th one is a '*', which we don't want
+      end
+
       def step_keywords
         %w{given when then and but}.map{|key| keywords(key, true)}.flatten.uniq
       end
 
       def keywords(key, space=false)
         raise "No #{key} in #{@keywords.inspect}" if @keywords[key].nil?
-        @keywords[key].split('|').map{|kw| space ? keyword_space(kw) : kw}
+        @keywords[key].split('|').map{|kw| space ? keyword_space(kw) : kw}.uniq
       end
 
       private

data/lib/cucumber/parser/py_string.rb

@@ -40,7 +40,7 @@ module Cucumber
           line >= open_py_string.line && line <= close_py_string.line
         end
 
-        def build(filter=nil)
+        def build(ignored_filter=nil)
           Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
         end
       end
@@ -128,7 +128,7 @@ module Cucumber
 
       module OpenPyString1
         def indentation
-          indent.text_value.length
+          indent.text_value
         end
 
         def line

data/lib/cucumber/parser/py_string.tt

@@ -15,7 +15,7 @@ module Cucumber
             line >= open_py_string.line && line <= close_py_string.line
           end
 
-          def build(filter=nil)
+          def build(ignored_filter=nil)
             Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
           end
         }
@@ -24,7 +24,7 @@ module Cucumber
       rule open_py_string
         indent:space* '"""' space* eol {
           def indentation
-            indent.text_value.length
+            indent.text_value
           end
 
           def line

data/lib/cucumber/rb_support/rb_world.rb

@@ -52,6 +52,15 @@ module Cucumber
         @__cucumber_step_mother.embed(file, mime_type)
       end
 
+      # Prints out the world class, followed by all included modules.
+      def announce_world
+        announce "WORLD:\n  #{self.class}"
+        world = self
+        (class << self; self; end).instance_eval do
+          world.announce "  #{included_modules.join("\n  ")}"
+        end
+      end
+
       # Mark the matched step as pending.
       def pending(message = "TODO")
         if block_given?

data/lib/cucumber/step_mother.rb

@@ -133,7 +133,7 @@ module Cucumber
     # nicer, and in all outputs (in case you use several formatters)
     #
     def announce(msg)
-      @visitor.announce(msg)
+      @visitor.announce(msg.to_s)
     end
 
     # Suspends execution and prompts +question+ to the console (STDOUT).
@@ -278,8 +278,8 @@ module Cucumber
         longest_regexp_length = no_groups.map {|step_match| step_match.text_length }.max
         no_groups.select {|step_match| step_match.text_length == longest_regexp_length }
       elsif top_groups.any?
-        shortest_capture_length = top_groups.map {|step_match| step_match.args.inject(0) {|sum, c| sum + c.length } }.min
-        top_groups.select {|step_match| step_match.args.inject(0) {|sum, c| sum + c.length } == shortest_capture_length }
+        shortest_capture_length = top_groups.map {|step_match| step_match.args.inject(0) {|sum, c| sum + c.to_s.length } }.min
+        top_groups.select {|step_match| step_match.args.inject(0) {|sum, c| sum + c.to_s.length } == shortest_capture_length }
       else
         top_groups
       end

data/spec/cucumber/ast/feature_factory.rb

@@ -27,7 +27,7 @@ module Cucumber
         py_string = Ast::PyString.new(21, 22, %{
            I like
           Cucumber sandwich
-        }, 10)
+        }, ' '*10)
         
         background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "",
           [

data/spec/cucumber/ast/py_string_spec.rb

@@ -5,20 +5,20 @@ module Cucumber
   module Ast
     describe PyString do
       it "should handle unindented" do
-        ps = PyString.new(10, 13, "4.1\n4.2\n", 0)
+        ps = PyString.new(10, 13, "4.1\n4.2\n", "")
         ps.to_s.should == "4.1\n4.2\n"
       end
 
       it "should handle indented" do
         #                    """
-        ps = PyString.new(10, 13, "     4.1\n   4.2\n", 2)
+        ps = PyString.new(10, 13, "     4.1\n   4.2\n", "  ")
         ps.to_s.should == "   4.1\n 4.2\n"
       end
       
       describe "replacing arguments" do
 
         before(:each) do
-          @ps = PyString.new(10, 13, "<book>\n<qty>\n", 0)
+          @ps = PyString.new(10, 13, "<book>\n<qty>\n", "")
         end
       
         it "should return a new py_string with arguments replaced with values" do
@@ -34,7 +34,7 @@ module Cucumber
         end
 
         it "should replaced nil with empty string" do
-          ps = PyString.new(10, 13, "'<book>'", 0)
+          ps = PyString.new(10, 13, "'<book>'", "")
           py_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
           
           py_string_with_replaced_arg.to_s.should == "''"

data/spec/cucumber/ast/step_spec.rb

@@ -48,7 +48,7 @@ module Cucumber
       end
 
       it "should replace arguments in py string arg" do
-        py_string = PyString.new(1, 2, 'taste_<taste> color_<color>', 0)
+        py_string = PyString.new(1, 2, 'taste_<taste> color_<color>', '')
 
         step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
 

data/spec/cucumber/cli/configuration_spec.rb

@@ -140,6 +140,13 @@ module Cli
         config.options[:require].should == ['from/yml']
       end
 
+      it "allows --strict to be set by a profile" do
+        given_cucumber_yml_defined_as({'bongo' => '--strict'})
+        
+        config.parse!(%w{--profile bongo})
+        config.options[:strict].should be_true
+      end
+
       it "parses ERB syntax in the cucumber.yml file" do
         given_cucumber_yml_defined_as({'default' => '<%="--require some_file"%>'})
 

data/spec/cucumber/cli/profile_loader_spec.rb

@@ -2,9 +2,34 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'yaml'
 
 module Cucumber
-module Cli
-  describe ProfileLoader do
-    it "should have all of its specs migrated from configuration_spec"
+  module Cli
+    describe ProfileLoader do
+      def given_cucumber_yml_defined_as(hash_or_string)
+        Dir.stub!(:glob).with('{,.config/,config/}cucumber{.yml,.yaml}').and_return(['cucumber.yml'])
+        File.stub!(:exist?).and_return(true)
+        cucumber_yml = hash_or_string.is_a?(Hash) ? hash_or_string.to_yaml : hash_or_string
+        IO.stub!(:read).with('cucumber.yml').and_return(cucumber_yml)
+      end
+
+      def loader
+        ProfileLoader.new
+      end
+
+      it "treats backslashes as literals in rerun.txt when on Windows (JRuby or MRI)" do
+        given_cucumber_yml_defined_as({'default' => '--format "pretty" features\sync_imap_mailbox.feature:16:22'})
+        if(Cucumber::WINDOWS)
+          loader.args_from('default').should == ['--format','pretty','features\sync_imap_mailbox.feature:16:22']
+        else
+          loader.args_from('default').should == ['--format','pretty','featuressync_imap_mailbox.feature:16:22']
+        end
+
+      end
+
+      it "treats forward slashes as literals" do
+        given_cucumber_yml_defined_as({'default' => '--format "ugly" features/sync_imap_mailbox.feature:16:22'})
+        loader.args_from('default').should == ['--format','ugly','features/sync_imap_mailbox.feature:16:22']
+      end
+
+    end
   end
 end
-end

data/spec/cucumber/step_mother_spec.rb

@@ -67,6 +67,16 @@ spec/cucumber/step_mother_spec.rb:48:in `/Three cute (.*)/'
       end.should_not raise_error
     end
     
+    it "should not raise NoMethodError when guessing from multiple step definitions with nil fields" do
+      @step_mother.options = {:guess => true}
+      @dsl.Given(/Three (.*) mice( cannot find food)?/) {|disability, is_disastrous|}
+      @dsl.Given(/Three (.*)?/) {|animal|}
+      
+      lambda do
+        @step_mother.step_match("Three blind mice")
+      end.should_not raise_error
+    end
+    
     it "should pick right step definition when --guess is enabled and equal number of capture groups" do
       @step_mother.options = {:guess => true}
       right = @dsl.Given(/Three (.*) mice/) {|disability|}
@@ -112,7 +122,7 @@ spec/cucumber/step_mother_spec.rb:48:in `/Three cute (.*)/'
         raise "Should fail"
       rescue RbSupport::NilWorld => e
         e.message.should == "World procs should never return nil"
-        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:108:in `World'"]
+        e.backtrace.should == ["spec/cucumber/step_mother_spec.rb:118:in `World'"]
       end
     end
 
@@ -142,8 +152,8 @@ spec/cucumber/step_mother_spec.rb:48:in `/Three cute (.*)/'
       end.should raise_error(RbSupport::MultipleWorld, %{You can only pass a proc to #World once, but it's happening
 in 2 places:
 
-spec/cucumber/step_mother_spec.rb:139:in `World'
-spec/cucumber/step_mother_spec.rb:141:in `World'
+spec/cucumber/step_mother_spec.rb:149:in `World'
+spec/cucumber/step_mother_spec.rb:151:in `World'
 
 Use Ruby modules instead to extend your worlds. See the Cucumber::RbSupport::RbDsl#World RDoc
 or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-02 00:00:00 +01:00
+date: 2010-03-30 00:00:00 +02:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -236,10 +236,10 @@ files:
 - examples/i18n/bg/features/support/env.rb
 - examples/i18n/bg/features/support/world.rb
 - examples/i18n/bg/lib/calculator.rb
-- examples/i18n/cat/Rakefile
-- examples/i18n/cat/features/step_definitons/calculator_steps.rb
-- examples/i18n/cat/features/suma.feature
-- examples/i18n/cat/lib/calculadora.rb
+- examples/i18n/ca/Rakefile
+- examples/i18n/ca/features/step_definitons/calculator_steps.rb
+- examples/i18n/ca/features/suma.feature
+- examples/i18n/ca/lib/calculadora.rb
 - examples/i18n/da/Rakefile
 - examples/i18n/da/features/sammenlaegning.feature
 - examples/i18n/da/features/step_definitons/lommeregner_steps.rb
@@ -357,25 +357,25 @@ files:
 - examples/i18n/ru/features/support/env.rb
 - examples/i18n/ru/features/support/world.rb
 - examples/i18n/ru/lib/calculator.rb
-- examples/i18n/se/Rakefile
-- examples/i18n/se/features/step_definitons/kalkulator_steps.rb
-- examples/i18n/se/features/summering.feature
-- examples/i18n/se/lib/kalkulator.rb
 - examples/i18n/sk/.gitignore
 - examples/i18n/sk/Rakefile
 - examples/i18n/sk/features/addition.feature
 - examples/i18n/sk/features/division.feature
 - examples/i18n/sk/features/step_definitons/calculator_steps.rb
 - examples/i18n/sk/lib/calculator.rb
-- examples/i18n/sr-latn/Rakefile
-- examples/i18n/sr-latn/features/sabiranje.feature
-- examples/i18n/sr-latn/features/step_definitons/calculator_steps.rb
-- examples/i18n/sr-latn/lib/calculator.rb
-- examples/i18n/sr/Rakefile
-- examples/i18n/sr/features/sabiranje.feature
-- examples/i18n/sr/features/step_definitons/calculator_steps.rb
-- examples/i18n/sr/features/support/env.rb
-- examples/i18n/sr/lib/calculator.rb
+- examples/i18n/sr-Cyrl/Rakefile
+- examples/i18n/sr-Cyrl/features/sabiranje.feature
+- examples/i18n/sr-Cyrl/features/step_definitons/calculator_steps.rb
+- examples/i18n/sr-Cyrl/features/support/env.rb
+- examples/i18n/sr-Cyrl/lib/calculator.rb
+- examples/i18n/sr-Latn/Rakefile
+- examples/i18n/sr-Latn/features/sabiranje.feature
+- examples/i18n/sr-Latn/features/step_definitons/calculator_steps.rb
+- examples/i18n/sr-Latn/lib/calculator.rb
+- examples/i18n/sv/Rakefile
+- examples/i18n/sv/features/step_definitons/kalkulator_steps.rb
+- examples/i18n/sv/features/summering.feature
+- examples/i18n/sv/lib/kalkulator.rb
 - examples/i18n/tr/.gitignore
 - examples/i18n/tr/Rakefile
 - examples/i18n/tr/features/bolme.feature
@@ -522,6 +522,7 @@ files:
 - features/bug_371.feature
 - features/bug_464.feature
 - features/bug_475.feature
+- features/bug_585_tab_indentation.feature
 - features/call_many_steps.feature
 - features/cucumber_cli.feature
 - features/cucumber_cli_diff_disabled.feature
@@ -549,6 +550,7 @@ files:
 - features/rerun_formatter.feature
 - features/simplest.feature
 - features/snippet.feature
+- features/snippets_when_using_star_keyword.feature
 - features/step_definitions/cucumber_steps.rb
 - features/step_definitions/extra_steps.rb
 - features/step_definitions/simplest_steps.rb
@@ -580,7 +582,9 @@ files:
 - lib/autotest/cucumber_mixin.rb
 - lib/autotest/cucumber_rails.rb
 - lib/autotest/cucumber_rails_rspec.rb
+- lib/autotest/cucumber_rails_rspec2.rb
 - lib/autotest/cucumber_rspec.rb
+- lib/autotest/cucumber_rspec2.rb
 - lib/autotest/discover.rb
 - lib/cucumber.rb
 - lib/cucumber/ast.rb
@@ -743,7 +747,7 @@ post_install_message: |+
   
                        (::)   U P G R A D I N G    (::)
   
-  Thank you for installing cucumber-0.6.3.
+  Thank you for installing cucumber-0.6.4.
   Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
   for important information about this release. Happy cuking!
   
@@ -822,8 +826,8 @@ test_files:
 - examples/i18n/bg/features/support/env.rb
 - examples/i18n/bg/features/support/world.rb
 - examples/i18n/bg/lib/calculator.rb
-- examples/i18n/cat/features/step_definitons/calculator_steps.rb
-- examples/i18n/cat/lib/calculadora.rb
+- examples/i18n/ca/features/step_definitons/calculator_steps.rb
+- examples/i18n/ca/lib/calculadora.rb
 - examples/i18n/da/features/step_definitons/lommeregner_steps.rb
 - examples/i18n/da/lib/lommeregner.rb
 - examples/i18n/de/features/step_definitons/calculator_steps.rb
@@ -875,15 +879,15 @@ test_files:
 - examples/i18n/ru/features/support/env.rb
 - examples/i18n/ru/features/support/world.rb
 - examples/i18n/ru/lib/calculator.rb
-- examples/i18n/se/features/step_definitons/kalkulator_steps.rb
-- examples/i18n/se/lib/kalkulator.rb
 - examples/i18n/sk/features/step_definitons/calculator_steps.rb
 - examples/i18n/sk/lib/calculator.rb
-- examples/i18n/sr/features/step_definitons/calculator_steps.rb
-- examples/i18n/sr/features/support/env.rb
-- examples/i18n/sr/lib/calculator.rb
-- examples/i18n/sr-latn/features/step_definitons/calculator_steps.rb
-- examples/i18n/sr-latn/lib/calculator.rb
+- examples/i18n/sr-Cyrl/features/step_definitons/calculator_steps.rb
+- examples/i18n/sr-Cyrl/features/support/env.rb
+- examples/i18n/sr-Cyrl/lib/calculator.rb
+- examples/i18n/sr-Latn/features/step_definitons/calculator_steps.rb
+- examples/i18n/sr-Latn/lib/calculator.rb
+- examples/i18n/sv/features/step_definitons/kalkulator_steps.rb
+- examples/i18n/sv/lib/kalkulator.rb
 - examples/i18n/tr/features/step_definitons/hesap_makinesi_adimlari.rb
 - examples/i18n/tr/lib/hesap_makinesi.rb
 - examples/i18n/uz/features/step_definitons/calculator_steps.rb