doing 2.1.31pre → 2.1.35

data/lib/doing/wwid.rb

@@ -14,7 +14,7 @@ module Doing
   class WWID
     attr_reader   :additional_configs, :current_section, :doing_file, :content
 
-    attr_accessor :config, :config_file, :auto_tag, :default_option
+    attr_accessor :config, :config_file, :default_option
 
     include Color
     # include Util
@@ -26,7 +26,12 @@ module Doing
       @timers = {}
       @recorded_items = []
       @content = Items.new
-      @auto_tag = true
+      Doing.auto_tag = true
+    end
+
+    # For backwards compatibility where @wwid.config was accessed instead of Doing.config.settings
+    def config
+      Doing.config.settings
     end
 
     ##
@@ -354,7 +359,7 @@ module Doing
       title = [title.strip.cap_first]
       title = title.join(' ')
 
-      if @auto_tag
+      if Doing.auto_tag
         title = autotag(title)
         title.add_tags!(Doing.setting('default_tags')) if Doing.setting('default_tags').good?
       end
@@ -499,7 +504,7 @@ module Doing
       # Remove @done tag
       title = item.title.sub(/\s*@done(\(.*?\))?/, '').chomp
       section = opt[:in].nil? ? item.section : guess_section(opt[:in])
-      @auto_tag = false
+      Doing.auto_tag = false
 
       note = opt[:note] || Note.new
 
@@ -667,12 +672,14 @@ module Doing
         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
-          opt[:time_filter] = opt[:from]
-        elsif opt[:from][0].is_a?(Time)
-          opt[:date_filter] = opt[:from]
+      if !opt[:time_filter]
+        opt[:time_filter] = [nil, nil]
+        if opt[:from] && !opt[:date_filter]
+          if opt[:from][0].is_a?(String) && opt[:from][0] =~ time_rx
+            opt[:time_filter] = opt[:from]
+          elsif opt[:from][0].is_a?(Time)
+            opt[:date_filter] = opt[:from]
+          end
         end
       end
 
@@ -1255,7 +1262,7 @@ module Doing
         removed = []
 
         if opt[:autotag]
-          new_title = autotag(item.title) if @auto_tag
+          new_title = autotag(item.title) if Doing.auto_tag
           if new_title == item.title
             logger.count(:skipped, level: :debug, message: '%count unchaged %items')
             # logger.debug('Autotag:', 'No changes')
@@ -1653,6 +1660,7 @@ module Doing
       opt[:tag_order] ||= :asc
       opt[:tags_color] = cfg['tags_color'] || false if opt[:tags_color].nil?
       opt[:template] ||= cfg['template']
+      opt[:sort_tags] ||= opt[:tag_sort]
 
       # opt[:highlight] ||= true
       title = ''
@@ -1768,6 +1776,7 @@ module Doing
         from: opt[:from],
         format: cfg['date_format'],
         interval_format: opt[:interval_format],
+        only_timed: opt[:only_timed],
         order: cfg['order'] || :asc,
         output: output,
         section: opt[:section],
@@ -1800,19 +1809,19 @@ module Doing
       # :date_filter expects an array with start and end date
       dates = dates.split_date_range if dates.instance_of?(String)
 
-      list_section({
-                     section: section,
-                     count: 0,
-                     order: :asc,
-                     date_filter: dates,
-                     times: times,
-                     output: output,
-                     totals: opt[:totals],
-                     duration: opt[:duration],
-                     sort_tags: opt[:sort_tags],
-                     template: opt[:template],
-                     config_template: opt[:config_template]
-                   })
+      opt[:section] = section
+      opt[:count] = 0
+      opt[:order] = :asc
+      opt[:date_filter] = dates
+      opt[:times] = times
+      opt[:output] = output
+
+      time_rx = /^(\d{1,2}+(:\d{1,2}+)?( *(am|pm))?|midnight|noon)$/
+      if opt[:from] && opt[:from][0].is_a?(String) && opt[:from][0] =~ time_rx
+        opt[:time_filter] = opt[:from]
+      end
+
+      list_section(opt)
     end
 
     ##
@@ -1827,30 +1836,20 @@ module Doing
       opt ||= {}
       opt[:totals] ||= false
       opt[:sort_tags] ||= false
+      opt[:config_template] ||= 'today'
+      opt[:yesterday] = true
+
       section = guess_section(section)
       y = (Time.now - (60 * 60 * 24)).strftime('%Y-%m-%d')
       opt[:after] = "#{y} #{opt[:after]}" if opt[:after]
       opt[:before] = "#{y} #{opt[:before]}" if opt[:before]
 
-      options = {
-        after: opt[:after],
-        before: opt[:before],
-        count: 0,
-        duration: opt[:duration],
-        from: opt[:from],
-        order: opt[:order],
-        output: output,
-        section: section,
-        sort_tags: opt[:sort_tags],
-        tag_order: opt[:tag_order],
-        times: times,
-        totals: opt[:totals],
-        yesterday: true,
-        config_template: opt[:config_template] || 'today',
-        template: opt[:template]
-      }
+      opt[:output] = output
+      opt[:section] = section
+      opt[:times] = times
+      opt[:count] = 0
 
-      list_section(options)
+      list_section(opt)
     end
 
     ##
@@ -1947,7 +1946,7 @@ module Doing
     ##
     def autotag(string)
       return unless string
-      return string unless @auto_tag
+      return string unless Doing.auto_tag
 
       original = string.dup
       text = string.dup
@@ -2250,6 +2249,7 @@ EOTAIL
       output = @other_content_top ? "#{@other_content_top.join("\n")}\n" : ''
       was_color = Color.coloring?
       Color.coloring = false
+      @content.dedup!(match_section: true)
       output += @content.to_s
       output += @other_content_bottom.join("\n") unless @other_content_bottom.nil?
       # Just strip all ANSI colors from the content before writing to doing file

data/lib/doing.rb

@@ -22,7 +22,6 @@ require 'tty-which'
 require 'tty-markdown'
 require 'tty-reader'
 require 'tty-screen'
-require 'sys-uname'
 
 require_relative 'doing/changelog'
 require_relative 'doing/hash'
@@ -42,7 +41,7 @@ require_relative 'doing/items'
 require_relative 'doing/note'
 require_relative 'doing/item'
 require_relative 'doing/wwid'
-require_relative 'doing/log_adapter'
+require_relative 'doing/logger'
 require_relative 'doing/prompt'
 require_relative 'doing/errors'
 require_relative 'doing/hooks'
@@ -57,13 +56,14 @@ require_relative 'doing/chronify/chronify'
 # Main doing module
 module Doing
   class << self
+    attr_accessor :auto_tag
     #
     # Fetch the logger
     #
-    # @return     the LogAdapter instance.
+    # @return     the Logger instance.
     #
     def logger
-      @logger ||= LogAdapter.new((ENV['DOING_LOG_LEVEL'] || :info).to_sym)
+      @logger ||= Logger.new((ENV['DOING_LOG_LEVEL'] || :info).to_sym)
     end
 
     ##

data/lib/examples/plugins/capture_thing_import.rb

@@ -33,7 +33,7 @@ module Doing
       raise InvalidArgument, 'Path is not a directory' unless File.directory?(path)
 
       options[:no_overlap] ||= false
-      options[:autotag] ||= wwid.auto_tag
+      options[:autotag] ||= Doing.auto_tag
 
       tags = options[:tag] ? options[:tag].split(/[ ,]+/).map { |t| t.sub(/^@?/, '') } : []
       options[:tag] = nil

data/lib/helpers/threaded_tests.rb

@@ -82,6 +82,7 @@ class ThreadedTests
     @running_tests = []
 
     begin
+      finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       while @children.count.positive?
 
         slices = @children.slice!(0, max_threads)
@@ -89,6 +90,7 @@ class ThreadedTests
         slices.each do |s|
           @threads << Thread.new do
             run_test(s)
+            finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           end
         end