doing 1.0.80 → 1.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83c61397f2a1827dbe04f16255c1739c8d6a194b636afa4b1181437ffaca2ee8
-  data.tar.gz: b5da9fcae50fb7c90ba70a4b3d28948f551945c92170559f8bb693cda921894b
+  metadata.gz: c11e6c75768b8dc2db3a36c5cdd572ad03eb884e118848ebbe413df2988a53df
+  data.tar.gz: a3f45b396e4c6b06bab65d24007f0437e72687c6811f559ece8f6c5ca2e7bbba
 SHA512:
-  metadata.gz: 181eb1fa0f18e0f4c7678e48b2ae8daf07a85e88842accdf3de7c522dbc022c175067e0226d9faa21e493a654175c80595df1853d97027d6708884cbe24f82e6
-  data.tar.gz: a472b2013051b3525af41577ea0020b5f43e720e2b5d8598eb07b229555310dadd7a1b2cc0a106763def82f2b1920a9acf41f9ac07d077f35543b0b90ed2a631
+  metadata.gz: 7be6844f9f6caa072014afeded310cbaddf2a15380fde5498aea0f980dd5e8448ca44f5c5d9692a2075818f632bbbd19cce93e0db338c621a487abed8259f555
+  data.tar.gz: d0af857fee4113e2055af031059901b56e2ff94e849f9d3a0d167d8edde0519e4d6a6ebdeef55050ee313ed628ba6fa2fbd17e73cfc66143e57e7a2c42f93c8f

data/README.md

@@ -27,7 +27,7 @@ If there's something I want to look at later but doesn't need to be added to a t
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.79<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.83<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -245,7 +245,7 @@ You can create your own "views" in the `~/.doingrc` file and view them with `doi
 
     views:
       old:
-        section: Old
+        section: Archive
         count: 5
         wrap_width: 0
         date_format: '%F %_I:%M%P'
@@ -253,6 +253,10 @@ You can create your own "views" in the `~/.doingrc` file and view them with `doi
         order: asc
         tags: done finished cancelled
         tags_bool: ANY
+        only_timed: false
+        tag_sort: time
+        tag_order: asc
+        totals: true
 
 You can add additional custom views. Just nest them under the `views` key (indented two spaces from the edge). Multiple views would look like this:
 
@@ -276,7 +280,9 @@ You can add new sections with `doing add_section section_name`. You can also cre
 
 The `tags` and `tags_bool` keys allow you to specify tags that the view is filtered by. You can list multiple tags separated by spaces, and then use `tags_bool` to specify `ALL`, `ANY`, or `NONE` to determine how it handles the multiple tags.
 
-The `order` key defines the sort order of the output. This is applied _after_ the tasks are retrieved and cut off at the maximum number specified in `count`.
+The `order` key defines the sort order of the output (asc or desc). This is applied _after_ the tasks are retrieved and cut off at the maximum number specified in `count`.
+
+You can include tag timers and totals in the output with `totals: true`. Control tag output using `tag_sort` (name or title) and `tag_order` (asc or desc). You can also output only timed entries using `only_timed: true`. All of these options can be overridden using flags on the `doing view` command.
 
 Regarding colors, you can use them to create very nice displays if you're outputting to a color terminal. Example:
 
