doing 2.1.39 → 2.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02eff91d6af3da80b7a9f728c517dbb34c4a308d74f7b722a45c0999e3d9cec8
-  data.tar.gz: edb57cbb3c4c3c6a6a598f3e16a6a8d23dcb2a466635b68e0ecd359db207f8f3
+  metadata.gz: 8bd8641c5280331189462c44f52c5bc4437c77610072d3c142cf7a56a6e75be6
+  data.tar.gz: 40a53127983360a0b7720dd4b27c71d5b783d23d22790bfbcdc8b7f49556ce2d
 SHA512:
-  metadata.gz: f1c66ccce28e225692c0e3fbbb46a74ba0c5ebd5f8043c79f2a938948cbb5c8a65dc6a7a80a19901bf5633441e01c083a7d1ab6e589cb1bfd5542f4aa6d48b5d
-  data.tar.gz: 53560dc1b93d92e67e9bc3a1803da23aaf167041857301126b4ae8b2eff851b75c45b36386cfad34922e22cbc2acc1e689b3c7b635f46dfd0fe5833d7ea24d4e
+  metadata.gz: 4d47d3a88086dd579b3b0f1f37a7e17890dd5969487bebd00f92f6194b6281987056b792ece88718c1a4da35803a9748d7cddb7e72f5c908fb0056e299ff9ef3
+  data.tar.gz: b2ba0a2c7a3b21e09c1da73c959895fb4dff4f72244cc5c6f855a1d44668d8b5620292881bbb47a7c1896c0fb68430fe33d1e5509a657c5c1fd870c1f5211028

data/CHANGELOG.md

@@ -1,3 +1,26 @@
+### 2.1.40
+
+2022-03-14 19:56
+
+#### NEW
+
+- `doing finish` accepts `--from` ranges to update both start and finish dates
+- `doing finish` allows `--back` and `--took` to be used together
+- `doing finish` allows `--search` and `--tag` to be used together
+- `doing finish --from 'DATE to DATE'` allows you to set a new start and end time with a single range string
+- `doing reset --from 'DATE to DATE'` allows you to reset an entry's start time and update or add @done time
+- `doing reset` accepts a `--took Xm` flag to change the finish time
+- `--output FORMAT` option for all display commands, including last, recent and today
+
+#### IMPROVED
+
+- Code refactoring, split up WWID class
+- Better diff method available to hooks to see what changed
+
+#### FIXED
+
+- Search highlighting was being skipped in all cases
+
 ### 2.1.39
 
 2022-03-13 04:32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.39)
+    doing (2.1.40)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)

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.38<!--END VER-->.
+The current version of `doing` is <!--VER-->2.1.39<!--END VER-->.
 
 Find all of the documentation in the [doing wiki][wiki].
 

data/bin/commands/config.rb

@@ -29,7 +29,7 @@ command :config do |c|
   c.long_desc 'Config files are listed in order of precedence (if there are multiple configs detected).
   Values defined in the top item in the list will override values in configutations below it.'
   c.command :list do |list|
-    list.action do |global, options, args|
+    list.action do
       puts Doing.config.additional_configs.join("\n")
       puts Doing.config.config_file
     end
@@ -54,7 +54,8 @@ command :config do |c|
       edit.arg_name 'BUNDLE_ID'
       edit.flag %i[b bundle_id]
 
-      edit.desc "Use the config editor defined in ~/.config/doing/config.yml (#{Doing.setting('editors.config', 'editors.config not set')})"
+      default_editor = Doing.setting('editors.config', 'editors.config not set')
+      edit.desc "Use the config editor defined in ~/.config/doing/config.yml (#{default_editor})"
       edit.switch %i[x default], negatable: false
     end
 
@@ -68,10 +69,11 @@ command :config do |c|
         end
         action = cmd.send(:get_action, nil)
         action.call(global, options, args)
-        Doing.logger.warn('Deprecated:', '--dump and --update are deprecated,
-                             use `doing config get` and `doing config update`')
-        Doing.logger.output_results
-        return
+
+        raise DoingNoTraceError.new('--dump and --update are deprecated,
+                                    use `doing config get` and `doing config update`',
+                                    level: :warn,
+                                    topic: 'Deprecated:')
       end
 
       config_file = Doing.config.choose_config
@@ -79,14 +81,12 @@ command :config do |c|
       if `uname` =~ /Darwin/
         if options[:default]
           editor = Doing::Util.find_default_editor('config')
-          if editor
-            if Doing::Util.exec_available(editor.split(/ /).first)
-              system %(#{editor} "#{config_file}")
-            else
-              `open -a "#{editor}" "#{config_file}"`
-            end
+          raise InvalidArgument, 'No viable editor found in config or environment.' unless editor
+
+          if Doing::Util.exec_available(editor.split(/ /).first)
+            system %(#{editor} "#{config_file}")
           else
-            raise InvalidArgument, 'No viable editor found in config or environment.'
+            `open -a "#{editor}" "#{config_file}"`
           end
         elsif options[:app] || options[:bundle_id]
           if options[:app]
@@ -107,7 +107,10 @@ command :config do |c|
         end
       else
         editor = options[:editor] || Doing::Util.default_editor
-        raise MissingEditor, 'No EDITOR variable defined in environment' unless editor && Doing::Util.exec_available(editor.split(/ /).first)
+        unless editor && Doing::Util.exec_available(editor.split(/ /).first)
+          raise MissingEditor, 'No EDITOR variable defined in environment'
+
+        end
 
         system %(#{editor} "#{config_file}")
       end
@@ -117,8 +120,8 @@ command :config do |c|
   # @@config.update @@config.refresh
   c.desc 'Update default config file, adding any missing keys'
   c.command %i[update refresh] do |update|
-    update.action do |_global, options, args|
-      Doing.config.configure({rewrite: true, ignore_local: true})
+    update.action do
+      Doing.config.configure({ rewrite: true, ignore_local: true })
       Doing.logger.warn('Config:', 'config refreshed')
     end
   end
@@ -126,7 +129,7 @@ command :config do |c|
   # @@config.undo
   c.desc 'Undo the last change to a config file'
   c.command :undo do |undo|
-    undo.action do |_global, options, args|
+    undo.action do
       config_file = Doing.config.choose_config
       Doing::Util::Backup.restore_last_backup(config_file, count: 1)
     end
@@ -137,22 +140,24 @@ command :config do |c|
   c.arg 'KEY_PATH'
   c.command %i[get dump] do |dump|
     dump.example 'doing config get', desc: 'Output the entire configuration'
-    dump.example 'doing config get timer_format --output raw', desc: 'Output the value of timer_format as a plain string'
-    dump.example 'doing config get doing_file', desc: 'Output the value of the doing_file setting, respecting local configurations'
-    dump.example 'doing config get -o json plug.plugpath', desc: 'Key path is fuzzy matched: output the value of plugins.plugin_path as JSON'
+    dump.example 'doing config get timer_format --output raw',
+                 desc: 'Output the value of timer_format as a plain string'
+    dump.example 'doing config get doing_file',
+                 desc: 'Output the value of the doing_file setting, respecting local configurations'
+    dump.example 'doing config get -o json plug.plugpath',
+                 desc: 'Key path is fuzzy matched: output the value of plugins.plugin_path as JSON'
 
     dump.desc 'Format for output (json|yaml|raw)'
     dump.arg_name 'FORMAT'
     dump.flag %i[o output], default_value: 'yaml', must_match: /^(?:y(?:aml)?|j(?:son)?|r(?:aw)?)$/
 
     dump.action do |_global, options, args|
-
       keypath = args.join('.')
       cfg = Doing.config.value_for_key(keypath)
       real_path = Doing.config.resolve_key_path(keypath)
 
       if cfg
-        val = cfg.map {|k, v| v }[0]
+        val = cfg.map { |_, v| v }[0]
         if real_path.count.positive?
           nested_cfg = {}
           nested_cfg.deep_set(real_path, val)
@@ -161,13 +166,15 @@ command :config do |c|
         end
 
         if options[:output] =~ /^r/
-          if val.is_a?(Hash)
-            $stdout.puts YAML.dump(val)
-          elsif val.is_a?(Array)
-            $stdout.puts val.join(', ')
-          else
-            $stdout.puts val.to_s
-          end
+
+          $stdout.puts case val
+                       when Hash
+                         YAML.dump(val)
+                       when Array
+                         val.join(', ')
+                       else
+                         val.to_s
+                       end
         else
           $stdout.puts case options[:output]
                        when /^j/
@@ -188,13 +195,14 @@ command :config do |c|
   c.arg 'KEY VALUE'
   c.command :set do |set|
     set.example 'doing config set timer_format human', desc: 'Set the value of timer_format to "human"'
-    set.example 'doing config set plug.plugpath ~/my_plugins', desc: 'Key path is fuzzy matched: set the value of plugins.plugin_path'
+    set.example 'doing config set plug.plugpath ~/my_plugins',
+                desc: 'Key path is fuzzy matched: set the value of plugins.plugin_path'
 
     set.desc 'Delete specified key'
     set.switch %i[r remove], negatable: false
 
     set.desc 'Force update to .doingrc in the current directory'
-    set.switch %[local], negatable: false
+    set.switch %i[local], negatable: false
 
     set.action do |_global, options, args|
       if args.count < 2 && !options[:remove]
@@ -209,10 +217,11 @@ command :config do |c|
       old_type = old_value&.class.to_s || nil
 
       if old_value.is_a?(Hash) && !options[:remove]
-        Doing.logger.log_now(:warn, 'Config:', "Config key must point to a single value, #{real_path.join('.').boldwhite} is a mapping")
+        Doing.logger.log_now(:warn, 'Config:', ['Config key must point to a single value, ',
+                                                "#{real_path.join('.').boldwhite} is a mapping"].join(' '))
         didyou = 'Did you mean:'
-        old_value.keys.each do |k|
-          Doing.logger.log_now(:warn, "#{didyou}", "#{keypath}.#{k}?")
+        old_value.each_key do |k|
+          Doing.logger.log_now(:warn, didyou, "#{keypath}.#{k}?")
           didyou = '..........or:'
         end
         raise InvalidArgument, 'Config value is a mapping, can not be set to a single value'

data/bin/commands/done.rb

@@ -19,24 +19,6 @@ command %i[done did] do |c|
   c.desc 'Immediately archive the entry'
   c.switch %i[a archive], negatable: false, default_value: false
 
-  c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm).
-  Used with --took, backdates start date)
-  c.arg_name 'DATE_STRING'
-  c.flag %i[at finished], type: DateEndString
-
-  c.desc %(
-        Start and end times as a date/time range `doing done --from "1am to 8am"`.
-        Overrides other date flags.
-      )
-  c.arg_name 'TIME_RANGE'
-  c.flag [:from], must_match: REGEX_RANGE
-
-  c.desc %(Set completion date to start date plus interval (XX[mhd] or HH:MM).
-  If used without the --back option, the start date will be moved back to allow
-  the completion date to be the current time.)
-  c.arg_name 'INTERVAL'
-  c.flag %i[t took for], type: DateIntervalString
-
   c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section]
@@ -45,6 +27,7 @@ command %i[done did] do |c|
   c.switch %i[u unfinished], negatable: false, default_value: false
 
   add_options(:add_entry, c)
+  add_options(:finish_entry, c)
 
   c.action do |global_options, options, args|
     Doing.auto_tag = !options[:noauto]

data/bin/commands/finish.rb

@@ -14,14 +14,6 @@ command :finish do |c|
   c.arg_name 'DATE_STRING'
   c.flag %i[b back started], type: DateBeginString
 
-  c.desc 'Set the completed date to the start date plus XX[hmd]'
-  c.arg_name 'INTERVAL'
-  c.flag %i[t took for], type: DateIntervalString
-
-  c.desc %(Set finish date to specific date/time (natural langauge parsed, e.g. --at=1:30pm). If used, ignores --back.)
-  c.arg_name 'DATE_STRING'
-  c.flag %i[at finished], type: DateEndString
-
   c.desc 'Overwrite existing @done tag with new date'
   c.switch %i[update], negatable: false, default_value: false
 
@@ -48,32 +40,43 @@ command :finish do |c|
 
   add_options(:search, c)
   add_options(:tag_filter, c)
+  add_options(:finish_entry, c)
 
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     unless options[:auto]
-      if options[:took]
-        took = options[:took]
-        raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
-      end
+      if options[:from]
+        options[:from] = options[:from].split(/#{REGEX_RANGE_INDICATOR}/).map do |time|
+          time =~ REGEX_TIME ? "today #{time.sub(/(?mi)(^.*?(?=\d+)|(?<=[ap]m).*?$)/, '')}" : time
+        end.join(' to ').split_date_range
+        start_date, finish_date = options[:from]
+        finish_date ||= Time.now
+      else
+        if options[:took]
+          took = options[:took]
+          raise InvalidTimeExpression, 'Unable to parse date string for --took' if took.nil?
 
-      raise InvalidArgument, '--back and --took can not be used together' if options[:back] && options[:took]
+        end
 
-      raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
+        if options[:at]
+          finish_date = options[:at]
+          finish_date = finish_date.chronify(guess: :begin) if finish_date.is_a? String
+          raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
 
-      if options[:at]
-        finish_date = options[:at]
-        finish_date = finish_date.chronify(guess: :begin) if finish_date.is_a? String
-        raise InvalidTimeExpression, 'Unable to parse date string for --at' if finish_date.nil?
+          start_date = options[:took] ? finish_date - took : nil
+        elsif options[:back]
+          start_date = options[:back]
+          finish_date = options[:took] ? start_date + took : Time.now
 
-        date = options[:took] ? finish_date - took : finish_date
-      elsif options[:back]
-        date = options[:back]
+          raise InvalidTimeExpression, 'Unable to parse date string' if start_date.nil?
 
-        raise InvalidTimeExpression, 'Unable to parse date string' if date.nil?
-      else
-        date = Time.now
+        else
+          start_date = options[:took] ? Time.now - took : nil
+          finish_date = Time.now
+        end
       end
+
+
     end
 
     if options[:tag].nil?
@@ -101,10 +104,11 @@ command :finish do |c|
 
     opts = {
       archive: options[:archive],
-      back: date,
+      back: start_date,
       case: options[:case].normalize_case,
       count: count,
       date: options[:date],
+      done_date: finish_date,
       fuzzy: options[:fuzzy],
       interactive: options[:interactive],
       not: options[:not],
@@ -112,6 +116,7 @@ command :finish do |c|
       search: search,
       section: options[:section],
       sequential: options[:auto],
+      start_date: start_date,
       tag: tags,
       tag_bool: options[:bool].normalize_bool,
       tags: ['done'],

data/bin/commands/grep.rb

@@ -16,25 +16,12 @@ command %i[grep search] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  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 '[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 'Case sensitivity for search string matching [(c)ase-sensitive, (i)gnore, (s)mart]'
   c.arg_name 'TYPE'
   c.flag [:case], must_match: REGEX_CASE,
@@ -53,13 +40,15 @@ 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
 
+  add_options(:output_template, c)
   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
-    raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
+
+    raise InvalidPlugin.new('output', options[:output]) if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     template = Doing.setting(['templates', options[:config_template]]).deep_merge(Doing.settings)
     tags_color = template.key?('tags_color') ? template['tags_color'] : nil

data/bin/commands/last.rb

@@ -21,20 +21,13 @@ command :last do |c|
   c.desc "Delete the last entry"
   c.switch %i[d delete], negatable: false, default_value: false
 
-  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: Doing.settings.dig('search', 'highlight')
 
   c.desc 'Show elapsed time if entry is not tagged @done'
   c.switch [:duration]
 
+  add_options(:output_template, c, default_template: 'last')
   add_options(:search, c)
   add_options(:tag_filter, c)
 
@@ -69,6 +62,7 @@ command :last do |c|
                         case: options[:case],
                         hilite: options[:hilite],
                         negate: options[:not],
+                        output: options[:output],
                         tag: options[:tag],
                         tag_bool: options[:bool],
                         delete: options[:delete],

data/bin/commands/meanwhile.rb

@@ -19,6 +19,8 @@ command :meanwhile do |c|
   c.switch %i[a archive], negatable: false, default_value: false
 
   add_options(:add_entry, c)
+  # TODO: Add took and from handling for post-dating meanwhile entries
+  # add_options(:add_dated, c)
 
   c.action do |global_options, options, args|
     Doing.auto_tag = !options[:noauto]
@@ -31,17 +33,18 @@ command :meanwhile do |c|
       date = Time.now
     end
 
-    if options[:section]
-      section = @wwid.guess_section(options[:section]) || options[:section].cap_first
-    else
-      section = Doing.setting('current_section')
-    end
+    section = if options[:section]
+                @wwid.guess_section(options[:section]) || options[:section].cap_first
+              else
+                Doing.setting('current_section')
+              end
     input = ''
 
     ask_note = options[:ask] ? Doing::Prompt.read_lines(prompt: 'Add a note') : []
 
     if options[:editor]
       raise MissingEditor, 'No EDITOR variable defined in environment' if Doing::Util.default_editor.nil?
+
       input += date.strftime('%F %R | ')
       input += args.join(' ') unless args.empty?
       input += "\n#{options[:note]}" if options[:note]
@@ -70,7 +73,11 @@ command :meanwhile do |c|
       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 })
+    @wwid.stop_start('meanwhile', { new_item: input,
+                                    back: date,
+                                    section: section,
+                                    archive: options[:archive],
+                                    note: note })
     @wwid.write(@wwid.doing_file)
   end
 end

data/bin/commands/on.rb

@@ -13,35 +13,22 @@ command :on do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  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]
-
+  add_options(:output_template, c)
   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)
+    raise InvalidPlugin.new('output', options[:output]) if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
     raise MissingArgument, 'Missing date argument' if args.empty?
 
     date_string = args.join(' ').strip
     if date_string =~ /^tod(?:ay)?/i
-      date_string = 'today 01:00 to today 23:59'
+      date_string = 'midnight to today 23:59'
     end
 
-    puts date_string
-
     start, finish = date_string.split_date_range
 
     raise InvalidTimeExpression, "Unrecognized date string (#{date_string})" unless start

data/bin/commands/recent.rb

@@ -12,17 +12,10 @@ command :recent do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
-  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 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
 
+  add_options(:output_template, c, default_template: 'recent')
   add_options(:time_display, c)
 
   c.action do |global_options, options, args|
@@ -53,6 +46,7 @@ command :recent do |c|
         times: options[:times],
         totals: options[:totals],
         interactive: options[:interactive],
+        output: options[:output],
         duration: options[:duration],
         config_template: options[:config_template],
         template: options[:template]

data/bin/commands/reset.rb

@@ -17,6 +17,17 @@ command %i[reset begin] do |c|
   c.desc 'Resume entry (remove @done)'
   c.switch %i[r resume], default_value: true
 
+  c.desc %(
+        Start and end times as a date/time range `doing done --from "1am to 8am"`.
+        Overrides any date argument and disables --resume.
+      )
+  c.arg_name 'TIME_RANGE'
+  c.flag [:from], must_match: REGEX_RANGE
+
+  c.desc %(Set completion date to start date plus interval (XX[mhd] or HH:MM). Disables --resume)
+  c.arg_name 'INTERVAL'
+  c.flag %i[t took for], type: DateIntervalString
+
   c.desc 'Change start date but do not remove @done (shortcut for --no-resume)'
   c.switch [:n]
 
@@ -62,9 +73,21 @@ command %i[reset begin] do |c|
 
     raise NoResults, 'No entry matching parameters was found.' unless last_entry
 
+    finish_date = nil
+
+    if options[:from]
+      options[:from] = options[:from].split(/#{REGEX_RANGE_INDICATOR}/).map do |time|
+        time =~ REGEX_TIME ? "today #{time.sub(/(?mi)(^.*?(?=\d+)|(?<=[ap]m).*?$)/, '')}" : time
+      end.join(' to ').split_date_range
+      reset_date, finish_date = options[:from]
+      options[:resume] = false if finish_date
+    end
+
+    finish_date = reset_date + options[:took] if options[:took]
+
     old_item = last_entry.clone
 
-    @wwid.reset_item(last_entry, date: reset_date, resume: options[:resume])
+    @wwid.reset_item(last_entry, date: reset_date, finish_date: finish_date, resume: options[:resume])
     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)
 

data/bin/commands/select.rb

@@ -94,7 +94,7 @@ command :select do |c|
 
   c.action do |_global_options, options, _args|
     if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
-      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+      raise InvalidPlugin.new('output', options[:output])
 
     end
 

data/bin/commands/show.rb

@@ -22,38 +22,27 @@ command :show do |c|
   c.arg_name 'MAX'
   c.flag %i[c count], default_value: 0, must_match: /^\d+$/, type: Integer
 
-  c.desc 'Age (oldest|newest)'
-  c.arg_name 'AGE'
-  c.flag %i[a age], default_value: :newest, type: AgeSymbol
-
   c.desc "Highlight search matches in output. Only affects command line output"
   c.switch %i[h hilite], default_value: Doing.settings.dig('search', 'highlight')
 
   c.desc "Edit matching entries with #{Doing::Util.default_editor}"
   c.switch %i[e editor], negatable: false, default_value: false
 
+  c.desc 'Age (oldest|newest)'
+  c.arg_name 'AGE'
+  c.flag %i[a age], default_value: :newest, type: AgeSymbol
+
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: REGEX_SORT_ORDER, default_value: :asc, type: OrderSymbol
 
-  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
 
   c.desc 'Select from a menu of matching entries to perform additional operations'
   c.switch %i[i interactive], negatable: false, default_value: false
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  c.arg_name 'FORMAT'
-  c.flag %i[o output]
-
+  add_options(:output_template, c)
   add_options(:time_display, c)
   add_options(:search, c)
   add_options(:tag_filter, c)
@@ -62,7 +51,7 @@ command :show do |c|
   c.action do |global_options, options, args|
     options[:fuzzy] = false
     if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
-      raise DoingRuntimeError, %(Invalid output type "#{options[:output]}")
+      raise InvalidPlugin.new('output', options[:output])
 
     end