doing 2.1.21 → 2.1.25

data/lib/doing/wwid.rb

@@ -338,6 +338,7 @@ module Doing
     ## @option opt :note [Array] item note (will be converted if value is String)
     ## @option opt :back [Date] backdate
     ## @option opt :timed [Boolean] new item is timed entry, marks previous entry as @done
+    ## @option opt :done [Date] If set, adds a @done tag to new entry
     ##
     def add_item(title, section = nil, opt)
       opt ||= {}
@@ -360,9 +361,18 @@ module Doing
 
       title.compress!
       entry = Item.new(opt[:back], title.strip, section)
+
+      if opt[:done] && entry.should_finish?
+        if entry.should_time?
+          entry.tag('done', value: opt[:done])
+        else
+          entry.tag('done')
+        end
+      end
+
       entry.note = note
 
-      items = @content.dup
+      items = @content.clone
       if opt[:timed]
         items.reverse!
         items.each_with_index do |i, x|
@@ -380,7 +390,8 @@ module Doing
       # logger.count(:added, level: :debug)
       logger.info('New entry:', %(added "#{entry.date.relative_date}: #{entry.title}" to #{section}))
 
-      Hooks.trigger :post_entry_added, self, entry.dup
+      Hooks.trigger :post_entry_added, self, entry
+      entry
     end
 
     ##
@@ -474,6 +485,7 @@ module Doing
     #
     def repeat_item(item, opt)
       opt ||= {}
+      old_item = item.clone
       if item.should_finish?
         if item.should_time?
           finish_date = verify_duration(item.date, Time.now, title: item.title)
@@ -481,7 +493,7 @@ module Doing
         else
           item.title.tag!('done')
         end
-        Hooks.trigger :post_entry_updated, self, item
+        Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
       # Remove @done tag
@@ -651,20 +663,14 @@ module Doing
 
       if items.nil? || items.empty?
         section = opt[:section] ? guess_section(opt[:section]) : 'All'
-        items = section =~ /^all$/i ? @content.dup : @content.in_section(section)
+        items = section =~ /^all$/i ? @content.clone : @content.in_section(section)
       end
 
       opt[:time_filter] = [nil, nil]
       if opt[:from] && !opt[:date_filter]
         if opt[:from][0].is_a?(String) && opt[:from][0] =~ time_rx
-          time_start, time_end = opt[:from]
-        elsif opt[:from].is_a?(Time)
-          start, finish = opt[:from]
-        end
-
-        if time_start
-          opt[:time_filter] = [time_start, time_end]
-        else
+          opt[:time_filter] = opt[:from]
+        elsif opt[:from][0].is_a?(Time)
           opt[:date_filter] = opt[:from]
         end
       end
@@ -853,7 +859,7 @@ module Doing
           note.map!(&:strip)
           note.delete_if(&:ignore?)
           item = items[i]
-          old_item = item.dup
+          old_item = item.clone
           item.date = date || items[i].date
           item.title = title
           item.note = note
@@ -861,7 +867,7 @@ module Doing
             Doing.logger.count(:skipped, level: :debug)
           else
             Doing.logger.count(:updated)
-            Hooks.trigger :post_entry_updated, self, item
+            Hooks.trigger :post_entry_updated, self, item, old_item
           end
         end
       end
@@ -1051,9 +1057,10 @@ module Doing
                 else
                   opt[:resume]
                 end
+          old_item = item.clone
           new_entry = reset_item(item, date: date, resume: res)
           @content.update_item(item, new_entry)
-          Hooks.trigger :post_entry_updated, self, new_entry
+          Hooks.trigger :post_entry_updated, self, new_entry, old_item
         end
         write(@doing_file)
 
@@ -1068,8 +1075,9 @@ module Doing
       if opt[:flag]
         tag = @config['marker_tag'] || 'flagged'
         items.map! do |i|
+          old_item = i.clone
           i.tag(tag, date: false, remove: opt[:remove], single: single)
-          Hooks.trigger :post_entry_updated, self, i
+          Hooks.trigger :post_entry_updated, self, i, old_item
         end
       end
 
@@ -1077,9 +1085,10 @@ module Doing
         tag = 'done'
         items.map! do |i|
           if i.should_finish?
+            old_item = i.clone
             should_date = !opt[:cancel] && i.should_time?
             i.tag(tag, date: should_date, remove: opt[:remove], single: single)
-            Hooks.trigger :post_entry_updated, self, i
+            Hooks.trigger :post_entry_updated, self, i, old_item
           end
         end
       end
@@ -1093,8 +1102,9 @@ module Doing
           else
             logger.count(:added_tags)
             logger.write(items.count == 1 ? :info : :debug, 'Tagged:', new_title)
+            old_item = i.clone
             i.title = new_title
-            Hooks.trigger :post_entry_updated, self, i
+            Hooks.trigger :post_entry_updated, self, i, old_item
           end
         end
       end
@@ -1102,17 +1112,19 @@ module Doing
       if opt[:tag]
         tag = opt[:tag]
         items.map! do |i|
+          old_item = i.clone
           i.tag(tag, date: false, remove: opt[:remove], single: single)
           i.expand_date_tags(@config['date_tags'])
-          Hooks.trigger :post_entry_updated, self, i
+          Hooks.trigger :post_entry_updated, self, i, old_item
         end
       end
 
       if opt[:archive] || opt[:move]
         section = opt[:archive] ? 'Archive' : guess_section(opt[:move])
         items.map! do |i|
+          old_item = i.clone
           i.move_to(section, label: true)
-          Hooks.trigger :post_entry_updated, self, i
+          Hooks.trigger :post_entry_updated, self, i, old_item
         end
       end
 
@@ -1234,6 +1246,7 @@ module Doing
       end
 
       items.each do |item|
+        old_item = item.clone
         added = []
         removed = []
 
@@ -1271,7 +1284,7 @@ module Doing
 
             tag = tag.strip
 
-            if tag =~ /^done$/
+            if tag =~ /^done$/ && opt[:date] && item.should_time?
               max_elapsed = @config.dig('interaction', 'confirm_longer_than') || 0
               max_elapsed = max_elapsed.chronify_qty if max_elapsed.is_a?(String)
               elapsed = done_date - item.date
@@ -1328,7 +1341,7 @@ module Doing
         end
 
         item.expand_date_tags(@config['date_tags'])
-        Hooks.trigger :post_entry_updated, self, item
+        Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
       write(@doing_file)
@@ -1367,6 +1380,7 @@ module Doing
         return
       end
 
+      old_item = item.clone
       content = ["#{item.date.strftime('%F %R')} | #{item.title.dup}"]
       content << item.note.strip_lines.join("\n") unless item.note.empty?
       new_item = fork_editor(content.join("\n"))
@@ -1382,7 +1396,7 @@ module Doing
         item.title = title
         item.note.add(note, replace: true)
         logger.info('Edited:', item.title)
-        Hooks.trigger :post_entry_updated, self, item.dup
+        Hooks.trigger :post_entry_updated, self, item, old_item
 
         write(@doing_file)
       end
@@ -1419,6 +1433,7 @@ module Doing
       found_items = 0
 
       @content.each_with_index do |item, i|
+        old_item = i.clone
         next unless item.section == opt[:section] || opt[:section] =~ /all/i
 
         next unless item.title =~ /@#{tag}/
@@ -1437,7 +1452,7 @@ module Doing
           logger.count(:completed)
           logger.info('Completed:', item.title)
         end
-        Hooks.trigger :post_entry_updated, self, item
+        Hooks.trigger :post_entry_updated, self, item, old_item
       end
 
 
@@ -1498,7 +1513,7 @@ module Doing
 
         unless ((!tags.empty? && !item.tags?(tags, bool)) || (opt[:search] && !item.search(opt[:search].to_s)) || (opt[:before] && item.date >= cutoff))
           new_item = @content.delete(item)
-          Hooks.trigger :post_entry_removed, self, item.dup
+          Hooks.trigger :post_entry_removed, self, item.clone
           raise DoingRuntimeError, "Error deleting item: #{item}" if new_item.nil?
 
           new_content.add_section(new_item.section, log: false)
@@ -1622,6 +1637,7 @@ module Doing
                        'duration' => @config['duration'],
                        'interval_format' => @config['interval_format']
                      }, { extend_existing_arrays: true, sort_merged_arrays: true })
+
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
       opt[:count] ||= 0
@@ -1724,7 +1740,7 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['today'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
+      cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
@@ -1733,6 +1749,8 @@ module Doing
         'interval_format' => @config['interval_format']
       }, { extend_existing_arrays: true, sort_merged_arrays: true })
 
+      template = opt[:template] || cfg['template']
+
       opt[:duration] ||= cfg['duration'] || false
       opt[:interval_format] ||= cfg['interval_format'] || 'text'
 
@@ -1748,13 +1766,13 @@ module Doing
         output: output,
         section: opt[:section],
         sort_tags: opt[:sort_tags],
-        template: cfg['template'],
+        template: template,
         times: times,
         today: true,
         totals: opt[:totals],
         wrap_width: cfg['wrap_width'],
         tags_color: cfg['tags_color'],
-        config_template: 'today'
+        config_template: opt[:config_template]
       }
       list_section(options)
     end
@@ -1786,7 +1804,8 @@ module Doing
                      totals: opt[:totals],
                      duration: opt[:duration],
                      sort_tags: opt[:sort_tags],
-                     config_template: 'default'
+                     template: opt[:template],
+                     config_template: opt[:config_template]
                    })
     end
 
@@ -1821,7 +1840,8 @@ module Doing
         times: times,
         totals: opt[:totals],
         yesterday: true,