@@ -291,7 +297,7 @@ Outputs:
 
 ![](http://ckyp.us/XKpj+)
 
-You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`). If the `view` command is used with the `-o` flag, it will override what's specified in the file.
+You can also specify a default output format for a view. Most of the optional output formats override the template specification (`html`, `csv`, `json`). If the `view` command is used with the `-o` flag, it will override what's specified for the view in the config.
 
 ### Colors
 

data/bin/doing

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -W1
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
@@ -55,7 +55,7 @@ arg_name 'ENTRY'
 command %i[now next] do |c|
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch %i[e editor], negatable: false, default_value: false
@@ -84,7 +84,11 @@ command %i[now next] do |c|
       date = Time.now
     end
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      options[:section] = wwid.config['current_section']
+    end
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero?)
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
@@ -135,7 +139,9 @@ command :note do |c|
   c.switch %i[r remove], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    end
 
     if options[:e] || (args.empty? && $stdin.stat.size.zero? && !options[:r])
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
@@ -176,7 +182,7 @@ arg_name 'ENTRY'
 command :meanwhile do |c|
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch %i[e editor], negatable: false, default_value: false
@@ -201,7 +207,11 @@ command :meanwhile do |c|
       date = Time.now
     end
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      section = wwid.config['current_section']
+    end
     input = ''
 
     if options[:e]
@@ -301,11 +311,14 @@ command :select do |c|
   c.desc 'Add flag to selected item(s)'
   c.switch %i[flag], negatable: false, default_value: false
 
+  c.desc 'Perform action without confirmation'
+  c.switch %i[force], negatable: false, default_value: false
+
   c.desc 'Save selected entries to file using --output format'
   c.arg_name 'FILE'
   c.flag %i[save_to]
 
-  c.desc 'Output format for export (doing|taskpaper|csv|html|json|template|timeline)'
+  c.desc 'Output entries to format (doing|taskpaper|csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
   c.flag %i[o output], must_match: /^(?:doing|taskpaper|html|csv|json|template|timeline)$/i
 
@@ -396,7 +409,7 @@ command %i[done did] do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch %i[e editor], negatable: false, default_value: false
@@ -437,7 +450,11 @@ command %i[done did] do |c|
       donedate = options[:date] ? "(#{finish_date.strftime('%F %R')})" : ''
     end
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      section = wwid.config['current_section']
+    end
 
     if options[:e]
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
@@ -494,7 +511,7 @@ command :cancel do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.desc 'Cancel the last X entries containing TAG. Separate multiple tags with comma (--tag=tag1,tag2)'
   c.arg_name 'TAG'
@@ -508,7 +525,11 @@ command :cancel do |c|
   c.switch %i[u unfinished], negatable: false, default_value: false
 
   c.action do |_global_options, options, args|
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      section = wwid.config['current_section']
+    end
 
     if options[:tag].nil?
       tags = []
@@ -561,6 +582,10 @@ command :finish do |c|
   c.arg_name 'INTERVAL'
   c.flag %i[t took]
 
+  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 [:at]
+
   c.desc 'Finish the last X entries containing TAG.
   Separate multiple tags with comma (--tag=tag1,tag2), combine with --bool'
   c.arg_name 'TAG'
@@ -587,17 +612,31 @@ command :finish do |c|
 
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.action do |_global_options, options, args|
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      section = wwid.config['current_section']
+    end
 
     unless options[:auto]
+      if options[:took]
+        took = wwid.chronify_qty(options[:took])
+        exit_now! 'Unable to parse date string for --took' if took.nil?
+      end
+
       exit_now! '--back and --took cannot be used together' if options[:back] && options[:took]
 
       exit_now! '--search and --tag cannot be used together' if options[:search] && options[:tag]
 
-      if options[:back]
+      if options[:at]
+        finish_date = wwid.chronify(options[:at])
+        exit_now! 'Unable to parse date string for --at' if finish_date.nil?
+
+        date = options[:took] ? finish_date - took : finish_date
+      elsif options[:back]
         date = wwid.chronify(options[:back])
 
         exit_now! 'Unable to parse date string' if date.nil?
@@ -823,7 +862,7 @@ desc 'Mark last entry as highlighted'
 command [:mark, :flag] do |c|
   c.desc 'Section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.desc 'Remove mark'
   c.switch %i[r remove], negatable: false, default_value: false
@@ -1306,7 +1345,8 @@ desc 'Select a section to display from a menu'
 command :choose do |c|
   c.action do |_global_options, _options, _args|
     section = wwid.choose_section
-    puts wwid.list_section({ section: section.cap_first, count: 0 })
+
+    puts wwid.list_section({ section: section.cap_first, count: 0 }) if section
   end
 end
 
@@ -1340,13 +1380,14 @@ command :colors do |c|
 end
 
 desc 'Display a user-created view'
+long_desc 'Command line options override associated view settings'
 arg_name 'VIEW_NAME'
 command :view do |c|
-  c.desc 'Section (override view settings)'
+  c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section]
 
-  c.desc 'Count to display (override view settings)'
+  c.desc 'Count to display'
   c.arg_name 'COUNT'
   c.flag %i[c count], must_match: /^\d+$/, type: Integer
 
@@ -1364,12 +1405,14 @@ command :view do |c|
   c.switch [:color], default_value: true, negatable: true
 
   c.desc 'Sort tags by (name|time)'
-  default = 'time'
-  default = wwid.config['tag_sort'] if wwid.config.key?('tag_sort')
   c.arg_name 'KEY'
-  c.flag [:tag_sort], must_match: /^(?:name|time)$/i, default_value: default
+  c.flag [:tag_sort], must_match: /^(?:name|time)$/i
 
-  c.desc 'Only show items with recorded time intervals'
+  c.desc 'Tag sort direction (asc|desc)'
+  c.arg_name 'DIRECTION'
+  c.flag [:tag_order], must_match: /^(?:a(?:sc)?|d(?:esc)?)$/i
+
+  c.desc 'Only show items with recorded time intervals (override view settings)'
   c.switch [:only_timed], default_value: false, negatable: false
 
   c.action do |_global_options, options, args|
@@ -1379,7 +1422,11 @@ command :view do |c|
               wwid.guess_view(args[0])
             end
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first if options[:s]
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      section = wwid.config['current_section']
+    end
 
     view = wwid.get_view(title)
     if view
@@ -1418,10 +1465,31 @@ command :view do |c|
                 end
       order = view.key?('order') ? view['order'] : 'asc'
 
-      options[:t] = true if options[:totals]
+      totals = if options[:totals]
+                 true
+               else
+                 view.key?('totals') ? view['totals'] : false
+               end
+
+      options[:t] = true if totals
       options[:output]&.downcase!
-      options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
+      options[:sort_tags] = if options[:tag_sort]
+                              options[:tag_sort] =~ /^n/i ? true : false
+                            elsif view.key?('tag_sort')
+                              view['tag_sort'] =~ /^n/i ? true : false
+                            else
+                              false
+                            end
+
+      tag_order = if options[:tag_order]
+                    options[:tag_order] =~ /^d/i ? 'desc' : 'asc'
+                  elsif view.key?('tag_order')
+                    view['tag_order'] =~ /^d/i ? 'desc' : 'asc'
+                  else
+                    'asc'
+                  end
+      warn "TAG ORDER: #{options[:tag_order]}"
       opts = {
         count: count,
         format: format,
@@ -1432,10 +1500,11 @@ command :view do |c|
         section: section,
         sort_tags: options[:sort_tags],
         tag_filter: tag_filter,
+        tag_order: tag_order,
         tags_color: tags_color,
         template: template,
         times: options[:t],
-        totals: options[:totals]
+        totals: totals
       }
 
       puts wwid.list_section(opts)
@@ -1524,6 +1593,48 @@ command :archive do |c|
   end
 end
 
+desc 'Move entries to archive file'
+command :rotate do |c|
+  c.desc 'How many items to keep in each section (most recent)'
+  c.arg_name 'X'
+  c.flag %i[k keep], must_match: /^\d+$/, type: Integer
+
+  c.desc 'Section to rotate'
+  c.arg_name 'SECTION_NAME'
+  c.flag %i[s section], default_value: 'All'
+
+  c.desc 'Tag filter, combine multiple tags with a comma. Added for compatibility with other commands.'
+  c.arg_name 'TAG'
+  c.flag [:tag]
+
+  c.desc 'Tag boolean (AND|OR|NOT)'
+  c.arg_name 'BOOLEAN'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
+
+  c.desc 'Search filter'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
+  c.action do |_global_options, options, args|
+    if options[:section] && options[:section] !~ /^all$/i
+      options[:section] = wwid.guess_section(options[:section])
+    end
+
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
+
+    wwid.rotate(options)
+  end
+end
+
 desc 'Open the "doing" file in an editor'
 long_desc "`doing open` defaults to using the editor_app setting in #{wwid.config_file} (#{wwid.config.key?('editor_app') ? wwid.config['editor_app'] : 'not set'})"
 command :open do |c|
@@ -1633,12 +1744,15 @@ command :import do |c|
 
   c.desc 'Target section'
   c.arg_name 'NAME'
-  c.flag %i[s section], default_value: wwid.current_section
+  c.flag %i[s section]
 
   c.desc 'Tag all imported entries'
   c.arg_name 'TAGS'
   c.flag :tag
 
+  c.desc 'Autotag entries'
+  c.switch :autotag, negatable: true, default_value: true
+
   c.desc 'Prefix entries with'
   c.arg_name 'PREFIX'
   c.flag :prefix
@@ -1648,11 +1762,22 @@ command :import do |c|
 
   c.action do |_global_options, options, args|
 
-    section = wwid.guess_section(options[:s]) || options[:s].cap_first
+    if options[:section]
+      section = wwid.guess_section(options[:section]) || options[:section].cap_first
+    else
+      section = wwid.config['current_section']
+    end
 
     if options[:type] =~ /^tim/i
       args.each do |path|
-        wwid.import_timing(path, { section: section, tag: options[:tag], prefix: options[:prefix], no_overlap: !options[:overlap] })
+        options = {
+          autotag: options[:autotag],
+          no_overlap: !options[:overlap],
+          prefix: options[:prefix],
+          section: section,
+          tag: options[:tag]
+        }
+        wwid.import_timing(path, options)
         wwid.write(wwid.doing_file)
       end
     else

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.80'
+  VERSION = '1.0.84'
 end

data/lib/doing/wwid.rb

@@ -84,6 +84,7 @@ class WWID
   ##
   def configure(opt = {})
     @timers = {}
+    @recorded_items = []
     opt[:ignore_local] ||= false
 
     @config_file ||= File.join(@user_home, @default_config_file)
@@ -424,8 +425,8 @@ class WWID
   ## @param      guessed  (Boolean) already guessed and failed
   ##
   def guess_section(frag, guessed: false)
-    return 'All' if frag =~ /all/i
-
+    return 'All' if frag =~ /^all$/i
+    frag ||= @current_section
     sections.each { |section| return section.cap_first if frag.downcase == section.downcase }
     section = false
     re = frag.split('').join('.*?')
@@ -583,17 +584,17 @@ class WWID
   end
 
   def same_time?(item_a, item_b)
-    item_a['date'] == item_b['date'] ? get_interval(item_a, false) == get_interval(item_b, false) : false
+    item_a['date'] == item_b['date'] ? get_interval(item_a, formatted: false, record: false) == get_interval(item_b,  formatted: false, record: false) : false
   end
 
   def overlapping_time?(item_a, item_b)
     return true if same_time?(item_a, item_b)
 
     start_a = item_a['date']
-    interval = get_interval(item_a, false)
+    interval = get_interval(item_a, formatted: false, record: false)
     end_a = interval ? start_a + interval.to_i : start_a
     start_b = item_b['date']
-    interval = get_interval(item_b, false)
+    interval = get_interval(item_b,  formatted: false, record: false)
     end_b = interval ? start_b + interval.to_i : start_b
     (start_a >= start_b && start_a <= end_b) || (end_a >= start_b && end_a <= end_b) || (start_a < start_b && end_a > end_b)
   end
@@ -626,6 +627,7 @@ class WWID
   def import_timing(path, opt = {})
     section = opt[:section] || @current_section
     opt[:no_overlap] ||= false
+    opt[:autotag] ||= @auto_tag
 
     add_section(section) unless @content.has_key?(section)
 
@@ -656,7 +658,7 @@ class WWID
           title += " @#{tag}"
         end
       end
-      title = autotag(title) if @auto_tag
+      title = autotag(title) if opt[:autotag]
       title += " @done(#{end_time.strftime('%Y-%m-%d %H:%M')})"
       title.gsub!(/ +/, ' ')
       title.strip!
@@ -757,7 +759,7 @@ class WWID
       all_items.concat(@content[section]['items'].dup) if @content.key?(section)
     end
 
-    if opt[:tag] && opt[:tag].length.positive?
+    if opt[:tag]&.length
       all_items.select! { |item| item.has_tags?(opt[:tag], opt[:tag_bool]) }
     elsif opt[:search]&.length
       all_items.select! { |item| item.matches_search?(opt[:search]) }
@@ -771,9 +773,14 @@ class WWID
   ##
   ## @return     (String) The selected option
   ##
-  def choose_from(options, prompt)
+  def choose_from(options, prompt: 'Make a selection: ', multiple: false, fzf_args: [])
     fzf = File.join(File.dirname(__FILE__), '../helpers/fuzzyfilefinder')
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} --prompt "#{prompt}"`
+    fzf_args << '-1'
+    fzf_args << %(--prompt "#{prompt}")
+    fzf_args << '--multi' if multiple
+    header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
+    fzf_args << %(--header "#{header}")
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     return false if res.strip.size.zero?
 
     res
@@ -807,7 +814,7 @@ class WWID
         ') ',
         item['date'],
         ' | ',
-        item['title'],
+        item['title']
       ]
       if opt[:section] =~ /^all/i
         out.concat([
@@ -818,8 +825,15 @@ class WWID
       end
       out.join('')
     end
-
-    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} --header="Arrows to navigate, tab to mark for selection, enter to perform action" --prompt="Select entries to act on> " -m --bind ctrl-a:select-all -q "#{opt[:query]}"`
+    fzf_args = [
+      %(--header="Arrows: navigate, tab: mark for selection, ctrl-a: select all, enter: commit"),
+      %(--prompt="Select entries to act on > "),
+      '-1',
+      '-m',
+      '--bind ctrl-a:select-all',
+      %(-q "#{opt[:query]}")
+    ]
+    res = `echo #{Shellwords.escape(options.join("\n"))}|#{fzf} #{fzf_args.join(' ')}`
     selected = []
     res.split(/\n/).each do |item|
       idx = item.match(/^(\d+)\)/)[1].to_i
@@ -841,62 +855,71 @@ class WWID
     end
 
     unless has_action
-      action = choose_from(
-                           [
-                            'add tag',
-                            'remove tag',
-                            'archive',
-                            'cancel',
-                            'delete',
-                            'edit',
-                            'finish',
-                            'flag',
-                            'move',
-                            'output format'
-                          ],
-                            'What do you want to do with the selected items? > ')
-      case action
-      when /(add|remove) tag/
-        print 'Enter tag: '
-        tag = STDIN.gets
-        return if tag =~ /^ *$/
-        opt[:tag] = tag.strip
-        opt[:remove] = true if action =~ /remove tag/
-      when /output format/
-        output_format = choose_from(%w[doing taskpaper json timeline html csv], 'Which output format? > ')
-        return if tag =~ /^ *$/
-        opt[:output] = output_format.strip
-        res = yn('Save to file?', default_response: 'n')
-        if res
-          print 'File path/name: '
-          filename = STDIN.gets.strip
-          return if filename.empty?
-          opt[:save_to] = filename
+      choice = choose_from([
+                             'add tag',
+                             'remove tag',
+                             'cancel',
+                             'delete',
+                             'finish',
+                             'flag',
+                             'archive',
+                             'move',
+                             'edit',
+                             'output formatted'
+                           ],
+                           prompt: 'What do you want to do with the selected items? > ',
+                           multiple: true,
+                           fzf_args: ['--height=60%', '--tac', '--no-sort'])
+      return unless choice
+
+      to_do = choice.strip.split(/\n/)
+      to_do.each do |action|
+        case action
+        when /(add|remove) tag/
+          type = action =~ /^add/ ? 'add' : 'remove'
+          if opt[:tag]
+            warn "'add tag' and 'remove tag' can not be used together"
+            Process.exit 1
+          end
+          print "#{colors['yellow']}Tag to #{type}: #{colors['reset']}"
+          tag = STDIN.gets
+          return if tag =~ /^ *$/
+          opt[:tag] = tag.strip.sub(/^@/, '')
+          opt[:remove] = true if type == 'remove'
+        when /output formatted/
+          output_format = choose_from(%w[doing taskpaper json timeline html csv].sort, prompt: 'Which output format? > ', fzf_args: ['--height=60%', '--tac', '--no-sort'])
+          return if tag =~ /^ *$/
+          opt[:output] = output_format.strip
+          res = opt[:force] ? false : yn('Save to file?', default_response: 'n')
+          if res
+            print "#{colors['yellow']}File path/name: #{colors['reset']}"
+            filename = STDIN.gets.strip
+            return if filename.empty?
+            opt[:save_to] = filename
+          end
+        when /archive/
+          opt[:archive] = true
+        when /delete/
+          opt[:delete] = true
+        when /edit/
+          opt[:editor] = true
+        when /finish/
+          opt[:finish] = true
+        when /cancel/
+          opt[:cancel] = true
+        when /move/
+          section = choose_section.strip
+          opt[:move] = section.strip unless section =~ /^ *$/
+        when /flag/
+          opt[:flag] = true
         end
-      when /archive/
-        opt[:archive] = true
-      when /delete/
-        opt[:delete] = true
-      when /edit/
-        opt[:editor] = true
-      when /finish/
-        opt[:finish] = true
-      when /cancel/
-        opt[:cancel] = true
-      when /move/
-        section = choose_section.strip
-        return if section =~ /^ *$/
-        opt[:move] = section.strip
-      when /flag/
-        opt[:flag] = true
       end
     end
 
-
     if opt[:delete]
-      res = yn("Delete #{selected.size} items?", default_response: 'y')
+      res = opt[:force] ? true : yn("Delete #{selected.size} items?", default_response: 'y')
       if res
-        selected.each {|item| delete_item(item) }
+        selected.each { |item| delete_item(item) }
         write(@doing_file)
       end
       return
@@ -990,13 +1013,16 @@ class WWID
         item
       end
 
-      @content = {'Export' => {'original' => 'Export:', 'items' => selected}}
-      options = {section: 'Export'}
+      @content = { 'Export' => { 'original' => 'Export:', 'items' => selected } }
+      options = { section: 'Export' }
 
-      if opt[:output] !~ /(doing|taskpaper)/
-        options[:output] = opt[:output]
-      else
+      case opt[:output]
+      when /doing/
         options[:template] = '- %date | %title%note'
+      when /taskpaper/
+        options[:template] = '- %title @date(%date)%note'
+      else
+        options[:output] = opt[:output]
       end
 
       output = list_section(options)
@@ -1078,7 +1104,6 @@ class WWID
         count = (opt[:count]).zero? ? items.length : opt[:count]
         items.map! do |item|
           break if idx == count
-
           finished = opt[:unfinished] && item.has_tags?('done', :and)
           tag_match = opt[:tag].nil? || opt[:tag].empty? ? true : item.has_tags?(opt[:tag], opt[:tag_bool])
           search_match = opt[:search].nil? || opt[:search].empty? ? true : item.matches_search?(opt[:search])
@@ -1497,13 +1522,85 @@ class WWID
     end
   end
 
+  ##
+  ## @brief      Rename doing file with date and start fresh one
+  ##
+  def rotate(opt = {})
+    count = opt[:keep] || 0
+    tags = []
+    tags.concat(opt[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if opt[:tag]
+    bool  = opt[:bool] || :and
+    sect = opt[:section] !~ /^all$/i ? guess_section(opt[:section]) : 'all'
+
+    if sect =~ /^all$/i
+      all_sections = sections.dup
+    else
+      all_sections = [sect]
+    end
+
+    counter = 0
+    new_content = {}
+
+
+    all_sections.each do |section|
+      items = @content[section]['items'].dup
+      new_content[section] = {}
+      new_content[section]['original'] = @content[section]['original']
+      new_content[section]['items'] = []
+
+      moved_items = []
+      if !tags.empty? || opt[:search]
+        items.delete_if do |item|
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+            moved_items.push(item)
+            counter += 1
+            true
+          else
+            false
+          end
+        end
+        @content[section]['items'] = items
+        new_content[section]['items'] = moved_items
+        @results.push("Rotated #{moved_items.length} items from #{section}")
+      else
+        new_content[section]['items'] = []
+        moved_items = []
+
+        count = items.length if items.length < count
+
+        if items.count > count
+          moved_items.concat(items[count..-1])
+        else
+          moved_items.concat(items)
+        end
+
+        @content[section]['items'] = if count.zero?
+                                       []
+                                     else
+                                       items[0..count - 1]
+                                     end
+        new_content[section]['items'] = moved_items
+
+        @results.push("Rotated #{items.length - count} items from #{section}")
+      end
+    end
+
+    write(@doing_file)
+
+    file = @doing_file.sub(/(\.\w+)$/, "_#{Time.now.strftime('%Y-%m-%d%H:%M')}\\1")
+    @content = new_content
+
+    write(file)
+  end
+
   ##
   ## @brief      Generate a menu of sections and allow user selection
   ##
   ## @return     (String) The selected section name
   ##
   def choose_section
-    choose_from(sections, 'Choose a section > ').strip
+    choice = choose_from(sections.sort, prompt: 'Choose a section > ', fzf_args: ['--height=60%'])
+    choice ? choice.strip : choice
   end
 
   ##
@@ -1521,7 +1618,8 @@ class WWID
   ## @return     (String) The selected view name
   ##
   def choose_view
-    choose_from(views, 'Choose a view > ').strip
+    choice = choose_from(views.sort, prompt: 'Choose a view > ', fzf_args: ['--height=60%'])
+    choice ? choice.strip : choice
   end
 
   ##
@@ -1544,20 +1642,21 @@ class WWID
   def list_section(opt = {})
     opt[:count] ||= 0
     count = opt[:count] - 1
-    opt[:section] ||= nil
-    opt[:format] ||= @default_date_format
-    opt[:template] ||= @default_template
     opt[:age] ||= 'newest'
+    opt[:date_filter] ||= []
+    opt[:format] ||= @default_date_format
+    opt[:only_timed] ||= false
     opt[:order] ||= 'desc'
-    opt[:today] ||= false
+    opt[:search] ||= false
+    opt[:section] ||= nil
+    opt[:sort_tags] ||= false
     opt[:tag_filter] ||= false
+    opt[:tag_order] ||= 'asc'
     opt[:tags_color] ||= false
+    opt[:template] ||= @default_template
     opt[:times] ||= false
+    opt[:today] ||= false
     opt[:totals] ||= false
-    opt[:sort_tags] ||= false
-    opt[:search] ||= false
-    opt[:only_timed] ||= false
-    opt[:date_filter] ||= []
 
     # opt[:highlight] ||= true
     section = ''
@@ -1610,7 +1709,7 @@ class WWID
 
     if opt[:only_timed]
       items.delete_if do |item|
-        get_interval(item) == false
+        get_interval(item, record: false) == false
       end
     end
 
@@ -1645,7 +1744,7 @@ class WWID
           arr = i['note'].map { |line| line.strip }.delete_if { |e| e =~ /^\s*$/ }
           note = arr.join("\n") unless arr.nil?
         end
-        interval = get_interval(i, false) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        interval = get_interval(i, formatted: false) if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
         interval ||= 0
         output.push(CSV.generate_line([i['date'], i['title'], note, interval, i['section']]))
       end
@@ -1664,7 +1763,7 @@ class WWID
         end
         if i['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
           end_date = Time.parse(Regexp.last_match(1))
-          interval = get_interval(i, false)
+          interval = get_interval(i, formatted: false)
         end
         end_date ||= ''
         interval ||= 0
@@ -1713,7 +1812,7 @@ class WWID
         out = {
           'section' => section,
           'items' => items_out,
-          'timers' => tag_times('json', opt[:sort_tags])
+          'timers' => tag_times(format: 'json', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order])
         }.to_json
       elsif opt[:output] == 'timeline'
         template = <<~EOTEMPLATE
@@ -1794,7 +1893,7 @@ class WWID
                 css_template
               end
 
-      totals = opt[:totals] ? tag_times('html', opt[:sort_tags]) : ''
+      totals = opt[:totals] ? tag_times(format: 'html', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) : ''
       engine = Haml::Engine.new(template)
       out = engine.render(Object.new,
                          { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
@@ -1835,7 +1934,7 @@ class WWID
 
         output.sub!(/%date/, item['date'].strftime(opt[:format]))
 
-        interval = get_interval(item) if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
+        interval = get_interval(item, record: true) if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/ && opt[:times]
         interval ||= ''
         output.sub!(/%interval/, interval)
 
@@ -1885,7 +1984,8 @@ class WWID
 
         out += "#{output}\n"
       end
-      out += tag_times('text', opt[:sort_tags]) if opt[:totals]
+
+      out += tag_times(format: 'text', sort_by_name: opt[:sort_tags], sort_order: opt[:tag_order]) if opt[:totals]
     end
     out
   end
@@ -1897,7 +1997,7 @@ class WWID
   ## @param      section      (String) The source section
   ## @param      options      (Hash) Options
   ##
-  def archive(section = 'Currently', options = {})
+  def archive(section = @current_section, options = {})
     count       = options[:keep] || 0
     destination = options[:destination] || 'Archive'
     tags        = options[:tags] || []
@@ -1956,7 +2056,7 @@ class WWID
           end
         end
         moved_items.each do |item|
-          if label && section != 'Currently'
+          if label && section != @current_section
             item['title'] =
               item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
           end
@@ -1969,7 +2069,7 @@ class WWID
         count = items.length if items.length < count
 
         items.map! do |item|
-          if label && section != 'Currently'
+          if label && section != @current_section
             item['title'] =
               item['title'].sub(/(?:@from\(.*?\))?(.*)$/, "\\1 @from(#{section})")
           end
@@ -2148,11 +2248,15 @@ class WWID
   end
 
   ##
-  ## @brief      Get total elapsed time for all tags in selection
+  ## @brief      Get total elapsed time for all tags in
+  ##             selection
   ##
-  ## @param      format  (String) return format (html, json, or text)
+  ## @param      format        (String) return format (html,
+  ##                           json, or text)
+  ## @param      sort_by_name  (Boolean) Sort by name if true, otherwise by time
+  ## @param      sort_order    (String) The sort order (asc or desc)
   ##
-  def tag_times(format = 'text', sort_by_name = false)
+  def tag_times(format: 'text', sort_by_name: false, sort_order: 'asc')
     return '' if @timers.empty?
 
     max = @timers.keys.sort_by { |k| k.length }.reverse[0].length + 1
@@ -2161,11 +2265,13 @@ class WWID
 
     tags_data = @timers.delete_if { |_k, v| v == 0 }
     sorted_tags_data = if sort_by_name
-                         tags_data.sort_by { |k, _v| k }.reverse
+                         tags_data.sort_by { |k, _v| k }
                        else
                          tags_data.sort_by { |_k, v| v }
                        end
 
+    sorted_tags_data.reverse! if sort_order =~ /^asc/i
+
     if format == 'html'
       output = <<EOS
         <table>
@@ -2299,19 +2405,20 @@ EOS
   ## @param      item       (Hash) The entry
   ## @param      formatted  (Bool) Return human readable time (default seconds)
   ##
-  def get_interval(item, formatted = true)
+  def get_interval(item, formatted: true, record: true)
     done = nil
     start = nil
 
     if @interval_cache.keys.include? item['title']
       seconds = @interval_cache[item['title']]
+      record_tag_times(item, seconds) if record
       return seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
     end
 
     if item['title'] =~ /@done\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
       done = Time.parse(Regexp.last_match(1))
     else
-      return nil
+      return false
     end
 
     start = if item['title'] =~ /@start\((\d{4}-\d\d-\d\d \d\d:\d\d.*?)\)/
@@ -2322,20 +2429,34 @@ EOS
 
     seconds = (done - start).to_i
 
+    if record
+      record_tag_times(item, seconds)
+    end
+
+    @interval_cache[item['title']] = seconds
+
+    return seconds > 0 ? seconds : false unless formatted
+
+    seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
+  end
+
+  ##
+  ## @brief      Record times for item tags
+  ##
+  ## @param      item  The item
+  ##
+  def record_tag_times(item, seconds)
+    return if @recorded_items.include?(item)
+
     item['title'].scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each do |m|
       k = m[0] == 'done' ? 'All' : m[0].downcase
-      if @timers.has_key?(k)
+      if @timers.key?(k)
         @timers[k] += seconds
       else
         @timers[k] = seconds
       end
+      @recorded_items.push(item)
     end
-
-    @interval_cache[item['title']] = seconds
-
-    return seconds unless formatted
-
-    seconds > 0 ? '%02d:%02d:%02d' % fmt_time(seconds) : false
   end
 
   ##

data/lib/doing.rb

@@ -8,5 +8,6 @@ require 'tempfile'
 require 'chronic'
 require 'haml'
 require 'json'
-require 'doing/helpers.rb'
-require 'doing/wwid.rb'
+require 'doing/helpers'
+require 'doing/wwid'
+# require 'doing/markdown_document_listener'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.80
+  version: 1.0.84
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake