cucumber 0.10.3 → 0.10.5

data/lib/cucumber/parser/gherkin_builder.rb

@@ -92,8 +92,8 @@ module Cucumber
         @table_owner.gherkin_statement(step)
         multiline_arg = rubify(step.multiline_arg)
         case(multiline_arg)
-        when Gherkin::Formatter::Model::PyString
-          @table_owner.multiline_arg = Ast::PyString.new(multiline_arg.value)
+        when Gherkin::Formatter::Model::DocString
+          @table_owner.multiline_arg = Ast::DocString.new(multiline_arg.value)
         when Array
           @table_owner.multiline_arg = Ast::Table.new(matrix(multiline_arg))
         end

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '0.10.3'
+  VERSION       = '0.10.5'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

data/lib/cucumber/rake/task.rb

@@ -70,7 +70,19 @@ module Cucumber
         end
 
         def use_bundler
-          @bundler.nil? ? File.exist?("./Gemfile") && Gem.available?("bundler") : @bundler
+          @bundler.nil? ? File.exist?("./Gemfile") && gem_available?("bundler") : @bundler
+        end
+
+        def gem_available?(gemname)
+          gem_available_new_rubygems?(gemname) || gem_available_old_rubygems?(gemname)
+        end
+
+        def gem_available_old_rubygems?(gemname)
+          Gem.available?(gemname)
+        end
+
+        def gem_available_new_rubygems?(gemname)
+          Gem::Specification.respond_to?(:find_all_by_name) && Gem::Specification.find_all_by_name(gemname).any?
         end
 
         def cmd

data/lib/cucumber/rb_support/rb_language.rb

@@ -22,7 +22,7 @@ module Cucumber
         message << first_proc.backtrace_line('World') << "\n"
         message << second_proc.backtrace_line('World') << "\n\n"
         message << "Use Ruby modules instead to extend your worlds. See the Cucumber::RbSupport::RbDsl#World RDoc\n"
-        message << "or http://wiki.github.com/aslakhellesoy/cucumber/a-whole-new-world.\n\n"
+        message << "or http://wiki.github.com/cucumber/cucumber/a-whole-new-world.\n\n"
         super(message)
       end
     end

data/lib/cucumber/rb_support/rb_world.rb

@@ -1,7 +1,11 @@
+require 'gherkin/formatter/ansi_escapes'
+
 module Cucumber
   module RbSupport
     # All steps are run in the context of an object that extends this module.
     module RbWorld
+      include Gherkin::Formatter::AnsiEscapes
+
       class << self
         def alias_adverb(adverb)
           alias_method adverb, :__cucumber_invoke
@@ -32,14 +36,19 @@ module Cucumber
         @__cucumber_step_mother.table(text_or_table, file, line_offset)
       end
 
-      # See StepMother#py_string
-      def py_string(string_with_triple_quotes, file=nil, line_offset=0)
-        @__cucumber_step_mother.py_string(string_with_triple_quotes, file, line_offset)
+      # See StepMother#doc_string
+      def doc_string(string_with_triple_quotes, file=nil, line_offset=0)
+        @__cucumber_step_mother.doc_string(string_with_triple_quotes, file, line_offset)
+      end
+
+      def announce(*messages)
+        STDERR.puts failed + "WARNING: #announce is deprecated. Use #puts instead:" + caller[0] + reset
+        puts(*messages)
       end
 
-      # See StepMother#announce
-      def announce(announcement)
-        @__cucumber_step_mother.announce(announcement)
+      # See StepMother#puts
+      def puts(*messages)
+        @__cucumber_step_mother.puts(*messages)
       end
 
       # See StepMother#ask
@@ -52,15 +61,6 @@ module Cucumber
         @__cucumber_step_mother.embed(file, mime_type, label)
       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?
@@ -88,7 +88,15 @@ module Cucumber
       # such errors in World we define it to just return a simple String.
       #
       def inspect #:nodoc:
-        sprintf("#<%s:0x%x>", self.class, self.object_id)
+        modules = [self.class]
+        (class << self; self; end).instance_eval do
+          modules += included_modules
+        end
+        sprintf("#<%s:0x%x>", modules.join('+'), self.object_id)
+      end
+
+      def to_s
+        inspect
       end
     end
   end

