doing 2.1.21 → 2.1.22

data/docs/doc/top-level-namespace.html

@@ -91,97 +91,6 @@
   
 </p>
 
-  
-    <h2>
-      Constant Summary
-      <small><a href="#" class="constants_summary_toggle">collapse</a></small>
-    </h2>
-
-    <dl class="constants">
-      
-        <dt id="REGEX_BOOL-constant" class="">REGEX_BOOL =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$</span><span class='regexp_end'>/i</span></span></pre></dd>
-      
-        <dt id="REGEX_SORT_ORDER-constant" class="">REGEX_SORT_ORDER =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(?:a(?:sc)?|d(?:esc)?)$</span><span class='regexp_end'>/i</span></span></pre></dd>
-      
-        <dt id="REGEX_VALUE_QUERY-constant" class="">REGEX_VALUE_QUERY =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(?:!)?@?(?:\S+) +(?:!?[&lt;&gt;=][=*]?|[$*^]=) +(?:.*?)$</span><span class='regexp_end'>/</span></span></pre></dd>
-      
-        <dt id="REGEX_CLOCK-constant" class="">REGEX_CLOCK =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)</span><span class='tstring_end'>&#39;</span></span></pre></dd>
-      
-        <dt id="REGEX_TIME-constant" class="">REGEX_TIME =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_CLOCK-constant" title="REGEX_CLOCK (constant)">REGEX_CLOCK</a></span></span><span class='embexpr_end'>}</span><span class='tstring_content'>$</span><span class='regexp_end'>/i</span></span></pre></dd>
-      
-        <dt id="REGEX_DAY-constant" class="">REGEX_DAY =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$</span><span class='regexp_end'>/i</span></span></pre></dd>
-      
-        <dt id="REGEX_RANGE_INDICATOR-constant" class="">REGEX_RANGE_INDICATOR =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'> +(?:to|through|thru|(?:un)?til|-+) +</span><span class='tstring_end'>&#39;</span></span></pre></dd>
-      
-        <dt id="REGEX_RANGE-constant" class="">REGEX_RANGE =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^\S+</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_RANGE_INDICATOR-constant" title="REGEX_RANGE_INDICATOR (constant)">REGEX_RANGE_INDICATOR</a></span></span><span class='embexpr_end'>}</span><span class='tstring_content'>+\S+</span><span class='regexp_end'>/i</span></span></pre></dd>
-      
-        <dt id="REGEX_TIME_RANGE-constant" class="">REGEX_TIME_RANGE =
-          
-        </dt>
-        <dd><pre class="code"><span class='tstring'><span class='regexp_beg'>/</span><span class='tstring_content'>^</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_CLOCK-constant" title="REGEX_CLOCK (constant)">REGEX_CLOCK</a></span></span><span class='embexpr_end'>}</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_RANGE_INDICATOR-constant" title="REGEX_RANGE_INDICATOR (constant)">REGEX_RANGE_INDICATOR</a></span></span><span class='embexpr_end'>}</span><span class='embexpr_beg'>#{</span><span class='const'><span class='object_link'><a href="top-level-namespace.html#REGEX_CLOCK-constant" title="REGEX_CLOCK (constant)">REGEX_CLOCK</a></span></span><span class='embexpr_end'>}</span><span class='tstring_content'>$</span><span class='regexp_end'>/i</span></span></pre></dd>
-      
-        <dt id="InvalidExportType-constant" class="">InvalidExportType =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>RuntimeError</span><span class='rparen'>)</span></pre></dd>
-      
-        <dt id="MissingConfigFile-constant" class="">MissingConfigFile =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>RuntimeError</span><span class='rparen'>)</span></pre></dd>
-      
-        <dt id="TagArray-constant" class="">TagArray =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'><span class='object_link'><a href="Array.html" title="Array (class)">Array</a></span></span><span class='rparen'>)</span></pre></dd>
-      
-        <dt id="DateBeginString-constant" class="">DateBeginString =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>DateTime</span><span class='rparen'>)</span></pre></dd>
-      
-        <dt id="DateEndString-constant" class="">DateEndString =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>DateTime</span><span class='rparen'>)</span></pre></dd>
-      
-        <dt id="DateRangeString-constant" class="">DateRangeString =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'><span class='object_link'><a href="Array.html" title="Array (class)">Array</a></span></span><span class='rparen'>)</span></pre></dd>
-      
-        <dt id="DateIntervalString-constant" class="">DateIntervalString =
-          
-        </dt>
-        <dd><pre class="code"><span class='const'>Class</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='const'>DateTime</span><span class='rparen'>)</span></pre></dd>
-      
-    </dl>
-  
-
 
 
 
