doing 2.1.24 → 2.1.25

data/lib/doing/template_string.rb

@@ -131,7 +131,7 @@ module Doing
 
         after = m['after']
 
-        if value.nil? || value.empty?
+        if !value.good?
           after
         else
           pad = m['width'].to_i
@@ -183,7 +183,7 @@ module Doing
                   '  '
                 else
                   line = l.gsub(/%/, '\%').strip.wrap(width, pad: pad, indent: indent, offset: 0, prefix: prefix, color: last_color, after: after, reset: reset, pad_first: true)
-                  line.highlight_tags!(tags_color, last_color: last_color) unless !tags_color || tags_color.nil? || tags_color.empty?
+                  line.highlight_tags!(tags_color, last_color: last_color) unless !tags_color || !tags_color.good?
                   "#{line}  "
                 end
               end.join("\n")

data/lib/doing/types.rb

@@ -20,6 +20,7 @@ module Doing
     DateBeginString = Class.new(DateTime)
     DateEndString = Class.new(DateTime)
     DateRangeString = Class.new(Array)
+    DateRangeOptionalString = Class.new(Array)
     DateIntervalString = Class.new(DateTime)
   end
 end

data/lib/doing/util.rb

@@ -19,7 +19,7 @@ module Doing
     ## @param      cli   [String] The name or path of the cli
     ##
     def exec_available(cli)
-      return false if cli.nil?
+      return false unless cli.good?
 
       !TTY::Which.which(cli).nil?
     end
@@ -32,7 +32,7 @@ module Doing
     ##
     def first_available_exec(*commands)
       commands.compact.map(&:strip).reject(&:empty?).uniq
-      .find { |cmd| exec_available(cmd.split.first) }
+              .find { |cmd| exec_available(cmd.split.first) }
     end
 
     def merge_default_proc(target, overwrite)
@@ -56,7 +56,7 @@ module Doing
     # @param      [Hash] other_hash   The other hash
     #
     def deep_merge_hashes(master_hash, other_hash)
-      deep_merge_hashes!(master_hash.dup, other_hash)
+      deep_merge_hashes!(master_hash.clone, other_hash)
     end
 
     # Merges a master hash with another hash, recursively.
@@ -157,32 +157,32 @@ module Doing
     def find_default_editor(editor_for = 'default')
       # return nil unless $stdout.isatty || ENV['DOING_EDITOR_TEST']
 
-      if ENV['DOING_EDITOR_TEST']
-        return ENV['EDITOR']
-      end
+      return ENV['EDITOR'] if ENV['DOING_EDITOR_TEST']
 
       editor_config = Doing.config.settings['editors']
 
       if editor_config.is_a?(String)
-        Doing.logger.warn('Deprecated:', "Please update your configuration, 'editors' should be a mapping. Delete the key and run `doing config --update`.")
+        msg = "Please update your configuration, 'editors' should be a mapping."
+        msg << ' Delete the key and run `doing config --update`.'
+        Doing.logger.warn('Deprecated:', msg)
         return editor_config
       end
 
       if editor_config[editor_for]
         editor = editor_config[editor_for]
         # Doing.logger.debug('Editor:', "Using #{editor} from config 'editors->#{editor_for}'")
-        return editor unless editor.nil? || editor.empty?
+        return editor unless editor.good?
       end
 
       if editor_for != 'editor' && editor_config['default']
         editor = editor_config['default']
         # Doing.logger.debug('Editor:', "Using #{editor} from config: 'editors->default'")
-        return editor unless editor.nil? || editor.empty?
+        return editor unless editor.good?
       end
 
       editor ||= ENV['DOING_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
 
-      unless editor.nil? || editor.empty?
+      unless editor.good?
         # Doing.logger.debug('Editor:', "Found editor in environment variables: #{editor}")
         return editor
       end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.24'
+  VERSION = '2.1.25'
 end

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,7 +663,7 @@ 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]
@@ -847,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
@@ -855,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
@@ -1045,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)
 
@@ -1062,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
 
@@ -1071,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
@@ -1087,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
@@ -1096,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
 
@@ -1228,6 +1246,7 @@ module Doing
       end
 
       items.each do |item|
+        old_item = item.clone
         added = []
         removed = []
 
@@ -1322,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)
@@ -1361,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"))
@@ -1376,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
@@ -1413,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}/
@@ -1431,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
 
 
@@ -1492,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)
@@ -2202,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?
 
@@ -2321,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

@@ -31,6 +31,7 @@ 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,64 +2,21 @@
 
 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: 8, max_tests: 0)
     start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    @results = File.expand_path('results.log')
 
     max_threads = 1000 if max_threads == 0
 
@@ -90,13 +47,21 @@ class ThreadedTests
     ].join('')
     progress = TTY::ProgressBar::Multi.new(banner,
                                            width: 12,
+                                           clear: true,
                                            hide_cursor: true)
     @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: 4, width: 1, head: ' ', unknown: ' ', hide_cursor: true, clear: true)
-      @children.push([test_name, new_sp, nil])
+                                 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
@@ -140,30 +105,36 @@ class ThreadedTests
     rescue
       progress.stop
     end
+  ensure
+    FileUtils.rm(@results)
   end
 
   def run_test(s)
-
     bar = s[1]
-    bar.advance(status: ": #{'running'.green}")
+    s[2] = ": #{'running'.green}"
+    bar.advance(status: s[2])
 
     if @running_tests.count.positive?
-      prev_bar = @running_tests[-1][1]
-      unless prev_bar.complete?
-        prev_bar.update(head: ' ', unfinished: ' ')
-        prev_bar.advance(status: ": #{'running'.green}")
+      @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]}", stdin_data: nil)
+    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/)
-      status = ": #{m['fail'].bold.red} #{'failures'.red}, #{m['err'].bold.red} #{'errors'.red}"
+      s[2] = ": #{m['fail'].bold.red} #{'failures'.red}, #{m['err'].bold.red} #{'errors'.red}"
       bar.update(head: '✖'.boldred)
-      bar.advance(head: '✖'.boldred, status: status)
+      bar.advance(head: '✖'.boldred, status: s[2])
 
       # errs = out.scan(/(?:Failure|Error): [\w_]+\((?:.*?)\):(?:.*?)(?=\n=======)/m)
       @error_out.push(out.highlight_errors)
@@ -175,7 +146,7 @@ class ThreadedTests
 
     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 = [
+    s[2] = [
       ': ',
       count['tests'].green,
       '/',
@@ -190,7 +161,7 @@ class ThreadedTests
       's'
     ].join('')
     bar.update(head: '✔'.boldgreen)
-    bar.advance(head: '✔'.boldgreen, status: status)
+    bar.advance(head: '✔'.boldgreen, status: s[2])
     @test_total += count['tests'].to_i
     @assrt_total += count['assrt'].to_i
     @elapsed += time['time'].to_f

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.24
+  version: 2.1.25
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-22 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -555,6 +555,7 @@ files:
 - lib/doing/completion/zsh_completion.rb
 - lib/doing/configuration.rb
 - lib/doing/errors.rb
+- lib/doing/good.rb
 - lib/doing/hash.rb
 - lib/doing/help_monkey_patch.rb
 - lib/doing/hooks.rb
@@ -687,6 +688,7 @@ files:
 - lib/helpers/fzf/test/test_go.rb
 - lib/helpers/fzf/uninstall
 - lib/helpers/threaded_tests.rb
+- lib/helpers/threaded_tests_string.rb
 - lib/templates/doing-dayone-entry.erb
 - lib/templates/doing-dayone.erb
 - lib/templates/doing-markdown.erb