data/lib/cucumber/runtime.rb

@@ -40,7 +40,7 @@ module Cucumber
       fire_after_configuration_hook
 
       tree_walker = @configuration.build_tree_walker(self)
-      self.visitor = tree_walker # Ugly circular dependency, but needed to support World#announce
+      self.visitor = tree_walker # Ugly circular dependency, but needed to support World#puts
       
       tree_walker.visit_features(features)
     end

data/lib/cucumber/runtime/for_programming_languages.rb

@@ -16,7 +16,7 @@ module Cucumber
       def_delegators :@user_interface,
         :embed,
         :ask,
-        :announce,
+        :puts,
         :features_paths,
         :step_match
     
@@ -59,8 +59,8 @@ module Cucumber
       #
       # Is retured as: " hello\nworld"
       #
-      def py_string(string_with_triple_quotes, file=nil, line_offset=0)
-        Ast::PyString.parse(string_with_triple_quotes)
+      def doc_string(string_with_triple_quotes, file=nil, line_offset=0)
+        Ast::DocString.parse(string_with_triple_quotes)
       end
     end
   end

data/lib/cucumber/runtime/support_code.rb

@@ -19,7 +19,7 @@ module Cucumber
 
         def step(step)
           cucumber_multiline_arg = case(rubify(step.multiline_arg))
-          when Gherkin::Formatter::Model::PyString
+          when Gherkin::Formatter::Model::DocString
             step.multiline_arg.value
           when Array
             Ast::Table.new(step.multiline_arg.map{|row| row.cells})

data/lib/cucumber/runtime/user_interface.rb

@@ -5,19 +5,19 @@ module Cucumber
 
     module UserInterface
       attr_writer :visitor
-      
-      # Output +announcement+ alongside the formatted output.
+
+      # Output +messages+ alongside the formatted output.
       # This is an alternative to using Kernel#puts - it will display
       # nicer, and in all outputs (in case you use several formatters)
       #
-      def announce(msg)
-        msg.respond_to?(:join) ? @visitor.announce(msg.join("\n")) : @visitor.announce(msg.to_s)
+      def puts(*messages)
+        @visitor.puts(*messages)
       end
 
       # Suspends execution and prompts +question+ to the console (STDOUT).
       # An operator (manual tester) can then enter a line of text and hit
       # <ENTER>. The entered text is returned, and both +question+ and
-      # the result is added to the output using #announce.
+      # the result is added to the output using #puts.
       #
       # If you want a beep to happen (to grab the manual tester's attention),
       # just prepend ASCII character 7 to the question:
@@ -30,7 +30,7 @@ module Cucumber
       def ask(question, timeout_seconds)
         STDOUT.puts(question)
         STDOUT.flush
-        announce(question)
+        puts(question)
 
         if(Cucumber::JRUBY)
           answer = jruby_gets(timeout_seconds)
@@ -39,18 +39,19 @@ module Cucumber
         end
 
         if(answer)
-          announce(answer)
+          puts(answer)
           answer
         else
           raise("Waited for input for #{timeout_seconds} seconds, then timed out.")
         end
       end
 
-      # Embed +file+ of MIME type +mime_type+ into the output. This may or may
-      # not be ignored, depending on what kind of formatter(s) are active.
+      # Embed +src+ of MIME type +mime_type+ into the output. The +src+ argument may
+      # be a path to a file, or if it's an image it may also be a Base64 encoded image. 
+      # The embedded data may or may not be ignored, depending on what kind of formatter(s) are active.
       #
-      def embed(file, mime_type, label)
-        @visitor.embed(file, mime_type, label)
+      def embed(src, mime_type, label)
+        @visitor.embed(src, mime_type, label)
       end
 
     private

data/lib/cucumber/step_match.rb

@@ -20,7 +20,7 @@ module Cucumber
     end
 
     def invoke(multiline_arg)