-        config_template: 'today'
+        config_template: opt[:config_template] || 'today',
+        template: opt[:template]
       }
 
       list_section(options)
@@ -1840,7 +1860,7 @@ module Doing
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
 
-      cfg = @config['templates']['recent'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
+      cfg = @config['templates'][opt[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
@@ -1858,10 +1878,9 @@ module Doing
       opt[:wrap_width] = cfg['wrap_width']
       opt[:count] = count
       opt[:format] = cfg['date_format']
-      opt[:template] = cfg['template']
+      opt[:template] = opt[:template] || cfg['template']
       opt[:order] = 'asc'
       opt[:times] = times
-      opt[:config_template] = 'recent'
 
       list_section(opt)
     end
@@ -1874,7 +1893,7 @@ module Doing
     ##
     def last(times: true, section: nil, options: {})
       section = section.nil? || section =~ /all/i ? 'All' : guess_section(section)
-      cfg = @config['templates']['last'].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
+      cfg = @config['templates'][options[:config_template]].deep_merge(@config['templates']['default'], { extend_existing_arrays: true, sort_merged_arrays: true }).deep_merge({
         'wrap_width' => @config['wrap_width'] || 0,
         'date_format' => @config['default_date_format'],
         'order' => @config['order'] || 'asc',
@@ -1886,19 +1905,19 @@ module Doing
       options[:interval_format] ||= cfg['interval_format'] || 'text'
 
       opts = {
-        section: section,
-        wrap_width: cfg['wrap_width'],
+        case: options[:case],
+        config_template: 'last',
         count: 1,
-        format: cfg['date_format'],
-        template: cfg['template'],
-        times: times,
+        delete: options[:delete],
         duration: options[:duration],
+        format: cfg['date_format'],
         interval_format: options[:interval_format],
-        case: options[:case],
         not: options[:negate],
-        config_template: 'last',
-        delete: options[:delete],
-        val: options[:val]
+        section: section,
+        template: options[:template] || cfg['template'],
+        times: times,
+        val: options[:val],
+        wrap_width: cfg['wrap_width']
       }
 
       if options[:tag]
@@ -2204,7 +2223,7 @@ EOS
 
       filename ||= @config['doing_file']
       init_doing_file(filename)
-      current_content = @content.dup
+      current_content = @content.clone
       backup_file = Util::Backup.last_backup(filename, count: 1)
       raise DoingRuntimeError, 'No undo history to diff' if backup_file.nil?
 
@@ -2307,7 +2326,6 @@ EOS
 
       section_items = @content.in_section(section)
       max = section_items.count - count.to_i
-      moved_items = []
 
       counter = 0
 
@@ -2324,8 +2342,9 @@ EOS
           item
         else
           counter += 1
+          old_item = item.clone
           item.move_to(destination, label: label, log: false)
-          Hooks.trigger :post_entry_updated, self, item.dup
+          Hooks.trigger :post_entry_updated, self, item, old_item
           item
         end
       end

data/lib/doing.rb

@@ -23,12 +23,15 @@ require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
 
+require_relative 'doing/changelog'
 require_relative 'doing/hash'
+require_relative 'doing/types'
 require_relative 'doing/colors'
 require_relative 'doing/template_string'
 require_relative 'doing/string'
 require_relative 'doing/time'
 require_relative 'doing/array'
+require_relative 'doing/good'
 require_relative 'doing/symbol'
 require_relative 'doing/util'
 require_relative 'doing/util_backup'

data/lib/helpers/threaded_tests.rb

@@ -2,66 +2,23 @@
 
 require 'tty-spinner'
 require 'tty-progressbar'
-require './lib/doing'
 require 'open3'
 require 'shellwords'
+require 'fileutils'
 
-class ::String
-  include Doing::Color
-
-  def highlight_errors
-    cols = `tput cols`.strip.to_i
-
-    string = dup
-
-    errs = string.scan(/(?<==\n)(?:Failure|Error):.*?(?=\n=+)/m)
-
-    errs.map! do |error|
-      err = error.dup
-
-      err.gsub!(%r{^(/.*?/)([^/:]+):(\d+):in (.*?)$}) do
-        m = Regexp.last_match
-        "#{m[1].white}#{m[2].bold.white}:#{m[3].yellow}:in #{m[4].cyan}"
-      end
-      err.gsub!(/(Failure|Error): (.*?)\((.*?)\):\n  (.*?)(?=\n)/m) do
-        m = Regexp.last_match
-        [
-          m[1].bold.boldbgred.white,
-          m[3].bold.boldbgcyan.white,
-          m[2].bold.boldbgyellow.black,
-          " #{m[4]} ".bold.boldbgwhite.black.reset
-        ].join(':'.boldblack.boldbgblack.reset)
-      end
-      err.gsub!(/(<.*?>) (was expected to) (.*?)\n( *<.*?>)./m) do
-        m = Regexp.last_match
-        "#{m[1].bold.green} #{m[2].white} #{m[3].boldwhite.boldbgred.reset}\n#{m[4].bold.white}"
-      end
-      err.gsub!(/(Finished in) ([\d.]+) (seconds)/) do
-        m = Regexp.last_match
-        "#{m[1].green} #{m[2].bold.white} #{m[3].green}"
-      end
-      err.gsub!(/(\d+) (failures)/) do
-        m = Regexp.last_match
-        "#{m[1].bold.red} #{m[2].red}"
-      end
-      err.gsub!(/100% passed/) do |m|
-        m.bold.green
-      end
-
-      err
-    end
-
-    errs.join("\n#{('=' * cols).blue}\n")
-  end
-end
+$LOAD_PATH.unshift File.join(__dir__, '..')
+require 'doing'
+require 'helpers/threaded_tests_string'
 
 class ThreadedTests
   include Doing::Color
+  include ThreadedTestString
 
-  def run(pattern: '*', max_threads: 24, max_tests: 0)
+  def run(pattern: '*', max_threads: 8, max_tests: 0)
     start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    @results = File.expand_path('results.log')
 
-    max_threads = 24 if max_threads == 0
+    max_threads = 1000 if max_threads == 0
 
     c = Doing::Color
     c.coloring = true
@@ -90,12 +47,21 @@ class ThreadedTests
     ].join('')
     progress = TTY::ProgressBar::Multi.new(banner,
                                            width: 12,
+                                           clear: true,
                                            hide_cursor: true)
-    children = []
+    @children = []
     tests.each do |t|
       test_name = File.basename(t, '.rb').sub(/doing_(.*?)_test/, '\1')
-      new_sp = progress.register("[#{':bar'.cyan}] #{test_name.bold.white}:status", total: 2, width: 1, head: '.', hide_cursor: true)
-      children.push([test_name, new_sp, nil])
+      new_sp = progress.register("[#{':bar'.cyan}] #{test_name.bold.white}:status",
+                                 total: tests.count + 8,
+                                 width: 1,
+                                 head: ' ',
+                                 unknown: ' ',
+                                 hide_cursor: true,
+                                 clear: true)
+      status = ': waiting'.dark.yellow.reset
+      @children.push([test_name, new_sp, status])
+      # new_sp.advance(status: ': waiting'.dark.yellow.reset)
     end
 
     @elapsed = 0.0
@@ -103,57 +69,21 @@ class ThreadedTests
     @assrt_total = 0
     @error_out = []
     # progress.start
+    @threads = []
+    @running_tests = []
 
     begin
-      while children.count.positive?
-        threads = []
-        slices = children.slice!(0, max_threads)
+      while @children.count.positive?
+
+        slices = @children.slice!(0, max_threads)
         slices.each { |c| c[1].start }
         slices.each do |s|
-          bar = s[1]
-          bar.advance(status: ": #{'running'.green}")
-
-          threads << Thread.new do
-            out, _err, status = Open3.capture3(ENV, 'rake', "test:#{s[0]}", stdin_data: nil)
-            unless status.success?
-              m = out.match(/(?<fail>\d+) failures, (?<err>\d+) errors/)
-              status = ": #{m['fail'].bold.red} #{'failures'.red}, #{m['err'].bold.red} #{'errors'.red}"
-              bar.update(head: '✖'.boldred)
-              bar.advance(head: '✖'.boldred, status: status)
-
-              # errs = out.scan(/(?:Failure|Error): [\w_]+\((?:.*?)\):(?:.*?)(?=\n=======)/m)
-              @error_out.push(out.highlight_errors)
-              bar.finish
-
-              Thread.exit
-            end
-
-            time = out.match(/^Finished in (?<time>\d+\.\d+) seconds\./)
-            count = out.match(/^(?<tests>\d+) tests, (?<assrt>\d+) assertions, (?<fails>\d+) failures, (?<errs>\d+) errors/)
-            status = [
-              ': ',
-              count['tests'].green,
-              '/',
-              count['assrt'].cyan,
-              # ' (',
-              # count['fails'].to_i == 0 ? '-'.dark.white.reset : count['fails'].bold.red,
-              # '/',
-              # count['errs'].to_i == 0 ? '-'.dark.white.reset : count['errs'].bold.red,
-              # ') ',
-              ' ',
-              time['time'].to_f.round(3).to_s.yellow,
-              's'
-            ].join('')
-            bar.update(head: '✔'.boldgreen)
-            bar.advance(head: '✔'.boldgreen, status: status)
-            @test_total += count['tests'].to_i
-            @assrt_total += count['assrt'].to_i
-            @elapsed += time['time'].to_f
-
-            bar.finish
+          @threads << Thread.new do
+            run_test(s)
           end
         end
-        threads.each { |t| t.join }
+
+        @threads.each { |t| t.join }
       end
 
       finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -175,6 +105,83 @@ class ThreadedTests
     rescue
       progress.stop
     end
+  ensure
+    FileUtils.rm(@results)
+  end
+
+  def run_test(s)
+    bar = s[1]
+    s[2] = ": #{'running'.green}"
+    bar.advance(status: s[2])
+
+    if @running_tests.count.positive?
+      @running_tests.each do |b|
+        prev_bar = b[1]
+        if prev_bar.complete?
+          prev_bar.reset
+          prev_bar.advance(status: b[2])
+          prev_bar.finish
+        else
+          prev_bar.update(head: ' ', unfinished: ' ')
+          prev_bar.advance(status: b[2])
+        end
+      end
+    end
+
+    @running_tests.push(s)
+    out, _err, status = Open3.capture3(ENV, "rake test:#{s[0]} | tee #{@results}", stdin_data: nil)
+    unless status.success?
+      m = out.match(/(?<fail>\d+) failures, (?<err>\d+) errors/)
+      s[2] = ": #{m['fail'].bold.red} #{'failures'.red}, #{m['err'].bold.red} #{'errors'.red}"
+      bar.update(head: '✖'.boldred)
+      bar.advance(head: '✖'.boldred, status: s[2])
+
+      # errs = out.scan(/(?:Failure|Error): [\w_]+\((?:.*?)\):(?:.*?)(?=\n=======)/m)
+      @error_out.push(out.highlight_errors)
+      bar.finish
+
+      next_test
+      Thread.exit
+    end
+
+    time = out.match(/^Finished in (?<time>\d+\.\d+) seconds\./)
+    count = out.match(/^(?<tests>\d+) tests, (?<assrt>\d+) assertions, (?<fails>\d+) failures, (?<errs>\d+) errors/)
+    s[2] = [
+      ': ',
+      count['tests'].green,
+      '/',
+      count['assrt'].cyan,
+      # ' (',
+      # count['fails'].to_i == 0 ? '-'.dark.white.reset : count['fails'].bold.red,
+      # '/',
+      # count['errs'].to_i == 0 ? '-'.dark.white.reset : count['errs'].bold.red,
+      # ') ',
+      ' ',
+      time['time'].to_f.round(3).to_s.yellow,
+      's'
+    ].join('')
+    bar.update(head: '✔'.boldgreen)
+    bar.advance(head: '✔'.boldgreen, status: s[2])
+    @test_total += count['tests'].to_i
+    @assrt_total += count['assrt'].to_i
+    @elapsed += time['time'].to_f
+
+    bar.finish
+
+    next_test
+  end
+
+  def next_test
+    if @children.count.positive?
+      t = Thread.new do
+        s = @children.shift
+        # s[1].start
+        # s[1].advance(status: ": #{'running'.green}")
+        run_test(s)
+      end
+
+      t.join
+    end
   end
 end
 

data/lib/helpers/threaded_tests_string.rb

@@ -0,0 +1,50 @@
+module ThreadedTestString
+  class ::String
+    include Doing::Color
+
+    def highlight_errors
+      cols = `tput cols`.strip.to_i
+
+      string = dup
+
+      errs = string.scan(/(?<==\n)(?:Failure|Error):.*?(?=\n=+)/m)
+
+      errs.map! do |error|
+        err = error.dup
+
+        err.gsub!(%r{^(/.*?/)([^/:]+):(\d+):in (.*?)$}) do
+          m = Regexp.last_match
+          "#{m[1].white}#{m[2].bold.white}:#{m[3].yellow}:in #{m[4].cyan}"
+        end
+        err.gsub!(/(Failure|Error): (.*?)\((.*?)\):\n  (.*?)(?=\n)/m) do
+          m = Regexp.last_match
+          [
+            m[1].bold.boldbgred.white,
+            m[3].bold.boldbgcyan.white,
+            m[2].bold.boldbgyellow.black,
+            " #{m[4]} ".bold.boldbgwhite.black.reset
+          ].join(':'.boldblack.boldbgblack.reset)
+        end
+        err.gsub!(/(<.*?>) (was expected to) (.*?)\n( *<.*?>)./m) do
+          m = Regexp.last_match
+          "#{m[1].bold.green} #{m[2].white} #{m[3].boldwhite.boldbgred.reset}\n#{m[4].bold.white}"
+        end
+        err.gsub!(/(Finished in) ([\d.]+) (seconds)/) do
+          m = Regexp.last_match
+          "#{m[1].green} #{m[2].bold.white} #{m[3].green}"
+        end
+        err.gsub!(/(\d+) (failures)/) do
+          m = Regexp.last_match
+          "#{m[1].bold.red} #{m[2].red}"
+        end
+        err.gsub!(/100% passed/) do |m|
+          m.bold.green
+        end
+
+        err
+      end
+
+      errs.join("\n#{('=' * cols).blue}\n")
+    end
+  end
+end