doing 2.1.33 → 2.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce292893553246aabe46ccbabe4bfe508107e43e74ec78f52f617504d80d2304
-  data.tar.gz: 32039a7f2af7742f57955fd20424fca0a3f4ef382dc2dccf0bff43044e937d3a
+  metadata.gz: 4b1f36d019cc1edb1f6e1cdf3fe5f6b31cbb010be429d466b9a680ecef3ad122
+  data.tar.gz: 143ad9abc312527232997eb51c87d0b1d0d3dc11a6857170dc3c22704dbc8f08
 SHA512:
-  metadata.gz: 2c567803b19db9141e602600d1ef26a59d7d5ac467d6b006fa05d8ead16e6a1fde636515c7515d1fe5325acd1eff622ee5488f97ab4c4017ccddfd4785ac7ea9
-  data.tar.gz: dac1f74ea6992cd368b6f6012b5edcbb237a016df323540962b3d0702634874f1fa62f18ce32d334b4c18c99e387512085bc7e44c3189b4810ac50e00e834f83
+  metadata.gz: 72bf009d051bbfeb05a2375251f52189970fd0d8e2c256a9e6f7372038090e3b09c64a9d7f5c0c7d7050657693998bb85e491b64ee8f98b25165145d3e2982ec
+  data.tar.gz: 783dec7a05f42ca67b58bbb61721792737a27a8454f05d2b07cc8c079f8bb6c2c2347e6f0bddef67b9ef9abb4262c2206e517103d2acab08895c32d67b748338

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+### 2.1.36
+
+2022-02-25 08:44
+
+#### FIXED
+
+- Warning when using `doing done --took`
+
+### 2.1.35
+
+2022-02-21 14:53
+
+#### FIXED
+
+- Revert switch to sys-uname, hopefully solve crash
+
+### 2.1.34
+
+2022-02-20 09:32
+
+#### IMPROVED
+
+- Allow `--from 8am` time range without end time to mean `8am to 11:59pm`
+- `--tag_order` for commands with `--totals` output that were missing it
+- Tag and search filters for on, since, today and yesterday
+- Time filters for today and yesterday
+- `--only_timed` filter for yesterday
+- `--only_timed` for today
+- Remove exact duplicates from content before saving
+- `doing sections` now has subcommands -- `sections list`, `sections add SECTION` (replaces `add_section`) and `sections remove SECTION` allows removal of a section and archiving of its contents
+
+#### FIXED
+
+- `doing yesterday --from` not filtering time range
+- Don't return a duration or interval for entries configured as never_time or never_finish
+- `--from` time filter for yesterday
+- Regex error in `doing archive`
+- `--times` error in `doing today`
+
 ### 2.1.33
 
 2022-02-18 12:09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.33)
+    doing (2.1.36)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)
@@ -9,7 +9,6 @@ PATH
       parslet (~> 2.0, >= 2.0.0)
       plist (~> 3.6, >= 3.6.0)
       safe_yaml (~> 1.0)
-      sys-uname (~> 1.2, >= 1.2.2)
       tty-link (~> 0.1, >= 0.1.1)
       tty-markdown (~> 0.7, >= 0.7.0)
       tty-progressbar (~> 0.18, >= 0.18.2)
@@ -22,7 +21,6 @@ GEM
   specs:
     chronic (0.10.2)
     deep_merge (1.2.2)
-    ffi (1.15.5)
     github-markup (4.0.0)
     gli (2.20.1)
     haml (5.0.4)
@@ -49,8 +47,6 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    sys-uname (1.2.2)
-      ffi (~> 1.1)
     temple (0.8.2)
     test-unit (3.4.9)
       power_assert

data/README.md

@@ -8,7 +8,7 @@ _If you're one of the rare people like me who find this useful, feel free to
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.1.31<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.35<!--END VER-->.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/bin/commands/config.rb

@@ -43,9 +43,9 @@ command :config do |c|
 
     edit.desc 'Editor to use'
     edit.arg_name 'EDITOR'
-    edit.flag %i[e editor], default_value: nil
+    edit.flag %i[e editor]
 
-    if Sys::Platform.mac?
+    if `uname` =~ /Darwin/
       edit.desc 'Application to use'
       edit.arg_name 'APP_NAME'
       edit.flag %i[a app]
@@ -54,8 +54,8 @@ command :config do |c|
       edit.arg_name 'BUNDLE_ID'
       edit.flag %i[b bundle_id]
 
-      edit.desc "Use the config_editor_app defined in ~/.config/doing/config.yml (#{@settings.key?('config_editor_app') ? @settings['config_editor_app'] : 'config_editor_app not set'})"
-      edit.switch %i[x default]
+      edit.desc "Use the config editor defined in ~/.config/doing/config.yml (#{Doing.setting('editors.config', 'editors.config not set')})"
+      edit.switch %i[x default], negatable: false
     end
 
     edit.action do |global, options, args|
@@ -76,7 +76,7 @@ command :config do |c|
 
       config_file = Doing.config.choose_config
 
-      if Sys::Platform.mac?
+      if `uname` =~ /Darwin/
         if options[:default]
           editor = Doing::Util.find_default_editor('config')
           if editor
@@ -205,7 +205,7 @@ command :config do |c|
       value = options[:remove] ? nil : args.pop
       keypath = args.join('.')
       real_path = Doing.config.resolve_key_path(keypath, create: true)
-      old_value = @settings.dig(*real_path)
+      old_value = Doing.config.settings.dig(*real_path)
       old_type = old_value&.class.to_s || nil
 
       if old_value.is_a?(Hash) && !options[:remove]
@@ -223,7 +223,7 @@ command :config do |c|
 
       cfg = Doing::Util.safe_load_file(config_file) || {}
 
-      $stderr.puts "Updating #{config_file}".yellow
+      $stderr.puts ">      Config: Updating #{config_file}".yellow
 
       if options[:remove]
         cfg.deep_set(real_path, nil)
@@ -231,10 +231,10 @@ command :config do |c|
       else
         current_value = cfg.dig(*real_path)
         cfg.deep_set(real_path, value.set_type(old_type))
-        $stderr.puts "#{' Key path:'.yellow} #{real_path.join('.').boldwhite}"
-        $stderr.puts "#{'Inherited:'.yellow} #{(old_value ? old_value.to_s : 'empty').boldwhite}"
-        $stderr.puts "#{'  Current:'.yellow} #{ (current_value ? current_value.to_s : 'empty').boldwhite }"
-        $stderr.puts "#{'      New:'.yellow} #{value.set_type(old_type).to_s.boldwhite}"
+        $stderr.puts "#{'     Key path:'.yellow} #{real_path.join('.').boldwhite}"
+        $stderr.puts "#{'    Inherited:'.yellow} #{(old_value ? old_value.to_s : 'empty').boldwhite}"
+        $stderr.puts "#{'      Current:'.yellow} #{ (current_value ? current_value.to_s : 'empty').boldwhite }"
+        $stderr.puts "#{'          New:'.yellow} #{value.set_type(old_type).to_s.boldwhite}"
       end
 
       res = Doing::Prompt.yn('Update selected config', default_response: true)

data/bin/commands/done.rb

@@ -47,7 +47,7 @@ command %i[done did] do |c|
   add_options(:add_entry, c)
 
   c.action do |_global_options, options, args|
-    @wwid.auto_tag = !options[:noauto]
+    Doing.auto_tag = !options[:noauto]
 
     took = 0
     donedate = nil
@@ -89,7 +89,7 @@ command %i[done did] do |c|
     end
 
     if options[:date]
-      date = date.chronify(guess: :begin, context: :today) if date =~ REGEX_TIME
+      date = date.chronify(guess: :begin, context: :today) if date.is_a? String
       finish_date = @wwid.verify_duration(date, finish_date) unless options[:took] || options[:from]
 
       donedate = finish_date.strftime('%F %R')

data/bin/commands/grep.rb

@@ -28,31 +28,12 @@ command %i[grep search] do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
-  c.desc 'Only show items with recorded time intervals'
-  c.switch [:only_timed], default_value: false, negatable: false
-
   # c.desc '[DEPRECATED] Use alternative fuzzy matching for search string'
   # c.switch [:fuzzy], default_value: false, negatable: false
 
   c.desc 'Force exact string matching (case sensitive)'
   c.switch %i[x exact], default_value: Doing.config.exact_match?, negatable: Doing.config.exact_match?
 
-  c.desc 'Show items that *don\'t* match search string'
-  c.switch [:not], default_value: false, negatable: false
 
   c.desc 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
   c.arg_name 'TYPE'
@@ -72,17 +53,9 @@ command %i[grep search] do |c|
   c.desc 'Display an interactive menu of results to perform further operations'
   c.switch %i[i interactive], default_value: false, negatable: false
 
-  c.desc 'Perform a tag value query ("@done > two hours ago" or "@progress < 50"). May be used multiple times, combined with --bool'
-  c.arg_name 'QUERY'
-  c.flag [:val], multiple: true, must_match: REGEX_VALUE_QUERY
-
-  c.desc 'Combine multiple tags or value queries using AND, OR, or NOT'
-  c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: REGEX_BOOL,
-                  default_value: :pattern,
-                  type: BooleanSymbol
-
+  add_options(:tag_filter, c)
   add_options(:date_filter, c)
+  add_options(:time_display, c)
 
   c.action do |_global_options, options, args|
     options[:fuzzy] = false

data/bin/commands/meanwhile.rb

@@ -21,7 +21,7 @@ command :meanwhile do |c|
   add_options(:add_entry, c)
 
   c.action do |_global_options, options, args|
-    @wwid.auto_tag = !options[:noauto]
+    Doing.auto_tag = !options[:noauto]
 
     if options[:back]
       date = options[:back]

data/bin/commands/now.rb

@@ -37,7 +37,7 @@ command %i[now next] do |c|
   # # c.flag [:a, :app]
 
   c.action do |_global_options, options, args|
-    @wwid.auto_tag = !options[:noauto]
+    Doing.auto_tag = !options[:noauto]
 
     raise InvalidArgument, '--back and --from cannot be used together' if options[:back] && options[:from]
 

data/bin/commands/on.rb

@@ -13,20 +13,6 @@ command :on do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
@@ -39,6 +25,11 @@ command :on do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
+  add_options(:time_display, c)
+  add_options(:search, c)
+  add_options(:tag_filter, c)
+  add_options(:time_filter, c)
+
   c.action do |_global_options, options, args|
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
@@ -59,7 +50,6 @@ command :on do |c|
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]
 
-    Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output],
-                        { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+    Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output], options).chomp
   end
 end

data/bin/commands/open.rb

@@ -8,7 +8,7 @@ command :open do |c|
   c.arg_name 'COMMAND'
   c.flag %i[e editor]
 
-  if Sys::Platform.mac?
+  if `uname` =~ /Darwin/
     c.desc 'Open with app name'
     c.arg_name 'APP_NAME'
     c.flag %i[a app]
@@ -29,7 +29,7 @@ command :open do |c|
 
       editor = TTY::Which.which(options[:editor])
       system %(#{editor} "#{File.expand_path(@wwid.doing_file)}")
-    elsif Sys::Platform.mac?
+    elsif `uname` =~ /Darwin/
       if options[:app]
         system %(open -a "#{options[:app]}" "#{File.expand_path(@wwid.doing_file)}")
       elsif options[:bundle_id]

data/bin/commands/recent.rb

@@ -12,9 +12,6 @@ command :recent do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
   c.desc "Output using a template from configuration"
   c.arg_name 'TEMPLATE_KEY'
   c.flag [:config_template], type: TemplateName, default_value: 'recent'
@@ -23,20 +20,11 @@ command :recent do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:time_display, c)
+
   c.action do |global_options, options, args|
     section = @wwid.guess_section(options[:section]) || options[:section].cap_first
 

data/bin/commands/rotate.rb

@@ -40,3 +40,20 @@ command :rotate do |c|
     @wwid.rotate(options)
   end
 end
+
+# # @@doctor
+
+# desc 'Doing file maintenance.'
+# long_desc %(Duplicate entries compressed to a single entry. This will modify the doing file.)
+# command :doctor do |c|
+#   c.example 'doing doctor', desc: 'Clean up the Doing file, sorting and removing duplicates'
+
+#   c.desc 'Only remove duplicates in the same section'
+#   c.switch %i[s same_section], negatable: false, default_value: false
+
+#   c.action do |_global_options, options, _args|
+#     @wwid.content.dedup!(match_section: options[:same_section])
+#     @wwid.write(@wwid.doing_file)
+#   end
+# end
+

data/bin/commands/sections.rb

@@ -1,11 +1,86 @@
-# @@sections
-desc 'List sections'
+# frozen_string_literal: true
+
+# @@add_section
+desc 'List, add, or remove sections in the Doing file'
 command :sections do |c|
-  c.desc 'List in single column'
-  c.switch %i[c column], negatable: false, default_value: false
+  c.default_command :list
+
+  c.example 'doing sections add Ideas', desc: 'Add a section called Ideas to the doing file'
+  c.example 'doing sections remove Reminders', desc: 'Remove the section Reminders'
+  c.example 'doing sections list', desc: 'List all sections'
+
+  c.desc 'Add a section'
+  c.arg_name 'SECTION_NAME'
+  c.command :add do |add|
+    add.action do |_g, _o, args|
+      raise InvalidArgument, "Section #{args[0]} already exists" if @wwid.sections.include?(args[0])
+
+      @wwid.content.add_section(args.join(' ').cap_first, log: true)
+      @wwid.write(@wwid.doing_file)
+    end
+  end
+
+  c.desc 'List sections'
+  c.command :list do |list|
+    list.desc 'List in single column'
+    list.switch %i[c column], negatable: false, default_value: false
+
+    list.action do |_global_options, options, _args|
+      joiner = options[:column] ? "\n" : "\t"
+      print @wwid.content.section_titles.join(joiner)
+    end
+  end
+
+  c.desc 'Remove a section'
+  c.arg_name 'SECTION_NAME'
+  c.command :remove do |remove|
+    remove.desc 'Archive entries in section before deleting. --no-archive permanently deletes section contents'
+    remove.switch %i[a archive], default_value: true, negatable: true
+
+    remove.action do |_g, options, args|
+      raise InvalidArgument, '--delete cannot be used with --archive' if options[:delete] && options[:archive]
+
+      section = args[0].cap_first
+
+      unless @wwid.sections.include?(section)
+        Doing.logger.log_now(:warn, 'Section:', "#{section} not found, did you mean #{guess_section(section)}?")
+        raise InvalidArgument, "Section #{args[0]} doesn't exist"
 
-  c.action do |_global_options, options, _args|
-    joiner = options[:column] ? "\n" : "\t"
-    print @wwid.content.section_titles.join(joiner)
+      end
+
+      items = @wwid.content.in_section(section)
+
+      if items.count.positive?
+        res = Doing::Prompt.yn("#{options[:archive] ? 'Archive' : 'Delete'} #{items.count} entries from #{section}", default_response: 'n')
+
+        if options[:archive] && res
+          @wwid.archive(section, {keep: 0})
+        elsif res
+          items.each { |item| @wwid.content.delete_item(item) }
+        end
+      end
+
+      @wwid.content.delete_section(section, log: true)
+
+      @wwid.write(@wwid.doing_file)
+    end
+  end
+end
+
+# For backward compatibility
+# @@add_section
+command :add_section do |c|
+  c.desc 'Archive entries in section before deleting'
+  c.switch %i[a archive], default_value: true, negatable: true
+
+  c.desc 'Permanently delete entries in section'
+  c.switch %i[d delete], default_value: false
+
+  c.action do |g, o, a|
+    cmd = commands[:sections].commands[:add]
+
+    action = cmd.send(:get_action, nil)
+    action.call(g, o, a)
   end
 end
+

data/bin/commands/show.rb

@@ -33,27 +33,6 @@ command :show do |c|
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show intervals with totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
-  c.desc 'Tag sort direction (asc|desc)'
-  c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
-
-  c.desc 'Only show items with recorded time intervals'
-  c.switch [:only_timed], default_value: false, negatable: false
-
   c.desc "Output using a template from configuration"
   c.arg_name 'TEMPLATE_KEY'
   c.flag [:config_template], type: TemplateName, default_value: 'default'
@@ -72,6 +51,7 @@ command :show do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
+  add_options(:time_display, c)
   add_options(:search, c)
   add_options(:tag_filter, c)
   add_options(:date_filter, c)

data/bin/commands/since.rb

@@ -11,20 +11,6 @@ command :since do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
@@ -37,6 +23,10 @@ command :since do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
+  add_options(:time_display, c)
+  add_options(:tag_filter, c)
+  add_options(:search, c)
+
   c.action do |_global_options, options, args|
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
@@ -57,7 +47,6 @@ command :since do |c|
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]
 
-    Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output],
-                        { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+    Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output], options).chomp
   end
 end

data/bin/commands/today.rb

@@ -12,20 +12,6 @@ command :today do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
   c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
   c.arg_name 'FORMAT'
   c.flag %i[o output]
@@ -38,26 +24,15 @@ command :today do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
-  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:before]
-
-  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:after]
-
-  c.desc %(
-    Time range to show `doing today --from "12pm to 4pm"`
-  )
-  c.arg_name 'TIME_RANGE'
-  c.flag [:from], type: DateRangeString
+  add_options(:time_filter, c)
+  add_options(:time_display, c)
 
   c.action do |_global_options, options, _args|
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]
-    filter_options = %i[after before duration from section sort_tags totals template config_template].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
+    filter_options = %i[after before times duration from section sort_tags totals tag_order template config_template only_timed].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
 
     Doing::Pager.page @wwid.today(options[:times], options[:output], filter_options).chomp
   end

data/bin/commands/yesterday.rb

@@ -23,47 +23,14 @@ command :yesterday do |c|
   c.arg_name 'TEMPLATE_STRING'
   c.flag [:template]
 
-  c.desc 'Show time intervals on @done tasks'
-  c.switch %i[t times], default_value: true, negatable: true
-
-  c.desc 'Show elapsed time on entries without @done tag'
-  c.switch [:duration]
-
-  c.desc 'Show time totals at the end of output'
-  c.switch [:totals], default_value: false, negatable: false
-
-  c.desc 'Sort tags by (name|time)'
-  default = Doing.setting('tag_sort').normalize_tag_sort || :name
-  c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: REGEX_TAG_SORT, default_value: default, type: TagSortSymbol
-
-  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:before]
-
-  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
-  c.arg_name 'TIME_STRING'
-  c.flag [:after]
-
-  c.desc 'Time range to show, e.g. `doing yesterday --from "1am to 8am"`'
-  c.arg_name 'TIME_RANGE'
-  c.flag [:from], must_match: REGEX_TIME_RANGE
-
-  c.desc 'Tag sort direction (asc|desc)'
-  c.arg_name 'DIRECTION'
-  c.flag [:tag_order], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
+  add_options(:time_filter, c)
+  add_options(:time_display, c)
 
   c.action do |_global_options, options, _args|
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     options[:sort_tags] = options[:tag_sort]
 
-    if options[:from]
-      options[:from] = options[:from].split(/#{REGEX_RANGE_INDICATOR}/).map do |time|
-        "yesterday #{time.sub(/(?mi)(^.*?(?=\d+)|(?<=[ap]m).*?$)/, '')}"
-      end.join(' to ').split_date_range
-    end
-
     opt = options.clone
     opt[:order] = Doing.setting(['templates', options[:config_template], 'order'])