micro_test 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775d8a6619af17df32d4d5ae13f62a5dd8f84d60
-  data.tar.gz: 02b1f437f7b5620cc7b0afd34d62bca05d7a04e5
+  metadata.gz: 95b18d1f0d146dbda392fada14c0d687ee85b703
+  data.tar.gz: 34d42a85bac2b5eb1c909383fdd92068f3f4c5ab
 SHA512:
-  metadata.gz: 10bfa9df02a1e8c96474c532939d7ae688f446e1676d529d0bfb06cd9567fb995449a9edac7f31b8658f9ffd7851c21a2423569be7b497ad7846add1bfd03515
-  data.tar.gz: 6047106158516aa8af7ab474926ce7857ad6d3b7bcd6d21dc040fdc5dfec9e4d97c20abfc1cc1e492374480b616029bca379ed1c1f4f9da2c038a15060fa00db
+  metadata.gz: 56ecea611b376a6ad4f02e457b722597dc340a85597c96409a3769816812479909bbc1514837e0cd585bee5073f3e28b9cf9fe00f769786ac90983daf20f0b04
+  data.tar.gz: 0d983415c067420fbb43ba964695576a099d56e1fbcf1a3061f709e426a59a1651d2f9a2383f3800d9d8aca968e96e6a06946403f93fac5ed35194628b5248d3

data/bin/mt

@@ -6,15 +6,7 @@ require File.join(lib_path, "micro_test")
 include MicroTest::Color
 
 # setup the formatters list ---------------------------------------------------
-formatters_path = File.join(lib_path, "micro_test", "formatters")
-formatter_names = Dir[File.join(formatters_path, "*.rb")].reduce([]) do |memo, file|
-  if (file =~ /(base_formatter\.rb|_async\.rb)$/).nil?
-    name = file[file.rindex("/") + 1..-4]
-    name = "*#{name}" if name == "mt"
-    memo << name
-  end
-  memo
-end
+formatter_names = MicroTest.formatters.map(&:short_name).sort
 
 # setup the options -----------------------------------------------------------
 options = {}
@@ -91,28 +83,11 @@ else
 end
 
 # setup the formatter ---------------------------------------------------------
-formatter_name = options[:formatter] || "mt"
-path = File.join(formatters_path, formatter_name + ".rb")
-if options[:async]
-  async_path = path.gsub(/\.rb$/, "_async.rb")
-  path = async_path if File.exist?(async_path)
-end
-unless File.exist?(path)
-  puts "Formatter not found at #{path}"
-  puts "Please check the formatter name and try again."
-  exit 1
-end
-begin
-  require path
-  formatter = MicroTest.const_get("Formatter").new
-rescue Exception => ex
-  puts "Failed to load the formatter defined at #{path}"
-  puts ex.message
-  exit 1
-end
+formatter = MicroTest.formatters.find { |f| f.short_name == options[:formatter] }
+formatter ||= MicroTest.formatters.find { |f| f.short_name == "default" }
 
 # setup the test runner -------------------------------------------------------
-runner = MicroTest::Runner.new(formatter, options)
+runner = MicroTest::Runner.new(formatter.new, options)
 
 # setup pry -------------------------------------------------------------------
 if options[:pry]

data/lib/micro_test.rb

@@ -1,2 +1,5 @@
-path = File.join(File.dirname(__FILE__), "micro_test", "*.rb")
+path = File.expand_path("../micro_test/*.rb", __FILE__)
+Dir[path].each { |file| require file }
+
+path = File.expand_path("../micro_test/formatters/*.rb", __FILE__)
 Dir[path].each { |file| require file }

data/lib/micro_test/formatters/base_formatter.rb

@@ -2,6 +2,12 @@ require File.join(File.dirname(__FILE__), "..", "color")
 
 module MicroTest
 
+  class << self
+    def formatters
+      @formatters ||= []
+    end
+  end
+
   # The base class for formatters.
   # Defines the API that formatters can/should implement
   # to control test run output.
@@ -9,6 +15,20 @@ module MicroTest
     include MicroTest::Color
     attr_accessor :passed, :failed, :duration
 
+    class << self
+      def inherited(subclass)
+        MicroTest.formatters << subclass
+      end
+
+      def short_name
+        @short_name || name
+      end
+
+      def set_short_name(value)
+        @short_name = value
+      end
+    end
+
     def initialize
       @duration = 0
       @passed = 0

data/lib/micro_test/formatters/default_async_formatter.rb

