doing 1.0.81 → 1.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 860b1b1c3f8f1ffd33fc344cabb37a7a060cdcb80d54f65a8f3598450b4c22cf
-  data.tar.gz: 83767946e503d9bd2515aa99a7e11de87c2910f48a1b2c6e5a745c9e7dada0be
+  metadata.gz: f11196376a7860f14164c80a107ce4151b18399f785cd607ba4f3a27205828fb
+  data.tar.gz: 1033e528416e1e3660db44ae55973009aa9b766f2566c0ff6e4bb942fdce4c05
 SHA512:
-  metadata.gz: d78baf84b0bef668b7c877e908b6f1ee4ea05ce3914735f8d2e069abed215dfe5c9fc1fc3a9eb0dc5e4f5e251420d2454fb14a1b7465a5df8cf688e4b16b24ef
-  data.tar.gz: b38cf4b873baeb35ecab15ef10b3c1b8be4a7d2e28f9b34511d30f50def0b47ef127829bc5755bb0b2ba424183959dd009a222958df03ee8e54680e2ce267ab6
+  metadata.gz: db7dc195eedf329ec7aad7e29830cf0d42c57178570a4675ce607e29761f733d2371b390f8c8ea73425a86240a28a91f7e05842ad9b49dd89257affbca12e5e6
+  data.tar.gz: 2b992ffea5a41c6f81ab7b5b1fb9b244197cca7eb1d7bbbae1eb6f9911db6ee16293b19e32c8c0b31cd03a3e181c4df9f8e1de893cc37c479fa2bdfd4accf6c4

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.84<!--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

@@ -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]
@@ -308,7 +318,7 @@ command :select do |c|
   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
 
@@ -323,10 +333,6 @@ command :later do |c|
   c.desc "Edit entry with #{ENV['EDITOR']}"
   c.switch %i[e editor], negatable: false, default_value: false
 
-  c.desc 'Edit entry with specified app'
-  c.arg_name 'APP'
-  c.flag %i[a app]
-
   c.desc 'Backdate start time to date string [4pm|20m|2h|yesterday noon]'
   c.arg_name 'DATE_STRING'
   c.flag %i[b back]
@@ -343,7 +349,7 @@ command :later do |c|
       date = Time.now
     end
 
-    if options[:e] || (args.empty? && $stdin.stat.size.zero?)
+    if options[:editor] || (args.empty? && $stdin.stat.size.zero?)
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = args.empty? ? '' : args.join(' ')
@@ -399,7 +405,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
@@ -440,9 +446,13 @@ 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]
+    if options[:editor]
       exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
       input = ''
@@ -497,7 +507,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'
@@ -511,7 +521,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 = []
@@ -564,6 +578,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'
@@ -590,17 +608,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?
@@ -826,7 +858,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
@@ -1285,7 +1317,7 @@ command :last do |c|
 
     end
 
-    if options[:e]
+    if options[:editor]
       wwid.edit_last(section: options[:s], options: { search: options[:search], tag: tags, tag_bool: options[:bool] })
     else
       puts wwid.last(times: true, section: options[:s],
@@ -1344,13 +1376,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
 
@@ -1368,12 +1401,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|
@@ -1383,7 +1418,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
@@ -1422,10 +1461,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,
@@ -1436,10 +1496,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)
@@ -1489,6 +1550,11 @@ command :archive do |c|
   c.arg_name 'QUERY'
   c.flag [:search]
 
+  c.desc 'Archive entries older than date
+    (Flexible date format, e.g. 1/27/2021, 2020-07-19, or Monday 3pm)'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
   c.action do |_global_options, options, args|
     if args.empty?
       section = wwid.current_section
@@ -1518,6 +1584,7 @@ command :archive do |c|
                       'AND'
                      end
     opts = {
+      before: options[:before],
       bool: options[:bool],
       destination: options[:to],
       keep: options[:keep],
@@ -1528,17 +1595,64 @@ 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.desc 'Rotate entries older than date
+    (Flexible date format, e.g. 1/27/2021, 2020-07-19, or Monday 3pm)'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  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|
   if `uname` =~ /Darwin/
     c.desc 'Open with app name'
     c.arg_name 'APP_NAME'
-    c.flag [:a]
+    c.flag %i[a app]
 
     c.desc 'Open with app bundle id'
     c.arg_name 'BUNDLE_ID'
-    c.flag [:b]
+    c.flag %i[b bundle_id]
   end
   c.desc "Open with $EDITOR (#{ENV['EDITOR']})"
   c.switch %i[e editor], negatable: false, default_value: false
@@ -1549,11 +1663,11 @@ command :open do |c|
       k.instance_of?(String) || v.nil? || v == false
     end
     if `uname` =~ /Darwin/
-      if options[:a]
+      if options[:app]
         system %(open -a "#{options[:a]}" "#{File.expand_path(wwid.doing_file)}")
-      elsif options[:b]
+      elsif options[:bundle_id]
         system %(open -b "#{options[:b]}" "#{File.expand_path(wwid.doing_file)}")
-      elsif options[:e]
+      elsif options[:editor]
         exit_now! 'No EDITOR variable defined in environment' if ENV['EDITOR'].nil?
 
         system %($EDITOR "#{File.expand_path(wwid.doing_file)}")
@@ -1637,12 +1751,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
@@ -1652,11 +1769,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.81'
+  VERSION = '1.0.85'
 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!
@@ -1098,7 +1100,6 @@ class WWID
         items = @content[section]['items'].dup.sort_by { |item| item['date'] }.reverse
         idx = 0
         done_date = Time.now
-        next_start = Time.now
         count = (opt[:count]).zero? ? items.length : opt[:count]
         items.map! do |item|
           break if idx == count
@@ -1117,8 +1118,8 @@ class WWID
               end
             else
               if opt[:sequential]
-                done_date = next_start - 1
-                next_start = item['date']
+                next_entry = next_item(item)
+                done_date = next_entry['date'] - 60 if next_entry
               elsif opt[:took]
                 if item['date'] + opt[:took] > Time.now
                   item['date'] = Time.now - opt[:took]
@@ -1207,6 +1208,24 @@ class WWID
     return new_item
   end
 
+  ##
+  ## @brief      Get next item in the index
+  ##
+  ## @param      old_item
+  ##
+  def next_item(old_item)
+    section = old_item['section']
+
+    section_items = @content[section]['items'].sort_by { |entry| entry['date'] }
+    idx = section_items.index(old_item)
+
+    if section_items.size > idx
+      section_items[idx + 1]
+    else
+      nil
+    end
+  end
+
   ##
   ## @brief      Delete an item from the index
   ##
@@ -1476,7 +1495,7 @@ class WWID
   ##
   ## @param      file  (String) The filepath to write to
   ##
-  def write(file = nil)
+  def write(file = nil, backup: true)
     output = @other_content_top ? "#{@other_content_top.join("\n")}\n" : ''
 
     @content.each do |title, section|
@@ -1488,7 +1507,7 @@ class WWID
       $stdout.puts output
     else
       file = File.expand_path(file)
-      if File.exist?(file)
+      if File.exist?(file) && backup
         # Create a backup copy for the undo command
         FileUtils.cp(file, "#{file}~")
       end
@@ -1520,6 +1539,88 @@ 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] || opt[:before]
+        if opt[:before]
+          time_string = opt[:before]
+          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+          cutoff = chronify(time_string)
+        end
+
+        items.delete_if do |item|
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
+            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')}\\1")
+    if File.exist?(file)
+      init_doing_file(file)
+      @content.deep_merge(new_content)
+    else
+      @content = new_content
+    end
+
+    write(file, backup: false)
+  end
+
   ##
   ## @brief      Generate a menu of sections and allow user selection
   ##
@@ -1569,20 +1670,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 = ''
@@ -1635,7 +1737,7 @@ class WWID
 
     if opt[:only_timed]
       items.delete_if do |item|
-        get_interval(item) == false
+        get_interval(item, record: false) == false
       end
     end
 
@@ -1670,7 +1772,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
@@ -1689,7 +1791,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
@@ -1738,7 +1840,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
@@ -1819,7 +1921,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 })
@@ -1860,7 +1962,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)
 
@@ -1910,7 +2012,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
@@ -1922,7 +2025,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] || []
@@ -1937,7 +2040,7 @@ class WWID
     destination = guess_section(destination)
 
     if sections.include?(destination) && (sections.include?(section) || archive_all)
-      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label] })
+      do_archive(section, destination, { count: count, tags: tags, bool: bool, search: options[:search], label: options[:label], before: options[:before] })
       write(doing_file)
     else
       exit_now! 'Either source or destination does not exist'
@@ -1970,9 +2073,15 @@ class WWID
       items = @content[section]['items'].dup
 
       moved_items = []
-      if !tags.empty? || opt[:search]
+      if !tags.empty? || opt[:search] || opt[:before]
+        if opt[:before]
+          time_string = opt[:before]
+          time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+          cutoff = chronify(time_string)
+        end
+
         items.delete_if do |item|
-          if (!tags.empty? && item.has_tags?(tags, bool) || (opt[:search] && item.matches_search?(opt[:search].to_s)))
+          if ((!tags.empty? && item.has_tags?(tags, bool)) || (opt[:search] && item.matches_search?(opt[:search].to_s)) || (opt[:before] && item['date'] < cutoff))
             moved_items.push(item)
             counter += 1
             true
@@ -1981,7 +2090,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
@@ -1994,7 +2103,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
@@ -2173,11 +2282,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
@@ -2186,11 +2299,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>
@@ -2324,19 +2439,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.*?)\)/
@@ -2347,20 +2463,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

@@ -10,4 +10,4 @@ require 'haml'
 require 'json'
 require 'doing/helpers'
 require 'doing/wwid'
-require 'doing/markdown_document_listener'
+# require 'doing/markdown_document_listener'

metadata

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