-      multiline_arg = Ast::PyString.new(multiline_arg) if String === multiline_arg
+      multiline_arg = Ast::DocString.new(multiline_arg) if String === multiline_arg
       all_args = args
       all_args << multiline_arg.to_step_definition_arg if multiline_arg
       @step_definition.invoke(all_args)

data/spec/cucumber/ast/doc_string_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'cucumber/ast/doc_string'
+
+module Cucumber
+  module Ast
+    describe DocString do
+      describe "replacing arguments" do
+
+        before(:each) do
+          @ps = DocString.new("<book>\n<qty>\n")
+        end
+      
+        it "should return a new doc_string with arguments replaced with values" do
+          doc_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere', '<qty>' => '5'})
+                
+          doc_string_with_replaced_arg.to_step_definition_arg.should == "Life is elsewhere\n5\n"
+        end
+        
+        it "should not change the original doc_string" do
+          doc_string_with_replaced_arg = @ps.arguments_replaced({'<book>' => 'Life is elsewhere'})
+          
+          @ps.to_s.should_not include("Life is elsewhere")
+        end
+
+        it "should replaced nil with empty string" do
+          ps = DocString.new("'<book>'")
+          doc_string_with_replaced_arg = ps.arguments_replaced({'<book>' => nil}) 
+          
+          doc_string_with_replaced_arg.to_step_definition_arg.should == "''"
+        end
+
+        it "should recognise when just a subset of a cell is delimited" do
+          @ps.should have_text('<qty>')
+        end
+
+      end
+      
+    end
+  end
+end

data/spec/cucumber/ast/feature_factory.rb

@@ -24,7 +24,7 @@ module Cucumber
           %w{1 22 333},
           %w{4444 55555 666666}
         ])
-        py_string = Ast::PyString.new(%{\n I like\nCucumber sandwich\n})
+        doc_string = Ast::DocString.new(%{\n I like\nCucumber sandwich\n})
         
         background = Ast::Background.new(Ast::Comment.new(""), 2, "Background:", "",
           [
@@ -46,7 +46,7 @@ module Cucumber
             "Scenario:", "A Scenario",
             [
               Step.new(10, "Given", "a passing step with an inline arg:", table),
-              Step.new(11, "Given", "a happy step with an inline arg:", py_string),
+              Step.new(11, "Given", "a happy step with an inline arg:", doc_string),
               Step.new(12, "Given", "a failing step")
             ]
           )]

data/spec/cucumber/ast/feature_spec.rb

@@ -40,7 +40,7 @@ module Cucumber
                 [:row, -1,
                   [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]], 
             [:step_invocation, 11, "Given", "a happy step with an inline arg:", 
-              [:py_string, "\n I like\nCucumber sandwich\n"]], 
+              [:doc_string, "\n I like\nCucumber sandwich\n"]], 
             [:step_invocation, 12, "Given", "a failing step"]]]          
       end
 

data/spec/cucumber/ast/step_spec.rb

@@ -48,9 +48,9 @@ module Cucumber
       end
 
       it "should replace arguments in py string arg" do
-        py_string = PyString.new('taste_<taste> color_<color>')
+        doc_string = DocString.new('taste_<taste> color_<color>')
 