@@ -0,0 +1,87 @@
+require File.join(File.dirname(__FILE__), "base_formatter")
+
+module MicroTest
+  class DefaultAsyncFormatter < MicroTest::BaseFormatter
+    set_short_name "default_async"
+
+    def after_test(test)
+      test.passed? ? print(green ".") : print(red ".")
+    end
+
+    def after_suite(test_classes)
+      puts
+      test_classes.each do |test_class|
+        print_output_for_test_class test_class
+      end
+      puts
+      puts "".ljust(80, "-")
+      print " #{passed + failed} Tests finished in #{yellow duration} seconds. "
+      totals = []
+      totals << green("#{passed} Passed") if passed > 0
+      totals << red("#{failed} Failed") if failed > 0
+      print "(#{totals.join(", ")})"
+      puts
+      puts
+    end
+
+    private
+
+    def print_output_for_test_class(test_class)
+      puts
+      puts test_class.name.ljust(80, "-")
+      test_class.tests.each do |test|
+        print_output_for_test test
+      end
+    end
+
+    def print_output_for_test(test)
+      return unless test.finished?
+      duration = (test.duration * 10**4).round.to_f / 10**4
+      print yellow("  #{duration.to_s.ljust(6, "0")}")
+
+      if test.passed?
+        print green(" #{test.desc}")
+      else
+        print_test_failure test
+      end
+
+      puts
+    end
+
+    def print_test_failure(test)
+      puts red(" #{test.desc}")
+      test.failed_asserts.each do |assert|
+        print_assert_failure assert
+      end
+    end
+
+    def print_assert_failure(assert)
+      puts
+      print "".ljust(9)
+      puts "#{assert[:file_path]}:#{red(assert[:line_num])}"
+      puts "".ljust(9) + "".rjust(71, "-")
+      index = assert[:line_num] - 1
+      start = index - 2
+      start = 0 if start <= 0
+      finish = index + 2
+      finish = assert[:lines].length - 1 if finish >= assert[:lines].length
+      print_assert_failure_lines assert, start, finish
+    end
+
+    def print_assert_failure_lines(assert, start, finish)
+      (start..finish).each do |i|
+        print "".ljust(9)
+        if i == index
+          print red((i + 1).to_s.rjust(3, "0"))
+          print red("|")
+          print red(assert[:lines][i])
+        else
+          print (i + 1).to_s.rjust(3, "0")
+          print "|"
+          print assert[:lines][i]
+        end
+      end
+    end
+
+  end
+end

data/lib/micro_test/formatters/default_formatter.rb

@@ -0,0 +1,89 @@
+require File.join(File.dirname(__FILE__), "base_formatter")
+
+module MicroTest
+  class DefaultFormatter < MicroTest::BaseFormatter
+    set_short_name "default"
+
+    def before_class(test_class)
+      puts
+      print_with_line test_class.name
+    end
+
+    def after_test(test)
+      duration = (test.duration * 10**4).round.to_f / 10**4
+      color = duration < 0.01 ? :yellow : :red
+      print send(color, "  #{duration.to_s.ljust(6, "0")}")
+
+      if test.passed?
+        print green(" #{test.desc}")
+      else
+        print_test_failure test
+      end
+
+      puts
+    end
+
+    def after_suite(test_classes)
+      puts
+      print_line
+      print_totals
+      puts " in #{yellow duration} seconds."
+      print_line
+      puts
+      puts
+    end
+
+    private
+
+    def print_with_line(value)
+      puts "#{value} ".ljust(80, "-")
+    end
+
+    def print_line
+      puts "".ljust(80, "-")
+    end
+
+    def print_totals
+      totals = []
+      totals << green("#{passed} Passed") if passed > 0
+      totals << red("#{failed} Failed") if failed > 0
+      print totals.join(", ")
+    end
+
+    def print_test_failure(test)
+      puts red(" #{test.desc}")
+      test.failed_asserts.each do |assert|
+        print_assert_failure assert
+      end
+    end
+
+    def print_assert_failure(assert)
+      puts
+      print "".ljust(9)
+      puts "#{assert[:file_path]}:#{red(assert[:line_num])}"
+      puts "".ljust(9) + "".rjust(71, "-")
+      index = assert[:line_num] - 1
+      start = index - 2
+      start = 0 if start <= 0
+      finish = index + 2
+      finish = assert[:lines].length - 1 if finish >= assert[:lines].length
+      print_assert_failure_lines assert, start, finish
+    end
+
+    def print_assert_failure_lines(assert, start, finish)
+      (start..finish).each do |i|
+        print "".ljust(9)
+        if i == index
+          print red((i + 1).to_s.rjust(3, "0"))
+          print red("|")
+          print red(assert[:lines][i])
+        else
+          print (i + 1).to_s.rjust(3, "0")
+          print "|"
+          print assert[:lines][i]
+        end
+      end
+    end
+
+  end
+end

