res 1.0.1 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b35dcb30d280879775b9e15a0ec5bd0d55e289
-  data.tar.gz: fc1cbd5e304e11af6ba7ae4f406dd93c7ce4aeda
+  metadata.gz: b731804b20181480f549059eeac6337968d79bd1
+  data.tar.gz: 62d01690d6f05bcb121c3c62dc9242a7ad1b9e08
 SHA512:
-  metadata.gz: ca7bd13c3a9312fd8b9c4f0cd1aa1f7a20d810adb037b86ccd37f2ebd04e1efdf322eb0f4271a6ec6015a334e74d47238a6c94072a286bc574a0f8208c89c17d
-  data.tar.gz: ffa22f1b34b2e2c7df830c7a7e607c7a411f854613e66b51fc0a261b88df3b2706151c725718d430cf804d00778a93b1253aa8022b57ba77c4190b701107c32d
+  metadata.gz: d2a33ffd4cb61a2905bcf0b21826d3f5fd5cedbf2f47a97eea6208f804591a57b61b7c39153fa1066ab66806a507f1dcc3b75737b1c2bf95efff9ed43108deaa
+  data.tar.gz: 475f54415d79992efaa03a5be29e644e91d6d13fd661437b111033457ae845ddb91cbbf576fba040c74919a04cd6e933a8d13fd01c0781192505c1533938ef9f

data/lib/res/formatters/rspec.rb

@@ -0,0 +1,140 @@
+require 'rspec/core/formatters'
+require 'res/ir'
+
+module Res
+  module Formatters
+    class Rspec
+     
+      attr_accessor :output, :result
+      RSpec::Core::Formatters.register self, :start, 
+                                             :example_group_started, :example_passed, :example_failed, :example_pending, 
+                                             :stop, :start_dump
+                                             
+
+      def initialize output
+	@io = output
+	@result = Array.new
+      end
+
+      # Called when rspec starts execution 
+      def start notification
+        @count = 0
+        @child = 0
+      end
+
+      # Called Once per example group
+      def example_group_started group_notification
+       if @child == 0
+          result[@count] = format_structure(group_notification.group)
+          @child += 1
+          i = 0
+          if result[@count].has_key?(:children)
+            index = result[@count][:children].count 
+          else
+            index =0
+          end
+          while i < group_notification.group.examples.count
+            result[@count][:children] = Array.new if !result[@count].has_key?(:children)
+            result[@count][:children][index] = Hash.new
+            result[@count][:children][index] = add_result(group_notification.group.examples[i].metadata)
+            index += 1
+            i += 1
+          end 
+          @count += 1
+        end
+        @child -= 1  
+      end
+   
+      # Called One of these per example, depending on outcome
+      def example_passed(passed_example_notification)
+        status = passed_example_notification.example.metadata[:execution_result].status.to_s
+        test = passed_example_notification.example
+        set_status(result, test.metadata[:location], status)
+      end
+
+      def example_failed(failed_example_notification)
+        status = failed_example_notification.example.metadata[:execution_result].status.to_s
+        test = failed_example_notification.example
+        set_status(result, test.metadata[:location], status)
+      end
+
+      def example_pending(pending_example_notification)
+        status = "skipped"
+        test = pending_example_notification.example
+        set_status(result, test.metadata[:location], status)
+      end
+
+        def add_result(test)
+       return { 
+          "type": "Rspec::Test",
+          "name": test[:description],
+          "urn": test[:location],
+        }
+      end
+
+      def format_structure(group)
+    
+        result = Hash.new
+        result[:type] = "Rspec::Describe"
+        result[:name] = group.description
+        result[:urn] = group.location
+        if !group.children.empty?
+          result[:children] = Array.new
+          i = 0
+          while i < group.children.count
+            
+            result[:children][i] = format_structure(group.children[i])
+            @child += 1            
+            
+            k = 0
+            j = i
+            while k < group.children[i].examples.count
+            if k == 0
+              result[:children][j][:children] = Array.new  
+              result[:children][j][:children][k] = Hash.new
+            end
+              result[:children][j][:children][k] = add_result(group.children[j].examples[k].metadata)
+              k += 1
+            end
+            i += 1
+          end
+        end
+
+        result
+      end
+
+      def set_status(result, urn, status)
+        result.each do |r|
+          if r[:type] == "Rspec::Describe"
+            set_status(r[:children], urn, status)
+          elsif r[:type] == "Rspec::Test"
+            if r[:urn] == urn
+              r[:status] = status
+              break;
+            end
+          end
+        end
+      end
+	
+
+      # Called At the end of the suite
+      def stop(stop_notification)
+        @ir = ::Res::IR.new( :type        => 'Rspec',
+                            :started     => '',
+                            :results     => result,
+                            :finished    => Time.now(),
+                            )
+      end
+
+
+      def start_dump(start_dump_notification)
+        @io = File.open("./rspec.res", "w") if @io.class.to_s != "File"
+        @io.puts @ir.json
+        @io.close
+      end
+
+    end
+  end
+end
+
+

data/lib/res/formatters/ruby_cucumber.rb

@@ -3,19 +3,17 @@
 require 'fileutils'
 require 'res/ir'
 require 'cucumber/formatter/io'
+require 'cucumber/formatter/summary'
 
 module Res
   module Formatters
     class RubyCucumber
       include FileUtils
       include ::Cucumber::Formatter::Io
-
+     
       def initialize(runtime, path_or_io, options)
-        cucumber_version = %x(cucumber --version)
-        @cucumber_version = cucumber_version.gsub("\n","") 
-        
         @runtime = runtime
-        @io = ensure_io(path_or_io, "reporter")
+        @io = ensure_io(path_or_io) 
         @options = options
         @exceptions = []
         @indent = 0
@@ -44,13 +42,7 @@ module Res
         @_context = {}
         @_feature[:started] = Time.now()
         begin
-          if @cucumber_version.to_f < 1.3.to_f
-            uri = feature.file.to_s
-          else  
-           uri = feature.location.to_s
-          end
-          
-          hash = RubyCucumber.split_uri( uri )
+          hash = RubyCucumber.split_uri( feature.location.to_s )
           @_feature[:file] = hash[:file]
           @_feature[:line] = hash[:line]
           @_feature[:urn]  = hash[:urn]
@@ -98,12 +90,7 @@ module Res
         @_context = {}
         @_feature_element[:started] = Time.now
         begin
-          if @cucumber_version.to_f < 1.3.to_f
-            uri = feature_element.file_colon_line
-          else  
-            uri = feature_element.location.to_s
-          end
-          hash = RubyCucumber.split_uri( uri )
+          hash = RubyCucumber.split_uri( feature_element.location.to_s )
           @_feature_element[:file] = hash[:file]
           @_feature_element[:line] = hash[:line]
           @_feature_element[:urn] = hash[:urn]
@@ -122,9 +109,24 @@ module Res
       def after_feature_element(feature_element)
         @_context = {}
 
-        if feature_element.respond_to? :status
-          @_feature_element[:status] = feature_element.status
+        scenario_class = Cucumber::Formatter::LegacyApi::Ast::Scenario
+        example_table_class = Cucumber::Core::Ast::Location
+
+        fail =  @runtime.scenarios(:failed).select do |s|
+          [scenario_class, example_table_class].include?(s.class)
+        end.map do |s|
+          if s.location == feature_element.location
+            s
+          end          
+        end
+
+        if fail.compact.empty? and feature_element.respond_to? :status
+          @_feature_element[:status] = feature_element.status if feature_element.status.to_s != "skipped"
+        else
+          fail = fail.compact
+          @_feature_element[:status] = fail[0].status
         end
+
         @_feature_element[:finished] = Time.now
       end
 
@@ -138,24 +140,9 @@ module Res
       def background_name(keyword, name, file_colon_line, source_indent)
       end
 
-        #    def before_examples_array(examples_array)
-        #      @indent = 4
-        #      @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
-        #      names = name.strip.empty? ? [name.strip] : name.split("\n")
-        #      @io.puts("    #{keyword}: #{names[0]}")
-        #      names[1..-1].each {|s| @io.puts "      #{s}" } unless names.empty?
-        #      @io.flush
-        #      @indent = 6
-        #      @scenario_indent = 6
       end
-        #
+
 
       def scenario_name(keyword, name, file_colon_line, source_indent)
         @_context[:type] = "Cucumber::" + keyword.gsub(/\s+/, "")
@@ -176,23 +163,6 @@ module Res
         @_context = @_step
       end
 
-    #  def before_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background, file_colon_line)
-    #    @hide_this_step = false
-    #    if exception
-    #      if @exceptions.include?(exception)
-    #        @hide_this_step = true
-    #        return
-    #      end
-    #      @exceptions << exception
-    #    end
-    #    if status != :failed && @in_background ^ background
-    #      @hide_this_step = true
-    #      return
-    #    end
-    #    @status = status
-    #  end
-
-      # Argument list changed after cucumber 1.4, hence the *args
       def step_name(keyword, step_match, status, source_indent, background, *args)
 
         file_colon_line = args[0] if args[0]
@@ -205,23 +175,12 @@ module Res
         @_step[:type] = "Cucumber::Step"
 
       end
-
-        #    def doc_string(string)
-        #      return if @options[:no_multiline] || @hide_this_step
-        #      s = %{"""\n#{string}\n"""}.indent(@indent)
-        #      s = s.split("\n").map{|l| l =~ /^\s+$/ ? '' : l}.join("\n")
-        #      @io.puts(format_string(s, @current_step.status))
-        #      @io.flush
-        #    end
-        #
         
       def exception(exception, status)
         @_context[:message] = exception.to_s
       end
 
       def before_multiline_arg(multiline_arg)
-        #      return if @options[:no_multiline] || @hide_this_step
-        #      @table = multiline_arg
       end
 
       def after_multiline_arg(multiline_arg)
@@ -251,14 +210,17 @@ module Res
       end
 
       def after_table_row(table_row)
-        if table_row.class == Cucumber::Ast::OutlineTable::ExampleRow
+	if table_row.class == Cucumber::Formatter::LegacyApi::Ast::ExampleTableRow
+
           @_current_table_row[:name] = table_row.name
           if table_row.exception
             @_current_table_row[:message] = table_row.exception.to_s
           end
-          if table_row.scenario_outline
+
+          if table_row.status and table_row.status != "skipped" and table_row.status != nil
             @_current_table_row[:status] = table_row.status
           end
+            
           @_current_table_row[:line] = table_row.line
           @_current_table_row[:urn] = @_feature_element[:file] + ":" + table_row.line.to_s
           @_table << @_current_table_row

data/lib/res/formatters/ruby_cucumber_legacy.rb

