doing 1.0.83 → 1.0.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb85f27f305f246d4ab182268c9e5188da67f22fde46d3ee4ae716996c78b2c3
-  data.tar.gz: 7b302748d9837511adc77679fd619c6daf85b2f7e15f541d530c8cc211e0aac3
+  metadata.gz: c11e6c75768b8dc2db3a36c5cdd572ad03eb884e118848ebbe413df2988a53df
+  data.tar.gz: a3f45b396e4c6b06bab65d24007f0437e72687c6811f559ece8f6c5ca2e7bbba
 SHA512:
-  metadata.gz: dbf5e04626a97e5287c2417cf5afffd6516860a1fa5f3ed64e93fe15bdc62b85f045d0a54adc08c774b4d711add29f02799cf3d4a2c22853e1273a691d0a9f00
-  data.tar.gz: 87bf6eac2e770b161c8ae4fd2fee4adea5ed261b828f2142997858393a627e0d36788981fe52a4c66486f442da2de349ce1ac157732d824b0ef633e4dcbdc703
+  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.82<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.83<!--END VER-->.
 
     $ [sudo] gem install doing
 

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
 
@@ -399,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
@@ -440,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?
@@ -497,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'
@@ -511,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 = []
@@ -564,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'
@@ -590,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?
@@ -826,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
@@ -1386,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
@@ -1553,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|
@@ -1662,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
@@ -1677,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.83'
+  VERSION = '1.0.84'
 end

data/lib/doing/wwid.rb

@@ -425,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('.*?')
@@ -627,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)
 
@@ -657,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!
@@ -1521,6 +1522,77 @@ 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
   ##
@@ -1925,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] || []
@@ -1984,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
@@ -1997,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.83
+  version: 1.0.84
 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