cucumber 1.2.1 → 1.2.2

data/lib/cucumber/formatter/interceptor.rb

@@ -36,10 +36,10 @@ module Cucumber
           case pipe
           when :stdout
             wrapped = $stdout
-            $stdout = wrapped.unwrap!
+            $stdout = wrapped.unwrap! if $stdout.respond_to?(:unwrap!)
           when :stderr
             wrapped = $stderr
-            $stderr = wrapped.unwrap!
+            $stderr = wrapped.unwrap! if $stderr.respond_to?(:unwrap!)
           end
           wrapped
         end

data/lib/cucumber/formatter/json.rb

@@ -9,7 +9,7 @@ module Cucumber
     class Json < GherkinFormatterAdapter
       include Io
 
-      def initialize(step_mother, io, options)
+      def initialize(runtime, io, options)
         @io = ensure_io(io, "json")
         super(Gherkin::Formatter::JSONFormatter.new(@io), false)
       end

data/lib/cucumber/formatter/json_pretty.rb

@@ -1,3 +1,4 @@
+require 'multi_json'
 require 'cucumber/formatter/json'
 
 module Cucumber
@@ -5,7 +6,7 @@ module Cucumber
     # The formatter used for <tt>--format json_pretty</tt>
     class JsonPretty < Json
       def after_features(features)
-        @io.write(JSON.pretty_generate(@obj))
+        @io.write(MultiJson.dump(@obj, :pretty => true))
       end
     end
   end

data/lib/cucumber/formatter/junit.rb

@@ -15,7 +15,7 @@ module Cucumber
         end
       end
 
-      def initialize(step_mother, io, options)
+      def initialize(runtime, io, options)
         @reportdir = ensure_dir(io, "junit")
         @options = options
       end

data/lib/cucumber/formatter/ordered_xml_markup.rb

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

data/lib/cucumber/formatter/pretty.rb

@@ -18,10 +18,10 @@ module Cucumber
       include Io
       include Gherkin::Formatter::Escaping
       attr_writer :indent
-      attr_reader :step_mother
+      attr_reader :runtime
 
-      def initialize(step_mother, path_or_io, options)
-        @step_mother, @io, @options = step_mother, ensure_io(path_or_io, "pretty"), options
+      def initialize(runtime, path_or_io, options)
+        @runtime, @io, @options = runtime, ensure_io(path_or_io, "pretty"), options
         @exceptions = []
         @indent = 0
         @prefixes = options[:prefixes] || {}
@@ -42,7 +42,7 @@ module Cucumber
           @io = ensure_file(file, "pretty")
         end
       end
-      
+
       def comment_line(comment_line)
         @io.puts(comment_line.indent(@indent))
         @io.flush
@@ -72,7 +72,7 @@ module Cucumber
         @indent = 2
         @scenario_indent = 2
       end
-      
+
       def after_feature_element(feature_element)
         @io.puts
         @io.flush
@@ -90,7 +90,7 @@ module Cucumber
         @io.flush
       end
 
-      def background_name(keyword, name, file_colon_line, source_indent)        
+      def background_name(keyword, name, file_colon_line, source_indent)
         print_feature_element_name(keyword, name, file_colon_line, source_indent)
       end
 
@@ -99,7 +99,7 @@ module Cucumber
         @io.puts
         @visiting_first_example_name = true
       end
-      
+
       def examples_name(keyword, name)
         @io.puts unless @visiting_first_example_name
         @visiting_first_example_name = false
@@ -110,7 +110,7 @@ module Cucumber
         @indent = 6
         @scenario_indent = 6
       end
-      
+
       def before_outline_table(outline_table)
         @table = outline_table
       end
@@ -119,7 +119,7 @@ module Cucumber
         @table = nil
         @indent = 4
       end
-      
+
       def scenario_name(keyword, name, file_colon_line, source_indent)
         print_feature_element_name(keyword, name, file_colon_line, source_indent)
       end
@@ -171,7 +171,7 @@ module Cucumber
         return if @options[:no_multiline] || @hide_this_step
         @table = multiline_arg
       end
-      
+
       def after_multiline_arg(multiline_arg)
         @table = nil
       end
@@ -208,7 +208,7 @@ module Cucumber
       end
 
       private
-      
+
       def print_feature_element_name(keyword, name, file_colon_line, source_indent)
         @io.puts if @scenario_indent == 6
         names = name.empty? ? [name] : name.split("\n")
