doing 1.0.83 → 1.0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb85f27f305f246d4ab182268c9e5188da67f22fde46d3ee4ae716996c78b2c3
-  data.tar.gz: 7b302748d9837511adc77679fd619c6daf85b2f7e15f541d530c8cc211e0aac3
+  metadata.gz: 2540726a17efa50ef0cddc29353d8c14a4d921a89fb302711225053faacfbc4d
+  data.tar.gz: e4f59cf1e2feda50df653bbbd981e1ab4ad75d807eaf47a8afbad9d98032d27b
 SHA512:
-  metadata.gz: dbf5e04626a97e5287c2417cf5afffd6516860a1fa5f3ed64e93fe15bdc62b85f045d0a54adc08c774b4d711add29f02799cf3d4a2c22853e1273a691d0a9f00
-  data.tar.gz: 87bf6eac2e770b161c8ae4fd2fee4adea5ed261b828f2142997858393a627e0d36788981fe52a4c66486f442da2de349ce1ac157732d824b0ef633e4dcbdc703
+  metadata.gz: dabcbefd24a3d099d71eb14c03f71250067e509b385d573405219d3cfaea8a66f6ec526a32547401f249f0fdd82774415ed0da1c95e233aada2f54135de49558
+  data.tar.gz: 5b5a5d7800110de9aeaf636b6b6b4947c1923e55ce4f455d2316483c37fcfb30461b818df78c24097ef66f574ed57bdeebf50f77e4f806161212c4d36c86eabd

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.82<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.86<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -92,6 +92,7 @@ A basic configuration looks like this:
         date_format: '%_I:%M%P'
         template: '%date > %title%odnote'
         wrap_width: 50
+        count: 10
     autotag:
       whitelist:
       - coding
@@ -239,6 +240,8 @@ and output my recent entries like this:
 
     $ 
 
+The recent template can include a `count` key to specify the number of entries shown when run without an argument. Default is 10.
+
 ### Custom views
 
 You can create your own "views" in the `~/.doingrc` file and view them with `doing view view_name`. Just add a section like this:

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
@@ -864,10 +896,22 @@ command :show do |c|
   c.arg_name 'MAX'
   c.flag %i[c count], default_value: 0
 
-  c.desc 'Age (oldest/newest)'
+  c.desc 'Age (oldest|newest)'
   c.arg_name 'AGE'
   c.flag %i[a age], default_value: 'newest'
 
+  c.desc 'View entries older than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries newer than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:after]
+
+  c.desc 'Search filter, surround with slashes for regex (/query/)'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
   c.flag %i[s sort], must_match: /^[ad].*/i, default_value: 'ASC'
@@ -892,6 +936,10 @@ command :show do |c|
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)/i, default_value: default
 
+  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'
   c.switch [:only_timed], default_value: false, negatable: false
 
@@ -947,8 +995,8 @@ command :show do |c|
       }
     end
 
-    if options[:f]
-      date_string = options[:f]
+    if options[:from]
+      date_string = options[:from]
       if date_string =~ / (to|through|thru|(un)?til|-+) /
         dates = date_string.split(/ (to|through|thru|(un)?til|-+) /)
         start = wwid.chronify(dates[0])
@@ -961,22 +1009,31 @@ command :show do |c|
       dates = [start, finish]
     end
 
-    options[:t] = true if options[:totals]
+    options[:times] = true if options[:totals]
 
     tags_color = wwid.config.key?('tags_color') ? wwid.config['tags_color'] : nil
 
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
+    tag_order = if options[:tag_order]
+                  options[:tag_order] =~ /^d/i ? 'desc' : 'asc'
+                else
+                  'asc'
+                end
     opts = {
-      age: options[:a],
+      after: options[:after],
+      age: options[:age],
+      before: options[:before],
       count: options[:c].to_i,
       date_filter: dates,
       highlight: true,
       only_timed: options[:only_timed],
       order: options[:s],
       output: options[:output],
+      search: options[:search],
       section: section,
       sort_tags: options[:sort_tags],
       tag_filter: tag_filter,
+      tag_order: tag_order,
       tags_color: tags_color,
       times: options[:t],
       totals: options[:totals]
@@ -998,6 +1055,14 @@ command [:grep, :search] do |c|
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: 'All'
 
+  c.desc 'Constrain search to entries older than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  c.desc 'Constrain search to entries newer than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:after]
+
   c.desc 'Output to export format (csv|html|json|template|timeline)'
   c.arg_name 'FORMAT'
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
@@ -1022,10 +1087,12 @@ command [:grep, :search] do |c|
 
     section = wwid.guess_section(options[:s]) if options[:s]
 
-    options[:t] = true if options[:totals]
+    options[:times] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
 
     opts = {
+      after: options[:after],
+      before: options[:before],
       highlight: true,
       only_timed: options[:only_timed],
       output: options[:output],
@@ -1033,7 +1100,7 @@ command [:grep, :search] do |c|
       section: section,
       sort_tags: options[:sort_tags],
       tags_color: tags_color,
-      times: options[:t],
+      times: options[:times],
       totals: options[:totals]
     }
 
@@ -1065,7 +1132,12 @@ command :recent do |c|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
 
     unless global_options[:version]
-      count = args.empty? ? 10 : args[0].to_i
+      if wwid.config['templates']['recent'].key?('count')
+        config_count = wwid.config['templates']['recent']['count'].to_i
+      else
+        config_count = 10
+      end
+      count = args.empty? ? config_count : args[0].to_i
       options[:t] = true if options[:totals]
       options[:sort_tags] = options[:tag_sort] =~ /^n/i
       tags_color = wwid.config.key?('tags_color') ? wwid.config['tags_color'] : nil
@@ -1105,12 +1177,25 @@ command :today do |c|
   c.arg_name 'FORMAT'
   c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
+  c.desc 'View entries before specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries after specified time (e.g. 8am, 12:30pm, 15:00)'
+  c.arg_name 'TIME_STRING'
+  c.flag [:after]
+
   c.action do |_global_options, options, _args|
     options[:t] = true if options[:totals]
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
-
-    puts wwid.today(options[:t], options[:output],
-                    { totals: options[:totals], section: options[:s], sort_tags: options[:sort_tags] }).chomp
+    opt = {
+      after: options[:after],
+      before: options[:before],
+      section: options[:section],
+      sort_tags: options[:sort_tags],
+      totals: options[:totals]
+    }
+    puts wwid.today(options[:times], options[:output], opt).chomp
   end
 end
 
@@ -1285,7 +1370,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,7 +1429,7 @@ command :colors do |c|
 end
 
 desc 'Display a user-created view'
-long_desc 'Command line options override associated view settings'
+long_desc 'Command line options override view configuration'
 arg_name 'VIEW_NAME'
 command :view do |c|
   c.desc 'Section'
@@ -1368,6 +1453,18 @@ command :view do |c|
   c.desc 'Include colors in output'
   c.switch [:color], default_value: true, negatable: true
 
+  c.desc 'Tag filter, combine multiple tags with a comma.'
+  c.arg_name 'TAG'
+  c.flag [:tag]
+
+  c.desc 'Tag boolean (AND,OR,NOT)'
+  c.arg_name 'BOOLEAN'
+  c.flag %i[b bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'OR'
+
+  c.desc 'Search filter, surround with slashes for regex (/query/)'
+  c.arg_name 'QUERY'
+  c.flag [:search]
+
   c.desc 'Sort tags by (name|time)'
   c.arg_name 'KEY'
   c.flag [:tag_sort], must_match: /^(?:name|time)$/i
@@ -1376,17 +1473,31 @@ command :view do |c|
   c.arg_name 'DIRECTION'
   c.flag [:tag_order], must_match: /^(?:a(?:sc)?|d(?:esc)?)$/i
 
+  c.desc 'View entries older than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:before]
+
+  c.desc 'View entries newer than date'
+  c.arg_name 'DATE_STRING'
+  c.flag [:after]
+
   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|
+    exit_now! '--tag and --search cannot be used together' if options[:tag] && options[:search]
+
     title = if args.empty?
               wwid.choose_view
             else
               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
@@ -1400,7 +1511,11 @@ command :view do |c|
       format = view.key?('date_format') ? view['date_format'] : nil
       tags_color = view.key?('tags_color') ? view['tags_color'] : nil
       tag_filter = false
-      if view.key?('tags') && !(view['tags'].nil? || view['tags'].empty?)
+      if options[:tag]
+        tag_filter = { 'tags' => [], 'bool' => 'OR' }
+        tag_filter['tags'] = options[:tag].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
+        tag_filter['bool'] = options[:bool].normalize_bool
+      elsif view.key?('tags') && !(view['tags'].nil? || view['tags'].empty?)
         tag_filter = { 'tags' => [], 'bool' => 'OR' }
         tag_filter['tags'] = if view['tags'].instance_of?(Array)
                                view['tags'].map(&:strip)
@@ -1449,14 +1564,17 @@ command :view do |c|
                   else
                     'asc'
                   end
-      warn "TAG ORDER: #{options[:tag_order]}"
+
       opts = {
+        after: options[:after],
+        before: options[:before],
         count: count,
         format: format,
         highlight: options[:color],
         only_timed: only_timed,
         order: order,
-        output: options[:o],
+        output: options[:output],
+        search: options[:search],
         section: section,
         sort_tags: options[:sort_tags],
         tag_filter: tag_filter,
@@ -1514,6 +1632,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
@@ -1543,6 +1666,7 @@ command :archive do |c|
                       'AND'
                      end
     opts = {
+      before: options[:before],
       bool: options[:bool],
       destination: options[:to],
       keep: options[:keep],
@@ -1553,17 +1677,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
@@ -1574,11 +1745,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)}")
@@ -1662,12 +1833,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
@@ -1677,11 +1851,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.83'
+  VERSION = '1.0.87'
 end

data/lib/doing/wwid.rb

@@ -124,7 +124,8 @@ class WWID
     @config['templates']['recent'] ||= {
       'date_format' => '%_I:%M%P',
       'template' => '%shortdate: %title (%section)',
-      'wrap_width' => 88
+      'wrap_width' => 88,
+      'count' => 10
     }
     @config['views'] ||= {
       'done' => {
@@ -425,8 +426,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('.*?')
@@ -627,6 +628,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)
 
@@ -657,7 +659,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!
@@ -1099,7 +1101,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
@@ -1118,8 +1119,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]
@@ -1208,6 +1209,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
   ##
@@ -1477,7 +1496,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|
@@ -1489,7 +1508,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
@@ -1521,6 +1540,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
   ##
@@ -1641,6 +1742,24 @@ class WWID
       end
     end
 
+    if opt[:before]
+      time_string = opt[:before]
+      time_string += ' 12am' if time_string !~ /(\d+:\d+|\d+[ap])/
+      cutoff = chronify(time_string)
+      if cutoff
+        items.delete_if { |item| item['date'] >= cutoff }
+      end
+    end
+
+    if opt[:after]
+      time_string = opt[:after]
+      time_string += ' 11:59pm' if time_string !~ /(\d+:\d+|\d+[ap])/
+      cutoff = chronify(time_string)
+      if cutoff
+        items.delete_if { |item| item['date'] <= cutoff }
+      end
+    end
+
     if opt[:today]
       items.delete_if do |item|
         item['date'] < Date.today.to_time
@@ -1868,13 +1987,13 @@ class WWID
 
         output.sub!(/%shortdate/) do
           if item['date'] > Date.today.to_time
-            item['date'].strftime('%_I:%M%P')
-          elsif item['date'] > (Date.today - 7).to_time
-            item['date'].strftime('%a %-I:%M%P')
+            item['date'].strftime('    %_I:%M%P')
+          elsif item['date'] > (Date.today - 6).to_time
+            item['date'].strftime('%a %_I:%M%P')
           elsif item['date'].year == Date.today.year
-            item['date'].strftime('%b %d, %-I:%M%P')
+            item['date'].strftime('%m/%d %_I:%M%P')
           else
-            item['date'].strftime('%b %d %Y, %-I:%M%P')
+            item['date'].strftime('%m/%d/%Y %_I:%M%P')
           end
         end
 
@@ -1925,7 +2044,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] || []
@@ -1940,7 +2059,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'
@@ -1973,9 +2092,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
@@ -1984,7 +2109,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
@@ -1997,7 +2122,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
@@ -2082,8 +2207,22 @@ class WWID
     opt[:sort_tags] ||= false
 
     cfg = @config['templates']['today']
-    list_section({ section: opt[:section], wrap_width: cfg['wrap_width'], count: 0,
-                   format: cfg['date_format'], template: cfg['template'], order: 'asc', today: true, times: times, output: output, totals: opt[:totals], sort_tags: opt[:sort_tags] })
+    options = {
+      after: opt[:after],
+      before: opt[:before],
+      count: 0,
+      format: cfg['date_format'],
+      order: 'asc',
+      output: output,
+      section: opt[:section],
+      sort_tags: opt[:sort_tags],
+      template: cfg['template'],
+      times: times,
+      today: true,
+      totals: opt[:totals],
+      wrap_width: cfg['wrap_width']
+    }
+    list_section(options)
   end
 
   ##

metadata

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