@@ -0,0 +1,239 @@
+# Formatter for ruby cucumber
+
+require 'fileutils'
+require 'res/ir'
+require 'cucumber/formatter/io'
+
+module Res
+  module Formatters
+    class RubyCucumberLegacy
+      include FileUtils
+      include ::Cucumber::Formatter::Io
+
+      def initialize(runtime, path_or_io, options)
+        cucumber_version = %x(cucumber --version)
+        @cucumber_version = cucumber_version.gsub("\n","") 
+        
+        @runtime = runtime
+        @io = ensure_io(path_or_io, "reporter")
+        @options = options
+        @exceptions = []
+        @indent = 0
+        @prefixes = options[:prefixes] || {}
+        @delayed_messages = []
+        @_start_time = Time.now
+      end
+
+      def before_features(features)
+        @_features = []
+      end
+
+      # Once everything has run -- whack it in a ResultIR object and
+      # dump it as json
+      def after_features(features)
+        results = @_features
+        ir = ::Res::IR.new( :started     => @_start_time,
+                            :finished    => Time.now(),
+                            :results     => results,
+                            :type        => 'Cucumber' )
+        @io.puts ir.json
+      end
+
+      def before_feature(feature)
+        @_feature = {}
+        @_context = {}
+        @_feature[:started] = Time.now()
+        begin
+          if @cucumber_version.to_f < 1.3.to_f
+            uri = feature.file.to_s
+          else  
+           uri = feature.location.to_s
+          end
+          
+          hash = RubyCucumberLegacy.split_uri( uri )
+          @_feature[:file] = hash[:file]
+          @_feature[:line] = hash[:line]
+          @_feature[:urn]  = hash[:urn]
+        rescue
+          @_feature[:uri] = 'unknown'
+        end
+        @_features << @_feature
+        @_context = @_feature
+      end
+
+      def comment_line(comment_line)
+        @_context[:comments] = [] if !@_context[:comments]
+        @_context[:comments] << comment_line 
+      end
+
+      def after_tags(tags)
+      end
+
+      def tag_name(tag_name)
+        @_context[:tags] = [] if !@_context[:tag]
+        # Strip @ from tags
+        @_context[:tags] << tag_name[1..-1]
+      end
+
+      # { :type => 'Feature',
+      #   :name => 'Feature name',
+      #   :description => "As a blah\nAs a blah\n" }
+      def feature_name(keyword, name)
+        @_feature[:type] = "Cucumber::" + keyword.gsub(/\s+/, "")
+
+        lines = name.split("\n")
+        lines = lines.collect { |l| l.strip }
+
+        @_feature[:name] = lines.shift
+        @_feature[:description] = lines.join("\n")
+      end
+
+      def after_feature(feature)
+        @_feature[:finished] = Time.now()
+      end
+
+      def before_feature_element(feature_element)
+
+        @_feature_element = {}
+        @_context = {}
+        @_feature_element[:started] = Time.now
+        begin
+          if @cucumber_version.to_f < 1.3.to_f
+            uri = feature_element.file_colon_line
+          else  
+            uri = feature_element.location.to_s
+          end
+          hash = RubyCucumberLegacy.split_uri( uri )
+          @_feature_element[:file] = hash[:file]
+          @_feature_element[:line] = hash[:line]
+          @_feature_element[:urn] = hash[:urn]
+        rescue => e
+          @_feature_element[:error] = e.message
+          @_feature_element[:file] = 'unknown'
+        end
+
+        @_feature[:children] = [] if ! @_feature[:children]
+
+        @_feature[:children] << @_feature_element
+        @_context = @_feature_element
+      end
+
+      # After a scenario
+      def after_feature_element(feature_element)
+        @_context = {}
+
+        if feature_element.respond_to? :status
+          @_feature_element[:status] = feature_element.status
+        end
+        @_feature_element[:finished] = Time.now
+      end
+
+      def before_background(background)
+      end
+
+      def after_background(background)
+      end
+
+      def background_name(keyword, name, file_colon_line, source_indent)
+      end
+
+      def examples_name(keyword, name)
+      end
+
+      def scenario_name(keyword, name, file_colon_line, source_indent)
+        @_context[:type] = "Cucumber::" + keyword.gsub(/\s+/, "")
+        @_context[:name] = name || ''
+      end
+
+      def before_step(step)
+        @_step = {}
+
+        # Background steps can appear totally divorced from scenerios (feature
+        # elements). Need to make sure we're not including them as children
+        # to scenario that don't exist
+        return if @_feature_element && @_feature_element[:finished]
+
+        @_feature_element = {} if !@_feature_element
+        @_feature_element[:children] = [] if !@_feature_element[:children]
+        @_feature_element[:children] << @_step
+        @_context = @_step
+      end
+
+      # Argument list changed after cucumber 1.4, hence the *args
+      def step_name(keyword, step_match, status, source_indent, background, *args)
+
+        file_colon_line = args[0] if args[0]
+
+        @_step[:type] = "Cucumber::Step"
+        name = keyword + step_match.format_args(lambda{|param| %{#{param}}}) 
+        @_step[:name] = name
+        @_step[:status] = status
+        @_step[:type] = "Cucumber::Step"
+
+      end
+
+      def exception(exception, status)
+        @_context[:message] = exception.to_s
+      end
+
+      def before_multiline_arg(multiline_arg)
+      end
+
+      def after_multiline_arg(multiline_arg)
+        @_context[:args] = multiline_arg.to_s.gsub(/\e\[(\d+)m/, '')
+        @_table = nil
+      end
+
+      # Before a scenario outline is encountered
+      def before_outline_table(outline_table)
+        # Scenario outlines appear as children like normal scenarios,
+        # but really we just want to construct normal-looking children
+        # from them
+        @_outlines = @_feature_element[:children]
+        @_table = []
+      end
+
+      def after_outline_table(outline_table)
+        headings = @_table.shift
+        description = @_outlines.collect{ |o| o[:name] }.join("\n") + "\n" + headings[:name]
+        @_feature_element[:children] = @_table
+        @_feature_element[:description] = description
+      end
+
+      def before_table_row(table_row)
+        @_current_table_row = { :type => 'Cucumber::ScenarioOutline::Example' }
+        @_table = [] if !@_table
+      end
+
+      def after_table_row(table_row)
+        if table_row.class == Cucumber::Ast::OutlineTable::ExampleRow
+          @_current_table_row[:name] = table_row.name
+          if table_row.exception
+            @_current_table_row[:message] = table_row.exception.to_s
+          end
+          if table_row.scenario_outline
+            @_current_table_row[:status] = table_row.status
+          end
+          @_current_table_row[:line] = table_row.line
+          @_current_table_row[:urn] = @_feature_element[:file] + ":" + table_row.line.to_s
+          @_table << @_current_table_row
+        end
+      end
+
+      def after_table_cell(cell)
+      end
+
+      def table_cell_value(value, status)
+        @_current_table_row[:children] = [] if !@_current_table_row[:children]
+        @_current_table_row[:children] << { :type => "Cucumber::ScenarioOutline::Parameter",
+                                            :name => value, :status => status }
+      end
+
+      def self.split_uri(uri)
+        strings = uri.rpartition(/:/)
+        { :file => strings[0], :line => strings[2].to_i, :urn => uri }
+      end
+
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -79,7 +79,9 @@ files:
 - README.md
 - lib/res.rb
 - lib/res/config.rb
+- lib/res/formatters/rspec.rb
 - lib/res/formatters/ruby_cucumber.rb
+- lib/res/formatters/ruby_cucumber_legacy.rb
 - lib/res/ir.rb
 - lib/res/mappings.rb
 - lib/res/parsers/junit.rb
@@ -101,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -111,4 +113,3 @@ signing_key:
 specification_version: 4
 summary: Test Result report libraries
 test_files: []
-has_rdoc: