fivemat 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9349641487e0924084af60468129537311044e74
-  data.tar.gz: b2041a9644d70b97bc3c5d91a4e16df1a0726b4b
+  metadata.gz: 0dff3961f1d0a9f6b0d5ff9b998f4a28f03212f3
+  data.tar.gz: 09b8a15c7e4a0f01fa2dc9b53f29e902d006f38c
 SHA512:
-  metadata.gz: 7c6c113654615425a1131478b39b97262f8eb15d3ebbc9fd91ce09b3ac97f9ffbc3eef1d70d2d6d0471ab74845d19da739e1efa4d40f0d7a0cf0e3612c4b1510
-  data.tar.gz: 1689d261d1bcd2eb0d260ce1d0477f988af5e04c35d2e9fbb511601a22b7958ae4de6615cbc1b43147f5a0cc3a5861c2a99b02e299f061745be6466ca63494a5
+  metadata.gz: cc2ed4bcf2da8622e037d07172a446163012e10117ccbf1416a335f1a35b6001fa983ec6899a2a23adf2365a301f268c5357c13cd48316acec73553fe9823c33
+  data.tar.gz: b8071efedf092f4a96539edbb63d7f83fe3aeb81910ecb8ad344edf8e5fc859c703054a6d29cfda1d0768c9c3df14428e1b1cb9ae92fe91494a3bb24c7f89bf4

data/README.markdown

@@ -41,8 +41,8 @@ Cucumber output:
 Enable profiling by setting the `FIVEMAT_PROFILE` variable in the environment:
 
     > FIVEMAT_PROFILE=1 rspec --format Fivemat
-    DoohickeyTest .... (0.27s)
-    KajiggerTest ..................................... (1.87s)
+    Doohickey .... (0.27s)
+    Kajigger ..................................... (1.87s)
 
 ## Usage
 
@@ -50,10 +50,12 @@ Start by adding `gem 'fivemat'` to your `Gemfile`.
 
 ### MiniTest
 
-Change `require 'minitest/autorun'` to `require 'fivemat/minitest/autorun'`.
-Or with Rails, add `require 'fivemat/minitest'` to
-`test/test_helper.rb`.  If it doesn't work, you may need a newer version of
-MiniTest. (Add `gem 'minitest'` to your Gemfile if it's not there already.)
+On MiniTest 5, it's loaded automatically as a plugin, and there's nothing else
+to do.  Otherwise, change `require 'minitest/autorun'` to
+`require 'fivemat/minitest/autorun'`.  Or with Rails, add
+`require 'fivemat/minitest'` to `test/test_helper.rb`.  If it doesn't work, you
+may need a newer version of MiniTest. (Add `gem 'minitest'` to your Gemfile if
+it's not there already.)
 
 ### RSpec
 

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.2.1'
+  gem.version       = '1.3.0'
 end

data/lib/fivemat.rb

@@ -4,12 +4,36 @@ module Fivemat
   autoload :Cucumber, 'fivemat/cucumber'
   autoload :MiniTest, 'fivemat/minitest/unit'
   autoload :RSpec, 'fivemat/rspec'
+  autoload :RSpec3, 'fivemat/rspec3'
   autoload :Spec, 'fivemat/spec'
 
+  def rspec3?
+    defined?(::RSpec) && ::RSpec::Core::Version::STRING >= '3.0.0'
+  end
+  module_function :rspec3?
+
+  if rspec3?
+    # This needs to be run before `.new` is called, so putting it inside the
+    # autoloaded rspec3 file will not work.
+    ::RSpec::Core::Formatters.register self,
+      :example_passed,
+      :example_pending,
+      :example_failed,
+      :example_group_started,
+      :example_group_finished,
+      :dump_pending_fixed,
+      :dump_summary
+  end
+
   def self.new(*args)
     case args.size
     when 0 then MiniTest::Unit
-    when 1 then RSpec
+    when 1 then
+      if rspec3?
+        RSpec3
+      else
+        RSpec
+      end
     when 2 then Spec
     when 3 then Cucumber
     else

data/lib/fivemat/minitest.rb

@@ -1,3 +1,6 @@
-require 'fivemat/minitest/unit'
-
-MiniTest::Unit.runner = Fivemat::MiniTest::Unit.new
+begin
+  require 'minitest'
+rescue LoadError
+  require 'fivemat/minitest/unit'
+  MiniTest::Unit.runner = Fivemat::MiniTest::Unit.new
+end

data/lib/fivemat/rspec3.rb

@@ -0,0 +1,74 @@
+require 'rspec/core/formatters/base_text_formatter'
+
+module Fivemat
+  class RSpec3 < ::RSpec::Core::Formatters::BaseTextFormatter
+    include ElapsedTime
+
+    # See fivemat.rb for formatter registration.
+
+    def initialize(output)
+      super(output)
+      @group_level = 0
+      @index_offset = 0
+      @cumulative_failed_examples = []
+      @failed_examples = []
+    end
+
+    def example_passed(notification)
+      output.print success_color('.')
+    end
+
+    def example_pending(notification)
+      super
+      output.print pending_color('*')
+    end
+
+    def example_failed(event)
+      super
+      output.print failure_color('F')
+    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)
+        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?
+    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.")
+    end
+
+    def dump_summary(*args)
+      @failed_examples = @cumulative_failed_examples
+      super
+    end
+  end
+end

data/lib/minitest/fivemat_plugin.rb

@@ -0,0 +1,30 @@
+require 'fivemat/elapsed_time'
+
+module Minitest
+  class FivematReporter < Reporter
+    include ElapsedTime
+
+    def record(result)
+      if @class != result.class
+        if @class
+          print_elapsed_time(io, @class_start_time)
+          io.print "\n"
+        end
+        @class = result.class
+        @class_start_time = Time.now
+        io.print "#@class "
+      end
+    end
+
+    def report
+      super
+      print_elapsed_time(io, @class_start_time) if @class_start_time
+    end
+  end
+
+  def self.plugin_fivemat_init(options)
+    if reporter.kind_of?(CompositeReporter)
+      reporter.reporters.unshift(FivematReporter.new(options[:io], options))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fivemat
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Tim Pope
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies: []
 description: MiniTest/RSpec/Cucumber formatter that gives each test file its own line
   of dots
@@ -32,7 +32,9 @@ files:
 - lib/fivemat/minitest/autorun.rb
 - lib/fivemat/minitest/unit.rb
 - lib/fivemat/rspec.rb
+- lib/fivemat/rspec3.rb
 - lib/fivemat/spec.rb
+- lib/minitest/fivemat_plugin.rb
 homepage: https://github.com/tpope/fivemat
 licenses: []
 metadata: {}
@@ -52,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Why settle for a test output format when you could have a test output fivemat?