@@ -220,7 +220,7 @@ module Cucumber
         end
         @io.puts
         names[1..-1].each {|s| @io.puts "    #{s}"}
-        @io.flush        
+        @io.flush
       end
 
       def cell_prefix(status)

data/lib/cucumber/formatter/progress.rb

@@ -7,10 +7,10 @@ module Cucumber
     class Progress
       include Console
       include Io
-      attr_reader :step_mother
+      attr_reader :runtime
 
-      def initialize(step_mother, path_or_io, options)
-        @step_mother, @io, @options = step_mother, ensure_io(path_or_io, "progress"), options
+      def initialize(runtime, path_or_io, options)
+        @runtime, @io, @options = runtime, ensure_io(path_or_io, "progress"), options
       end
 
       def after_features(features)
@@ -24,12 +24,12 @@ module Cucumber
       end
 
       def after_feature_element(*args)
-        progress(:failed) if @exception_raised
+        progress(:failed) if (defined? @exception_raised) and (@exception_raised)
         @exception_raised = false
       end
 
       def before_steps(*args)
-        progress(:failed) if @exception_raised
+        progress(:failed) if (defined? @exception_raised) and (@exception_raised)
         @exception_raised = false
       end
 

data/lib/cucumber/formatter/rerun.rb

@@ -15,18 +15,18 @@ module Cucumber
     class Rerun
       include Io
 
-      def initialize(step_mother, path_or_io, options)
+      def initialize(runtime, path_or_io, options)
         @io = ensure_io(path_or_io, "rerun")
         @options = options
         @file_names = []
         @file_colon_lines = Hash.new{|h,k| h[k] = []}
       end
-      
+
       def before_feature(feature_element)
         @lines = []
         @file = feature_element.file
       end
-      
+
       def after_feature(*)
         unless @lines.empty?
           after_first_time do
@@ -67,7 +67,7 @@ module Cucumber
         @header_row = true
         @in_examples = true
       end
-      
+
       def after_examples(*args)
         @in_examples = false
       end
@@ -81,7 +81,7 @@ module Cucumber
       end
 
     private
-    
+
       def after_first_time
         yield if @not_first_time
         @not_first_time = true

data/lib/cucumber/formatter/stepdefs.rb

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

data/lib/cucumber/formatter/steps.rb

@@ -3,10 +3,10 @@ module Cucumber
     # The formatter used for <tt>--format steps</tt>
     class Steps
 
-      def initialize(step_mother, path_or_io, options)
+      def initialize(runtime, path_or_io, options)
         @io = ensure_io(path_or_io, "steps")
         @options = options
-        @step_definition_files = collect_steps(step_mother)
+        @step_definition_files = collect_steps(runtime)
       end
 
       def after_features(features)
@@ -19,7 +19,7 @@ module Cucumber
         count = 0
         @step_definition_files.keys.sort.each do |step_definition_file|
           @io.puts step_definition_file
-          
+
           sources = @step_definition_files[step_definition_file]
           source_indent = source_indent(sources)
           sources.sort.each do |file_colon_line, regexp_source|
@@ -33,8 +33,8 @@ module Cucumber
         @io.puts "#{count} step definition(s) in #{@step_definition_files.size} source file(s)."
       end
 
-      def collect_steps(step_mother)
-        step_mother.step_definitions.inject({}) do |step_definitions, step_definition|
+      def collect_steps(runtime)
+        runtime.step_definitions.inject({}) do |step_definitions, step_definition|
           step_definitions[step_definition.file] ||= []
           step_definitions[step_definition.file] << [ step_definition.file_colon_line, step_definition.regexp_source ]
           step_definitions
@@ -46,4 +46,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/formatter/summary.rb

@@ -2,14 +2,14 @@ module Cucumber
   module Formatter
     module Summary
 
-      def scenario_summary(step_mother, &block)
-        scenarios_proc = lambda{|status| step_mother.scenarios(status)}
-        dump_count(step_mother.scenarios.length, "scenario") + dump_status_counts(scenarios_proc, &block)
+      def scenario_summary(runtime, &block)
+        scenarios_proc = lambda{|status| runtime.scenarios(status)}
+        dump_count(runtime.scenarios.length, "scenario") + dump_status_counts(scenarios_proc, &block)
       end
 
-      def step_summary(step_mother, &block)
-        steps_proc = lambda{|status| step_mother.steps(status)}
-        dump_count(step_mother.steps.length, "step") + dump_status_counts(steps_proc, &block)
+      def step_summary(runtime, &block)
+        steps_proc = lambda{|status| runtime.steps(status)}
+        dump_count(runtime.steps.length, "step") + dump_status_counts(steps_proc, &block)
       end
 
       private

data/lib/cucumber/formatter/unicode.rb

@@ -2,10 +2,10 @@
 # Tips for improvement - esp. ruby 1.9: http://www.ruby-forum.com/topic/184730
 require 'cucumber/platform'
 require 'cucumber/formatter/ansicolor'
-$KCODE='u' unless Cucumber::RUBY_1_9
+$KCODE='u' if Cucumber::RUBY_1_8_7
 
 if Cucumber::WINDOWS
-  require 'iconv' unless Cucumber::RUBY_1_9
+  require 'iconv' if Cucumber::RUBY_1_8_7
 
   if ENV['CUCUMBER_OUTPUT_ENCODING']
     Cucumber::CODEPAGE = ENV['CUCUMBER_OUTPUT_ENCODING']
@@ -27,14 +27,7 @@ if Cucumber::WINDOWS
         o.instance_eval do
           alias cucumber_print print
           def print(*a)
