doing 2.1.21 → 2.1.25

data/bin/doing

@@ -3,8 +3,8 @@
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'gli'
+require 'doing/help_monkey_patch'
 require 'doing'
-require 'doing/types'
 require 'tempfile'
 require 'pp'
 
@@ -22,17 +22,12 @@ end
 
 include GLI::App
 include Doing::Errors
+
 version Doing::VERSION
 hide_commands_without_desc true
 autocomplete_commands true
 
-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)
+include Doing::Types
 
 colors = Doing::Color
 wwid = Doing::WWID.new
@@ -72,6 +67,13 @@ if settings.dig('plugins', 'command_path')
   commands_from File.expand_path(settings.dig('plugins', 'command_path'))
 end
 
+accept TemplateName do |value|
+  res = settings['templates'].keys.select { |k| k =~ value.to_rx(distance: 2) }
+  raise InvalidArgument, "Unknown template: #{value}" unless res.good?
+
+  res.group_by(&:length).min.last[0]
+end
+
 accept DateBeginString do |value|
   if value =~ REGEX_TIME
     res = value
@@ -102,6 +104,13 @@ accept DateRangeString do |value|
   [start, finish]
 end
 
+accept DateRangeOptionalString do |value|
+  start, finish = value.split_date_range
+  raise InvalidTimeExpression, 'Invalid range' unless start
+
+  [start, finish]
+end
+
 accept DateIntervalString do |value|
   res = value.chronify_qty
   raise InvalidTimeExpression, 'Invalid time quantity' unless res
@@ -134,7 +143,7 @@ desc 'Use a pager when output is longer than screen'
 switch %i[p pager], default_value: settings['paginate']
 
 desc 'Answer yes/no menus with default option'
-switch [:default], default_value: false
+switch [:default], default_value: false, negatable: false
 
 desc 'Answer all yes/no menus with yes'
 switch [:yes], negatable: false
@@ -251,7 +260,7 @@ command %i[again resume] do |c|
 
     options[:note] = note
 
-    opts = options.dup
+    opts = options.clone
 
     opts[:tag] = tags
     opts[:tag_bool] = options[:bool].normalize_bool
@@ -370,7 +379,7 @@ desc 'Add a completed item with @done(date). No argument finishes last entry'
 long_desc 'Use this command to add an entry after you\'ve already finished it. It will be immediately marked as @done.
 You can modify the start and end times of the entry using the --back, --took, and --at flags, making it an easy
 way to add entries in post and maintain accurate (albeit manual) time tracking.'
-arg_name 'ENTRY'
+arg_name 'ENTRY', optional: true
 command %i[done did] do |c|
   c.example 'doing done', desc: 'Tag the last entry @done'
   c.example 'doing done I already finished this', desc: 'Add a new entry and immediately mark it @done'
@@ -502,7 +511,7 @@ command %i[done did] do |c|
           raise NoResults, 'No results'
         end
 
-        old_entry = last_entry.dup
+        old_entry = last_entry.clone
         last_entry.note.add(note)
         input = ["#{last_entry.date.strftime('%F %R | ')}#{last_entry.title}", last_entry.note.strip_lines.join("\n")].join("\n")
       else
@@ -511,13 +520,13 @@ command %i[done did] do |c|
       end
 
       input = wwid.fork_editor(input).strip
-      raise EmptyInput, 'No content' unless input && !input.empty?
+      raise EmptyInput, 'No content' unless input.good?
 
       d, title, note = wwid.format_input(input)
 
       if options[:ask]
         ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
-        note.add(ask_note) unless ask_note.empty?
+        note.add(ask_note) if ask_note.good?
       end
 
       date = d.nil? ? date : d
@@ -533,15 +542,16 @@ command %i[done did] do |c|
       if (is_new)
         Doing::Hooks.trigger :pre_entry_add, wwid, new_entry
         wwid.content.push(new_entry)
-        Doing::Hooks.trigger :post_entry_added, wwid, new_entry.dup
+        Doing::Hooks.trigger :post_entry_added, wwid, new_entry
       else
+        old = old_entry.clone
         wwid.content.update_item(old_entry, new_entry)
-        Doing::Hooks.trigger :post_entry_updated, wwid, new_entry unless options[:archive]
+        Doing::Hooks.trigger :post_entry_updated, wwid, new_entry, old unless options[:archive]
       end
 
       if options[:archive]
         wwid.move_item(new_entry, 'Archive', label: true)
-        Doing::Hooks.trigger :post_entry_updated, wwid, new_entry
+        Doing::Hooks.trigger :post_entry_updated, wwid, new_entry, old_entry
       end
 
       wwid.write(wwid.doing_file)
@@ -580,7 +590,7 @@ command %i[done did] do |c|
 
       Doing::Hooks.trigger :pre_entry_add, wwid, new_entry
       wwid.content.push(new_entry)
-      Doing::Hooks.trigger :post_entry_added, wwid, new_entry.dup
+      Doing::Hooks.trigger :post_entry_added, wwid, new_entry
       wwid.write(wwid.doing_file)
       Doing.logger.info('New entry:', %(added "#{new_entry.date.relative_date}: #{new_entry.title}" to #{section}))
     elsif $stdin.stat.size.positive?
@@ -604,7 +614,7 @@ command %i[done did] do |c|
 
       Doing::Hooks.trigger :pre_entry_add, wwid, new_entry
       wwid.content.push(new_entry)
-      Doing::Hooks.trigger :post_entry_added, wwid, new_entry.dup
+      Doing::Hooks.trigger :post_entry_added, wwid, new_entry
 
       wwid.write(wwid.doing_file)
       Doing.logger.info('New entry:', %(added "#{new_entry.date.relative_date}: #{new_entry.title}" to #{section}))
@@ -617,7 +627,7 @@ end
 # @@finish
 desc 'Mark last X entries as @done'
 long_desc 'Marks the last X entries with a @done tag and current date. Does not alter already completed entries.'
-arg_name 'COUNT'
+arg_name 'COUNT', optional: true
 command :finish do |c|
   c.example 'doing finish', desc: 'Mark the last entry @done'
   c.example 'doing finish --auto --section Later 10', desc: 'Add @done to any unfinished entries in the last 10 in Later, setting the finish time based on the start time of the task after it'
@@ -897,7 +907,7 @@ long_desc 'The @meanwhile tag allows you to have long-running entries that encom
 This command makes it easy to start and stop these overarching entries. Just run `doing meanwhile Starting work on this
 big project` to start a @meanwhile entry, add other entries as you work on the project, then use `doing meanwhile` by
 itself to mark the entry as @done.'
-arg_name 'ENTRY'
+arg_name 'ENTRY', optional: true
 command :meanwhile do |c|
   c.example 'doing meanwhile "Long task that will have others after it before it\'s done"', desc: 'Add a new long-running entry, completing any current @meanwhile entry'
   c.example 'doing meanwhile', desc: 'Finish any open @meanwhile entry'
@@ -948,7 +958,7 @@ command :meanwhile do |c|
       input += date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
       input += "\n#{options[:note]}" if options[:note]
-      input += "\n#{ask_note}" unless ask_note.empty?
+      input += "\n#{ask_note}" unless ask_note.good?
 
       input = wwid.fork_editor(input).strip
     elsif !args.empty?
@@ -957,7 +967,7 @@ command :meanwhile do |c|
       input = $stdin.read.strip
     end
 
-    if input && !input.empty?
+    if input.good?
       d, input, note = wwid.format_input(input)
       unless d.nil?
         Doing.logger.debug('Parser:', 'Date detected in input, overriding command line values')
@@ -970,7 +980,7 @@ command :meanwhile do |c|
 
     unless options[:editor]
       note.add(options[:note]) if options[:note]
-      note.add(ask_note) unless ask_note.empty?
+      note.add(ask_note) if ask_note.good?
     end
 
     wwid.stop_start('meanwhile', { new_item: input, back: date, section: section, archive: options[:archive], note: note })
@@ -987,7 +997,7 @@ long_desc %(
 
   Use -e to load the last entry in a text editor where you can append a note.
 )
-arg_name 'NOTE_TEXT'
+arg_name 'NOTE_TEXT', optional: true
 command :note do |c|
   c.example 'doing note', desc: 'Open the last entry in $EDITOR to append a note'
   c.example 'doing note "Just a quick annotation"', desc: 'Add a quick note to the last entry'
@@ -1055,8 +1065,8 @@ command :note do |c|
       options[:search] = search
     end
 
-
     last_entry = wwid.last_entry(options)
+    old_entry = last_entry.clone
 
     unless last_entry
       Doing.logger.warn('Not found:', 'No entry matching parameters was found.')
@@ -1065,44 +1075,44 @@ command :note do |c|
 
     last_note = last_entry.note || Doing::Note.new
     new_note = Doing::Note.new
-    ask_note = options[:ask] ? Doing::Prompt.read_lines(prompt: 'Add a note') : ''
 
-    if options[:editor] || (args.empty? && $stdin.stat.size.zero? && !options[:remove] && !options[:ask])
-      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+    if $stdin.stat.size.positive?
+      new_note.add($stdin.read.strip)
+    end
 
-      input = !args.empty? ? args.join(' ') : ''
+    unless args.empty?
+      new_note.add(args.join(' '))
+    end
+
+    if options[:editor]
+      raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
 
       if options[:remove]
-        prev_input = Doing::Note.new
+        input = Doing::Note.new
       else
-        prev_input = last_entry.note || Doing::Note.new
+        input = last_entry.note || Doing::Note.new
       end
 
+      input.add(new_note)
 
-      input = prev_input.add(input)
-      input.add(ask_note) unless ask_note.empty?
-
-      input = wwid.fork_editor(prev_input.strip_lines.join("\n"), message: nil).strip
-      note = input
+      new_note = Doing::Note.new(wwid.fork_editor(input.strip_lines.join("\n"), message: nil).strip)
       options[:remove] = true
-      new_note.add(note)
-    elsif !args.empty?
-      new_note.add(args.join(' '))
-    elsif $stdin.stat.size.positive?
-      new_note.add($stdin.read.strip)
-    else
-      raise EmptyInput, 'You must provide content when adding a note' unless options[:remove] || !ask_note.empty?
+    end
 
+    if (new_note.empty? && !options[:remove]) || options[:ask]
+      $stderr.puts last_note if last_note.good?
+      $stderr.puts new_note if new_note.good?
+      new_note.add(Doing::Prompt.read_lines(prompt: 'Add a note'))
     end
 
-    new_note.add(ask_note) unless ask_note.empty?
+    raise EmptyInput, 'You must provide content when adding a note' unless options[:remove] || new_note.good?
 
     if last_note.equal?(new_note)
       Doing.logger.debug('Skipped:', 'No note change')
     else
       last_note.add(new_note, replace: options[:remove])
       Doing.logger.info('Entry updated:', last_entry.title)
-      Doing::Hooks.trigger :post_entry_updated, wwid, last_entry
+      Doing::Hooks.trigger :post_entry_updated, wwid, last_entry, old_entry
     end
     # new_entry = Doing::Item.new(last_entry.date, last_entry.title, last_entry.section, new_note)
     wwid.write(wwid.doing_file)
@@ -1138,6 +1148,13 @@ command %i[now next] do |c|
   c.arg_name 'DATE_STRING'
   c.flag %i[b back started], type: DateBeginString
 
+  c.desc %(
+        Set a start and optionally end time as a date range ("from 1pm to 2:30pm").
+        If an end time is provided, a dated @done tag will be added
+      )
+  c.arg_name 'TIME_RANGE'
+  c.flag [:from], type: DateRangeString
+
   c.desc 'Timed entry, marks last entry in section as @done'
   c.switch %i[f finish_last], negatable: false, default_value: false
 
@@ -1153,13 +1170,17 @@ command %i[now next] do |c|
   # # c.flag [:a, :app]
 
   c.action do |_global_options, options, args|
+    raise InvalidArgument, "--back and --from cannot be used together" if options[:back] && options[:from]
+
     if options[:back]
       date = options[:back]
-
-      raise InvalidTimeExpression.new('unable to parse date string', topic: 'Parser:') if date.nil?
+    elsif options[:from]
+      date, finish_date = options[:from]
+      options[:done] = finish_date
     else
       date = Time.now
     end
+    raise InvalidTimeExpression.new('unable to parse date string', topic: 'Parser:') if date.nil?
 
     if options[:section]
       section = wwid.guess_section(options[:section]) || options[:section].cap_first
@@ -1174,16 +1195,17 @@ command %i[now next] do |c|
 
       input = date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
+      input += " @done(#{options[:done].strftime('%F %R')})" if options[:done]
       input += "\n#{options[:note]}" if options[:note]
-      input += "\n#{ask_note}" unless ask_note.empty?
+      input += "\n#{ask_note}" if ask_note.good?
       input = wwid.fork_editor(input).strip
 
       d, title, note = wwid.format_input(input)
-      raise EmptyInput, 'No content' if title.strip.empty?
+      raise EmptyInput, 'No content' unless title.good?
 
       if ask_note.empty? && options[:ask]
         ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
-        note.add(ask_note) unless ask_note.empty?
+        note.add(ask_note) if ask_note.good?
       end
 
       date = d.nil? ? date : d
@@ -1193,8 +1215,15 @@ command %i[now next] do |c|
       d, title, note = wwid.format_input(args.join(' '))
       date = d.nil? ? date : d
       note.add(options[:note]) if options[:note]
-      note.add(ask_note) unless ask_note.empty?
-      wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      note.add(ask_note) if ask_note.good?
+      entry = wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      if options[:done] && entry.should_finish?
+        if entry.should_time?
+          entry.tag('done', value: options[:done])
+        else
+          entry.tag('done')
+        end
+      end
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
       input = $stdin.read.strip
@@ -1206,15 +1235,22 @@ command %i[now next] do |c|
       note.add(options[:note]) if options[:note]
       if ask_note.empty? && options[:ask]
         ask_note = Doing::Prompt.read_lines(prompt: 'Add a note')
-        note.add(ask_note) unless ask_note.empty?
+        note.add(ask_note) if ask_note.good?
+      end
+      entry = wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      if options[:done] && entry.should_finish?
+        if entry.should_time?
+          entry.tag('done', value: options[:done])
+        else
+          entry.tag('done')
+        end
       end
-      wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
       wwid.write(wwid.doing_file)
     else
       tags = wwid.all_tags(wwid.content)
       $stderr.puts Doing::Color.boldgreen("Add a new entry. Tab will autocomplete known tags. Ctrl-c to cancel.")
       title = Doing::Prompt.read_line(prompt: 'Entry content', completions: tags)
-      raise EmptyInput, 'You must provide content when creating a new entry' if title.strip.empty?
+      raise EmptyInput, 'You must provide content when creating a new entry' unless title.good?
 
       note = Doing::Note.new
       note.add(options[:note]) if options[:note]
@@ -1222,7 +1258,14 @@ command %i[now next] do |c|
       ask_note = res ? Doing::Prompt.read_lines(prompt: 'Enter note') : []
       note.add(ask_note)
 
-      wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      entry = wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:finish_last] })
+      if options[:done] && entry.should_finish?
+        if entry.should_time?
+          entry.tag('done', value: options[:done])
+        else
+          entry.tag('done')
+        end
+      end
       wwid.write(wwid.doing_file)
     end
   end
@@ -1233,7 +1276,7 @@ desc 'Reset the start time of an entry'
 long_desc 'Update the start time of the last entry or the last entry matching a tag/search filter.
 If no argument is provided, the start time will be reset to the current time.
 If a date string is provided as an argument, the start time will be set to the parsed result.'
-arg_name 'DATE_STRING'
+arg_name 'DATE_STRING', optional: true
 command %i[reset begin] do |c|
   c.example 'doing reset', desc: 'Reset the start time of the last entry to the current time'
   c.example 'doing reset --tag project1', desc: 'Reset the start time of the most recent entry tagged @project1 to the current time'
@@ -1247,6 +1290,9 @@ command %i[reset begin] do |c|
   c.desc 'Resume entry (remove @done)'
   c.switch %i[r resume], default_value: true
 
+  c.desc 'Change start date but do not remove @done (shortcut for --no-resume)'
+  c.switch [:n]
+
   c.desc 'Reset last entry matching tag. Wildcards allowed (*, ?)'
   c.arg_name 'TAG'
   c.flag [:tag]
@@ -1322,8 +1368,10 @@ command %i[reset begin] do |c|
       return
     end
 
+    old_item = last_entry.clone
+
     wwid.reset_item(last_entry, date: reset_date, resume: options[:resume])
-    Doing::Hooks.trigger :post_entry_updated, wwid, last_entry
+    Doing::Hooks.trigger :post_entry_updated, wwid, last_entry, old_item
     # new_entry = Doing::Item.new(last_entry.date, last_entry.title, last_entry.section, new_note)
 
     wwid.write(wwid.doing_file)
@@ -1687,6 +1735,14 @@ command %i[grep search] do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
+  c.desc "Output using a template from configuration"
+  c.arg_name 'TEMPLATE_KEY'
+  c.flag [:config_template], type: TemplateName, default_value: 'default'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  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
 
@@ -1741,7 +1797,7 @@ command %i[grep search] do |c|
     options[:fuzzy] = false
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    template = settings['templates']['default'].deep_merge(settings)
+    template = settings['templates'][options[:config_template]].deep_merge(settings)
     tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
     section = wwid.guess_section(options[:section]) if options[:section]
@@ -1798,6 +1854,14 @@ command :last do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc "Output using a template from configuration"
+  c.arg_name 'TEMPLATE_KEY'
+  c.flag [:config_template], type: TemplateName, default_value: 'last'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  c.arg_name 'TEMPLATE_STRING'
+  c.flag [:template]
+
   c.desc "Highlight search matches in output. Only affects command line output"
   c.switch %i[h hilite], default_value: settings.dig('search', 'highlight')
 
@@ -1851,6 +1915,8 @@ command :last do |c|
     else
       last = wwid.last(times: true, section: options[:section],
                      options: {
+                        config_template: options[:config_template],
+                        template: options[:template],
                         duration: options[:duration],
                         search: options[:search],
                         fuzzy: options[:fuzzy],
@@ -1885,6 +1951,14 @@ command :recent do |c|
   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'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  c.arg_name 'TEMPLATE_STRING'
+  c.flag [:template]
+
   c.desc 'Show elapsed time on entries without @done tag'
   c.switch [:duration]
 
@@ -1928,7 +2002,9 @@ command :recent do |c|
         times: options[:times],
         totals: options[:totals],
         interactive: options[:interactive],
-        duration: options[:duration]
+        duration: options[:duration],
+        config_template: options[:config_template],
+        template: options[:template]
       }
 
       Doing::Pager::page wwid.recent(count, section.cap_first, opts)
@@ -2043,6 +2119,14 @@ command :show do |c|
   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'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  c.arg_name 'TEMPLATE_STRING'
+  c.flag [:template]
+
   c.desc 'Select section or tag to display from a menu'
   c.switch %i[m menu], negatable: false, default_value: false
 
@@ -2099,7 +2183,7 @@ command :show do |c|
 
     options[:times] = true if options[:totals]
 
-    template = settings['templates']['default'].deep_merge({
+    template = settings['templates'][options[:config_template]].deep_merge({
         'wrap_width' => settings['wrap_width'] || 0,
         'date_format' => settings['default_date_format'],
         'order' => settings['order'] || 'asc',
@@ -2116,7 +2200,7 @@ command :show do |c|
 
     options[:section] = section
 
-    unless tags.empty?
+    if tags.good?
       tag_filter = {
         'tags' => tags,
         'bool' => options[:bool].normalize_bool
@@ -2135,7 +2219,7 @@ command :show do |c|
       # options[:bool] = :and unless tags.empty?
 
       tags = tag.split(/ +/).map { |t| t.strip.sub(/^@?/, '') } if tag =~ /^@/
-      unless tags.empty?
+      if tags.good?
         tag_filter = {
           'tags' => tags,
           'bool' => options[:bool].normalize_bool
@@ -2146,7 +2230,7 @@ command :show do |c|
 
     options[:age] ||= :newest
 
-    opt = options.dup
+    opt = options.clone
     opt[:age] = options[:age].normalize_age(:newest) if options[:age]
     opt[:sort_tags] = options[:tag_sort] =~ /^n/i
     opt[:count] = options[:count].to_i
@@ -2163,6 +2247,7 @@ end
 
 # @@tags
 desc 'List all tags in the current Doing file'
+arg_name 'MAX_COUNT', optional: true, type: Integer
 command :tags do |c|
   c.desc 'Section'
   c.arg_name 'SECTION_NAME'
@@ -2171,6 +2256,9 @@ command :tags do |c|
   c.desc 'Show count of occurrences'
   c.switch %i[c counts]
 
+  c.desc 'Output in a single line with @ symbols. Ignored if --counts is specified.'
+  c.switch %i[l line]
+
   c.desc 'Sort by name or count'
   c.arg_name 'SORT_ORDER'
   c.flag %i[sort], default_value: 'name', must_match: /^(?:n(?:ame)?|c(?:ount)?)$/
@@ -2214,6 +2302,7 @@ command :tags do |c|
 
   c.action do |_global, options, args|
     section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    options[:count] = args.count.positive? ? args[0].to_i : 0
 
     items = wwid.filter_items([], opt: options)
 
@@ -2241,7 +2330,11 @@ command :tags do |c|
     if options[:counts]
       tags.each { |t, c| puts "#{t} (#{c})" }
     else
-      tags.each { |t, c| puts "#{t}" }
+      if options[:line]
+        puts tags.map { |t, c| t }.to_tags.join(' ')
+      else
+        tags.each { |t, c| puts "#{t}" }
+      end
     end
   end
 end
@@ -2279,6 +2372,14 @@ command :today do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
+  c.desc "Output using a template from configuration"
+  c.arg_name 'TEMPLATE_KEY'
+  c.flag [:config_template], type: TemplateName, default_value: 'today'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  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]
@@ -2298,7 +2399,7 @@ command :today do |c|
 
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
-    filter_options = %i[after before duration from section sort_tags totals].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
+    filter_options = %i[after before duration from section sort_tags totals template config_template].each_with_object({}) { |k, hsh| hsh[k] = options[k] }
 
     Doing::Pager.page wwid.today(options[:times], options[:output], filter_options).chomp
   end
@@ -2338,6 +2439,14 @@ command :on do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
+  c.desc "Output using a template from configuration"
+  c.arg_name 'TEMPLATE_KEY'
+  c.flag [:config_template], type: TemplateName, default_value: 'default'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  c.arg_name 'TEMPLATE_STRING'
+  c.flag [:template]
+
   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)
 
@@ -2359,7 +2468,7 @@ command :on do |c|
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
     Doing::Pager.page wwid.list_date([start, finish], options[:section], options[:times], options[:output],
-                        { duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+                        { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
   end
 end
 
@@ -2395,6 +2504,14 @@ command :since do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
+  c.desc "Output using a template from configuration"
+  c.arg_name 'TEMPLATE_KEY'
+  c.flag [:config_template], type: TemplateName, default_value: 'default'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  c.arg_name 'TEMPLATE_STRING'
+  c.flag [:template]
+
   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)
 
@@ -2416,7 +2533,7 @@ command :since do |c|
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
     Doing::Pager.page wwid.list_date([start, finish], options[:section], options[:times], options[:output],
-                        { duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
+                        { template: options[:template], config_template: options[:config_template], duration: options[:duration], totals: options[:totals], sort_tags: options[:sort_tags] }).chomp
   end
 end
 
@@ -2551,17 +2668,17 @@ command :view do |c|
     view = wwid.get_view(title)
 
     if view
-      page_title = view.key?('title') ? view['title'] : title.cap_first
+      page_title = view['title'] || title.cap_first
       only_timed = if (view.key?('only_timed') && view['only_timed']) || options[:only_timed]
                      true
                    else
                      false
                    end
 
-      template = view.key?('template') ? view['template'] : nil
-      date_format = view.key?('date_format') ? view['date_format'] : nil
+      template = view['template'] || nil
+      date_format = view['date_format'] || nil
 
-      tags_color = view.key?('tags_color') ? view['tags_color'] : nil
+      tags_color = view['tags_color'] || nil
       tag_filter = false
       if options[:tag]
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
@@ -2572,7 +2689,7 @@ command :view do |c|
                              else
                                options[:tag].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
                              end
-      elsif view.key?('tags') && !(view['tags'].nil? || view['tags'].empty?)
+      elsif view.key?('tags') && view['tags'].good?
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
         bool = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].normalize_bool : :pattern
         tag_filter['bool'] = bool
@@ -2591,19 +2708,19 @@ command :view do |c|
       section = if options[:section]
                   section
                 else
-                  view.key?('section') ? view['section'] : settings['current_section']
+                  view['section'] || settings['current_section']
                 end
-      order = view.key?('order') ? view['order'].normalize_order : 'asc'
+      order = view['order']&.normalize_order || 'asc'
 
       totals = if options[:totals]
                  true
                else
-                 view.key?('totals') ? view['totals'] : false
+                 view['totals'] || false
                end
       tag_order = if options[:tag_order]
                     options[:tag_order].normalize_order
                   else
-                    view.key?('tag_order') ? view['tag_order'].normalize_order : 'asc'
+                    view['tag_order']&.normalize_order || 'asc'
                   end
 
       options[:times] = true if totals
@@ -2630,7 +2747,7 @@ command :view do |c|
 
       options[:age] ||= :newest
 
-      opts = options.dup
+      opts = options.clone
       opts[:age] = options[:age].normalize_age(:newest)
       opts[:count] = count
       opts[:format] = date_format
@@ -2676,6 +2793,14 @@ command :yesterday do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output]
 
+  c.desc "Output using a template from configuration"
+  c.arg_name 'TEMPLATE_KEY'
+  c.flag [:config_template], type: TemplateName, default_value: 'today'
+
+  c.desc 'Override output format with a template string containing %placeholders'
+  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
 
@@ -2717,16 +2842,10 @@ command :yesterday do |c|
       end.join(' to ').split_date_range
     end
 
-    opt = {
-      after: options[:after],
-      before: options[:before],
-      duration: options[:duration],
-      from: options[:from],
-      sort_tags: options[:sort_tags],
-      tag_order: options[:tag_order].normalize_order,
-      totals: options[:totals],
-      order: settings.dig('templates', 'today', 'order')
-    }
+    opt = options.clone
+    opt[:tag_order] = options[:tag_order].normalize_order
+    opt[:order] = settings.dig('templates', options[:config_template], 'order')
+
     Doing::Pager.page wwid.yesterday(options[:section], options[:times], options[:output], opt).chomp
   end
 end
@@ -3015,7 +3134,7 @@ command :open do |c|
   end
 
   c.action do |_global_options, options, _args|
-    params = options.dup
+    params = options.clone
     params.delete_if do |k, v|
       k.instance_of?(String) || v.nil? || v == false
     end
@@ -3167,7 +3286,7 @@ command %i[archive move] do |c|
       search.sub!(/^'?/, "'") if options[:exact]
     end
 
-    opts = options.dup
+    opts = options.clone
     opts[:search] = search
     opts[:bool] = options[:bool].normalize_bool
     opts[:destination] = options[:to]
@@ -3587,17 +3706,44 @@ end
 
 # @@changelog @@changes
 desc 'List recent changes in Doing'
-long_desc 'Display a formatted list of changes in recent versions, latest at the top'
-command %i[changelog changes] do |c|
+long_desc %(Display a formatted list of changes in recent versions.
+
+            Without flags, displays only the most recent version.
+            Use --lookup or --all for history.)
+command %i[changes changelog] do |c|
+  c.desc 'Display all versions'
+  c.switch %i[a all], default_value: false, negatable: false
+
+  c.desc %(Look up a specific version. Specify versions as "MAJ.MIN.PATCH", MIN
+           and PATCH are optional. Use > or < to see all changes since or prior
+           to a version.)
+  c.arg_name 'VERSION'
+  c.flag %i[l lookup], must_match: /^(?:(?:(?:[<>=]|p(?:rior)|b(?:efore)|o(?:lder)|s(?:ince)|a(?:fter)|n(?:ewer))? *[\d.*?]+ *)+|(?:[\d.]+ *-+ *[\d.]+))$/
+
+  c.desc %(Show changelogs matching search terms (uses pattern-based searching).
+           Add slashes to search with regular expressions, e.g. `--search "/output.*flag/"`)
+  c.flag %i[s search]
+
+  c.example 'doing changes', desc: 'View changes in the current version'
+  c.example 'doing changes --all', desc: 'See the entire changelog'
+  c.example 'doing changes --lookup 2.0.21', desc: 'See changes from version 2.0.21'
+  c.example 'doing changes --lookup "> 2.1"', desc: 'See all changes since 2.1.0'
+  c.example 'doing changes --search "tags +bool"', desc: 'See all changes containing "tags" and "bool"'
+  c.example 'doing changes -l "> 2.1" -s "pattern"', desc: 'Lookup and search can be combined'
+
+
   c.action do |_global_options, options, args|
-    changelog = File.expand_path(File.join(File.dirname(__FILE__), '..', 'CHANGELOG.md'))
-    if File.exist?(changelog)
-      parsed = TTY::Markdown.parse(IO.read(changelog), width: 80, symbols: {override: {bullet: "•"}})
-      Doing::Pager.paginate = true
-      Doing::Pager.page parsed
-    else
-      raise "Error locating changelog"
-    end
+    cl = Doing::Changes.new(lookup: options[:lookup], search: options[:search])
+
+    content = if options[:all] || options[:search] || options[:lookup]
+                cl.to_s
+              else
+                cl.latest
+              end
+
+    parsed = TTY::Markdown.parse(content, width: 80, symbols: {override: {bullet: "•"}})
+    Doing::Pager.paginate = true
+    Doing::Pager.page parsed
   end
 end
 
@@ -3654,7 +3800,7 @@ pre do |global, _command, _options, _args|
   Doing::Pager.paginate = global[:pager]
 
   $stdout.puts "doing v#{Doing::VERSION}" if global[:version]
-  unless STDOUT.isatty
+  unless $stdout.isatty
     Doing::Color.coloring = global[:pager] ? global[:color] : false
   else
     Doing::Color.coloring = global[:color]
@@ -3704,7 +3850,12 @@ around do |global, command, options, arguments, code|
     Doing::Prompt.force_answer = false
     Doing.config.force_answer = false
   else
-    Doing::Prompt.default_answer = global[:default]
+    Doing::Prompt.default_answer = if $stdout.isatty
+                                     global[:default]
+                                   else
+                                     true
+                                   end
+
     Doing.config.force_answer = global[:default] ? true : false
   end