fivemat 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dff3961f1d0a9f6b0d5ff9b998f4a28f03212f3
-  data.tar.gz: 09b8a15c7e4a0f01fa2dc9b53f29e902d006f38c
+  metadata.gz: 2a5b609f9df1bdb02278cb9d1c00ae1795ed939f
+  data.tar.gz: ae9f16c478877ad98754b952d5749e60d807da89
 SHA512:
-  metadata.gz: cc2ed4bcf2da8622e037d07172a446163012e10117ccbf1416a335f1a35b6001fa983ec6899a2a23adf2365a301f268c5357c13cd48316acec73553fe9823c33
-  data.tar.gz: b8071efedf092f4a96539edbb63d7f83fe3aeb81910ecb8ad344edf8e5fc859c703054a6d29cfda1d0768c9c3df14428e1b1cb9ae92fe91494a3bb24c7f89bf4
+  metadata.gz: 388ae947ef201509b647deb0204f16ec428c433ee74ef3bfb8d946795ad2f9311e0ea8cb15ffb1ea5c585115357627d090aafa762652bfd6e944455f66d65752
+  data.tar.gz: 5cb2396594c40a0f676648a17f0846ff9a7b83654fc7822e325fba0240c1054c3eb7f4bc49e1732aeea5205f8d98e862b75d3098fd55852c379df7230d8ea133

data/fivemat.gemspec

@@ -12,5 +12,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fivemat"
   gem.require_paths = ["lib"]
-  gem.version       = '1.3.0'
+  gem.version       = '1.3.1'
 end

data/lib/fivemat.rb

@@ -8,7 +8,7 @@ module Fivemat
   autoload :Spec, 'fivemat/spec'
 
   def rspec3?
-    defined?(::RSpec) && ::RSpec::Core::Version::STRING >= '3.0.0'
+    defined?(::RSpec::Core) && ::RSpec::Core::Version::STRING >= '3.0.0'
   end
   module_function :rspec3?
 
@@ -21,8 +21,8 @@ module Fivemat
       :example_failed,
       :example_group_started,
       :example_group_finished,
-      :dump_pending_fixed,
-      :dump_summary
+      :dump_summary,
+      :seed
   end
 
   def self.new(*args)

data/lib/fivemat/rspec3.rb

@@ -1,74 +1,66 @@
-require 'rspec/core/formatters/base_text_formatter'
+require 'rspec/core/formatters/console_codes'
 
 module Fivemat
-  class RSpec3 < ::RSpec::Core::Formatters::BaseTextFormatter
+  class RSpec3
     include ElapsedTime
 
     # See fivemat.rb for formatter registration.
+    attr_reader :output, :failed_notifications
 
     def initialize(output)
-      super(output)
+      @output = output
       @group_level = 0
       @index_offset = 0
-      @cumulative_failed_examples = []
-      @failed_examples = []
+      @failed_notifications = []
     end
 
+    Color = ::RSpec::Core::Formatters::ConsoleCodes
+
     def example_passed(notification)
-      output.print success_color('.')
+      output.print Color.wrap('.', :success)
     end
 
     def example_pending(notification)
-      super
-      output.print pending_color('*')
+      output.print Color.wrap('*', :pending)
     end
 
-    def example_failed(event)
-      super
-      output.print failure_color('F')
+    def example_failed(notification)
+      @failed_notifications << notification
+      output.print Color.wrap('F', :failure)
     end
 
     def example_group_started(event)
       if @group_level.zero?
         output.print "#{event.group.description} "
-        @failure_output = []
         @start_time = Time.now
       end
+
       @group_level += 1
     end
 
     def example_group_finished(event)
       @group_level -= 1
+
       if @group_level.zero?
         print_elapsed_time output, @start_time
         output.puts
 
-        failed_examples.each_with_index do |example, index|
-          if pending_fixed?(example)
-            dump_pending_fixed(example, @index_offset + index)
-          else
-            dump_failure(example, @index_offset + index)
-          end
-          dump_backtrace(example)
+        failed_notifications.each_with_index do |failure, index|
+          output.puts failure.fully_formatted(@index_offset + index + 1)
         end
-        @index_offset += failed_examples.size
-        @cumulative_failed_examples += failed_examples
-        failed_examples.clear
-      end
-    end
 
-    def pending_fixed?(example)
-      example.execution_result.pending_fixed?
+        @index_offset += failed_notifications.size
+        failed_notifications.clear
+      end
     end
 
-    def dump_pending_fixed(example, index)
-      output.puts "#{short_padding}#{index.next}) #{example.full_description} FIXED"
-      output.puts fixed_color("#{long_padding}Expected pending '#{example.execution_result.pending_message}' to fail. No Error was raised.")
+    def dump_summary(summary)
+      output.puts summary.fully_formatted
     end
 
-    def dump_summary(*args)
-      @failed_examples = @cumulative_failed_examples
-      super
+    def seed(notification)
+      return unless notification.seed_used?
+      output.puts notification.fully_formatted
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fivemat
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies: []
 description: MiniTest/RSpec/Cucumber formatter that gives each test file its own line
   of dots