rspec_junit_formatter 0.4.0.pre → 0.4.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad7496b872a273636e473effb145427f2cf66d94
-  data.tar.gz: b61510be2cfa388a7d450937f8bfb3f75b7c1ee1
+  metadata.gz: 7e45b452b3b1ddc9a5fe134c0f440b5c75f61ede
+  data.tar.gz: cb0b99afd6014613c513c98e52cdf7b7244e07a6
 SHA512:
-  metadata.gz: 18f054c82f287d788bfe67b6288f697bfdcfd2d9e568425c4443b8a507ac37e6e00f190c1f7c7bf6ca3a371d2a31c29dbc1f88ea0347b002c0daa609e596a8c8
-  data.tar.gz: d0ec6791a67eb4c740e12850d95cc13487d107bea68ae6875a4d430da13a426dd3422e60cd79129c86ecad668f453b352fb575b2e1ded75dab406ac6db41bc0a
+  metadata.gz: f49ef97111a63bb72f5b4b55eba04f1afa1e17e6f1a57a1d0f492b3030db8d810f3ba1dded5bfbae9b27f77284282148c51c763c974352f9abcb42bbde82284f
+  data.tar.gz: 5a3421440dec87320bd86e230a31e18fdd395ab41d6c105296b3cef80101f49c3bc2696e77762184a0d030e8634e2182922b1889449c55b9b3a6ca78c6c17649

data/README.md

@@ -60,16 +60,19 @@ The formatter includes `$TEST_ENV_NUMBER` in the test suite name within the XML,
 
 ## Caveats
 
- * XML can only represent a [limited subset of characters][xml-charsets] which
-   excludes null bytes and most control characters. This gem will use character
-   entities where possible and fall back to replacing invalid characters with
-   Ruby-like escape codes otherwise. For example, the null byte becomes `\0`.
+ * XML can only represent a [limited subset of characters][xml-charsets] which excludes null bytes and most control characters. This gem will use character entities where possible and fall back to replacing invalid characters with Ruby-like escape codes otherwise. For example, the null byte becomes `\0`.
 
 ## Roadmap
 
- * It would be nice to split things up into individual test suites, although
-   would this correspond to example groups? The subject? The spec file? Not
-   sure yet.
+ * It would be nice to split things up into individual test suites, although would this correspond to example groups? The subject? The spec file? Not sure yet.
+
+## Development
+
+Run the specs with `bundle exec rake spec`. Run the specs against a matrix of rspec versions using `bundle exec rake spec:all`.
+
+## Releasing
+
+Bump the gem version in the gemspec, and commit. Then `bundle exec rake build` to build a gem package, `bundle exec rake install` to install and test it locally, then `bundle exec rake release` to tag and push the commits and gem.
 
 ## License
 

data/lib/rspec_junit_formatter.rb

@@ -149,6 +149,22 @@ private
     # Make sure it's utf-8, replace illegal characters with ruby-like escapes, and replace special and discouraged characters with entities
     text.to_s.encode(Encoding::UTF_8).gsub(ILLEGAL_REGEXP, ILLEGAL_REPLACEMENT).gsub(DISCOURAGED_REGEXP, DISCOURAGED_REPLACEMENTS)
   end
+
+  STRIP_DIFF_COLORS_BLOCK_REGEXP = /^ ( [ ]* ) Diff: (?: \e\[0m )? (?: \n \1 \e\[\d+m .* )* /x
+  STRIP_DIFF_COLORS_CODES_REGEXP = /\e\[\d+m/
+
+  def strip_diff_colors(string)
+    # XXX: RSpec diffs are appended to the message lines fairly early and will
+    # contain ANSI escape codes for colorizing terminal output if the global
+    # rspec configuration is turned on, regardless of which notification lines
+    # we ask for. We need to strip the codes from the diff part of the message
+    # for XML output here.
+    #
+    # We also only want to target the diff hunks because the failure message
+    # itself might legitimately contain ansi escape codes.
+    #
+    string.sub(STRIP_DIFF_COLORS_BLOCK_REGEXP) { |match| match.gsub(STRIP_DIFF_COLORS_CODES_REGEXP, "".freeze) }
+  end
 end
 
 RspecJunitFormatter = RSpecJUnitFormatter

data/lib/rspec_junit_formatter/rspec2.rb

@@ -47,18 +47,19 @@ private
   end
 
   def failure_message_for(example)
-    exception_for(example).to_s
+    strip_diff_colors(exception_for(example).to_s)
   end
 
   def failure_for(example)
     exception = exception_for(example)
+    message   = strip_diff_colors(exception.message)
     backtrace = format_backtrace(exception.backtrace, example)
 
     if shared_group = find_shared_group(example)
       backtrace << "Shared Example Group: \"#{shared_group.metadata[:shared_group_name]}\" called from #{shared_group.metadata[:example_group][:location]}"
     end
 
-    "#{exception.message}\n#{backtrace.join("\n")}"
+    "#{message}\n#{backtrace.join("\n")}"
   end
 
   def find_shared_group(example)

data/lib/rspec_junit_formatter/rspec3.rb

@@ -84,45 +84,42 @@ private
     notification.example.execution_result.exception
   end
 
-  STRIP_DIFF_COLORS_BLOCK_REGEXP = /^ ( [ ]* ) Diff: \e\[0m (?: \n \1 \e\[0m .* )* /x
-  STRIP_DIFF_COLORS_CODES_REGEXP = /\e\[\d+m/
-
-  def strip_diff_colors(string)
-    # XXX: RSpec diffs are appended to the message lines fairly early and will
-    # contain ANSI escape codes for colorizing terminal output if the global
-    # rspec configuration is turned on, regardless of which notification lines
-    # we ask for. We need to strip the codes from the diff part of the message
-    # for XML output here.
-    #
-    # We also only want to target the diff hunks because the failure message
-    # itself might legitimately contain ansi escape codes.
-    #
-    string.sub(STRIP_DIFF_COLORS_BLOCK_REGEXP) { |match| match.gsub(STRIP_DIFF_COLORS_CODES_REGEXP, "".freeze) }
-  end
-
-  # Completely gross hack for forcing off colorising
-  if Gem::Version.new(RSpec::Core::Version::STRING) >= Gem::Version.new("3.6")
-    WITHOUT_COLOR_KEY = :color_mode
-    WITHOUT_COLOR_VALUE = :off
-  else
-    WITHOUT_COLOR_KEY = :color
-    WITHOUT_COLOR_VALUE = false
-  end
-  def without_color
+  # rspec makes it really difficult to swap in configuration temporarily due to
+  # the way it cascades defaults, command line arguments, and user
+  # configuration. This method makes sure configuration gets swapped in
+  # correctly, but also that the original state is definitely restored.
+  def swap_rspec_configuration(key, value)
     unset = Object.new
-    force = RSpec.configuration.send(:value_for, WITHOUT_COLOR_KEY) { unset }
+    force = RSpec.configuration.send(:value_for, key) { unset }
     if unset.equal?(force)
-      previous = RSpec.configuration.send(WITHOUT_COLOR_KEY)
-      RSpec.configuration.send(:"#{WITHOUT_COLOR_KEY}=", WITHOUT_COLOR_VALUE)
+      previous = RSpec.configuration.send(key)
+      RSpec.configuration.send(:"#{key}=", value)
     else
-      RSpec.configuration.force({WITHOUT_COLOR_KEY => WITHOUT_COLOR_VALUE})
+      RSpec.configuration.force({key => value})
     end
     yield
   ensure
     if unset.equal?(force)
-      RSpec.configuration.send(:"#{WITHOUT_COLOR_KEY}=", previous)
+      RSpec.configuration.send(:"#{key}=", previous)
     else
-      RSpec.configuration.force({WITHOUT_COLOR_KEY => force})
+      RSpec.configuration.force({key => force})
+    end
+  end
+
+  # Completely gross hack for absolutely forcing off colorising for the
+  # duration of a block.
+  if RSpec.configuration.respond_to?(:color_mode=)
+    def without_color(&block)
+      swap_rspec_configuration(:color_mode, :off, &block)
+    end
+  elsif RSpec.configuration.respond_to?(:color=)
+    def without_color(&block)
+      swap_rspec_configuration(:color, false, &block)
+    end
+  else
+    warn 'rspec_junit_formatter cannot prevent colorising due to an unexpected RSpec.configuration format'
+    def without_color
+      yield
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_junit_formatter
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre
+  version: 0.4.0.pre2
 platform: ruby
 authors:
 - Samuel Cochran
@@ -28,7 +28,7 @@ cert_chain:
   P4lSfmXxsd1C71ckIp0cyXkPhyTtpyS/5hq9HhuUNzEHkSDe36/Rd1xYKV5JxMC2
   YAttWFUs06lor2q1wwncPaMtUtbWwW35+1IV6xhs2rFY6DD/I6ZkK3GnHdY=
   -----END CERTIFICATE-----
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -56,6 +56,20 @@ dependencies:
     - - "!="
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +84,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: RSpec results that your continuous integration service can read.
 email: sj26@sj26.com
 executables: []