minitest_log 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 236b57c783822edbb9a07679686b08149677797e5a7a047ec73fc093185fb1ba
-  data.tar.gz: 868cc374fad37e8da78356faa0a8d637203132964c47c8ad6b6af6d572175772
+  metadata.gz: 2f0a05214c679b2851776f4f5cabea520b673112759f45cb7bf8788a50887361
+  data.tar.gz: 1c83fcd0f14dfe379bb76a384a46369862c1be5016b24ff889edf5ef025943ce
 SHA512:
-  metadata.gz: a671ea26b34d7aa17791d9bdef45c0162bc5bd21f1645b47ee100ff1ebfe31e4f9e8f78aecd107453e425864600f98c86f306e78cf721e6ed7ce4a39443f3eb0
-  data.tar.gz: 07caf2ac34f7ef71875eb9167a4b55b3107004665f118d3b563b153c11f21d3b4441510b918cd199d6c60b1c19cdc070e63e31f562b935f099a7fd96229141ac
+  metadata.gz: 13f1b174112581541efdc28a8747914f4a426d7c6251f7e1d3f1e69755efe14dc405647bead3ac39a7a1e2f8e62f59593fbc82398dafb65dd05188a4c47e11a6
+  data.tar.gz: 57f373a87eb5a6a5479d18be5ec02466ed6b0e6bf31fb1befa53adcf8de21530dfe64be6acd4c6ac85b39f6b40c441fb336f14ae5284218e3ce153cbd67c8dae

data/.gitignore

@@ -1,2 +1,4 @@
 /.idea
 /pkg/
+/test/actual/
+

data/Gemfile.lock

@@ -1,26 +1,26 @@
-PATH
-  remote: .
-  specs:
-    minitest_log (1.0.0)
-      diff-lcs (~> 1.3)
-      minitest (~> 5.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    markdown_helper (2.1.0)
-    minitest (5.11.3)
-    rake (10.5.0)
-
-PLATFORMS
-  x64-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.7)
-  markdown_helper (~> 2.0)
-  minitest_log!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.17.3
+PATH
+  remote: .
+  specs:
+    minitest_log (1.0.1)
+      diff-lcs (~> 1.3)
+      minitest (~> 5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    markdown_helper (2.1.0)
+    minitest (5.11.3)
+    rake (10.5.0)
+
+PLATFORMS
+  x64-mingw32
+
+DEPENDENCIES
+  bundler (~> 1.7)
+  markdown_helper (~> 2.0)
+  minitest_log!
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.17.3

data/README.md

@@ -286,13 +286,13 @@ end
 ```log.xml```:
 ```xml
 <log>
-  <section_ name='My section with timestamp' timestamp='2019-05-09-Thu-10.32.53.066'>
+  <section_ name='My section with timestamp' timestamp='2019-06-01-Sat-15.07.07.469'>
     Section with timestamp.
   </section_>
-  <section_ name='My section with duration' duration_seconds='0.501'>
+  <section_ name='My section with duration' duration_seconds='0.503'>
     Section with duration.
   </section_>
-  <section_ name='My section with both' timestamp='2019-05-09-Thu-10.32.53.568' duration_seconds='0.501'>
+  <section_ name='My section with both' timestamp='2019-06-01-Sat-15.07.07.974' duration_seconds='0.514'>
     Section with both.
   </section_>
 </log>
@@ -364,7 +364,7 @@ end
 ```xml
 <log>
   <section_ name='My unrescued section'>
-    <uncaught_exception_ timestamp='2019-05-09-Thu-10.32.54.471' class='RuntimeError'>
+    <uncaught_exception_ timestamp='2019-06-01-Sat-15.07.08.960' class='RuntimeError'>
       <message_>
         Boo!
       </message_>
@@ -421,7 +421,7 @@ end
 ```log.xml```:
 ```xml
 <log>
-  <section_ name='Section with potpourri of arguments' a='0' b='1' timestamp='2019-05-09-Thu-10.32.51.426' c='2' d='3' duration_seconds='0.501'>
+  <section_ name='Section with potpourri of arguments' a='0' b='1' timestamp='2019-06-01-Sat-15.07.05.791' c='2' d='3' duration_seconds='0.513'>
     Word More words
     <rescued_exception_ class='Exception' message='Boo!'>
       <backtrace_>
@@ -824,7 +824,7 @@ error_verdict.rb:9:in `test_demo'
   <verdict_ method='verdict_assert_equal?' outcome='failed' id='error_count'>
     <expected_ class='Integer' value='0'/>
     <actual_ class='Integer' value='1'/>
-    <exception_ class='Minitest::Assertion' message='Expected: 0'>
+    <exception_ class='Minitest::Assertion' message='Expected: 0\n  Actual: 1'>
       <backtrace_>
         <![CDATA[
 error_verdict.rb:9:in `new'
@@ -860,7 +860,7 @@ end
 ```default_backtrace_filter.xml```:
 ```xml
 <log>
-  <uncaught_exception_ timestamp='2019-05-09-Thu-10.32.49.597' class='RuntimeError'>
+  <uncaught_exception_ timestamp='2019-06-01-Sat-15.07.03.608' class='RuntimeError'>
     <message_>
       Boo!
     </message_>
@@ -878,14 +878,16 @@ backtrace_filter.rb:4:in `test_demo'
 ```custom_backtrace_filter.xml```:
 ```xml
 <log>
-  <uncaught_exception_ timestamp='2019-05-09-Thu-10.32.49.599' class='RuntimeError'>
+  <uncaught_exception_ timestamp='2019-06-01-Sat-15.07.03.610' class='RuntimeError'>
     <message_>
       Boo!
     </message_>
     <backtrace_>
       <![CDATA[
 backtrace_filter.rb:8:in `block in test_demo'
-C:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest_log-0.2.0/lib/minitest_log.rb:59:in `initialize'
+C:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest_log-1.0.0/lib/minitest_log.rb:39:in `block in initialize'
+C:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest_log-1.0.0/lib/minitest_log.rb:186:in `do_log'
+C:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest_log-1.0.0/lib/minitest_log.rb:37:in `initialize'
 backtrace_filter.rb:7:in `new'
 backtrace_filter.rb:7:in `test_demo'
 C:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest-5.11.3/lib/minitest/test.rb:98:in `block (3 levels) in run'
@@ -1113,7 +1115,7 @@ end
       (?-mix:Bar)
     </data_>
     <data_ name='My time' class='Time' method=':to_s'>
-      2019-05-09 10:32:47 -0500
+      2019-06-01 15:07:01 -0500
     </data_>
     <data_ name='My uri,' class='URI::HTTPS' method=':to_s'>
       https://www.github.com
@@ -1286,7 +1288,7 @@ end
   <verdict_ method='verdict_assert_equal?' outcome='failed' id='another_id' message='Another message'>
     <expected_ class='Integer' value='0'/>
     <actual_ class='Integer' value='1'/>
-    <exception_ class='Minitest::Assertion' message='Expected: 0'>
+    <exception_ class='Minitest::Assertion' message='Expected: 0\n  Actual: 1'>
       <backtrace_>
         <![CDATA[
 verdict_assert_equal.rb:6:in `block in test_demo_verdict'
@@ -1470,7 +1472,7 @@ end
   <verdict_ method='verdict_assert_instance_of?' outcome='failed' id='another_id' message='another message'>
     <expected_ class='Class' value='Integer'/>
     <actual_ class='String' value='&quot;my_string&quot;'/>
-    <exception_ class='Minitest::Assertion' message='Expected &quot;my_string&quot; to be an instance of Integer, not String.'>
+    <exception_ class='Minitest::Assertion' message='Expected # encoding: UTF-8\n&quot;my_string&quot; to be an instance of Integer, not String.'>
       <backtrace_>
         <![CDATA[
 verdict_assert_instance_of.rb:6:in `block in test_demo_verdict'
@@ -1560,7 +1562,7 @@ end
   <verdict_ method='verdict_assert_match?' outcome='failed' id='another_id' message='Another message'>
     <expected_ class='Regexp' value='/foo/'/>
     <actual_ class='String' value='&quot;feed&quot;'/>
-    <exception_ class='Minitest::Assertion' message='Expected /foo/ to match &quot;feed&quot;.'>
+    <exception_ class='Minitest::Assertion' message='Expected /foo/ to match # encoding: UTF-8\n&quot;feed&quot;.'>
       <backtrace_>
         <![CDATA[
 verdict_assert_match.rb:6:in `block in test_demo_verdict'
@@ -1703,7 +1705,7 @@ end
   <verdict_ method='verdict_assert_output?' outcome='failed' id='another_id'>
     <stdout_ class='String' value='&quot;Bar&quot;'/>
     <stderr_ class='String' value='&quot;Foo&quot;'/>
-    <exception_ class='Minitest::Assertion' message='In stderr.'>
+    <exception_ class='Minitest::Assertion' message='In stderr.\n--- expected\n+++ actual\n@@ -1,2 +1 @@\n-# encoding: UTF-8\n-&quot;Foo&quot;\n+&quot;Bar&quot;\n'>
       <backtrace_>
         <![CDATA[
 verdict_assert_output.rb:9:in `block in test_demo_verdict'
@@ -1748,7 +1750,7 @@ end
   <verdict_ method='verdict_assert_predicate?' outcome='failed' id='another_id' message='Another message'>
     <object_ class='String' value='&quot;x&quot;'/>
     <operator_ class='Symbol' value=':empty?'/>
-    <exception_ class='Minitest::Assertion' message='Expected &quot;x&quot; to be empty?.'>
+    <exception_ class='Minitest::Assertion' message='Expected # encoding: UTF-8\n&quot;x&quot; to be empty?.'>
       <backtrace_>
         <![CDATA[
 verdict_assert_predicate.rb:6:in `block in test_demo_verdict'
@@ -1795,7 +1797,7 @@ end
   </verdict_>
   <verdict_ method='verdict_assert_raises?' outcome='failed' id='another_id' message='Another message'>
     <error_class_ class='Class' value='RuntimeError'/>
-    <exception_ class='Minitest::Assertion' message='[RuntimeError] exception expected, not'>
+    <exception_ class='Minitest::Assertion' message='[RuntimeError] exception expected, not\nClass: &lt;Exception&gt;\nMessage: &lt;&quot;Boo!&quot;&gt;\n---Backtrace---\nverdict_assert_raises.rb:9:in `block (2 levels) in test_demo_verdict&apos;\nC:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest_log-1.0.0/lib/verdict_assertion.rb:260:in `block in verdict_assert_raises?&apos;\nC:/Ruby25-x64/lib/ruby/gems/2.5.0/gems/minitest_log-1.0.0/lib/verdict_assertion.rb:272:in `block in _verdict_raises?&apos;\n---------------'>
       <backtrace_>
         <![CDATA[
 verdict_assert_raises.rb:8:in `block in test_demo_verdict'
@@ -1885,7 +1887,7 @@ end
   <verdict_ method='verdict_assert_same?' outcome='failed' id='another_id' message='Another message'>
     <expected_ class='String' value='&quot;foo&quot;'/>
     <actual_ class='String' value='&quot;foo&quot;'/>
-    <exception_ class='Minitest::Assertion' message='Expected &quot;foo&quot; (oid=27933780) to be the same as &quot;foo&quot; (oid=27933800).'>
+    <exception_ class='Minitest::Assertion' message='Expected # encoding: UTF-8\n&quot;foo&quot; (oid=28462120) to be the same as # encoding: UTF-8\n&quot;foo&quot; (oid=28462140).'>
       <backtrace_>
         <![CDATA[
 verdict_assert_same.rb:6:in `block in test_demo_verdict'
@@ -1928,7 +1930,7 @@ end
 <log>
   <verdict_ method='verdict_assert_silent?' outcome='passed' id='one_id'/>
   <verdict_ method='verdict_assert_silent?' outcome='failed' id='another_id'>
-    <exception_ class='Minitest::Assertion' message='In stdout.'>
+    <exception_ class='Minitest::Assertion' message='In stdout.\n--- expected\n+++ actual\n@@ -1,2 +1 @@\n-# encoding: UTF-8\n-&quot;&quot;\n+&quot;Foo&quot;\n'>
       <backtrace_>
         <![CDATA[
 verdict_assert_silent.rb:7:in `block in test_demo_verdict'
@@ -2294,7 +2296,7 @@ end
   <verdict_ method='verdict_refute_instance_of?' outcome='failed' id='another_id' message='another message'>
     <expected_ class='Class' value='String'/>
     <actual_ class='String' value='&quot;my_string&quot;'/>
-    <exception_ class='Minitest::Assertion' message='Expected &quot;my_string&quot; to not be an instance of String.'>
+    <exception_ class='Minitest::Assertion' message='Expected # encoding: UTF-8\n&quot;my_string&quot; to not be an instance of String.'>
       <backtrace_>
         <![CDATA[
 verdict_refute_instance_of.rb:6:in `block in test_demo_verdict'
@@ -2384,7 +2386,7 @@ end
   <verdict_ method='verdict_refute_match?' outcome='failed' id='another_id' message='Another message'>
     <expected_ class='Regexp' value='/foo/'/>
     <actual_ class='String' value='&quot;food&quot;'/>
-    <exception_ class='Minitest::Assertion' message='Expected /foo/ to not match &quot;food&quot;.'>
+    <exception_ class='Minitest::Assertion' message='Expected /foo/ to not match # encoding: UTF-8\n&quot;food&quot;.'>
       <backtrace_>
         <![CDATA[
 verdict_refute_match.rb:6:in `block in test_demo_verdict'
@@ -2519,7 +2521,7 @@ end
   <verdict_ method='verdict_refute_predicate?' outcome='failed' id='another_id' message='Another message'>
     <object_ class='String' value='&quot;&quot;'/>
     <operator_ class='Symbol' value=':empty?'/>
-    <exception_ class='Minitest::Assertion' message='Expected &quot;&quot; to not be empty?.'>
+    <exception_ class='Minitest::Assertion' message='Expected # encoding: UTF-8\n&quot;&quot; to not be empty?.'>
       <backtrace_>
         <![CDATA[
 verdict_refute_predicate.rb:6:in `block in test_demo_verdict'

data/lib/minitest_assertions_patch.rb

@@ -0,0 +1,9 @@
+module Minitest
+  module Assertions
+    # Minitest uses a platform-dependent program for diff.
+    # Here, we already have diff-lcs available, so always use that.
+    def self.diff
+      'ldiff -u 0'
+    end
+  end
+end

data/lib/minitest_log.rb

@@ -4,9 +4,12 @@ require 'minitest/assertions'
 require 'diff/lcs'
 
 require_relative 'verdict_assertion'
+require_relative 'minitest_assertions_patch'
 
 class MinitestLog
 
+  include REXML
+  include Minitest::Assertions
   include VerdictAssertion
 
   attr_accessor \
@@ -21,9 +24,6 @@ class MinitestLog
     :error_verdict,
     :summary
 
-  include REXML
-  include Minitest::Assertions
-
   class MinitestLogError < Exception; end
   class NoBlockError < MinitestLogError; end
   class DuplicateVerdictIdError < MinitestLogError; end
@@ -32,42 +32,16 @@ class MinitestLog
 
   def initialize(file_path, options=Hash.new)
     raise NoBlockError.new('No block given for MinitestLog#new.') unless (block_given?)
-    default_options = Hash[
-        :root_name => 'log',
-        :xml_indentation => 2,
-        :error_verdict => false,
-        :summary => false
-    ]
-    options = default_options.merge(options)
-    self.assertions = 0
     self.file_path = file_path
-    self.root_name = options[:root_name]
-    self.xml_indentation = options[:xml_indentation]
-    self.summary = options[:summary]
-    self.error_verdict = options[:error_verdict] || false
-    self.backtrace_filter = options[:backtrace_filter] || /minitest/
-    self.file = File.open(self.file_path, 'w')
-    log_puts("REMARK\tThis text log is the precursor for an XML log.")
-    log_puts("REMARK\tIf the logged process completes, this text will be converted to XML.")
-    log_puts("BEGIN\t#{self.root_name}")
-    self.counts = Hash[
-        :verdict => 0,
-        :failure => 0,
-        :error => 0,
-    ]
-    begin
-      yield self
-    rescue => x
-      put_element('uncaught_exception', :timestamp, :class => x.class) do
-        put_element('message', x.message)
-        put_element('backtrace') do
-          backtrace = filter_backtrace(x.backtrace)
-          put_pre(backtrace.join("\n"))
-        end
+    handle_options(options)
+    do_log do
+      begin
+        yield self
+      rescue => x
+        handle_exception(x)
       end
     end
-    dispose
-    nil
+    create_xml_log
   end
 
   def section(name, *args)
@@ -90,78 +64,12 @@ class MinitestLog
   end
 
   def put_element(element_name = 'element', *args)
-    if false ||
-        caller[0].match(/minitest_log.rb/) ||
-        caller[0].match(/verdict_assertion.rb/)
-      # Make the element name special.
-      element_name += '_'
-    elsif element_name.end_with?('_')
-      # Don't accept user's special.
-      message = "Element name should not end with underscore: #{element_name}"
-      raise IllegalElementNameError.new(message)
-    else
-      # Ok.
-    end
-    attributes = {}
-    pcdata = ''
-    start_time = nil
-    duration_to_be_included = false
-    block_to_be_rescued = false
-    args.each do |arg|
-      case
-      when arg.kind_of?(Hash)
-        attributes.merge!(arg)
-      when arg.kind_of?(String)
-        pcdata += arg
-      when arg == :timestamp
-        attributes[:timestamp] = MinitestLog.timestamp
-      when arg == :duration
-        duration_to_be_included = true
-      when arg == :rescue
-        block_to_be_rescued = true
-      else
-        pcdata = pcdata + arg.inspect
-      end
-    end
-    log_puts("BEGIN\t#{element_name}")
-    put_attributes(attributes)
-    unless pcdata.empty?
-      # Guard against using a terminator that's a substring of pcdata.
-      s = 'EOT'
-      terminator = s
-      while pcdata.match(terminator) do
-        terminator += s
-      end
-      log_puts("PCDATA\t<<#{terminator}")
-      log_puts(pcdata)
-      log_puts(terminator)
-    end
-    start_time = Time.new if duration_to_be_included
+    conditioned_element_name = condition_element_name(element_name, caller[0])
     if block_given?
-      if block_to_be_rescued
-        begin
-          yield
-        rescue Exception => x
-          put_element('rescued_exception', {:class => x.class, :message => x.message}) do
-            put_element('backtrace') do
-              backtrace = filter_backtrace(x.backtrace)
-              put_pre(backtrace.join("\n"))
-            end
-          end
-          self.counts[:error] += 1
-        end
-      else
-        yield
-      end
-    end
-    if start_time
-      end_time = Time.now
-      duration_f = end_time.to_f - start_time.to_f
-      duration_s = format('%.3f', duration_f)
-      put_attributes({:duration_seconds => duration_s})
+      Element.new(self, conditioned_element_name, *args, &Proc.new)
+    else
+      Element.new(self, conditioned_element_name, *args)
     end
-    log_puts("END\t#{element_name}")
-    nil
   end
 
   def put_each_with_index(name, obj)
@@ -273,18 +181,34 @@ class MinitestLog
 
   private
 
-  def dispose
+  def do_log
+    begin_log
+    yield
+    end_log
+  end
 
-    # Add a verdict for the error count, if needed.
+  def begin_log
+    self.counts = Hash[
+        :verdict => 0,
+        :failure => 0,
+        :error => 0,
+    ]
+    self.assertions = 0
+    self.file = File.open(self.file_path, 'w')
+    log_puts("REMARK\tThis text log is the precursor for an XML log.")
+    log_puts("REMARK\tIf the logged process completes, this text will be converted to XML.")
+    log_puts("BEGIN\t#{self.root_name}")
+  end
+
+  def end_log
     if self.error_verdict
       verdict_assert_equal?('error_count', 0, self.counts[:error])
     end
-
-    # Close the text log.
     log_puts("END\t#{self.root_name}")
     self.file.close
+  end
 
-    # Create the xml log.
+  def create_xml_log
     document = REXML::Document.new
     File.open(self.file_path, 'r') do |file|
       element = document
@@ -374,10 +298,7 @@ class MinitestLog
       end
       if exception
         self.counts[:failure] += 1
-        # If the encoding is not UTF-8, a string will have been added.
-        # Remove it, so that the message is the same on all platforms.
-        conditioned_message = exception.message.gsub("# encoding: UTF-8\n", '')
-        put_element('exception', {:class => exception.class, :message => conditioned_message}) do
+        put_element('exception', {:class => exception.class, :message => exception.message}) do
           put_element('backtrace') do
             backtrace = filter_backtrace(exception.backtrace)
             put_pre(backtrace.join("\n"))
@@ -392,7 +313,7 @@ class MinitestLog
     attributes.each_pair do |name, value|
       value = case
                 when value.is_a?(String)
-                  value
+                  value.gsub("\n", "\\n")
                 when value.is_a?(Symbol)
                   value.to_s
                 else
@@ -419,19 +340,27 @@ class MinitestLog
     nil
   end
 
-  def put_cdata(text)
+  def put_cdata_or_pcdata(token, text)
     # Guard against using a terminator that's a substring of the cdata.
     s = 'EOT'
     terminator = s
     while text.match(terminator) do
       terminator += s
     end
-    log_puts("CDATA\t<<#{terminator}")
+    log_puts("#{token}\t<<#{terminator}")
     log_puts(text)
     log_puts(terminator)
     nil
   end
 
+  def put_cdata(text)
+    put_cdata_or_pcdata('CDATA', text)
+  end
+
+  def put_pcdata(text)
+    put_cdata_or_pcdata('PCDATA', text)
+  end
+
   def get_assertion_outcome(verdict_id, assertion_method, *assertion_args)
     validate_verdict_id(verdict_id)
     self.counts[:verdict] += 1
@@ -471,8 +400,7 @@ class MinitestLog
     while usec_s.length < 3 do
       usec_s = '0' + usec_s
     end
-    # noinspection RubyUnusedLocalVariable
-    ts += ".#{usec_s}"
+    "#{ts}.#{usec_s}"
   end
 
   def assertion_method_for(verdict_method)
@@ -495,4 +423,160 @@ class MinitestLog
     document
   end
 
+  def condition_element_name(element_name, caller_0)
+    if caller_is_us?(caller_0)
+      conditioned_element_name = element_name + '_'
+    elsif element_name.end_with?('_')
+      message = "Element name should not end with underscore: #{element_name}"
+      raise IllegalElementNameError.new(message)
+    else
+      conditioned_element_name = element_name
+    end
+    conditioned_element_name
+  end
+
+  def caller_is_us?(caller_0)
+    caller_0.match(/minitest_log.rb/) || caller_0.match(/verdict_assertion.rb/)
+  end
+
+  def handle_options(options)
+    default_options = Hash[
+        :root_name => 'log',
+        :xml_indentation => 2,
+        :error_verdict => false,
+        :summary => false
+    ]
+    options = default_options.merge(options)
+    self.root_name = options[:root_name]
+    self.xml_indentation = options[:xml_indentation]
+    self.summary = options[:summary]
+    self.error_verdict = options[:error_verdict] || false
+    self.backtrace_filter = options[:backtrace_filter] || /minitest/
+  end
+
+  def handle_exception(x)
+    put_element('uncaught_exception', :timestamp, :class => x.class) do
+      put_element('message', x.message)
+      put_element('backtrace') do
+        backtrace = filter_backtrace(x.backtrace)
+        put_pre(backtrace.join("\n"))
+      end
+    end
+  end
+
+  class Element
+
+    attr_accessor \
+        :args,
+        :attributes,
+        :block_to_be_rescued,
+        :duration_to_be_included,
+        :element_name,
+        :log,
+        :pcdata,
+        :start_time
+
+    def initialize(log, element_name, *args)
+
+      self.log = log
+      self.element_name = element_name
+      self.args = args
+
+      self.attributes = {}
+      self.block_to_be_rescued = false
+      self.duration_to_be_included = false
+      self.pcdata = ''
+      self.start_time = nil
+
+      process_args
+      put_element do
+        put_attributes
+        put_pcdata
+        do_duration do
+          do_block(&Proc.new) if block_given?
+        end
+      end
+
+    end
+
+    def process_args
+      args.each do |arg|
+        case
+        when arg.kind_of?(Hash)
+          self.attributes.merge!(arg)
+        when arg.kind_of?(String)
+          self.pcdata += arg
+        when arg == :timestamp
+          self.attributes[:timestamp] = MinitestLog.timestamp
+        when arg == :duration
+          self.duration_to_be_included = true
+        when arg == :rescue
+          self.block_to_be_rescued = true
+        else
+          self.pcdata = self.pcdata + arg.inspect
+        end
+      end
+    end
+
+    def put_element
+      log_puts("BEGIN\t#{element_name}")
+      yield
+      log_puts("END\t#{element_name}")
+    end
+
+    def put_attributes
+      log_put_attributes(attributes)
+    end
+
+    def put_pcdata
+      unless pcdata.empty?
+        log.send(:put_pcdata, pcdata)
+      end
+    end
+
+    def do_duration
+      self.start_time = Time.new
+      yield
+      if duration_to_be_included
+        end_time = Time.now
+        duration_f = end_time.to_f - start_time.to_f
+        duration_s = format('%.3f', duration_f)
+        log_put_attributes({:duration_seconds => duration_s})
+      end
+    end
+
+    def do_block
+      if block_to_be_rescued
+        begin
+          yield
+        rescue Exception => x
+          log.put_element('rescued_exception', {:class => x.class, :message => x.message}) do
+            log.put_element('backtrace') do
+              backtrace = log_filter_backtrace(x.backtrace)
+              log.put_pre(backtrace.join("\n"))
+            end
+          end
+          log.counts[:error] += 1
+        end
+      else
+        yield
+      end
+    end
+
+    # The called methods are private.
+
+    def log_puts(s)
+      log.send(:log_puts, s)
+    end
+
+    def log_put_attributes(attributes)
+      log.send(:put_attributes, attributes)
+    end
+
+    def log_filter_backtrace(backtrace)
+      log.send(:filter_backtrace, backtrace)
+    end
+
+  end
+
 end

data/lib/minitest_log/version.rb

@@ -1,3 +1,3 @@
 class MinitestLog
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/minitest_log.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['burdettelamar@yahoo.com']
 
   spec.summary       = %q{Logging for testing with Minitest}
-  spec.description   = "Gem minitest_log uses Minitest, adding structured loging, data explication, and verdicts."
+  spec.description   = "Gem minitest_log uses Minitest, adding structured logging, data explication, and verdicts."
   spec.homepage      = "https://github.com/BurdetteLamar/minitest_log"
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest_log
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Burdette Lamar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: Gem minitest_log uses Minitest, adding structured loging, data explication,
+description: Gem minitest_log uses Minitest, adding structured logging, data explication,
   and verdicts.
 email:
 - burdettelamar@yahoo.com
@@ -99,6 +99,7 @@ files:
 - lib/helpers/array_helper.rb
 - lib/helpers/hash_helper.rb
 - lib/helpers/set_helper.rb
+- lib/minitest_assertions_patch.rb
 - lib/minitest_log.rb
 - lib/minitest_log/version.rb
 - lib/verdict_assertion.rb
@@ -123,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Logging for testing with Minitest