doing 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc03da6b7d2ea778baf93cd1031b1663f071e1aaddf84efc15ffc21690fc157
-  data.tar.gz: 1fecde44c95f32746406cbf2cafbdddea6d47db1696a0311437cd7dd928f3fef
+  metadata.gz: fd5337fb3832570e16b9d3572b931c8484f3fe84547aa2ba5db15a4a0a622713
+  data.tar.gz: e9df16fbd231aeba99a1e4976e7e0f96908f7f1bb0e16e385722db1e6de79548
 SHA512:
-  metadata.gz: '095d859e021692c9cee5e9ab16b82b48c1c1619798db261e83a9c50375f9df52547390a817623ba1ec3173f502731b9bf208dc574333886742955864e7a21ba9'
-  data.tar.gz: e0a350fb87a0c173181eb5ff4ca6ea8e2152d98a8f54cf9a70153e24b94990f058d8fd5937ae2f5f40a7826b85e9d98b84277d4dd02a98a99d996ba24d17ca31
+  metadata.gz: 7b30f84f92598bae30f83d476d3989c0fe9a3aff32a7a3e8472be85c235c89e4dfc29f65c3eb9f5cc99076e94d5a00fe93d6291ba00b8e73c823a28407349d07
+  data.tar.gz: fe71eb8ab551f9f7a240e49c474ce01abde51182300c9c22a18062b25803dffa427714ee22665f34a98947d1742e68a7c4694a92eefddfc82a274489679fa21f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 2.0.11
+
+#### NEW
+
+- Append `/r` to tag transforms to replace original tag
+
+#### FIXED
+
+- Autotag tag transform fixes
+
 ### 2.0.10
 
 #### NEW

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doing (2.0.10)
+    doing (2.0.11)
       amatch (~> 0.4, >= 0.4.0)
       chronic (~> 0.10, >= 0.10.2)
       deep_merge (~> 1.2, >= 1.2.1)

data/README.md

@@ -6,7 +6,7 @@ _If you're one of the rare people like me who find this useful, feel free to [bu
 
 <!--README-->
 
-The current version of `doing` is <!--VER-->2.0.9<!--END VER-->.
+The current version of `doing` is <!--VER-->2.0.10<!--END VER-->.
 
 Find all of the documentation in the [doing wiki](https://github.com/ttscoff/doing/wiki).
 

data/bin/doing

@@ -1252,6 +1252,7 @@ command :tag do |c|
       count = options[:count].to_i
     end
 
+    options[:case] ||= :smart
     options[:case] = options[:case].normalize_case
 
     if options[:search]

data/doing.rdoc

@@ -5,7 +5,7 @@ record of what you've been doing, complete with tag-based time tracking. The
 command line tool allows you to add entries, annotate with tags and notes, and
 view your entries with myriad options, with a focus on a "natural" language syntax.
 
-v2.0.10
+v2.0.11
 
 === Global Options
 === --config_file arg

data/lib/doing/array.rb

@@ -4,5 +4,18 @@ module Doing
   ##
   ## Array helpers
   ##
-  class ::Array end
+  class ::Array
+    def to_tags
+      map { |t| t.sub(/^@?/, '@') }
+    end
+
+    def highlight_tags(color = 'cyan')
+      tag_color = Doing::Color.send(color)
+      to_tags.map { |t| "#{tag_color}#{t}" }
+    end
+
+    def log_tags
+      highlight_tags.join(', ')
+    end
+  end
 end

data/lib/doing/log_adapter.rb

@@ -19,16 +19,17 @@ module Doing
     }.freeze
 
     COUNT_KEYS = %i[
-      added_tags
-      removed_tags
       added
-      updated
-      deleted
-      completed
+      added_tags
       archived
-      moved
+      autotag
+      completed
       completed_archived
+      deleted
+      moved
+      removed_tags
       skipped
+      updated
     ].freeze
 
     #
@@ -242,6 +243,8 @@ module Doing
 
     def format_counter(key, data)
       case key
+      when :autotag
+        ['Autotag:', data[:message] || 'autotagged %count %items']
       when :added_tags
         ['Tagged:', data[:message] || 'added %tags to %count %items']
       when :removed_tags

data/lib/doing/string.rb

@@ -279,7 +279,7 @@ module Doing
 
     def add_tags(tags, remove: false)
       title = self.dup
-      tags = tags.to_tags if tags.is_a?(String)
+      tags = tags.to_tags
       tags.each { |tag| title.tag!(tag, remove: remove) }
       title
     end
@@ -353,7 +353,7 @@ module Doing
 
     def dedup_tags
       title = dup
-      tags = title.scan(/(?<=^| )(@(\S+?)(\([^)]+\))?)(?= |$)/).uniq
+      tags = title.scan(/(?<=\A| )(@(\S+?)(\([^)]+\))?)(?= |\Z)/).uniq
       tags.each do |tag|
         found = false
         title.gsub!(/( |^)#{tag[1]}(\([^)]+\))?(?= |$)/) do |m|

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.0.10'
+  VERSION = '2.0.11'
 end

data/lib/doing/wwid.rb

@@ -1868,68 +1868,90 @@ module Doing
 
       original = text.dup
 
-      current_tags = text.scan(/@\w+/)
-      whitelisted = []
+      current_tags = text.scan(/@\w+/).map { |t| t.sub(/^@/, '') }
+      tagged = {
+        whitelisted: [],
+        synonyms: [],
+        transformed: [],
+        replaced: []
+      }
+
       @config['autotag']['whitelist'].each do |tag|
         next if text =~ /@#{tag}\b/i
 
-        text.sub!(/(?<!@)\b(#{tag.strip})\b/i) do |m|
-          m.downcase! if tag =~ /[a-z]/
-          whitelisted.push("@#{m}")
+        text.sub!(/(?<= |\A)(#{tag.strip})(?= |\Z)/i) do |m|
+          m.downcase! unless tag =~ /[A-Z]/
+          tagged[:whitelisted].push(m)
           "@#{m}"
         end
       end
-      tail_tags = []
+
       @config['autotag']['synonyms'].each do |tag, v|
         v.each do |word|
           next unless text =~ /\b#{word}\b/i
 
-          tail_tags.push(tag) unless current_tags.include?("@#{tag}") || whitelisted.include?("@#{tag}")
+          unless current_tags.include?(tag) || tagged[:whitelisted].include?(tag)
+            tagged[:synonyms].push(tag)
+            tagged[:synonyms] = tagged[:synonyms].uniq
+          end
         end
       end
+
       if @config['autotag'].key? 'transform'
         @config['autotag']['transform'].each do |tag|
           next unless tag =~ /\S+:\S+/
 
           rx, r = tag.split(/:/)
+          flag_rx = %r{/([r]+)$}
+          if r =~ flag_rx
+            flags = r.match(flag_rx)[1].split(//)
+            r.sub!(flag_rx, '')
+          end
           r.gsub!(/\$/, '\\')
-          rx.sub!(/^@/, '')
-          regex = Regexp.new('@' + rx + '\b')
+          rx.sub!(/^@?/, '@')
+          regex = Regexp.new("(?<= |\\A)#{rx}(?= |\\Z)")
 
-          matches = text.scan(regex)
-          next unless matches
-
-          matches.each do |m|
+          text.sub!(regex) do
+            m = Regexp.last_match
             new_tag = r
-            if m.is_a?(Array)
-              index = 1
-              m.each do |v|
-                new_tag.gsub!('\\' + index.to_s, v)
-                index += 1
-              end
+
+            m.to_a.slice(1, m.length - 1).each_with_index do |v, idx|
+              new_tag.gsub!("\\#{idx + 1}", v)
+            end
+            # Replace original tag if /r
+            if flags&.include?('r')
+              tagged[:replaced].concat(new_tag.split(/ /).map { |t| t.sub(/^@/, '') })
+              new_tag.split(/ /).map { |t| t.sub(/^@?/, '@') }.join(' ')
+            else
+              tagged[:transformed].concat(new_tag.split(/ /).map { |t| t.sub(/^@/, '') })
+              tagged[:transformed] = tagged[:transformed].uniq
+              m[0]
             end
-            tail_tags.push(new_tag)
           end
         end
       end
 
-      logger.debug('Autotag:', "whitelisted tags: #{whitelisted.join(', ')}") unless whitelisted.empty?
-      new_tags = whitelisted
-      unless tail_tags.empty?
-        tags = tail_tags.uniq.map { |t| "@#{t}".cyan }.join(' ')
-        logger.debug('Autotag:', "synonym tags: #{tags}")
-        tags_a = tail_tags.map { |t| "@#{t}" }
-        text.add_tags!(tags_a.join(' '))
-        new_tags.concat(tags_a)
-      end
 
-      unless text == original
-        logger.info('Autotag:', "added #{new_tags.join(', ')} to \"#{text}\"")
+      logger.debug('Autotag:', "whitelisted tags: #{tagged[:whitelisted].log_tags}") unless tagged[:whitelisted].empty?
+      logger.debug('Autotag:', "synonyms: #{tagged[:synonyms].log_tags}") unless tagged[:synonyms].empty?
+      logger.debug('Autotag:', "transforms: #{tagged[:transformed].log_tags}") unless tagged[:transformed].empty?
+      logger.debug('Autotag:', "transform replaced: #{tagged[:replaced].log_tags}") unless tagged[:replaced].empty?
+
+      tail_tags = tagged[:synonyms].concat(tagged[:transformed])
+      tail_tags.sort!
+      tail_tags.uniq!
+
+      text.add_tags!(tail_tags) unless tail_tags.empty?
+
+      if text == original
+        logger.debug('Autotag:', "no change to \"#{text}\"")
       else
-        logger.debug('Skipped:', "no change to \"#{text}\"")
+        new_tags = tagged[:whitelisted].concat(tail_tags).concat(tagged[:replaced])
+        logger.debug('Autotag:', "added #{new_tags.log_tags} to \"#{text}\"")
+        logger.count(:autotag, level: :info, count: 1, message: 'autotag updated %count %items')
       end
 
-      text
+      text.dedup_tags
     end
 
     ##

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml