aslakhellesoy-cucumber 0.1.100.1 → 0.1.100.2

data/History.txt

@@ -92,6 +92,7 @@ pure Ruby users have been enjoying for a while.
 * Pending steps in > steps called from steps (#65 Aslak Hellesøy)
 
 === New features
+* Added World#announce(announcment) which lets you output text to the formatted output (#222 Rob Kaufmann)
 * Added Table#transpose to to allow use of vertically aligned table keys (Torbjørn Vatn, Aslak Hellesøy)
 * Added Table#map_headers to to allow use of more readable headers (Rob Holland)
 * New -S/--step-definitions option. Useful (among other things) for tools that implement automcompletion. (#208 Aslak Hellesøy).

data/Manifest.txt

@@ -321,4 +321,3 @@ spec/cucumber/treetop_parser/with_tags.feature
 spec/cucumber/world/pending_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
-target/maven-archiver/pom.properties

data/lib/cucumber/ast/table.rb

@@ -158,7 +158,7 @@ module Cucumber
           row.map do |cell|
             cell_with_replaced_args = cell
             arguments.each do |name, value|
-              cell_with_replaced_args = value && !cell.nil? ? cell_with_replaced_args.gsub(name, value) : nil
+              cell_with_replaced_args = value && cell_with_replaced_args ? cell_with_replaced_args.gsub(name, value) : nil
             end
             cell_with_replaced_args
           end

data/lib/cucumber/ast/visitor.rb

@@ -116,6 +116,10 @@ module Cucumber
 
       def visit_exception(exception, status)
       end
+
+      def announce(announcement)
+      end
+
     end
   end
 end

data/lib/cucumber/broadcaster.rb

@@ -1,6 +1,5 @@
 module Cucumber
   class Broadcaster
-
     def initialize(receivers = [])
       @receivers = receivers
     end
@@ -10,6 +9,5 @@ module Cucumber
         receiver.__send__(method_name, *args)
       end
     end
-
   end
 end

data/lib/cucumber/cli/main.rb

@@ -44,6 +44,7 @@ module Cucumber
         features = load_plain_text_features
 
         visitor = configuration.build_formatter_broadcaster(step_mother)
+        step_mother.visitor = visitor # Needed to support World#announce
         visitor.visit_features(features)
 
         failure = step_mother.steps(:failed).any? || 

data/lib/cucumber/formatter/console.rb

@@ -86,6 +86,12 @@ module Cucumber
         @io.flush
       end
 
+      def announce(announcement)
+        @io.puts
+        @io.puts(format_string(announcement, :tag))
+        @io.flush
+      end
+
     private
 
       def dump_count(count, what, state=nil)

data/lib/cucumber/formatter/html.rb

@@ -116,6 +116,10 @@ module Cucumber
         @builder.td(value, :class => status)
       end
 
+      def announce(announcement)
+        @builder.pre(announcement, :class => 'announcement')
+      end
+
       private
 
       def inline_css
@@ -126,4 +130,4 @@ module Cucumber
 
     end
   end
-end
+end

data/lib/cucumber/formatter/progress.rb

@@ -31,7 +31,7 @@ module Cucumber
       def visit_table_cell_value(value, width, status)
         progress(status) if (status != :thead) && !@multiline_arg
       end
-      
+
       private
 
       def print_summary
@@ -57,4 +57,4 @@ module Cucumber
       
     end
   end
-end
+end

data/lib/cucumber/formatter/rerun.rb

@@ -32,4 +32,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/step_mother.rb

@@ -55,7 +55,7 @@ module Cucumber
       end
     end
 
-    attr_writer :snippet_generator, :options
+    attr_writer :snippet_generator, :options, :visitor
 
     def step_visited(step)
       steps << step unless steps.index(step)
@@ -180,6 +180,7 @@ module Cucumber
 
       @current_world.extend(World)
       @current_world.__cucumber_step_mother = self
+      @current_world.__cucumber_visitor = @visitor
 
       @current_world.extend(::Spec::Matchers) if defined?(::Spec::Matchers)
       @current_world

data/lib/cucumber/version.rb

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

data/lib/cucumber/world.rb

@@ -7,7 +7,7 @@ module Cucumber
       end
     end
     
-    attr_writer :__cucumber_step_mother, :__cucumber_current_step
+    attr_writer :__cucumber_step_mother, :__cucumber_visitor, :__cucumber_current_step
 
     # Call a step from within a step definition
     def __cucumber_invoke(name, multiline_argument=nil) #:nodoc:
@@ -26,6 +26,17 @@ module Cucumber
       @table_parser.parse_or_fail(text.strip, file, line_offset)
     end
 
+    # Output +announcement+ 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)
+    #
+    # Beware that the output will be printed *before* the corresponding
+    # step. This is because the step itself will not be printed until
+    # after it has run, so it can be coloured according to its status.
+    def announce(announcement)
+      @__cucumber_visitor.announce(announcement)
+    end
+
     def pending(message = "TODO")
       if block_given?
         begin

data/spec/cucumber/ast/table_spec.rb

@@ -111,11 +111,11 @@ module Cucumber
 
         it "should not raise an error when there are nil values in the table" do
           table = Table.new([
-                              ['book'],
-                              [nil]
+                              ['book', 'qty'],
+                              ['<book>', nil],
                             ])
           lambda{ 
-            table.arguments_replaced({'<book>' => 'The great sheep chase'})
+            table.arguments_replaced({'<book>' => nil, '<qty>' => '5'})
           }.should_not raise_error
         end
 

data/spec/cucumber/broadcaster_spec.rb

@@ -2,13 +2,14 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 module Cucumber
   describe Broadcaster do
+    before do
+      @receiver = mock('receiver')
+      @broadcaster = Broadcaster.new([@receiver])
+    end
     
     it "should broadcast methods to registered objects" do
-      receiver = mock('receiver')
-      broadcaster = Broadcaster.new([receiver])
-
-      receiver.should_receive(:konbanwa).with('good evening')
-      broadcaster.konbanwa('good evening')
+      @receiver.should_receive(:konbanwa).with('good evening')
+      @broadcaster.konbanwa('good evening')
     end
   end
 end

data/spec/cucumber/step_definition_spec.rb

@@ -66,5 +66,16 @@ module Cucumber
       stepdef.to_s.should    == '/Hello (.*)/ # spec/cucumber/step_definition_spec.rb:63'
       stepdef.to_s(2).should == '/Hello (.*)/   # spec/cucumber/step_definition_spec.rb:63'
     end
+    
+    it "should allow announce" do
+      v = mock('visitor')
+      v.should_receive(:announce).with('wasup')
+      self.visitor = v
+      world = new_world!
+      Given /Loud/ do
+        announce 'wasup'
+      end
+      step_match("Loud").invoke(world, nil)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.1.100.1
+  version: 0.1.100.2
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"