@@ -193,7 +102,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu Jan 20 12:10:33 2022 by
+  Generated on Fri Jan 21 14:53:33 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.1.21
+v2.1.22
 
 === Global Options
 === --config_file arg
@@ -32,7 +32,7 @@ Verbose output
 
 
 
-=== --[no-]default
+=== --default
 Answer yes/no menus with default option
 
 
@@ -528,7 +528,7 @@ Update default config file, adding any missing keys
 
 
 [Default Command] edit
-==== Command: <tt>done|did  ENTRY</tt>
+==== Command: <tt>done|did  [ENTRY]</tt>
 Add a completed item with @done(date). No argument finishes last entry
 
 Use this command to add an entry after you've already finished it. It will be immediately marked as @done.
@@ -612,7 +612,7 @@ Finish last entry not already marked @done
 
 
 
-==== Command: <tt>finish  COUNT</tt>
+==== Command: <tt>finish  [COUNT]</tt>
 Mark last X entries as @done
 
 Marks the last X entries with a @done tag and current date. Does not alter already completed entries.
@@ -1165,7 +1165,7 @@ Force exact search string matching (case sensitive)
 
 
 
-==== Command: <tt>meanwhile  ENTRY</tt>
+==== Command: <tt>meanwhile  [ENTRY]</tt>
 Finish any running @meanwhile tasks and optionally create a new one
 
 The @meanwhile tag allows you to have long-running entries that encompass smaller entries.
@@ -1209,7 +1209,7 @@ Edit entry with vim
 
 
 
-==== Command: <tt>note  NOTE_TEXT</tt>
+==== Command: <tt>note  [NOTE_TEXT]</tt>
 Add a note to the last entry
 
 If -r is provided with no other arguments, the last note is removed.
@@ -1473,7 +1473,7 @@ Show intervals with totals at the end of output
 
 
 
-==== Command: <tt>reset|begin  DATE_STRING</tt>
+==== Command: <tt>reset|begin  [DATE_STRING]</tt>
 Reset the start time of an entry
 
 Update the start time of the last entry or the last entry matching a tag/search filter.
@@ -1530,6 +1530,11 @@ Select from a menu of matching entries
 
 
 
+===== -n
+Change start date but do not remove @done (shortcut for --no-resume)
+
+
+
 ===== --not
 Reset items that *don't* match search/tag filters
 

data/lib/doing/array.rb

@@ -11,17 +11,18 @@ module Doing
     ## @return     [Array] array of strings
     ##
     def tags_to_array
-      map { |t| t.sub(/^@/, '') }
+      map(&:remove_at)
     end
 
     # Convert strings to @tags
     #
-    # @example `['one', '@two', 'three'].to_tags`
-    # @example `=> ['@one', '@two', '@three']`
     # @return     [Array] Array of @tags
     #
+    # @example
+    # ['one', '@two', 'three'].to_tags
+    # # => ['@one', '@two', '@three']
     def to_tags
-      map { |t| t.sub(/^@?/, '@') }
+      map(&:add_at)
     end
 
     def to_tags!

data/lib/doing/array_chronify.rb

@@ -6,9 +6,10 @@ module Doing
     ##
     ## Format [d, h, m] as string
     ##
-    ## @param      time    [Array] Array of [days, hours,
-    ##                     minutes]
-    ## @param      format  [Symbol] The format, :dhm, :hm, :m, :clock, :natural
+    ## @accept     [Array] Array of [days, hours, minutes]
+    ##
+    ## @param      format  [Symbol] The format, :dhm, :hm,
+    ##                     :m, :clock, :natural
     ## @return     [String] formatted string
     ##
     def time_string(format: :dhm)

data/lib/doing/configuration.rb

@@ -160,7 +160,7 @@ module Doing
     def choose_config(create: false)
       return @config_file if @force_answer
 