-        step = Step.new(1, 'Given', 'a <color> cucumber', py_string)
+        step = Step.new(1, 'Given', 'a <color> cucumber', doc_string)
 
         invocation_table = Table.new([
           %w{color taste},

data/spec/cucumber/formatter/junit_spec.rb

@@ -94,6 +94,7 @@ module Cucumber::Formatter
         it { @doc.to_s.should =~ /Big Mac/ }
         it { @doc.to_s.should_not =~ /Things/ }
         it { @doc.to_s.should_not =~ /Good|Evil/ }
+        it { @doc.to_s.should_not =~ /type="skipped"/}
       end
   
       describe "with a regular data table scenario" do

data/spec/cucumber/rb_support/rb_language_spec.rb

@@ -144,7 +144,7 @@ spec/cucumber/rb_support/rb_language_spec.rb:\\d+:in `World'
 spec/cucumber/rb_support/rb_language_spec.rb:\\d+: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.
+or http://wiki.github.com/cucumber/cucumber/a-whole-new-world.
 
 }
           dsl.World { Hash.new }

data/spec/cucumber/rb_support/rb_step_definition_spec.rb

@@ -74,10 +74,10 @@ module Cucumber
         end.should raise_error(Cucumber::ArityMismatchError)
       end
 
-      it "should allow announce" do
-        user_interface.should_receive(:announce).with('wasup')
+      it "should allow puts" do
+        user_interface.should_receive(:puts).with('wasup')
         dsl.Given /Loud/ do
-          announce 'wasup'
+          puts 'wasup'
         end
         
         support_code.step_match("Loud").invoke(nil)

metadata

@@ -2,7 +2,7 @@
 name: cucumber
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.3
+  version: 0.10.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 +01:00
+date: 2011-06-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.8
+        version: 2.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -153,7 +153,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.4
+        version: 0.9.0.rc7
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -164,7 +164,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.4.2
   type: :development
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -208,7 +208,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.6
   type: :development
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
@@ -513,6 +513,7 @@ files:
 - fixtures/json/features/tables.feature
 - fixtures/junit/features/one_passing_one_failing.feature
 - fixtures/junit/features/pending.feature
+- fixtures/junit/features/scenario_outline.feature
 - fixtures/junit/features/some_subdirectory/one_passing_one_failing.feature
 - fixtures/junit/features/step_definitions/steps.rb
 - fixtures/self_test/.gitignore
@@ -647,12 +648,12 @@ files:
 - lib/cucumber/ast.rb
 - lib/cucumber/ast/background.rb
 - lib/cucumber/ast/comment.rb
+- lib/cucumber/ast/doc_string.rb
 - lib/cucumber/ast/examples.rb
 - lib/cucumber/ast/feature.rb
 - lib/cucumber/ast/feature_element.rb
 - lib/cucumber/ast/features.rb
 - lib/cucumber/ast/outline_table.rb
-- lib/cucumber/ast/py_string.rb
 - lib/cucumber/ast/scenario.rb
 - lib/cucumber/ast/scenario_outline.rb
 - lib/cucumber/ast/step.rb
@@ -742,10 +743,10 @@ files:
 - lib/cucumber/wire_support/wire_protocol/requests.rb
 - lib/cucumber/wire_support/wire_step_definition.rb
 - spec/cucumber/ast/background_spec.rb
+- spec/cucumber/ast/doc_string_spec.rb
 - spec/cucumber/ast/feature_factory.rb
 - spec/cucumber/ast/feature_spec.rb
 - spec/cucumber/ast/outline_table_spec.rb
-- spec/cucumber/ast/py_string_spec.rb
 - spec/cucumber/ast/scenario_outline_spec.rb
 - spec/cucumber/ast/scenario_spec.rb
 - spec/cucumber/ast/step_spec.rb
@@ -790,8 +791,8 @@ licenses: []
 
 post_install_message: "\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n\
-  Thank you for installing cucumber-0.10.3.\n\
-  Please be sure to read http://wiki.github.com/aslakhellesoy/cucumber/upgrading\n\
+  Thank you for installing cucumber-0.10.5.\n\
+  Please be sure to read http://wiki.github.com/cucumber/cucumber/upgrading\n\
   for important information about this release. Happy cuking!\n\n\
   (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n\n"
 rdoc_options: 
@@ -816,7 +817,7 @@ rubyforge_project:
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: cucumber-0.10.3
+summary: cucumber-0.10.5
 test_files: 
 - features/background.feature
 - features/bootstrap.feature
@@ -832,10 +833,10 @@ test_files:
 - features/tagged_hooks.feature
 - features/transforms.feature
 - spec/cucumber/ast/background_spec.rb
+- spec/cucumber/ast/doc_string_spec.rb
 - spec/cucumber/ast/feature_factory.rb
 - spec/cucumber/ast/feature_spec.rb
 - spec/cucumber/ast/outline_table_spec.rb
-- spec/cucumber/ast/py_string_spec.rb
 - spec/cucumber/ast/scenario_outline_spec.rb
 - spec/cucumber/ast/scenario_spec.rb
 - spec/cucumber/ast/step_spec.rb