tet 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2de0d206de213821dee31d262b4fe42fce252ec
-  data.tar.gz: 89d73965972497b3b25fe0991cb81311dff1ce6d
+  metadata.gz: 449cdabbdb6add0195f4e4c6741f9a6ca2e491b8
+  data.tar.gz: 56a1ca4040f22d3c406084a494f05c935555c541
 SHA512:
-  metadata.gz: 67ff1d3932a9f0c12b25f9c98d6abe18502ceb2ae8961c58c7b59bc2c09812b8a56d591a119815f51d23aee376d7100671047af4288cd2c4a16b9bf2971ac55d
-  data.tar.gz: 4426a2c64c71c5b14709b059c3486cfec984d059a7d860561a1f6dcef07a51803352dbb9365000077839787fc1f126614e81fac2ca79011b8b077b649b274564
+  metadata.gz: 52e770323c5aba08b74b57ce5bc059de674f9d1dd23d491901d2eedd5910ea1b322733d6fd413ee7eb554984659bd80286c289f73d07fdcb68cd38624d55ea22
+  data.tar.gz: 0d3e1b923b7292cff3c613fe5697e26561f9200efd801dd5836ab98834891406f43b4903ce7665ab4a7e5e09363ccf012849ba29cd99b969e94304ed7b9f6513

data/lib/tests.rb

@@ -23,11 +23,11 @@ at_exit do
 end
 
 def total_fails
-  Tet.data[:fails] - Tet.data[:errs]
+  Tet.fail_count - Tet.err_count
 end
 
 def total_errs
-  Tet.data[:errs]
+  Tet.err_count
 end
 
 # Wraps the block in a group to label it as an example instead of a real test.
@@ -61,16 +61,21 @@ group "#assert" do
 
   should_fail { assert("falsy blocks fail") { nil } }
   should_err { assert("errors are caught and count as failures") { not_a_method } }
+  should_fail { assert("empty assertions fail") {} }
 
-  assert("passing returns true") { true }.equal?(true)
+  assert("passing returns true") {  assert { true }.equal?(true) }
 
   should_fail { assert("failing returns false") { nil }.equal?(false) }
-  should_fail { assert("Can have a name") { nil } }
 end
 
 group "#group" do
   assert "returns output of block" do
-    group("EXAMPLE") { "example ouput" } == "example ouput"
+    result = group("EXAMPLE") do
+               assert("EXAMPLE") { true }
+               "example output"
+             end
+
+      result == "example output"
   end
 
   return_value = should_err { group { raise "Example Error" } }
@@ -79,6 +84,10 @@ group "#group" do
     return_value.nil?
   end
 
+  group 'fails when empty' do
+    should_fail { group { } }
+  end
+
   group "can have classes for names" do
     group String do
       should_fail { assert { false } }
@@ -90,19 +99,21 @@ group "#err" do
   group "passes when there is an error" do
     err { not_a_method }
 
-    assert "... and returns true" do
+    assert "and returns true" do
       err { not_a_method }.equal?(true)
     end
   end
 
+  should_fail { err("empty assertions fail") {} }
+
   group "allows you to specify an exception class" do
     err(expect: NameError) { not_a_method }
 
-    group "... or a parent exception class" do
+    group "or a parent exception class" do
       err(expect: Exception) { not_a_method }
     end
 
-    assert "... and returns true" do
+    assert "and returns true" do
       err(expect: NameError) { not_a_method }.equal?(true)
     end
   end
@@ -110,15 +121,15 @@ group "#err" do
   group "fails when there is no error" do
     should_fail { err { 1+1 } }
 
-    assert "... and returns false" do
+    assert "and returns false" do
       should_fail { err { 1+1 } }.equal?(false)
     end
   end
 
-  group "ail sgiven wrong error class" do
+  group "fails given wrong error class" do
     should_fail { err(expect: ArgumentError) { not_a_method } }
 
-    assert "... and returns false" do
+    assert "and returns false" do
       should_fail { err(expect: ArgumentError) { not_a_method } }.equal?(false)
     end
   end

data/lib/tet.rb

@@ -7,7 +7,10 @@
 
 # Label all tests within a block.
 def group name = nil
+  before = Tet.test_count
+
   Tet.in_group(name) { yield }
+     .tap { Tet.fail "EMPTY GROUP" if Tet.test_count == before }
 end
 
 # Declare that a block will return a truthy value.
@@ -56,26 +59,25 @@ end
 
 # A namespace for all of the helper methods.
 module Tet
-  PassChar       = "."
-  FailChar       = "F"
-  ErrorChar      = "!"
-  GroupSeperator = "  |  "
+  PassChar  = "."
+  FailChar  = "F"
+  ErrorChar = "!"
+  Indent    = "    "
 
+  @messages      = []
   @current_group = []
-  @data          = {
-                     messages: [],
-                     tests:    0,
-                     fails:    0,
-                     errs:     0
-                   }
+  @test_count    = 0
+  @fail_count    = 0
+  @err_count     = 0
 
   class << self
-    attr_reader :data
+    attr_reader :messages, :test_count, :fail_count, :err_count
 
     # Store the group name for the duration of calling the given block.
     def in_group name
       result = nil
-      @current_group.push(name) if name
+
+      @current_group << name.to_s if name
 
       begin
         result = yield
@@ -84,6 +86,7 @@ module Tet
       end
 
       @current_group.pop if name
+
       result
     end
 
@@ -91,22 +94,35 @@ module Tet
     def pass
       print PassChar
 
-      @data[:tests] += 1
+      @test_count += 1
     end
 
     # Log a failing test.
     def fail *messeges, letter: FailChar
       print letter
 
-      @data[:tests] += 1
-      @data[:fails] += 1
+      @test_count += 1
+      @fail_count += 1
+
+      group   = @current_group.dup
+      section = @messages
 
-      @data[:messages] << @current_group.join(GroupSeperator) << messeges
+      until group.empty? || group.first != section[-2]
+        group.shift
+        section = section.last
+      end
+
+      until group.empty?
+        section << group.shift << []
+        section = section.last
+      end
+
+      section.concat(messeges)
     end
 
     # Log an error.
     def error error_object, *messages
-      @data[:errs] += 1
+      @err_count += 1
       fail *messages, *format_error(error_object), letter: ErrorChar
     end
 
@@ -117,15 +133,23 @@ module Tet
 
     # Print stats and messages for all the failing tests.
     def render_result
-      puts "\n" unless @data[:tests] == 0
+      puts "\n" unless @test_count.zero?
+
+      print "#{plural @test_count, 'result'}, "
 
-      if @data[:fails] + @data[:errs] == 0
-        puts "all #{@data[:tests]} tests passed"
+      if (@fail_count + @err_count).zero?
+        print "suite passed!"
       else
-        puts "#{@data[:fails]} fails including #{@data[:errs]} errors"
+        print "#{plural @fail_count, 'fail'}"
+        print " (including #{plural @err_count, 'error'})" unless @err_count.zero?
       end
 
-      puts indent(@data[:messages])
+      print "\n"
+
+      unless @messages.empty?
+        puts "\nFailed tests:"
+        puts indent(@messages)
+      end
     end
 
     private
@@ -134,7 +158,10 @@ module Tet
     def format_error error_object
       [
         "ERROR: #{error_object.class}",
-        ["#{error_object.message}", error_object.backtrace]
+        [
+          "#{error_object.message}",
+          error_object.backtrace
+        ]
       ]
     end
 
@@ -143,13 +170,17 @@ module Tet
     def indent input, amount = 0
       case input
       when String
-        input.gsub(/^/, "  " * amount)
+        input.gsub(/^/, Indent * amount)
       when Array
         input.reject(&:empty?)
              .map { |part| indent(part, amount + 1) }
              .join("\n")
       end
     end
+
+    def plural amount, name
+      "#{amount} #{name}#{amount != 1 ? "s" : ""}"
+    end
   end
 
   at_exit { Tet.render_result }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tet
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Colin Fulton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-05 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies: []
 description: A very minimal test framework designed for simple projects. A couple
   of features, relatively nice looking output, and nothing else. Does the world need