doing 2.1.30 → 2.1.34

data/bin/commands/open.rb

@@ -1,7 +1,7 @@
 # @@open
 desc 'Open the "doing" file in an editor'
 long_desc "`doing open` defaults to using the editors.doing_file setting
-in #{@config.config_file} (#{Doing::Util.find_default_editor('doing_file')})."
+in #{Doing.config.config_file} (#{Doing::Util.find_default_editor('doing_file')})."
 command :open do |c|
   c.example 'doing open', desc: 'Open the doing file in the default editor'
   c.desc 'Open with editor command (e.g. vim, mate)'

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,26 +20,17 @@ 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 = @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 '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
 
     unless global_options[:version]
-      if @settings['templates']['recent'].key?('count')
-        config_count = @settings['templates']['recent']['count'].to_i
+      if Doing.setting('templates.recent.count')
+        config_count = Doing.setting('templates.recent.count').to_i
       else
         config_count = 10
       end
@@ -56,7 +44,7 @@ command :recent do |c|
       options[:times] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort]
 
-      template = @settings['templates']['recent'].deep_merge(@settings['templates']['default'])
+      template = Doing.setting('templates.recent').deep_merge(Doing.setting('templates.default'))
       tags_color = template.key?('tags_color') ? template['tags_color'] : nil
 
       opts = {

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

@@ -27,33 +27,12 @@ command :show do |c|
   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: @settings.dig('search', 'highlight')
+  c.switch %i[h hilite], default_value: Doing.settings.dig('search', 'highlight')
 
   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 '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 '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)
@@ -118,7 +98,7 @@ command :show do |c|
         end
       end
     else
-      section = options[:menu] ? @wwid.choose_section(include_all: true) : @settings['current_section']
+      section = options[:menu] ? @wwid.choose_section(include_all: true) : Doing.setting('current_section')
       section ||= 'All'
     end
 
@@ -126,11 +106,11 @@ command :show do |c|
 
     options[:times] = true if options[:totals]
 
-    template = @settings['templates'][options[:config_template]].deep_merge({
-                                                    'wrap_width' => @settings['wrap_width'] || 0,
-                                                    'date_format' => @settings['default_date_format'],
-                                                    'order' => @settings['order']&.normalize_order || :asc,
-                                                    'tags_color' => @settings['tags_color']
+    template = Doing.setting(['templates', options[:config_template]]).deep_merge({
+                                                    'wrap_width' => Doing.setting('wrap_width') || 0,
+                                                    'date_format' => Doing.setting('default_date_format'),
+                                                    'order' => Doing.setting('order')&.normalize_order || :asc,
+                                                    'tags_color' => Doing.setting('tags_color')
                                                   })
 
     if options[:search]

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 = @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]
@@ -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/tag_dir.rb

@@ -5,7 +5,7 @@ subdirectories will be tagged with the default tags. You can modify these any ti
 manually editing the .doingrc file.'
 arg_name 'TAG [TAG..]'
 command :tag_dir do |c|
-  c.example 'doing tag_dir project1 project2', desc: 'Add @project1 and @project to to any entries in the current directory'
+  c.example 'doing tag_dir project1 project2', desc: 'Add @project1 and @project2 to to any entries created from the current directory'
   c.example 'doing tag_dir --remove', desc: 'Clear the default tags for the directory'
 
   c.desc 'Remove all default_tags from the local .doingrc'
@@ -16,14 +16,38 @@ command :tag_dir do |c|
 
     cfg_cmd = commands[:config]
     set_cmd = cfg_cmd.commands[:set]
-    set_options = {}
+
+    set_options = { local: true }
     if options[:remove]
       set_args = ['default_tags']
       set_options[:remove] = true
     else
+      current_tags = Doing.setting('default_tags')
+
+      tags.delete_if do |tag|
+        if current_tags.include?(tag)
+          Doing.logger.info('Skipped:', "#{tag} is already applied by existing config")
+          true
+        else
+          false
+        end
+      end
+
+      raise EmptyInput, 'No new tags provided' if tags.empty?
+
+      if File.exist?('.doingrc')
+        local = Doing::Util.safe_load_file('.doingrc')
+        dir_tags = local['default_tags'] || []
+
+        tags.concat(dir_tags)
+        tags.sort!.uniq!
+
+        raise UserCancelled, 'Tag(s) already exist for directory' if tags == dir_tags.sort
+      end
+
       set_args = ['default_tags', tags.join(',')]
     end
     action = set_cmd.send(:get_action, nil)
-    return action.call(global, set_options, set_args)
+    action.call(global, set_options, set_args)
   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 = @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]
@@ -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/view.rb

@@ -36,7 +36,7 @@ command :view do |c|
   c.switch [:color], default_value: true, negatable: true
 
   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 'Sort tags by (name|time)'
   c.arg_name 'KEY'
@@ -82,7 +82,7 @@ command :view do |c|
     section = if options[:section]
                 @wwid.guess_section(options[:section]) || options[:section].cap_first
               else
-                @settings['current_section']
+                Doing.setting('current_section')
               end
 
     view = @wwid.get_view(title)
@@ -134,7 +134,7 @@ command :view do |c|
       section = if options[:section]
                   section
                 else
-                  view['section'] || @settings['current_section']
+                  view['section'] || Doing.setting('current_section')
                 end
       order = if view.key?('order')
                 view['order'].normalize_order

data/bin/commands/yesterday.rb

@@ -23,49 +23,16 @@ 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 = @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 '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] = @settings.dig('templates', options[:config_template], 'order')
+    opt[:order] = Doing.setting(['templates', options[:config_template], 'order'])
 
     Doing::Pager.page @wwid.yesterday(options[:section], options[:times], options[:output], opt).chomp
   end