doing 2.1.41 → 2.1.44

data/bin/commands/since.rb

@@ -15,7 +15,7 @@ command :since do |c|
   add_options(:time_display, c)
   add_options(:tag_filter, c)
   add_options(:search, c)
-
+  add_options(:save, 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)
 
@@ -25,7 +25,7 @@ command :since do |c|
 
     date_string.sub!(/(day) (\d)/, '\1 at \2')
     date_string.sub!(/(\d+)d( ago)?/, '\1 days ago')
-
+    Doing.original_options[:date_begin] = date_string
     start = date_string.chronify(guess: :begin)
     finish = Time.now
 
@@ -37,5 +37,9 @@ command :since do |c|
     options[:sort_tags] = options[:tag_sort]
 
     Doing::Pager.page @wwid.list_date([start, finish], options[:section], options[:times], options[:output], options).chomp
+    if options[:save]
+      options[:after] = Doing.original_options[:date_begin] if Doing.original_options[:date_begin].good?
+      Doing.config.save_view(options.to_view, options[:save].downcase)
+    end
   end
 end

data/bin/commands/template.rb

@@ -28,34 +28,23 @@ command :template do |c|
       else
         $stdout.puts "Available templates: #{Doing::Plugins.plugin_templates.join(', ')}"
       end
-      return
-    end
-
-    if args.empty?
-      type = Doing::Prompt.choose_from(Doing::Plugins.plugin_templates, sorted: false, prompt: 'Select template type > ')
-      type.sub!(/ \(.*?\)$/, '').strip!
-      options[:save] = Doing::Prompt.yn("Save to #{options[:path]}? (No outputs to STDOUT)", default_response: false)
     else
-      type = args[0]
-    end
 
-    raise InvalidPluginType, "No type specified, use `doing template [#{Doing::Plugins.plugin_templates.join('|')}]`" unless type
+      if args.empty?
+        type = Doing::Prompt.choose_from(Doing::Plugins.plugin_templates, sorted: false, prompt: 'Select template type > ')
+        type.sub!(/ \(.*?\)$/, '').strip!
+        options[:save] = Doing::Prompt.yn("Save to #{options[:path]}? (No outputs to STDOUT)", default_response: false)
+      else
+        type = args[0]
+      end
+
+      raise InvalidPluginType, "No type specified, use `doing template [#{Doing::Plugins.plugin_templates.join('|')}]`" unless type
 
-    if options[:save]
-      Doing::Plugins.template_for_trigger(type, save_to: options[:path])
-    else
-      $stdout.puts Doing::Plugins.template_for_trigger(type, save_to: nil)
+      if options[:save]
+        Doing::Plugins.template_for_trigger(type, save_to: options[:path])
+      else
+        $stdout.puts Doing::Plugins.template_for_trigger(type, save_to: nil)
+      end
     end
-
-    # case args[0]
-    # when /html|haml/i
-    #   $stdout.puts @wwid.haml_template
-    # when /css/i
-    #   $stdout.puts @wwid.css_template
-    # when /markdown|md|erb/i
-    #   $stdout.puts @wwid.markdown_template
-    # else
-    #   exit_now! 'Invalid type specified, must be HAML or CSS'
-    # end
   end
 end

data/bin/commands/today.rb

@@ -15,6 +15,7 @@ command :today do |c|
   add_options(:output_template, c, default_template: 'today')
   add_options(:time_filter, c)
   add_options(:time_display, c)
+  add_options(:save, c)
 
   c.action do |_global_options, options, _args|
     raise InvalidPlugin.new('output', options[:output]) if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
@@ -22,7 +23,9 @@ command :today do |c|
     options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort]
     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] }
-
+    filter_options[:today] = true
     Doing::Pager.page @wwid.today(options[:times], options[:output], filter_options).chomp
+    filter_options[:title] = options[:title]
+    Doing.config.save_view(filter_options.to_view, options[:save].downcase) if options[:save]
   end
 end

data/bin/commands/undo.rb

@@ -28,7 +28,7 @@ command :undo do |c|
   c.action do |_global_options, options, args|
     file = options[:file] || @wwid.doing_file
     count = args.empty? ? 1 : args[0].to_i