data/lib/micro_test/formatters/{doc.rb → doc_formatter.rb}

@@ -1,7 +1,8 @@
 require File.join(File.dirname(__FILE__), "base_formatter")
 
 module MicroTest
-  class Formatter < MicroTest::BaseFormatter
+  class DocFormatter < MicroTest::BaseFormatter
+    set_short_name "doc"
 
     def initialize
       @failures = []

data/lib/micro_test/formatters/{dots.rb → dots_formatter.rb}

@@ -1,7 +1,8 @@
 require File.join(File.dirname(__FILE__), "base_formatter")
 
 module MicroTest
-  class Formatter < MicroTest::BaseFormatter
+  class DotsFormatter < MicroTest::BaseFormatter
+    set_short_name "dots"
 
     def after_test(test)
       print(test.passed? ? green(".") : red("."))

data/lib/micro_test/formatters/{min.rb → min_formatter.rb}

@@ -1,7 +1,8 @@
 require File.join(File.dirname(__FILE__), "base_formatter")
 
 module MicroTest
-  class Formatter < MicroTest::BaseFormatter
+  class MinFormatter < MicroTest::BaseFormatter
+    set_short_name "min"
 
     def after_suite(test_classes)
       puts

data/lib/micro_test/version.rb

@@ -1,3 +1,3 @@
 module MicroTest
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/runner_test.rb

@@ -2,7 +2,7 @@ unless ENV["MT_DEMO"]
   class TestRunner < MicroTest::Test
 
     before do
-      @runner = MicroTest::Runner.new(MicroTest::Formatter.new)
+      @runner = MicroTest::Runner.new(MicroTest::DefaultFormatter.new)
     end
 
     test ".running" do

data/test/test_test.rb

@@ -2,9 +2,10 @@ unless ENV["MT_DEMO"]
   class TestTest < MicroTest::Test
 
     before do
-      TestTest.instance_eval { @subclasses = [] }
-      TestTest.instance_eval { @tests = [] }
-      @Example = Class.new(TestTest) do
+      @test_test = TestTest.clone
+      @test_test.instance_eval { @subclasses = [] }
+      @test_test.instance_eval { @tests = [] }
+      @Example = Class.new(@test_test) do
         before {}
         after {}
         test("truth") { assert true }
@@ -14,14 +15,14 @@ unless ENV["MT_DEMO"]
     end
 
     test "adds subclass" do
-      assert TestTest.subclasses.length == 1
-      assert TestTest.subclasses[0] == @Example
+      assert @test_test.subclasses.length == 1
+      assert @test_test.subclasses[0] == @Example
     end
 
     test "stores subclasses" do
-      assert TestTest.subclasses.is_a?(Array)
-      assert TestTest.subclasses.length == 1
-      assert TestTest.subclasses.first == @Example
+      assert @test_test.subclasses.is_a?(Array)
+      assert @test_test.subclasses.length == 1
+      assert @test_test.subclasses.first == @Example
     end
 
     test "stores tests" do
@@ -32,8 +33,8 @@ unless ENV["MT_DEMO"]
 
     test "stores files" do
       file = __FILE__
-      assert TestTest.files[file].is_a?(Array)
-      assert TestTest.files[file].select{ |l| l.start_with?("      assert TestTest.files[file].select{ |l| l.start_with?(") }.length > 0
+      assert @test_test.files[file].is_a?(Array)
+      assert @test_test.files[file].select{ |l| l.start_with?("      assert @test_test.files[file].select{ |l| l.start_with?(") }.length > 0
     end
 
     test ".reset" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micro_test
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Nathan Hopkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: os
@@ -51,11 +51,11 @@ files:
 - ext/mkrf_conf.rb
 - lib/micro_test/color.rb
 - lib/micro_test/formatters/base_formatter.rb
-- lib/micro_test/formatters/doc.rb
-- lib/micro_test/formatters/dots.rb
-- lib/micro_test/formatters/min.rb
-- lib/micro_test/formatters/mt.rb
-- lib/micro_test/formatters/mt_async.rb
+- lib/micro_test/formatters/default_async_formatter.rb
+- lib/micro_test/formatters/default_formatter.rb
+- lib/micro_test/formatters/doc_formatter.rb
+- lib/micro_test/formatters/dots_formatter.rb
+- lib/micro_test/formatters/min_formatter.rb
 - lib/micro_test/runner.rb
 - lib/micro_test/test.rb
 - lib/micro_test/test_wrapper.rb
@@ -69,7 +69,7 @@ files:
 - test/runner_test.rb
 - test/test_test.rb
 - test/test_wrapper_test.rb
-homepage: http://hopsoft.github.com/micro_test/
+homepage: https://github.com/hopsoft/micro_test
 licenses:
 - MIT
 metadata: {}
@@ -102,3 +102,4 @@ test_files:
 - test/runner_test.rb
 - test/test_test.rb
 - test/test_wrapper_test.rb
+has_rdoc: 

data/lib/micro_test/formatters/mt.rb

@@ -1,63 +0,0 @@
-require File.join(File.dirname(__FILE__), "base_formatter")
-
-module MicroTest
-  class Formatter < MicroTest::BaseFormatter
-    def before_class(test_class)
-      puts
-      puts test_class.name.ljust(80, "-")
-    end
-
-    def after_test(test)
-      duration = (test.duration * 10**4).round.to_f / 10**4
-      if duration < 0.01
-        print yellow("  #{duration.to_s.ljust(6, "0")}")
-      else
-        print red("  #{duration.to_s.ljust(6, "0")}")
-      end
-
-      if test.passed?
-        print green(" #{test.desc}")
-      else
-        puts red(" #{test.desc}")
-        test.failed_asserts.each do |assert|
-          puts
-          print "".ljust(9)
-          puts "#{assert[:file_path]}:#{red(assert[:line_num])}"
-          puts "".ljust(9) + "".rjust(71, "-")
-          index = assert[:line_num] - 1
-          start = index - 2
-          start = 0 if start <= 0
-          finish = index + 2
-          finish = assert[:lines].length - 1 if finish >= assert[:lines].length
-          (start..finish).each do |i|
-            print "".ljust(9)
-            if i == index
-              print red((i + 1).to_s.rjust(3, "0"))
-              print red("|")
-              print red(assert[:lines][i])
-            else
-              print (i + 1).to_s.rjust(3, "0")
-              print "|"
-              print assert[:lines][i]
-            end
-          end
-        end
-      end
-
-      puts
-    end
-
-    def after_suite(test_classes)
-      puts
-      puts "".ljust(80, "-")
-      print " #{passed + failed} Tests finished in #{yellow duration} seconds. "
-      totals = []
-      totals << green("#{passed} Passed") if passed > 0
-      totals << red("#{failed} Failed") if failed > 0
-      print "(#{totals.join(", ")})"
-      puts
-      puts
-    end
-
-  end
-end

data/lib/micro_test/formatters/mt_async.rb

@@ -1,67 +0,0 @@
-require File.join(File.dirname(__FILE__), "base_formatter")
-
-module MicroTest
-  class Formatter < MicroTest::BaseFormatter
-
-    def after_test(test)
-      test.passed? ? print(green ".") : print(red ".")
-    end
-
-    def after_suite(test_classes)
-      puts
-
-      test_classes.each do |test_class|
-        puts
-        puts test_class.name.ljust(80, "-")
-
-        test_class.tests.each do |test|
-          next unless test.finished?
-          duration = (test.duration * 10**4).round.to_f / 10**4
-          print yellow("  #{duration.to_s.ljust(6, "0")}")
-
-          if test.passed?
-            print green(" #{test.desc}")
-          else
-            puts red(" #{test.desc}")
-            test.failed_asserts.each do |assert|
-              puts
-              print "".ljust(9)
-              puts "#{assert[:file_path]}:#{red(assert[:line_num])}"
-              puts "".ljust(9) + "".rjust(71, "-")
-              index = assert[:line_num] - 1
-              start = index - 2
-              start = 0 if start <= 0
-              finish = index + 2
-              finish = assert[:lines].length - 1 if finish >= assert[:lines].length
-              (start..finish).each do |i|
-                print "".ljust(9)
-                if i == index
-                  print red((i + 1).to_s.rjust(3, "0"))
-                  print red("|")
-                  print red(assert[:lines][i])
-                else
-                  print (i + 1).to_s.rjust(3, "0")
-                  print "|"
-                  print assert[:lines][i]
-                end
-              end
-            end
-          end
-
-          puts
-        end
-      end
-
-      puts
-      puts "".ljust(80, "-")
-      print " #{passed + failed} Tests finished in #{yellow duration} seconds. "
-      totals = []
-      totals << green("#{passed} Passed") if passed > 0
-      totals << red("#{failed} Failed") if failed > 0
-      print "(#{totals.join(", ")})"
-      puts
-      puts
-    end
-
-  end
-end