-            if Cucumber::RUBY_1_9
-              begin
-                cucumber_print(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
-              rescue Encoding::UndefinedConversionError => e
-                STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_print(*a)
-              end
-            else
+            if Cucumber::RUBY_1_8_7
               begin
                 cucumber_print(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
               rescue Iconv::InvalidEncoding => e
@@ -44,19 +37,19 @@ if Cucumber::WINDOWS
                 STDERR.cucumber_puts("WARNING: #{e.message}")
                 cucumber_print(*a)
               end
+            else
+              begin
+                cucumber_print(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
+              rescue Encoding::UndefinedConversionError => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_print(*a)
+              end
             end
           end
 
           alias cucumber_puts puts
           def puts(*a)
-            if Cucumber::RUBY_1_9
-              begin
-                cucumber_puts(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
-              rescue Encoding::UndefinedConversionError => e
-                STDERR.cucumber_puts("WARNING: #{e.message}")
-                cucumber_puts(*a)
-              end
-            else
+            if Cucumber::RUBY_1_8_7
               begin
                 cucumber_puts(*Iconv.iconv(Cucumber::CODEPAGE, "UTF-8", *a.map{|a|a.to_s}))
               rescue Iconv::InvalidEncoding => e
@@ -66,6 +59,13 @@ if Cucumber::WINDOWS
                 STDERR.cucumber_puts("WARNING: #{e.message}")
                 cucumber_puts(*a)
               end
+            else
+              begin
+                cucumber_puts(*a.map{|arg| arg.to_s.encode(Encoding.default_external)})
+              rescue Encoding::UndefinedConversionError => e
+                STDERR.cucumber_puts("WARNING: #{e.message}")
+                cucumber_puts(*a)
+              end
             end
           end
         end

data/lib/cucumber/formatter/usage.rb

@@ -10,8 +10,8 @@ module Cucumber
         attr_accessor :mean_duration, :status
       end
 
-      def initialize(step_mother, path_or_io, options)
-        @step_mother = step_mother
+      def initialize(runtime, path_or_io, options)
+        @runtime = runtime
         @io = ensure_io(path_or_io, "usage")
         @options = options
         @stepdef_to_match = Hash.new{|h,stepdef_key| h[stepdef_key] = []}
@@ -31,9 +31,9 @@ module Cucumber
           stepdef_key = StepDefKey.new(step_match.step_definition.regexp_source, step_match.step_definition.file_colon_line)
 
           @stepdef_to_match[stepdef_key] << {
-            :keyword => keyword, 
-            :step_match => step_match, 
-            :status => status, 
+            :keyword => keyword,
+            :step_match => step_match,
+            :status => status,
             :file_colon_line => @step.file_colon_line,
             :duration => @duration
           }
@@ -117,11 +117,11 @@ module Cucumber
       end
 
       def add_unused_stepdefs
-        @step_mother.unmatched_step_definitions.each do |step_definition|
+        @runtime.unmatched_step_definitions.each do |step_definition|
           stepdef_key = StepDefKey.new(step_definition.regexp_source, step_definition.file_colon_line)
           @stepdef_to_match[stepdef_key] = []
         end
       end
     end
   end
-end
+end

data/lib/cucumber/js_support/js_dsl.js

@@ -54,4 +54,4 @@ var Transform = CucumberJsDsl.registerTransform;
 
 var World = CucumberJsDsl.world;
 
-var steps = CucumberJsDsl.steps;
+var steps = CucumberJsDsl.steps;

data/lib/cucumber/language_support.rb

@@ -23,7 +23,7 @@ module Cucumber
   #
   # Each language implementation manages its own hooks, and must execute them
   # at appropriate times.
-  #   
+  #
   #
   module LanguageSupport
   end

data/lib/cucumber/parser/gherkin_builder.rb

@@ -16,8 +16,8 @@ module Cucumber
 
       def feature(feature)
         @feature = Ast::Feature.new(
-          nil, 
-          Ast::Comment.new(feature.comments.map{|comment| comment.value}.join("\n")), 
+          nil,
+          Ast::Comment.new(feature.comments.map{|comment| comment.value}.join("\n")),
           Ast::Tags.new(nil, feature.tags),
           feature.keyword,
           feature.name.lstrip,
@@ -30,12 +30,12 @@ module Cucumber
 
       def background(background)
         @background = Ast::Background.new(
-          Ast::Comment.new(background.comments.map{|comment| comment.value}.join("\n")), 
-          background.line, 
-          background.keyword, 
-          background.name, 
+          Ast::Comment.new(background.comments.map{|comment| comment.value}.join("\n")),
+          background.line,
+          background.keyword,
+          background.name,
           background.description,
-          steps=[]
+          []
         )
         @feature.background = @background
         @background.feature = @feature
@@ -45,14 +45,14 @@ module Cucumber
 
       def scenario(statement)
         scenario = Ast::Scenario.new(
-          @background, 
-          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, statement.tags), 
-          statement.line, 
-          statement.keyword, 
+          @background,
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")),
+          Ast::Tags.new(nil, statement.tags),
+          statement.line,
+          statement.keyword,
           statement.name,
-          statement.description, 
-          steps=[]
+          statement.description,
+          []
         )
         @feature.add_feature_element(scenario)
         @background.feature_elements << scenario if @background
@@ -62,15 +62,15 @@ module Cucumber
 
       def scenario_outline(statement)
         scenario_outline = Ast::ScenarioOutline.new(
-          @background, 
-          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")), 
-          Ast::Tags.new(nil, statement.tags), 
-          statement.line, 
-          statement.keyword, 
-          statement.name, 
-          statement.description, 
-          steps=[],
-          example_sections=[]
+          @background,
+          Ast::Comment.new(statement.comments.map{|comment| comment.value}.join("\n")),
+          Ast::Tags.new(nil, statement.tags),
+          statement.line,
+          statement.keyword,
+          statement.name,
+          statement.description,
+          [],
+          []
         )
         @feature.add_feature_element(scenario_outline)
         if @background
@@ -83,11 +83,11 @@ module Cucumber
 
       def examples(examples)
         examples_fields = [
-          Ast::Comment.new(examples.comments.map{|comment| comment.value}.join("\n")), 
-          examples.line, 
-          examples.keyword, 
-          examples.name, 
-          examples.description, 
+          Ast::Comment.new(examples.comments.map{|comment| comment.value}.join("\n")),
+          examples.line,
+          examples.keyword,
+          examples.name,
+          examples.description,
           matrix(examples.rows)
         ]
         @step_container.add_examples(examples_fields, examples)
@@ -95,9 +95,9 @@ module Cucumber
 
       def step(gherkin_step)
         step = Ast::Step.new(
-          gherkin_step.line, 
-          gherkin_step.keyword, 
-          gherkin_step.name, 
+          gherkin_step.line,
+          gherkin_step.keyword,
+          gherkin_step.name,
           Ast::MultilineArgument.from(gherkin_step.doc_string || gherkin_step.rows)
         )
         step.gherkin_statement(gherkin_step)
@@ -110,9 +110,9 @@ module Cucumber
       def syntax_error(state, event, legal_events, line)
         # raise "SYNTAX ERROR"
       end
-      
+
     private
-    
+
       def matrix(gherkin_table)
         gherkin_table.map do |gherkin_row|
           row = gherkin_row.cells