rspec_junit_formatter_jenkins 0.1.6 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07670f3813a151905b6e8e36970d3df3e8babcfa
-  data.tar.gz: 930dc3138e52178cacae4e2feaac4b3102f8967b
+  metadata.gz: 7fc7f2e232b26f66a41b501066a0063523f321ad
+  data.tar.gz: 36a2219be70c61d6da80cd641f36f487e182306c
 SHA512:
-  metadata.gz: 464e40ecc66e66b61929e26e627248c13b5ea20331fa36a6be59d05824d09fdf7617322eea9e95c0b20602009635051260d424515d6797b7c45e29e8a6c5ae9f
-  data.tar.gz: 1c381b45084bc1178539d25b8893a87a9236689f7c14a6ec8f23e28426768d4a152b6f24e610703ca0f28d1bf7e993b1054175a2d70d42b1cb46edebe817ee75
+  metadata.gz: ee353ff2896acebfb23ff25f68afd1e79e8d55ed046bd663e71231c546b5ce57cdb95c4ac6ffdcbe8c7aefd53af11352d44cf1752260e2ab79519e91558cf265
+  data.tar.gz: bd54e173d3fe0441e0deb5fca936d931f428aabf4023c6beea8baea3fb1e3b352e89e50e40ee66d0138d3377746daa59778ba29b4f6941f041cf01faa4a3a2c0

data/README.md

@@ -1,8 +1,11 @@
 # RSpec JUnit Formatter
 
-[RSpec][rspec] results that [Jenkins][jenkins] can read. Probably a few other CI servers, too.
+[![Build results](http://img.shields.io/travis/sj26/rspec_junit_formatter.svg)](https://travis-ci.org/sj26/rspec_junit_formatter) 
+[![Gem version](http://img.shields.io/gem/v/rspec_junit_formatter.svg)](https://rubygems.org/gems/rspec_junit_formatter)
 
-Inspired by the work of [Diego Souza][dsouza] on [RSpec Formatters][dsouza/rspec_formatters] after frustration with [CI Reporter][ci_reporter].
+[RSpec][rspec] 2 & 3 results that [Jenkins][jenkins] can read. Probably a few other CI servers, too.
+
+Inspired by the work of [Diego Souza][dgvncsz0f] on [RSpec Formatters][dgvncsz0f/rspec_formatters] after frustration with [CI Reporter][ci_reporter].
 
 ## Usage
 
@@ -25,7 +28,9 @@ In your .rspec, usually alongside another formatter, add:
     --format RspecJunitFormatter
     --out rspec.xml
 
-I use it with the excellent [Fuubar formatter][fuubar].
+You can use it in combination with other formatters:
+
+    rspec --format progress --format RspecJunitFormatter --out rspec.xml
 
 ## Roadmap
 
@@ -38,9 +43,9 @@ The MIT License, see [LICENSE][license].
 
   [rspec]: http://rspec.info/
   [jenkins]: http://jenkins-ci.org/
-  [dsouza]: https://github.com/dsouza
-  [dsouza/rspec_formatters]: https://github.com/dsouza/rspec_formatters
-  [ci_reporter]: http://caldersphere.rubyforge.org/ci_reporter/
+  [dgvncsz0f]: https://github.com/dgvncsz0f
+  [dgvncsz0f/rspec_formatters]: https://github.com/dgvncsz0f/rspec_formatters
+  [ci_reporter]: https://github.com/nicksieger/ci_reporter
   [bundler]: http://gembundler.com/
   [fuubar]: http://jeffkreeftmeijer.com/2010/fuubar-the-instafailing-rspec-progress-bar-formatter/
   [license]: https://github.com/sj26/rspec-junit-formatter/blob/master/LICENSE

data/lib/rspec_junit_formatter.rb

@@ -1,8 +1,65 @@
-require 'builder'
-require 'rspec'
+require "time"
+require "builder"
 
-require 'rspec/core/formatters/base_formatter'
-require 'rspec/core/formatters/j_unit_formatter'
+require "rspec/core"
+require "rspec/core/formatters/base_formatter"
 
-# Make it easier to use
-RspecJunitFormatter = RSpecJUnitFormatter = RSpec::Core::Formatters::JUnitFormatter
+# Dumps rspec results as a JUnit XML file.
+# Based on XML schema: http://windyroad.org/dl/Open%20Source/JUnit.xsd
+class RSpecJUnitFormatter < RSpec::Core::Formatters::BaseFormatter
+  # rspec 2 and 3 implements are in separate files.
+
+private
+
+  def xml
+    @xml ||= Builder::XmlMarkup.new target: output, indent: 2
+  end
+
+  def xml_dump
+    xml.instruct!
+    xml.testsuite name: "rspec#{ENV['TEST_ENV_NUMBER']}", tests: example_count, failures: failure_count, errors: 0, time: "%.6f" % duration, timestamp: started.iso8601 do
+      xml.comment! "Randomized with seed #{RSpec.configuration.seed}"
+      xml.properties
+      xml_dump_examples
+    end
+  end
+
+  def xml_dump_examples
+    examples.each do |example|
+      send :"xml_dump_#{result_of(example)}", example
+    end
+  end
+
+  def xml_dump_passed(example)
+    xml_dump_example(example)
+  end
+
+  def xml_dump_pending(example)
+    xml_dump_example(example) do
+      xml.skipped
+    end
+  end
+
+  def xml_dump_failed(example)
+    exception = exception_for(example)
+    backtrace = formatted_backtrace_for(example)
+
+    xml_dump_example(example) do
+      xml.error message: exception.to_s, type: exception.class.name do
+        xml.text! "#{exception.message.encode(:xml => :text)}\n#{backtrace.join.encode(:xml => :text)}"
+      end
+    end
+  end
+
+  def xml_dump_example(example, &block)
+    xml.testcase classname: classname_for(example), name: description_for(example), file: example_group_file_path_for(example), time: "%.6f" % duration_for(example), &block
+  end
+end
+
+RspecJunitFormatter = RSpecJUnitFormatter
+
+if RSpec::Core::Version::STRING.start_with? "3."
+  require "rspec_junit_formatter/rspec3"
+else RSpec::Core::Version::STRING.start_with? "2."
+  require "rspec_junit_formatter/rspec2"
+end

data/lib/rspec_junit_formatter/rspec2.rb

@@ -0,0 +1,54 @@
+class RSpecJUnitFormatter < RSpec::Core::Formatters::BaseFormatter
+  attr_reader :started
+
+  def start(example_count)
+    @started = Time.now
+    super
+  end
+
+  def dump_summary(duration, example_count, failure_count, pending_count)
+    super
+    xml_dump
+  end
+
+private
+
+  def xml_dump_examples
+    examples.each do |example|
+      send :"xml_dump_#{example.execution_result[:status]}", example
+    end
+  end
+
+  def result_of(example)
+    example.execution_result[:status]
+  end
+
+  def example_group_file_path_for(example)
+    meta = example.metadata
+    while meta[:example_group]
+      meta = meta[:example_group]
+    end
+    meta[:file_path]
+  end
+
+  def classname_for(example)
+    fp = example_group_file_path_for(example)
+    fp.sub(%r{\.[^/.]+\Z}, "").gsub("/", ".").gsub(/\A\.+|\.+\Z/, "")
+  end
+
+  def duration_for(example)
+    example.execution_result[:run_time]
+  end
+
+  def description_for(example)
+    example.full_description
+  end
+
+  def exception_for(example)
+    example.execution_result[:exception]
+  end
+
+  def formatted_backtrace_for(example)
+    format_backtrace exception_for(example).backtrace, example
+  end
+end

data/lib/rspec_junit_formatter/rspec3.rb

@@ -0,0 +1,70 @@
+class RSpecJUnitFormatter < RSpec::Core::Formatters::BaseFormatter
+  RSpec::Core::Formatters.register self,
+    :start,
+    :stop,
+    :dump_summary
+
+  def start(notification)
+    @start_notification = notification
+    @started = Time.now
+    super
+  end
+
+  def stop(notification)
+    @examples_notification = notification
+  end
+
+  def dump_summary(notification)
+    @summary_notification = notification
+    xml_dump
+  end
+
+private
+
+  attr_reader :started
+
+  def example_count
+    @summary_notification.examples.count
+  end
+
+  def failure_count
+    @summary_notification.failed_examples.count
+  end
+
+  def duration
+    @summary_notification.duration
+  end
+
+  def examples
+    @examples_notification.notifications
+  end
+
+  def result_of(notification)
+    notification.example.execution_result.status
+  end
+
+  def example_group_file_path_for(notification)
+    notification.example.example_group.file_path
+  end
+
+  def classname_for(notification)
+    fp = example_group_file_path_for(notification)
+    fp.sub(%r{\.[^/]*\Z}, "").gsub("/", ".").gsub(%r{\A\.+|\.+\Z}, "")
+  end
+
+  def duration_for(notification)
+    notification.example.execution_result.run_time
+  end
+
+  def description_for(notification)
+    notification.example.full_description
+  end
+
+  def exception_for(notification)
+    notification.example.execution_result.exception
+  end
+
+  def formatted_backtrace_for(notification)
+    notification.formatted_backtrace
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_junit_formatter_jenkins
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.4
 platform: ruby
 authors:
 - Touseef Liaqat
@@ -11,60 +11,74 @@ cert_chain: []
 date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "!="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: RSpec results that Hudson can read. Code is forked from github.com/sj26/rspec_junit_formatter
+        version: '1.6'
+description: RSpec results that Hudson can read. Code forked from github.com/sj26/rspec_junit_formatter
   and modified for our use.
 email: touseefliaqat@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rspec/core/formatters/j_unit_formatter.rb
+- lib/rspec_junit_formatter/rspec2.rb
+- lib/rspec_junit_formatter/rspec3.rb
 - lib/rspec_junit_formatter.rb
 - README.md
 - LICENSE
 homepage: http://github.com/tliaqat/rspec_junit_formatter_jenkins
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/rspec/core/formatters/j_unit_formatter.rb

@@ -1,55 +0,0 @@
-require 'time'
-
-# Dumps rspec results as a JUnit XML file.
-# Based on XML schema: http://windyroad.org/dl/Open%20Source/JUnit.xsd
-class RSpec::Core::Formatters::JUnitFormatter < RSpec::Core::Formatters::BaseFormatter
-  def xml
-    @xml ||= Builder::XmlMarkup.new :target => output, :indent => 2 
-  end
-
-  def start example_count
-    @start = Time.now
-    super
-  end
-
-  def dump_summary duration, example_count, failure_count, pending_count
-    super
-
-    xml.instruct!
-    xml.testsuite :tests => example_count, :failures => failure_count, :errors => 0, :time => '%.6f' % duration, :timestamp => @start.iso8601 do
-      xml.properties
-      examples.each do |example|
-        send :"dump_summary_example_#{example.execution_result[:status]}", example
-      end
-    end
-  end
-
-  def xml_example example, &block
-    xml.testcase :classname => example_classname(example), :name => example.full_description, :time => '%.6f' % example.execution_result[:run_time], &block
-  end
-
-  def dump_summary_example_passed example
-    xml_example example
-  end
-
-  def dump_summary_example_pending example
-    xml_example example do
-      xml.skipped
-    end
-  end
-
-  def dump_summary_example_failed example
-    exception = example.execution_result[:exception]
-    backtrace = format_backtrace exception.backtrace, example
-
-    xml_example example do
-      xml.error message: exception.to_s, type: exception.class.name do
-        xml.text! "#{exception.message.encode(:xml => :text)}\n#{backtrace.join.encode(:xml => :text)}"
-      end
-    end
-  end
-
-  def example_classname example
-    example.file_path.sub(%r{\.[^/]*\Z}, "").gsub("/", ".").gsub(%r{\A\.+|\.+\Z}, "")
-  end
-end