-    raise InvalidArgument, "Invalid count specified for undo" unless count&.positive?
+    raise InvalidArgument, 'Invalid count specified for undo' unless count&.positive?
 
     if options[:prune]
       Doing::Util::Backup.prune_backups(file, options[:prune])
@@ -38,12 +38,10 @@ command :undo do |c|
       else
         Doing::Util::Backup.redo_backup(file, count: count)
       end
+    elsif options[:interactive]
+      Doing::Util::Backup.select_backup(file)
     else
-      if options[:interactive]
-        Doing::Util::Backup.select_backup(file)
-      else
-        Doing::Util::Backup.restore_last_backup(file, count: count)
-      end
+      Doing::Util::Backup.restore_last_backup(file, count: count)
     end
   end
 end

data/bin/commands/view.rb

@@ -15,28 +15,24 @@ command :view do |c|
   c.arg_name 'COUNT'
   c.flag %i[c count], must_match: /^\d+$/, type: Integer
 
-  c.desc "Output to export format (#{Doing::Plugins.plugin_names(type: :export)})"
-  c.arg_name 'FORMAT'
-  c.flag %i[o output]
-
   c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
-  c.flag %i[age], default_value: :newest, type: AgeSymbol
+  c.flag %i[age], type: AgeSymbol
 
   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.switch [:duration], default_value: false, negatable: false
 
   c.desc 'Show intervals with totals at the end of output'
   c.switch [:totals], default_value: false, negatable: false
 
   c.desc 'Include colors in output'
-  c.switch [:color], default_value: true, negatable: true
+  c.switch [:color], negatable: true
 
   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.switch %i[h hilite], default_value: false, negatable: true
 
   c.desc 'Sort tags by (name|time)'
   c.arg_name 'KEY'
@@ -53,8 +49,9 @@ command :view do |c|
   c.switch %i[i interactive], negatable: false, default_value: false
 
   add_options(:search, c)
-  add_options(:tag_filter, c)
+  add_options(:tag_filter_no_defaults, c)
   add_options(:date_filter, c)
+  add_options(:output_template_no_defaults, c)
 
   c.action do |global_options, options, args|
     options[:fuzzy] = false
@@ -85,83 +82,55 @@ command :view do |c|
                 Doing.setting('current_section')
               end
 
-    view = @wwid.get_view(title)
+    view = @wwid.view_to_options(title)
 
     if view
-      page_title = view['title'] || title.cap_first
-      only_timed = if (view.key?('only_timed') && view['only_timed']) || options[:only_timed]
-                     true
-                   else
-                     false
-                   end
+      options = Doing::Util.deep_merge_hashes(view, options)
 
-      template = view['template'] || nil
-      date_format = view['date_format'] || nil
+      options[:totals] = view[:totals] unless options[:totals]
+      options[:only_timed] = view[:only_timed] unless options[:only_timed]
+      options[:times] = view[:times] if options[:times]
+      options[:duration] = view[:duration] unless options[:duration]
+      options[:hilite] = view[:hilite] unless options[:hilite]
 
-      tags_color = view['tags_color'] || nil
+      page_title = options[:title] || title.cap_first
       tag_filter = false
-      if options[:tag]
+      if options[:tag] && options[:tag].good
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
-        bool = options[:bool]
+        bool = options[:bool].normalize_bool
         tag_filter['bool'] = bool
         tag_filter['tags'] = if bool == :pattern
                                options[:tag]
                              else
                                options[:tag].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
                              end
-      elsif view.key?('tags') && view['tags'].good?
+        options[:tags] = nil
+        options[:bool] = bool
+      elsif options[:tags]
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
-        bool = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].normalize_bool : :pattern
+        bool = options[:bool] ? options[:bool].normalize_bool : :pattern
         tag_filter['bool'] = bool
-        tag_filter['tags'] = if view['tags'].instance_of?(Array)
-                               bool == :pattern ? view['tags'].join(' ').strip : view['tags'].map(&:strip)
+        tag_filter['tags'] = if options[:tags].instance_of?(Array)
+                               bool == :pattern ? options[:tags].join(' ').strip : options[:tags].map(&:strip)
                              else
-                               bool == :pattern ? view['tags'].strip : view['tags'].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
+                               bool == :pattern ? options[:tags].strip : options[:tags].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
                              end
+        options[:tags] = nil
+        options[:bool] = bool
       end
 
-      # If the -o/--output flag was specified, override any default in the view template
-      options[:output] ||= view.key?('output_format') ? view['output_format'] : 'template'
-
-      count = if options[:count]
-                options[:count]
-              elsif view.key?('count')
-                view['count']
-              else
-                10
-              end
-
-      section = if options[:section]
-                  section
-                else
-                  view['section'] || Doing.setting('current_section')
-                end
-      order = if view.key?('order')
-                view['order'].normalize_order
-              else
-                :asc
-              end
-
-      totals = if options[:totals]
-                 true
-               else
-                 view['totals'] || false
-               end
-      tag_order = options[:tag_order] || view['tag_order']&.normalize_order || :asc
-
-      options[:times] = true if totals
+      section = options[:section] || Doing.setting('current_section')
+      order = options[:order]&.normalize_order || :asc
+      totals = options[:totals] || false
+      tag_order = options[:tag_order]&.normalize_order || :asc
       output_format = options[:output]&.downcase || 'template'
 
-      options[:sort_tags] = if options[:tag_sort]
-                              options[:tag_sort]
-                            elsif view.key?('tag_sort')
-                              view['tag_sort'].normalize_tag_sort
-                            else
-                              false
-                            end
-
-      %w[before after from duration].each { |k| options[k.to_sym] = view[k] if view.key?(k) && !options[k.to_sym] }
+      options[:times] = true if totals
 
+      options.rename_key(:tag_sort, :sort_tags)
+      options[:sort_tags] ||= :name
+      options.rename_key(:date_format, :format)
+      options.rename_key(:color, :highlight)
       search = nil
 
       if options[:search]
@@ -172,12 +141,8 @@ command :view do |c|
       options[:age] ||= :newest
 
       opts = options.clone
-      opts[:age] = options[:age]
-      opts[:count] = count
-      opts[:format] = date_format
-      opts[:highlight] = options[:color]
-      opts[:hilite] = options[:hilite]
-      opts[:only_timed] = only_timed
+
+      opts[:count] ||= 10
       opts[:order] = order
       opts[:output] = options[:interactive] ? nil : options[:output]
       opts[:output] = output_format
@@ -186,8 +151,6 @@ command :view do |c|
       opts[:section] = section
       opts[:tag_filter] = tag_filter
       opts[:tag_order] = tag_order
-      opts[:tags_color] = tags_color
-      opts[:template] = template
       opts[:totals] = totals
       opts[:view_template] = title
 

data/bin/commands/views.rb

@@ -1,11 +1,108 @@
 # @@views
-desc 'List available custom views'
+desc 'List available custom views. Specify view names to see YAML configurations.'
+arg_name 'NAME(S)', optional: true
 command :views do |c|
+  c.example 'doing views', desc: 'list all views'
+  c.example 'doing views -c', desc: 'list views in column, ideal for shell completion'
+  c.example 'doing views color', desc: 'dump the YAML for a single view'
+  c.example 'doing views -e color', desc: 'edit the YAML configuration for a single view'
+  c.example 'doing views -e -o json color finished', desc: 'edit multiple view configs as JSON'
+
   c.desc 'List in single column'
-  c.switch %i[c column], default_value: false
+  c.switch %i[c column], default_value: false, negatable: false
+
+  c.desc 'Open YAML for view in editor (requires argument)'
+  c.switch %i[e editor], negatable: false
+
+  c.desc 'Output/edit view in alternative format (json, yaml)'
+  c.arg_name 'FORMAT'
+  c.flag %i[o output], must_match: /^[jy]/i, default_value: 'yaml'
+
+  c.desc 'Delete view config'
+  c.switch %i[r remove], negatable: false
+
+  c.action do |_global_options, options, args|
+    cmd = Doing::ViewsCommand.new(options, args, @wwid)
+
+    if args.count.positive?
+      if options[:remove]
+        cmd.remove_views
+      elsif options[:editor]
+        cmd.edit_views
+      else
+        cmd.output_views
+      end
+    else
+      cmd.list_views
+    end
+  end
+end
+
+module Doing
+  # views Command
+  class ViewsCommand
+    def initialize(options, args, wwid)
+      @options = options
+      @args = args
+      @wwid = wwid
+
+      @views = {}
+      args.each do |v|
+        view = @wwid.get_view(v)
+        raise InvalidArgument, 'Unrecognized view' unless view
+
+        @views[v] = view if view
+      end
+    end
+
+    def list_views
+      joiner = @options[:column] ? "\n" : "\t"
+      print @wwid.views.join(joiner)
+    end
+
+    def save_view(view, res)
+      val = if res.nil? || !res.key?(view) || res[view]&.empty?
+              nil
+            else
+              res[view]
+            end
+
+      Doing.set("views.#{view}", val)
+    end
+
+    def remove_views
+      @args.each do |v|
+        Doing.set("views.#{v}", nil)
+      end
+
+      save_config
+    end
+
+    def edit_views
+      res = if @options[:output] =~ /^j/i
+              JSON.parse(@wwid.fork_editor(JSON.pretty_generate(@views), message: nil))
+            else
+              YAML.safe_load(@wwid.fork_editor(YAML.dump(@views), message: nil))
+            end
+      @args.each do |v|
+        save_view(v, res)
+      end
+      save_config
+    end
+
+    def output_views
+      out = if @options[:output] =~ /^j/i
+              JSON.pretty_generate(@views)
+            else
+              YAML.dump(@views)
+            end
+
+      Doing::Pager.page out
+    end
 
-  c.action do |_global_options, options, _args|
-    joiner = options[:column] ? "\n" : "\t"
-    print @wwid.views.join(joiner)
+    def save_config
+      Doing::Util.write_to_file(Doing.config.config_file, YAML.dump(Doing.settings), backup: true)
+      Doing.logger.warn('Config:', "#{Doing.config.config_file} updated")
+    end
   end
 end

data/bin/commands/yesterday.rb

@@ -14,6 +14,7 @@ command :yesterday do |c|
   add_options(:output_template, c, default_template: 'today')
   add_options(:time_filter, c)
   add_options(:time_display, c)
+  add_options(:save, c)
 
   c.action do |_global_options, options, _args|
     raise InvalidPlugin.new('output', options[:output]) if options[:output] && options[:output] !~ Doing::Plugins.plugin_regex(type: :export)
@@ -22,7 +23,8 @@ command :yesterday do |c|
 
     opt = options.clone
     opt[:order] = Doing.setting(['templates', options[:config_template], 'order'])
-
+    opt[:yesterday] = true
     Doing::Pager.page @wwid.yesterday(options[:section], options[:times], options[:output], opt).chomp
+    Doing.config.save_view(opt.to_view, options[:save].downcase) if options[:save]
   end
 end

data/bin/doing

@@ -26,7 +26,7 @@ include Doing::Errors
 
 version Doing::VERSION
 hide_commands_without_desc true
-autocomplete_commands true
+autocomplete_commands false
 wrap_help_text :one_line unless $stdout.isatty
 
 include Doing::Types
@@ -88,14 +88,33 @@ accept TagSortSymbol do |value|
   value.normalize_tag_sort(Doing.config.fetch('tag_sort', :name))
 end
 
+accept ExportTemplate do |value|
+  if value !~ Doing::Plugins.plugin_regex(type: :export)
+    raise Doing::Errors::InvalidPlugin.new('output', value)
+
+  end
+
+  tpl = nil
+
+  Doing::Plugins.plugins[:export].each do |k, options|
+    next unless value =~ /^(#{options[:trigger].normalize_trigger})$/i
+
+    tpl = k
+    break
+  end
+
+  tpl.nil? ? 'template' : value
+end
+
 accept TemplateName do |value|
   res = Doing.setting('templates').keys.select { |k| k =~ value.to_rx(distance: 2) }
-  raise InvalidArgument, "Unknown template: #{value}" unless res.good?
+  raise Doing::Errors::InvalidArgument, "Unknown template: #{value}" unless res.good?
 
   res.group_by(&:length).min.last[0]
 end
 
 accept DateBeginString do |value|
+  Doing.original_options[:date_begin] = value
   res = if value =~ REGEX_TIME
           value
         else
@@ -107,6 +126,7 @@ accept DateBeginString do |value|
 end
 
 accept DateEndString do |value|
+  Doing.original_options[:date_end] = value
   res = if value =~ REGEX_TIME
           value
         else
@@ -118,6 +138,7 @@ accept DateEndString do |value|
 end
 
 accept DateRangeString do |value|
+  Doing.original_options[:date_range] = value
   start, finish = value.split_date_range
   raise InvalidTimeExpression, 'Invalid range' unless start
 
@@ -126,6 +147,7 @@ accept DateRangeString do |value|
 end
 
 accept DateRangeOptionalString do |value|
+  Doing.original_options[:date_range] = value
   start, finish = value.split_date_range
   raise InvalidTimeExpression, 'Invalid range' unless start
 
@@ -133,6 +155,7 @@ accept DateRangeOptionalString do |value|
 end
 
 accept DateIntervalString do |value|
+  Doing.original_options[:date_interval] = value
   res = value.chronify_qty
   raise InvalidTimeExpression, 'Invalid time quantity' unless res
 
@@ -233,16 +256,20 @@ pre do |global, _command, _options, _args|
 end
 
 on_error do |exception|
-  if exception.is_a?(GLI::UnknownCommand)
+  case exception
+  when GLI::UnknownCommand
     if ARGV.count > 1
+      exit run(['view'].concat(ARGV.unshift(@command))) if @wwid.get_view(@command, fallback: false)
       exit run(['now'].concat(ARGV.unshift(@command)))
     else
+      exit run(['view'].concat(ARGV.unshift(@command))) if @wwid.get_view(@command, fallback: false)
+
       Doing::Color.coloring = $stdout.isatty
       Doing.logger.error('Unknown Command:', @command)
       Doing.logger.output_results
       false
     end
-  elsif exception.is_a?(SystemExit)
+  when SystemExit
     false
   else
     # Doing.logger.error('Fatal:', exception)

data/docs/doc/Array.html

@@ -89,7 +89,7 @@
   
   <dl>
       <dt>Includes:</dt>
-      <dd>ArrayNestedHash, ArrayTags, <span class='object_link'><a href="Doing/ChronifyArray.html" title="Doing::ChronifyArray (module)">Doing::ChronifyArray</a></span></dd>
+      <dd>ArrayCleanup, ArrayNestedHash, ArrayTags, <span class='object_link'><a href="Doing/ChronifyArray.html" title="Doing::ChronifyArray (module)">Doing::ChronifyArray</a></span></dd>
   </dl>
   
   
@@ -106,7 +106,17 @@
   
 </div>
 
-<div id="subclasses">
+<h2>Overview</h2><div class="docstring">
+  <div class="discussion">
+    <p>Array helpers</p>
+
+
+  </div>
+</div>
+<div class="tags">
+  
+
+</div><div id="subclasses">
   <h2>Direct Known Subclasses</h2>
   <p class="children"><span class='object_link'><a href="Doing/Items.html" title="Doing::Items (class)">Doing::Items</a></span>, <span class='object_link'><a href="Doing/Note.html" title="Doing::Note (class)">Doing::Note</a></span></p>
 </div>
@@ -188,6 +198,7 @@
 
   
   
+  
 
   <div id="instance_method_details" class="method_details_list">
     <h2>Instance Method Details</h2>
@@ -277,7 +288,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Clause.html

@@ -283,7 +283,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:16 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Operator.html

@@ -162,7 +162,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:16 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/Query.html

@@ -407,7 +407,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:16 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryParser.html

@@ -125,7 +125,7 @@ parser. In order to do that, a new "clause" node is added to the parse
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:16 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser/QueryTransformer.html

@@ -114,7 +114,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:16 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>

data/docs/doc/BooleanTermParser.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Wed Mar 16 09:42:15 2022 by
+  Generated on Mon Mar 21 07:53:15 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.27 (ruby-3.0.1).
 </div>