doing 1.0.65 → 1.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a774718572df78395293b6294bcfa4bac94cfe2cde0ffec43e8bbea60b874534
-  data.tar.gz: fba4b65439084eae5b291bd65f5a1d14d49e5b5c4c8b70abd5e8f73fa39b3545
+  metadata.gz: bf5235acbab516c74ea7ff28c610dcbc49b9d9f108056c1b3c60ac0100bd9ec5
+  data.tar.gz: ca6abc5bd66a950d78ab16aabc781660b0ea5ee3f6dc50bb8a9fd0b986cce21e
 SHA512:
-  metadata.gz: 01bf52dbc6e7077e6ff2a67ab22504dda4be927f31da8be7e5383136b5cac500cd7920203b7383ebe302af5ddce375e0ee7389273a275edfde27971de8ae87bb
-  data.tar.gz: 79e7b8dcf00223118a0e3f5bb648ed33e920dc915909f62d1c21f2a19332f3d35336d3e5ca85a31632416b9fb9364d58db2fb6a4f90e7a200bc7cb706f76e14b
+  metadata.gz: b9f62baa0a4348212c54c1f9f3aa5bca041d81bc5061221310a85747b05c0b9b7af9036d309fcffd78e192a7a415f462ceeb96f8c276cef320249651f4890d35
+  data.tar.gz: cc61feaf78e9a3d6865bbb3d5fecdff00659b9b00a7430971012bfca0856e45ee87efd864dde603a7a6e6abf6a571f01f0e8d60afbbb7ebe060364f65c908b6b

data/README.md

@@ -29,7 +29,7 @@ _Side note:_ I actually use the library behind this utility as part of another s
 
 ## Installation
 
-The current version of `doing` is <!--VER-->1.0.64<!--END VER-->.
+The current version of `doing` is <!--VER-->1.0.68<!--END VER-->.
 
     $ [sudo] gem install doing
 
@@ -464,6 +464,7 @@ You can also include a `--no-date` switch to add `@done` without a finish date,
 
 By default `doing finish` works on a single entry, the last entry or the most recent entry matching a `--tag` or `--search` query. Specifying `doing finish 10` would finish any unfinished entries within the last 10 entries. In the case of `--tag` or `--search` queries, the count serves as the maximum number of matches doing will act on, sorted in reverse date order (most recent first). A count of 0 will disable the limit entirely, acting on all matching entries.
 
+Both `finish` and `cancel` accept `--unfinished` as an argument. This causes them to act on the last entry not already marked @done, no matter how far back it's dated or how many @done entries come after it. You can use `doing finish --unfinished X -s SECTION` to finish the last X unfinished entries in SECTION.
 
 ##### Tagging and Autotagging
 

data/bin/doing

@@ -52,7 +52,7 @@ flag %i[f doing_file]
 
 desc 'Add an entry'
 arg_name 'ENTRY'
-command [:now, :next] do |c|
+command %i[now next] do |c|
   c.desc 'Section'
   c.arg_name 'NAME'
   c.flag %i[s section], default_value: wwid.current_section
@@ -105,7 +105,8 @@ command [:now, :next] do |c|
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
     elsif $stdin.stat.size.positive?
-      title, note = wwid.format_input($stdin.read)
+      input = $stdin.read
+      title, note = wwid.format_input(input)
       note.push(options[:n]) if options[:n]
       wwid.add_item(title.cap_first, section, { note: note, back: date, timed: options[:f] })
       wwid.write(wwid.doing_file)
@@ -239,7 +240,7 @@ long_desc %(
 
   Example `doing template HAML > ~/styles/my_doing.haml`
 )
-arg_name 'TYPE', must_match: /^(html|haml|css)/i
+arg_name 'TYPE', must_match: /^(?:html|haml|css)/i
 command :template do |c|
   c.action do |_global_options, options, args|
     raise 'No type specified, use `doing template [HAML|CSS]`' if args.empty?
@@ -443,7 +444,10 @@ command :cancel do |c|
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
+
+  c.desc 'Cancel last entry (or entries) not already marked @done'
+  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
@@ -452,7 +456,16 @@ command :cancel do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                       when /(and|all)/i
+                        'AND'
+                       when /(any|or)/i
+                        'OR'
+                       when /(not|none)/i
+                        'NOT'
+                       else
+                        'AND'
+                       end
     end
 
     raise 'Only one argument allowed' if args.length > 1
@@ -468,7 +481,8 @@ command :cancel do |c|
       sequential: false,
       tag: tags,
       tag_bool: options[:bool],
-      tags: ['done']
+      tags: ['done'],
+      unfinished: options[:unfinished]
     }
     wwid.tag_last(opts)
   end
@@ -500,7 +514,10 @@ command :finish do |c|
 
   c.desc 'Boolean (AND|OR|NOT) with which to combine multiple tag filters'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
+
+  c.desc 'Finish last entry (or entries) not already marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
 
   c.desc %(Auto-generate finish dates from next entry's start time.
   Automatically generate completion dates 1 minute before next start date.
@@ -537,7 +554,16 @@ command :finish do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                             when /(and|all)/i
+                              'AND'
+                             when /(any|or)/i
+                              'OR'
+                             when /(not|none)/i
+                              'NOT'
+                             else
+                              'AND'
+                             end
     end
 
     raise 'Only one argument allowed' if args.length > 1
@@ -555,7 +581,8 @@ command :finish do |c|
       sequential: options[:auto],
       tag: tags,
       tag_bool: options[:bool],
-      tags: ['done']
+      tags: ['done'],
+      unfinished: options[:unfinished]
     }
     wwid.tag_last(opts)
   end
@@ -582,7 +609,7 @@ command [:again, :resume] do |c|
 
   c.desc 'Boolean used to combine multiple tags'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /^(and|or|not)$/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Note'
   c.arg_name 'TEXT'
@@ -590,6 +617,16 @@ command [:again, :resume] do |c|
 
   c.action do |_global_options, options, _args|
     tags = options[:tag].nil? ? [] : options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
     opts = {
       in: options[:in],
       note: options[:n],
@@ -619,6 +656,9 @@ command :tag do |c|
   c.desc 'Remove given tag(s)'
   c.switch %i[r remove], negatable: false, default_value: false
 
+  c.desc 'Tag last entry (or entries) not marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
+
   c.desc 'Autotag entries based on autotag configuration in ~/.doingrc'
   c.switch %i[a autotag], negatable: false, default_value: false
 
@@ -662,7 +702,8 @@ command :tag do |c|
       date: options[:date],
       remove: options[:r],
       section: section,
-      tags: tags
+      tags: tags,
+      unfinished: options[:unfinished]
     }
     wwid.tag_last(opts)
   end
@@ -677,9 +718,17 @@ command [:mark, :flag] do |c|
   c.desc 'Remove mark'
   c.switch %i[r remove], negatable: false, default_value: false
 
+  c.desc 'Mark last entry not marked @done'
+  c.switch %i[u unfinished], negatable: false, default_value: false
+
   c.action do |_global_options, options, _args|
     mark = wwid.config['marker_tag'] || 'flagged'
-    wwid.tag_last({ tags: [mark], section: options[:s], remove: options[:r] })
+    wwid.tag_last({
+      remove: options[:r],
+      section: options[:s],
+      tags: [mark],
+      unfinished: options[:unfinished]
+    })
   end
 end
 
@@ -694,9 +743,9 @@ command :show do |c|
   c.arg_name 'TAG'
   c.flag [:tag]
 
-  c.desc 'Tag boolean (AND,OR,NONE)'
+  c.desc 'Tag boolean (AND,OR,NOT)'
   c.arg_name 'BOOLEAN'
-  c.flag %i[b bool], must_match: /^(and|or|not)$/i, default_value: 'OR'
+  c.flag %i[b bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'OR'
 
   c.desc 'Max count to show'
   c.arg_name 'MAX'
@@ -708,7 +757,7 @@ command :show do |c|
 
   c.desc 'Sort order (asc/desc)'
   c.arg_name 'ORDER'
-  c.flag %i[s sort], must_match: /^(a|d)/i, default_value: 'ASC'
+  c.flag %i[s sort], must_match: /^[ad].*/i, default_value: 'ASC'
 
   c.desc %(
     Date range to show, or a single day to filter date on.
@@ -728,14 +777,14 @@ command :show do |c|
   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, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
 
   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
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
   c.action do |_global_options, options, args|
     tag_filter = false
     tags = []
@@ -757,13 +806,9 @@ command :show do |c|
       end
       if args.length.positive?
         args.each do |arg|
-          if arg =~ /,/
-            arg.split(/,/).each do |tag|
-              tags.push(tag.strip.sub(/^@/, ''))
-            end
-          else
-            tags.push(arg.strip.sub(/^@/, ''))
-          end
+          arg.split(/,/).each do |tag|
+                        tags.push(tag.strip.sub(/^@/, ''))
+                      end
         end
       end
     else
@@ -771,11 +816,21 @@ command :show do |c|
     end
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
 
     unless tags.empty?
       tag_filter = {
         'tags' => tags,
-        'bool' => options[:b]
+        'bool' => options[:bool]
       }
     end
 
@@ -832,7 +887,7 @@ command [:grep, :search] do |c|
 
   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
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -844,7 +899,7 @@ command [:grep, :search] do |c|
   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, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: false
@@ -891,7 +946,7 @@ command :recent do |c|
   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, default_value: default
 
   c.action do |global_options, options, args|
     section = wwid.guess_section(options[:s]) || options[:s].cap_first
@@ -931,11 +986,11 @@ command :today do |c|
   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, default_value: default
 
   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
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.action do |_global_options, options, _args|
     options[:t] = true if options[:totals]
@@ -966,11 +1021,11 @@ command :on do |c|
   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, default_value: default
 
   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
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.action do |_global_options, options, args|
     exit_now! 'Missing date argument' if args.empty?
@@ -1008,7 +1063,7 @@ command :yesterday do |c|
 
   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
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -1020,7 +1075,7 @@ command :yesterday do |c|
   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, default_value: default
 
   c.action do |_global_options, options, _args|
     options[:sort_tags] = options[:tag_sort] =~ /^n/i
@@ -1044,7 +1099,7 @@ command :last do |c|
 
   c.desc 'Tag boolean'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Search filter, surround with slashes for regex (/query/)'
   c.arg_name 'QUERY'
@@ -1057,7 +1112,15 @@ command :last do |c|
       tags = []
     else
       tags = options[:tag].split(/ *, */).map { |t| t.strip.sub(/^@/, '') }
-      options[:bool] = options[:bool] =~ /^(and|or|not)$/i ? options[:bool].upcase : 'AND'
+      options[:bool] = case options[:bool]
+                       when /(any|or)/i
+                        :or
+                       when /(not|none)/i
+                        :not
+                       else
+                        :and
+                       end
+
     end
 
     if options[:e]
@@ -1130,7 +1193,7 @@ command :view do |c|
 
   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
+  c.flag %i[o output], must_match: /^(?:template|html|csv|json|timeline)$/i
 
   c.desc 'Show time intervals on @done tasks'
   c.switch %i[t times], default_value: true
@@ -1145,7 +1208,7 @@ command :view do |c|
   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, default_value: default
 
   c.desc 'Only show items with recorded time intervals'
   c.switch [:only_timed], default_value: false, negatable: true
@@ -1178,7 +1241,7 @@ command :view do |c|
                              else
                                view['tags'].gsub(/[, ]+/, ' ').split(' ').map(&:strip)
                              end
-        tag_filter['bool'] = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].upcase : 'OR'
+        tag_filter['bool'] = view.key?('tags_bool') && !view['tags_bool'].nil? ? view['tags_bool'].normalize_bool : :or
       end
 
       # If the -o/--output flag was specified, override any default in the view template
@@ -1257,7 +1320,7 @@ command :archive do |c|
 
   c.desc 'Tag boolean (AND|OR|NOT)'
   c.arg_name 'BOOLEAN'
-  c.flag [:bool], must_match: /(and|or|not)/i, default_value: 'AND'
+  c.flag [:bool], must_match: /(?:and|all|any|or|not|none)/i, default_value: 'AND'
 
   c.desc 'Search filter'
   c.arg_name 'QUERY'
@@ -1281,6 +1344,16 @@ command :archive do |c|
 
     tags.concat(options[:tag].split(/ *, */).map { |t| t.sub(/^@/, '').strip }) if options[:tag]
 
+    options[:bool] = case options[:bool]
+                     when /(and|all)/i
+                      'AND'
+                     when /(any|or)/i
+                      'OR'
+                     when /(not|none)/i
+                      'NOT'
+                     else
+                      'AND'
+                     end
     opts = {
       bool: options[:bool],
       destination: options[:to],

data/lib/doing.rb

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

data/lib/doing/helpers.rb

@@ -0,0 +1,121 @@
+##
+## @brief      Hash helpers
+##
+class ::Hash
+  def has_tags?(tags, bool = :and)
+    tags = tags.split(/ *, */) if tags.is_a? String
+    bool = bool.normalize_bool if bool.is_a? String
+    item = self
+    tags.map! {|t| t.strip.sub(/^@/, '')}
+    case bool
+    when :and
+      result = true
+      tags.each do |tag|
+        unless item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    when :not
+      result = true
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = false
+          break
+        end
+      end
+      result
+    else
+      result = false
+      tags.each do |tag|
+        if item['title'] =~ /@#{tag}/
+          result = true
+          break
+        end
+      end
+      result
+    end
+  end
+
+  def matches_search?(search)
+    item = self
+    text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
+    pattern = if search.strip =~ %r{^/.*?/$}
+                search.sub(%r{/(.*?)/}, '\1')
+              else
+                search.split('').join('.{0,3}')
+              end
+    text =~ /#{pattern}/i ? true : false
+  end
+end
+
+##
+## @brief      String helpers
+##
+class ::String
+  def cap_first
+    sub(/^\w/) do |m|
+      m.upcase
+    end
+  end
+
+
+  ##
+  ## @brief      Convert a boolean string to a symbol
+  ##
+  ## @return     Symbol :and, :or, or :not
+  ##
+  def normalize_bool!
+    replace normalize_bool
+  end
+
+  def normalize_bool(default = :and)
+    case self
+    when /(and|all)/i
+      :and
+    when /(any|or)/i
+      :or
+    when /(not|none)/i
+      :not
+    else
+      default.is_a?(Symbol) ? default : default.normalize_bool
+    end
+  end
+
+
+  ##
+  ## @brief      Turn raw urls into HTML links
+  ##
+  ## @param      opt   (Hash) Additional Options
+  ##
+  def link_urls(opt = {})
+    opt[:format] ||= :html
+    if opt[:format] == :html
+      gsub(%r{(?mi)((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) do |_match|
+        m = Regexp.last_match
+        proto = m[1].nil? ? 'http://' : ''
+        %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)
+      end.gsub(/<(\w+:.*?)>/) do |match|
+        m = Regexp.last_match
+        if m[1] =~ /<a href/
+          match
+        else
+          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
+        end
+      end
+    else
+      self
+    end
+  end
+end
+
+class ::Symbol
+  def normalize_bool!
+    replace normalize_bool
+  end
+
+  def normalize_bool
+    to_s.normalize_bool
+  end
+end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.65'
+  VERSION = '1.0.69'
 end

data/lib/doing/wwid.rb

@@ -4,92 +4,6 @@ require 'deep_merge'
 require 'open3'
 require 'pp'
 
-##
-## @brief      Hash helpers
-##
-class ::Hash
-  def has_tags?(tags, bool = 'AND')
-    tags = tags.split(/ *, */) if tags.is_a? String
-    item = self
-    case bool
-    when 'AND'
-      result = true
-      tags.each do |tag|
-        unless item['title'] =~ /@#{tag}/
-          result = false
-          break
-        end
-      end
-      result
-    when 'NOT'
-      result = true
-      tags.each do |tag|
-        if item['title'] =~ /@#{tag}/
-          result = false
-          break
-        end
-      end
-      result
-    else
-      result = false
-      tags.each do |tag|
-        if item['title'] =~ /@#{tag}/
-          result = true
-          break
-        end
-      end
-      result
-    end
-  end
-
-  def matches_search?(search)
-    item = self
-    text = item['note'] ? item['title'] + item['note'].join(' ') : item['title']
-    pattern = if search.strip =~ %r{^/.*?/$}
-                search.sub(%r{/(.*?)/}, '\1')
-              else
-                search.split('').join('.{0,3}')
-              end
-    text =~ /#{pattern}/i ? true : false
-  end
-end
-
-##
-## @brief      String helpers
-##
-class String
-  def cap_first
-    sub(/^\w/) do |m|
-      m.upcase
-    end
-  end
-
-  ##
-  ## @brief      Turn raw urls into HTML links
-  ##
-  ## @param      opt   (Hash) Additional Options
-  ##
-  def link_urls(opt = {})
-    opt[:format] ||= :html
-    if opt[:format] == :html
-      gsub(%r{(?mi)((http|https)://)?([\w\-_]+(\.[\w\-_]+)+)([\w\-.,@?^=%&:/~+#]*[\w\-@^=%&/~+#])?}) do |_match|
-        m = Regexp.last_match
-        proto = m[1].nil? ? 'http://' : ''
-        %(<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>)
-      end.gsub(/<(\w+:.*?)>/) do |match|
-        m = Regexp.last_match
-        if m[1] =~ /<a href/
-          match
-        else
-          %(<a href="#{m[1]}" title="Link to #{m[1]}">[link]</a>)
-        end
-      end
-    else
-      self
-    end
-  end
-end
-
 ##
 ## @brief      Main "What Was I Doing" methods
 ##
@@ -791,7 +705,7 @@ class WWID
     opt[:section] ||= 'all'
     opt[:note] ||= []
     opt[:tag] ||= []
-    opt[:tag_bool] ||= 'AND'
+    opt[:tag_bool] ||= :and
 
     last = last_entry(opt)
     if last.nil?
@@ -817,7 +731,7 @@ class WWID
   ## @param      opt   (Hash) Additional Options
   ##
   def last_entry(opt = {})
-    opt[:tag_bool] ||= 'AND'
+    opt[:tag_bool] ||= :and
     opt[:section] ||= @current_section
 
     sec_arr = []
@@ -867,6 +781,7 @@ class WWID
     opt[:autotag] ||= false
     opt[:back] ||= false
     opt[:took] ||= nil
+    opt[:unfinished] ||= false
 
     sec_arr = []
 
@@ -902,10 +817,11 @@ class WWID
         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])
 
-          if tag_match && search_match
+          if tag_match && search_match && !finished
             if opt[:autotag]
               new_title = autotag(item['title']) if @auto_tag
               if new_title == item['title']
@@ -1308,7 +1224,7 @@ class WWID
         @content.each do |_k, v|
           combined['items'] += v['items']
         end
-        section = if opt[:tag_filter] && opt[:tag_filter]['bool'] != 'NONE'
+        section = if opt[:tag_filter] && opt[:tag_filter]['bool'].normalize_bool != :not
                     opt[:tag_filter]['tags'].map do |tag|
                       "@#{tag}"
                     end.join(' + ')
@@ -1339,31 +1255,7 @@ class WWID
     end
 
     if opt[:tag_filter] && !opt[:tag_filter]['tags'].empty?
-      items.delete_if do |item|
-        case opt[:tag_filter]['bool']
-        when /(AND|ALL)/
-          del = false
-          opt[:tag_filter]['tags'].each do |tag|
-            unless item['title'] =~ /@#{tag}/
-              del = true
-              break
-            end
-          end
-          del
-        when /NONE/
-          del = false
-          opt[:tag_filter]['tags'].each do |tag|
-            del = true if item['title'] =~ /@#{tag}/
-          end
-          del
-        when /(OR|ANY)/
-          del = true
-          opt[:tag_filter]['tags'].each do |tag|
-            del = false if item['title'] =~ /@#{tag}/
-          end
-          del
-        end
-      end
+      items.select! { |item| item.has_tags?(opt[:tag_filter]['tags'], opt[:tag_filter]['bool']) }
     end
 
     if opt[:search]
@@ -1655,7 +1547,7 @@ class WWID
     count       = options[:keep] || 0
     destination = options[:destination] || 'Archive'
     tags        = options[:tags] || []
-    bool        = options[:bool] || 'AND'
+    bool        = options[:bool] || :and
 
     section = choose_section if section.nil? || section =~ /choose/i
     archive_all = section =~ /^all$/i # && !(tags.nil? || tags.empty?)
@@ -1683,7 +1575,7 @@ class WWID
   def do_archive(sect, destination, opt = {})
     count = opt[:count] || 0
     tags  = opt[:tags] || []
-    bool  = opt[:bool] || 'AND'
+    bool  = opt[:bool] || :and
     label = opt[:label] || true
 
     if sect =~ /^all$/i
@@ -1696,7 +1588,7 @@ class WWID
     counter = 0
 
     all_sections.each do |section|
-      items = @content[section]['items']
+      items = @content[section]['items'].dup
 
       moved_items = []
       if !tags.empty? || opt[:search]
@@ -1720,13 +1612,7 @@ class WWID
         @content[destination]['items'].concat(moved_items)
         @results.push("Archived #{moved_items.length} items from #{section} to #{destination}")
       else
-        count = items.length if count == 0 || items.length < count
-
-        @content[section]['items'] = if count.zero?
-                                       []
-                                     else
-                                       items[0..count - 1]
-                                     end
+        count = items.length if items.length < count
 
         items.map! do |item|
           if label && section != 'Currently'
@@ -1735,12 +1621,19 @@ class WWID
           end
           item
         end
+
         if items.count > count
           @content[destination]['items'].concat(items[count..-1])
         else
           @content[destination]['items'].concat(items)
         end
 
+        @content[section]['items'] = if count.zero?
+                                       []
+                                     else
+                                       items[0..count - 1]
+                                     end
+
         @results.push("Archived #{items.length - count} items from #{section} to #{destination}")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.65
+  version: 1.0.69
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,7 @@ files:
 - README.md
 - bin/doing
 - lib/doing.rb
+- lib/doing/helpers.rb
 - lib/doing/version.rb
 - lib/doing/wwid.rb
 - lib/templates/doing.css