doing 2.1.30 → 2.1.34

data/Dockerfile-2.6

@@ -5,5 +5,7 @@ WORKDIR /doing
 # COPY ./ /doing/
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
-RUN apt-get install -y less
+RUN apt-get install -y less vim
+COPY ./inputrc /root/.inputrc
+COPY ./bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/Dockerfile-2.7

@@ -1,9 +1,11 @@
 FROM ruby:2.7
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+# RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
 RUN mkdir /doing
 WORKDIR /doing
 # COPY ./ /doing/
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
-RUN apt-get install -y less
+RUN apt-get install -y less vim
+COPY ./inputrc /root/.inputrc
+COPY ./bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/Dockerfile-3.0

@@ -5,5 +5,7 @@ WORKDIR /doing
 # COPY ./ /doing/
 RUN gem install bundler:2.2.17
 RUN apt-get update -y
-RUN apt-get install -y less
+RUN apt-get install -y less vim
+COPY ./inputrc /root/.inputrc
+COPY ./bash_profile /root/.bash_profile
 CMD ["scripts/runtests.sh"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.1.30)
+    doing (2.1.34)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)
       gli (~> 2.20, >= 2.20.1)
@@ -20,68 +20,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (7.0.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    aruba (1.0.4)
-      childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
-      rspec-expectations (~> 3.4)
-      thor (~> 1.0)
-    builder (3.2.4)
-    childprocess (4.1.0)
     chronic (0.10.2)
-    concurrent-ruby (1.1.9)
-    contracts (0.16.1)
-    cucumber (5.3.0)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      cucumber-wire (~> 4.0, >= 4.0.1)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.4)
-      cucumber-messages (~> 13.1, >= 13.1.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.2.1)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
     deep_merge (1.2.2)
-    diff-lcs (1.5.0)
     ffi (1.15.5)
     github-markup (4.0.0)
     gli (2.20.1)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
-    i18n (1.8.11)
-      concurrent-ruby (~> 1.0)
     kramdown (2.3.1)
       rexml
-    middleware (0.1.0)
-    minitest (5.15.0)
-    multi_test (0.1.2)
     parallel (1.21.0)
     parallel_tests (3.7.3)
       parallel
@@ -90,20 +38,11 @@ GEM
       tty-color (~> 0.5)
     plist (3.6.0)
     power_assert (2.0.1)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
     rake (13.0.6)
     rdoc (6.3.3)
     redcarpet (3.5.1)
     rexml (3.2.5)
     rouge (3.27.0)
-    rspec-expectations (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
     safe_yaml (1.0.5)
     strings (0.2.1)
       strings-ansi (~> 0.2)
@@ -115,8 +54,6 @@ GEM
     temple (0.8.2)
     test-unit (3.4.9)
       power_assert
-    thor (1.2.1)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
@@ -141,8 +78,6 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     tty-which (0.5.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     unicode_utils (1.4.0)
     webrick (1.7.0)
@@ -154,7 +89,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 1.0.2)
   doing!
   github-markup (~> 4.0, >= 4.0.0)
   parallel_tests (~> 3.7, >= 3.7.3)

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

data/bash_profile

@@ -0,0 +1,13 @@
+#!/bin/bash
+export GLI_DEBUG=true
+export EDITOR="/usr/bin/vim"
+alias bdoing="GLI_DEBUG=true bundle exec bin/doing"
+
+shopt -s nocaseglob
+shopt -s histappend
+shopt -s histreedit
+shopt -s histverify
+shopt -s cmdhist
+
+cd /doing
+bundle install

data/bin/commands/again.rb

@@ -39,7 +39,7 @@ command %i[again resume] do |c|
 
     if options[:back]
       options[:date] = options[:back]
-      raise InvalidTimeExpression, 'Unable to parse date string for --back' if date.nil?
+      raise InvalidTimeExpression, 'Unable to parse date string for --back' if options[:date].nil?
 
     else
       options[:date] = Time.now

data/bin/commands/archive.rb

@@ -5,9 +5,9 @@ desc 'Move entries between sections'
 long_desc %(Argument can be a section name to move all entries from a section,
 or start with an "@" to move entries matching a tag.
 
-Default with no argument moves items from the "#{@settings['current_section']}" section to Archive.)
+Default with no argument moves items from the "#{Doing.setting('current_section')}" section to Archive.)
 arg_name 'SECTION_OR_TAG'
-default_value @settings['current_section']
+default_value Doing.setting('current_section')
 command %i[archive move] do |c|
   c.example 'doing archive Currently', desc: 'Move all entries in the Currently section to Archive section'
   c.example 'doing archive @done', desc: 'Move all entries tagged @done to Archive'
@@ -33,7 +33,7 @@ command %i[archive move] do |c|
   c.action do |_global_options, options, args|
     options[:fuzzy] = false
     section, tags = if args.empty?
-                      [@settings['current_section'], []]
+                      [Doing.setting('current_section'), []]
                     elsif args[0] =~ /^all/i
                       ['all', []]
                     elsif args[0] =~ /^@\S+/

data/bin/commands/cancel.rb

@@ -30,7 +30,7 @@ command :cancel do |c|
     options[:section] = if options[:section]
                           @wwid.guess_section(options[:section]) || options[:section].cap_first
                         else
-                          @settings['current_section']
+                          Doing.setting('current_section')
                         end
 
     raise InvalidArgument, 'Only one argument allowed' if args.length > 1

data/bin/commands/commands.rb

@@ -15,8 +15,8 @@ command :commands do |c|
   c.arg_name 'COMMAND [COMMAND...]'
   c.command %i[add enable] do |add|
     add.action do |_global, _options, args|
-      cfg = @settings
-      custom_dir = @settings.dig('plugins', 'command_path')
+      cfg = Doing.settings
+      custom_dir = cfg.dig('plugins', 'command_path')
 
       available = cfg['disabled_commands']
       raise UserCancelled, 'No commands available to enable' unless args.good? || available.good?
@@ -45,8 +45,8 @@ command :commands do |c|
 
       cfg.deep_set(['disabled_commands'], available)
 
-      Doing::Util.write_to_file(@config.config_file, YAML.dump(cfg), backup: true)
-      Doing.logger.warn('Config:', "#{@config.config_file} updated")
+      Doing::Util.write_to_file(Doing.config.config_file, YAML.dump(cfg), backup: true)
+      Doing.logger.warn('Config:', "#{Doing.config.config_file} updated")
     end
   end
 
@@ -55,8 +55,8 @@ command :commands do |c|
   c.command %i[remove disable] do |remove|
     remove.action do |_global, _options, args|
       available = Dir.glob(File.join(File.dirname(__FILE__), '*.rb')).map { |cmd| File.basename(cmd, '.rb') }
-      cfg = @settings
-      custom_dir = @settings.dig('plugins', 'command_path')
+      cfg = Doing.settings
+      custom_dir = cfg.dig('plugins', 'command_path')
       custom_commands = Dir.glob(File.join(File.expand_path(custom_dir), '*.rb'))
       available.concat(custom_commands.map { |cmd| File.basename(cmd, '.rb') })
       disabled = cfg['disabled_commands']
@@ -82,8 +82,8 @@ command :commands do |c|
 
       cfg.deep_set(['disabled_commands'], disabled.concat(to_disable))
 
-      Doing::Util.write_to_file(@config.config_file, YAML.dump(cfg), backup: true)
-      Doing.logger.warn('Config:', "#{@config.config_file} updated")
+      Doing::Util.write_to_file(Doing.config.config_file, YAML.dump(cfg), backup: true)
+      Doing.logger.warn('Config:', "#{Doing.config.config_file} updated")
     end
   end
 end

data/bin/commands/completion.rb

@@ -1,27 +1,69 @@
 # frozen_string_literal: true
 
+SHELLS = %w[zsh bash fish all].freeze
+SHELL_RX = /^(?:[bzf](?:[ai]?sh)?|all)$/i.freeze
+
 # @@completion
-desc 'Generate shell completion scripts'
+desc 'Generate shell completion scripts for doing'
 long_desc 'Generates the necessary scripts to add command line completion to various shells,
 so typing \'doing\' and hitting tab will offer completions of subcommands and their options.'
 command :completion do |c|
-  c.example 'doing completion', desc: 'Output zsh (default) to STDOUT'
-  c.example 'doing completion --type zsh --file ~/.zsh-completions/_doing.zsh',
-            desc: 'Output zsh completions to file'
-  c.example 'doing completion --type fish --file ~/.config/fish/completions/doing.fish',
-            desc: 'Output fish completions to file'
-  c.example 'doing completion --type bash --file ~/.bash_it/completion/enabled/doing.bash',
-            desc: 'Output bash completions to file'
-
-  c.desc 'Shell to generate for (bash, zsh, fish)'
-  c.arg_name 'SHELL'
-  c.flag %i[t type], must_match: /^(?:[bzf](?:[ai]?sh)?|all)$/i, default_value: 'zsh'
-
-  c.desc 'File to write output to'
-  c.arg_name 'PATH'
-  c.flag %i[f file], default_value: 'STDOUT'
-
-  c.action do |_global_options, options, _args|
-    Doing::Completion.generate_completion(type: options[:type], file: options[:file])
+  c.example 'doing completion install zsh',
+            desc: 'Install the default zsh completion script and link it to the zsh autolaod directory.'
+  c.example 'doing completion generate zsh', desc: 'Generate zsh (default) script to default file, offer to symlink'
+  c.example 'doing completion generate fish --file ~/doing.fish',
+            desc: 'Generate fish completions to alternative file'
+
+  c.desc 'Deprecated, specify shell as argument to subcommand'
+  c.flag %i[t type], must_match: SHELL_RX
+
+  c.desc 'Generate completion scripts, including custom plugins and command options'
+  c.long_desc "Argument specifies which shell to install for: #{SHELLS.join(', ')}"
+  c.arg_name "[#{SHELLS.join('|')}]"
+  c.command :generate do |gen|
+    gen.example 'doing completion generate fish', desc: 'Generate fish completion script and link to autoload directory'
+    gen.example 'doing completion generate zsh --file ~/.zsh-completions/doing.zsh', desc: 'Generate zsh completion script and save to alternative file'
+
+    gen.desc 'Alternative file to write output to'
+    gen.arg_name 'PATH'
+    gen.flag %i[f file]
+
+    gen.desc 'Output result to STDOUT only'
+    gen.switch [:stdout], negatable: false
+
+    gen.action do |_global_options, options, args|
+      args = [options[:type]] if options[:type] && args.count.zero?
+
+      raise MissingArgument, "Specify a shell (#{SHELLS.join('|')})" unless args.count.positive?
+
+      file = options[:stdout] ? 'stdout' : options[:file] || :default
+
+      raise InvalidArgument, '--file can not be used with multiple arguments' if options[:file] && args.count > 1
+
+      args.each do |shell|
+        type = Doing::Completion.normalize_type(shell)
+        raise InvalidArgument, "Unknown shell #{shell}" if type == :invalid
+
+        Doing::Completion.generate_completion(type: type, file: file)
+      end
+    end
+  end
+
+  c.desc 'Install default completion scripts'
+  c.long_desc 'Argument specifies which shell to install for: zsh, bash, fish, or all'
+  c.arg_name '[zsh|bash|fish]'
+  c.command :install do |install|
+    install.example 'doing completion install zsh', desc: 'Install and link zsh completion script'
+
+    # install.flag %i[t type], must_match: /^(?:[bzf](?:[ai]?sh)?|all)$/i
+
+    install.action do |_global_options, options, args|
+      type = options[:type] || args[0]&.strip || 'zsh'
+      raise InvalidArgument, "Unknown shell #{type}" unless type =~ SHELL_RX
+
+      Doing::Completion.link_default(type)
+    end
   end
+
+  c.default_command :generate
 end

data/bin/commands/config.rb

@@ -30,8 +30,8 @@ command :config do |c|
   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|
-      puts @config.additional_configs.join("\n")
-      puts @config.config_file
+      puts Doing.config.additional_configs.join("\n")
+      puts Doing.config.config_file
     end
   end
 
@@ -43,7 +43,7 @@ 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?
       edit.desc 'Application to use'
@@ -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|
@@ -74,7 +74,7 @@ command :config do |c|
         return
       end
 
-      config_file = @config.choose_config
+      config_file = Doing.config.choose_config
 
       if Sys::Platform.mac?
         if options[:default]
@@ -118,7 +118,7 @@ command :config do |c|
   c.desc 'Update default config file, adding any missing keys'
   c.command %i[update refresh] do |update|
     update.action do |_global, options, args|
-      @config.configure({rewrite: true, ignore_local: true})
+      Doing.config.configure({rewrite: true, ignore_local: true})
       Doing.logger.warn('Config:', 'config refreshed')
     end
   end
@@ -127,7 +127,7 @@ command :config do |c|
   c.desc 'Undo the last change to a config file'
   c.command :undo do |undo|
     undo.action do |_global, options, args|
-      config_file = @config.choose_config
+      config_file = Doing.config.choose_config
       Doing::Util::Backup.restore_last_backup(config_file, count: 1)
     end
   end
@@ -148,8 +148,8 @@ command :config do |c|
     dump.action do |_global, options, args|
 
       keypath = args.join('.')
-      cfg = @config.value_for_key(keypath)
-      real_path = @config.resolve_key_path(keypath)
+      cfg = Doing.config.value_for_key(keypath)
+      real_path = Doing.config.resolve_key_path(keypath)
 
       if cfg
         val = cfg.map {|k, v| v }[0]
@@ -191,7 +191,10 @@ command :config do |c|
     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], default_value: false, negatable: false
+    set.switch %i[r remove], negatable: false
+
+    set.desc 'Force update to .doingrc in the current directory'
+    set.switch %[local], negatable: false
 
     set.action do |_global, options, args|
       if args.count < 2 && !options[:remove]
@@ -201,8 +204,8 @@ command :config do |c|
 
       value = options[:remove] ? nil : args.pop
       keypath = args.join('.')
-      real_path = @config.resolve_key_path(keypath, create: true)
-      old_value = @settings.dig(*real_path)
+      real_path = Doing.config.resolve_key_path(keypath, create: true)
+      old_value = Doing.config.settings.dig(*real_path)
       old_type = old_value&.class.to_s || nil
 
       if old_value.is_a?(Hash) && !options[:remove]
@@ -216,11 +219,11 @@ command :config do |c|
 
       end
 
-      config_file = @config.choose_config(create: true)
+      config_file = Doing.config.choose_config(create: true, local: options[:local])
 
       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)
@@ -228,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
@@ -98,7 +98,7 @@ command %i[done did] do |c|
     if options[:section]
       section = @wwid.guess_section(options[:section]) || options[:section].cap_first
     else
-      section = @settings['current_section']
+      section = Doing.setting('current_section')
     end
 
 

data/bin/commands/flag.rb

@@ -34,7 +34,7 @@ command %i[mark flag] do |c|
 
   c.action do |_global_options, options, _args|
     options[:fuzzy] = false
-    mark = @settings['marker_tag'] || 'flagged'
+    mark = Doing.setting('marker_tag', 'flagged')
 
     raise InvalidArgument, '--search and --tag can not be used together' if options[:search] && options[:tag]
 

data/bin/commands/grep.rb

@@ -28,40 +28,21 @@ 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 = @settings['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: @config.exact_match?, negatable: @config.exact_match?
+  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'
   c.flag [:case], must_match: REGEX_CASE,
-                  default_value: @settings.dig('search', 'case').normalize_case,
+                  default_value: Doing.settings.dig('search', 'case').normalize_case,
                   type: CaseSymbol
 
   c.desc "Highlight search matches in output. Only affects command line output"
-  c.switch %i[h hilite], default_value: @settings.dig('search', 'highlight')
+  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
@@ -72,23 +53,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
 
-  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
     raise DoingRuntimeError, %(Invalid output type "#{options[:output]}") if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
 
-    template = @settings['templates'][options[:config_template]].deep_merge(@settings)
+    template = Doing.setting(['templates', options[:config_template]]).deep_merge(Doing.settings)
     tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
     section = @wwid.guess_section(options[:section]) if options[:section]

data/bin/commands/last.rb

@@ -30,7 +30,7 @@ command :last do |c|
   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')
+  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]

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]
@@ -34,7 +34,7 @@ command :meanwhile do |c|
     if options[:section]
       section = @wwid.guess_section(options[:section]) || options[:section].cap_first
     else
-      section = @settings['current_section']
+      section = Doing.setting('current_section')
     end
     input = ''
 

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]
 
@@ -54,7 +54,7 @@ command %i[now next] do |c|
     section = if options[:section]
                 @wwid.guess_section(options[:section]) || options[:section].cap_first
               else
-                @settings['current_section']
+                Doing.setting('current_section')
               end
 
     ask_note = if options[:ask] && !options[:editor] && args.count.positive?

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 = @settings['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