-      if @additional_configs.count.positive? || create
+      if @additional_configs&.count&.positive? || create
         choices = [@config_file].concat(@additional_configs)
         choices.push('Create a new .doingrc in the current directory') if create && !File.exist?('.doingrc')
         res = Doing::Prompt.choose_from(choices.uniq.sort.reverse,

data/lib/doing/hash.rb

@@ -6,14 +6,32 @@ module Doing
     ##
     ## Freeze all values in a hash
     ##
-    ## @return     { description_of_the_return_value }
+    ## @return     Hash with all values frozen
     ##
     def deep_freeze
-      map { |k, v| v.is_a?(Hash) ? v.deep_freeze : v.freeze }.freeze
+      chilled = {}
+      each do |k, v|
+        chilled[k] = v.is_a?(Hash) ? v.deep_freeze : v.freeze
+      end
+
+      chilled.freeze
     end
 
     def deep_freeze!
-      replace deep_freeze
+      replace deep_thaw.deep_freeze
+    end
+
+    def deep_thaw
+      chilled = {}
+      each do |k, v|
+        chilled[k] = v.is_a?(Hash) ? v.deep_thaw : v.dup
+      end
+
+      chilled.dup
+    end
+
+    def deep_thaw!
+      replace deep_thaw
     end
 
     # Turn all keys into string

data/lib/doing/item.rb

@@ -633,8 +633,8 @@ module Doing
     end
 
     def split_tags(tags)
-      tags = tags.split(/ *, */) if tags.is_a? String
-      tags.map { |t| t.strip.add_at }
+      tags = tags.to_tags if tags.is_a? String
+      tags.map(&:remove_at)
     end
   end
 end

data/lib/doing/log_adapter.rb

@@ -356,7 +356,7 @@ module Doing
         next if data[:count].zero?
 
         count = data[:count]
-        tags = data[:tag] ? data[:tag].uniq.map { |t| "@#{t}".cyan }.join(', ') : 'tags'
+        tags = data[:tag] ? data[:tag].uniq.map { |t| t.add_at.cyan }.join(', ') : 'tags'
         topic, m = format_counter(key, data)
         message = m.dup
         message.sub!(/%count/, count.to_s)

data/lib/doing/pager.rb

@@ -54,7 +54,7 @@ module Doing
           read_io.close
           write_io.write(text)
           write_io.close
-        rescue SystemCallError => e
+        rescue SystemCallError # => e
           # raise Errors::DoingStandardError, "Pager error, #{e}"
         end
 

data/lib/doing/plugins/export/template_export.rb

@@ -49,6 +49,8 @@ module Doing
           note = []
         end
 
+        placeholders['tags'] = item.tags
+
         placeholders['date'] = item.date.strftime(opt[:format])
 
         interval = wwid.get_interval(item, record: true, formatted: false) if opt[:times]
@@ -56,8 +58,10 @@ module Doing
           interval = case opt[:interval_format].to_sym
                      when :human
                        interval.time_string(format: :hm)
-                     else
+                     when :text
                        interval.time_string(format: :clock)
+                     else
+                       interval.time_string(format: opt[:interval_format].to_sym)
                      end
         end
 
@@ -69,8 +73,10 @@ module Doing
           duration = case opt[:interval_format].to_sym
                      when :human
                        duration.time_string(format: :hm)
-                     else
+                     when :text
                        duration.time_string(format: :clock)
+                     else
+                       duration.time_string(format: opt[:interval_format].to_sym)
                      end
         end
         duration ||= ''

data/lib/doing/prompt.rb

@@ -42,7 +42,7 @@ module Doing
         end
       end
 
-      def read_lines(prompt: 'Enter text', completions: [])
+      def read_lines(prompt: 'Enter text', completions: [], default_response: '')
         $stdin.reopen('/dev/tty')
         return default_response if @default_answer
 
@@ -72,8 +72,10 @@ module Doing
         res.join("\n").strip
       end
 
-      def request_lines(prompt: 'Enter text')
+      def request_lines(prompt: 'Enter text', default_response: '')
         $stdin.reopen('/dev/tty')
+        return default_response if @default_answer
+
         ask_note = []
         reader = TTY::Reader.new(interrupt: -> { raise Errors::UserCancelled }, track_history: false)
         puts "#{boldgreen(prompt.sub(/:?$/, ':'))} #{yellow('Hit return for a new line, ')}#{boldwhite('enter a blank line (')}#{boldyellow('return twice')}#{boldwhite(') to end editing')}"

data/lib/doing/string.rb

@@ -458,7 +458,16 @@ module Doing
     ## @return     [String] @string
     ##
     def add_at
-      strip.sub(/^([+-]*)@/, '\1')
+      strip.sub(/^([+-]*)@?/, '\1@')
+    end
+
+    ##
+    ## Removes @ prefix if needed, maintains +/- prefix
+    ##
+    ## @return     [String] string without @ prefix
+    ##
+    def remove_at
+      strip.sub(/^([+-]*)@?/, '\1')
     end
 
     ##

data/lib/doing/template_string.rb

@@ -146,6 +146,13 @@ module Doing
           end
           indent ||= placeholder =~ /^title/ ? '' : "\t"
           prefix = m['prefix']
+
+          if placeholder =~ /^tags/
+            prefix ||= ''
+            value = value.map { |t| "#{prefix}#{t.sub(/^#{prefix}?/, '')}" }.join(' ')
+            prefix = ''
+          end
+
           if placeholder =~ /^title/
             color = last_color + color
 

data/lib/doing/types.rb

@@ -1,19 +1,23 @@
 # frozen_string_literal: true
 
-REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i
-REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i
-REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/
-REGEX_CLOCK = '(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)'
-REGEX_TIME = /^#{REGEX_CLOCK}$/i
-REGEX_DAY = /^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$/i
-REGEX_RANGE_INDICATOR = ' +(?:to|through|thru|(?:un)?til|-+) +'
-REGEX_RANGE = /^\S+#{REGEX_RANGE_INDICATOR}+\S+/i
-REGEX_TIME_RANGE = /^#{REGEX_CLOCK}#{REGEX_RANGE_INDICATOR}#{REGEX_CLOCK}$/i
+module Doing
+  module Types
+    REGEX_BOOL = /^(?:and|all|any|or|not|none|p(?:at(?:tern)?)?)$/i.freeze
+    REGEX_SORT_ORDER = /^(?:a(?:sc)?|d(?:esc)?)$/i.freeze
+    REGEX_VALUE_QUERY = /^(?:!)?@?(?:\S+) +(?:!?[<>=][=*]?|[$*^]=) +(?:.*?)$/.freeze
+    REGEX_CLOCK = '(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)'
+    REGEX_TIME = /^#{REGEX_CLOCK}$/i.freeze
+    REGEX_DAY = /^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$/i.freeze
+    REGEX_RANGE_INDICATOR = ' +(?:to|through|thru|(?:un)?til|-+) +'
+    REGEX_RANGE = /^\S+#{REGEX_RANGE_INDICATOR}+\S+/i.freeze
+    REGEX_TIME_RANGE = /^#{REGEX_CLOCK}#{REGEX_RANGE_INDICATOR}#{REGEX_CLOCK}$/i.freeze
 
-InvalidExportType = Class.new(RuntimeError)
-MissingConfigFile = Class.new(RuntimeError)
-TagArray = Class.new(Array)
-DateBeginString = Class.new(DateTime)
-DateEndString = Class.new(DateTime)
-DateRangeString = Class.new(Array)
-DateIntervalString = Class.new(DateTime)
+    InvalidExportType = Class.new(RuntimeError)
+    MissingConfigFile = Class.new(RuntimeError)
+    TagArray = Class.new(Array)
+    DateBeginString = Class.new(DateTime)
+    DateEndString = Class.new(DateTime)
+    DateRangeString = Class.new(Array)
+    DateIntervalString = Class.new(DateTime)
+  end
+end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.21'
+  VERSION = '2.1.22'
 end

data/lib/doing/wwid.rb

@@ -657,14 +657,8 @@ module Doing
       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
@@ -1622,6 +1616,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
@@ -2307,7 +2302,6 @@ EOS
 
       section_items = @content.in_section(section)
       max = section_items.count - count.to_i
-      moved_items = []
 
       counter = 0
 

data/lib/doing.rb

@@ -24,6 +24,7 @@ require 'tty-reader'
 require 'tty-screen'
 
 require_relative 'doing/hash'
+require_relative 'doing/types'
 require_relative 'doing/colors'
 require_relative 'doing/template_string'
 require_relative 'doing/string'

data/lib/helpers/threaded_tests.rb

@@ -58,10 +58,10 @@ end
 class ThreadedTests
   include Doing::Color
 
-  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)
 
-    max_threads = 24 if max_threads == 0
+    max_threads = 1000 if max_threads == 0
 
     c = Doing::Color
     c.coloring = true
@@ -91,11 +91,12 @@ class ThreadedTests
     progress = TTY::ProgressBar::Multi.new(banner,
                                            width: 12,
                                            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: 2, width: 1, head: '.', hide_cursor: true, clear: true)
+      @children.push([test_name, new_sp, nil])
     end
 
     @elapsed = 0.0
@@ -103,57 +104,20 @@ class ThreadedTests
     @assrt_total = 0
     @error_out = []
     # progress.start
+    @threads = []
 
     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)
@@ -176,6 +140,65 @@ class ThreadedTests
       progress.stop
     end
   end
+
+  def run_test(s)
+    bar = s[1]
+    bar.advance(status: ": #{'running'.green}")
+
+    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
+
+      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/)
+    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
+
+    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
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.21
+  version: 2.1.22
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml