doing 1.0.32 → 1.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6fb41048c3152bcb7368e8c0c1443a750f2f4c35dcf6b961854d1535ff6d7f
-  data.tar.gz: 77dce944d05f9de577f4fecf1fc4ea95ea408f6cd6d1aef34f2b03f6d64e303c
+  metadata.gz: d00d66a9e4fa16bdc40697f2fa7b42685d87e64c757d6f5e0096dd8a07af4c37
+  data.tar.gz: d7624aefddb7eb42b1a86c97f140e0881cbf2d8a41b34109d1f2f3a31b82c9b3
 SHA512:
-  metadata.gz: cf4553553485d02e7ebe4bbe8bb538d0fab8172e3d5eb44671d252659ecba2d804c1ff8631eb4eec0c0cdd5867d4108901b36ccd7006ec4dfca7ea49e2a515e5
-  data.tar.gz: ea0efd6dbc79ca4c018e2a252261f727f37d8525c09382ae386a9d90f840faafa9a4b2f409938735317f486879febde14c75e3c0a41cdf583c7b2cd23bf25936
+  metadata.gz: a50d44f0db2756591fc7b7e276dd521a27f13fc893c91928386a504ffc874657bb3913cad123c59e5c86fbb858812aa91914082bd183652857a43d0455ee3047
+  data.tar.gz: bf9684307fbdf99a5f6846ae09ecc3c574eecba8be0d609ce0ce7f00c838470d39b434e065725c951a140d1be921910b61376c0793319be184997daa0d4b98e3

data/README.md

@@ -464,6 +464,16 @@ To add autotagging, include a section like this in your `~/.doingrc` file:
         - posting
         - publishing
 
+###### Tag transformation
+
+You can include a `transform` section in the autotag config which contains pairs of regular expressions and replacement patterns separated by a colon. These will be used to look at existing tags in the text and generate additional tags from them. For example:
+
+  autotag:
+    transform:
+    - (\w+)-\d+:$1
+
+This creates a search pattern looking for a string of word characters followed by a hyphen and one or more digits, e.g. `@projecttag-12`. Do not include the @ symbol in the pattern. The replacement (`$1`) indicates that the first matched group (in parenthesis) should be used to generate the new tag, resulting in `@projecttag` being added to the entry.
+
 ##### Annotating
 
 `note` lets you append a note to the last entry. You can specify a section to grab the last entry from with `-s section_name`. `-e` will open your `$EDITOR` for typing the note, but you can also just include it on the command line after any flags. You can also pipe a note in on STDIN (`echo "fun stuff"|doing note`). If you don't use the `-r` switch, new notes will be appended to the existing notes, and using the `-e` switch will let you edit and add to an existing note. The `-r` switch will remove/replace a note; if there's new note text passed when using the `-r` switch, it will replace any existing note. If the `-r` switch is used alone, any existing note will be removed.

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.32'
+  VERSION = '1.0.37'
 end

data/lib/doing/wwid.rb

@@ -581,6 +581,8 @@ class WWID
     opt[:back] ||= Time.now
     opt[:timed] ||= false
 
+    opt[:note] = [opt[:note]] if opt[:note].class == String
+
     title = [title.strip.cap_first]
     title = title.join(' ')
 
@@ -602,7 +604,7 @@ class WWID
     title.gsub!(/ +/,' ')
     entry = {'title' => title.strip, 'date' => opt[:back]}
     unless opt[:note].join('').strip == ''
-      entry['note'] = opt[:note].map {|n| n.gsub(/ *$/,'')}
+      entry['note'] = opt[:note].map {|n| n.chomp}
     end
     items = @content[section]['items']
     if opt[:timed]
@@ -1693,6 +1695,25 @@ EOS
         end
       }
     }
+    if @config['autotag'].key? 'transform'
+      @config['autotag']['transform'].each {|tag|
+        if tag =~ /\S+:\S+/
+          rx, r = tag.split(/:/)
+          r.gsub!(/\$/,'\\')
+          rx.sub!(/^@/,'')
+          regex = Regexp.new('@' + rx + '\b')
+
+          matches = text.scan(regex)
+
+          matches.each {|m|
+            puts rx,r
+            new_tag = m[0].sub(Regexp.new(rx), r)
+            puts new_tag
+            tail_tags.push(new_tag)
+          } if matches
+        end
+      }
+    end
     if whitelisted.length > 0
       @results.push("Whitelisted tags: #{whitelisted.join(', ')}")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.32
+  version: 1.0.37
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 6.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 6.2.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -78,38 +72,38 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.19'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.17.1
+        version: 2.19.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
@@ -152,26 +146,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.2.0
 description: A tool for managing a TaskPaper-like file of recent activites. Perfect
   for the late-night hacker on too much caffeine to remember what they accomplished
   at 2 in the morning.
@@ -216,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A command line tool for managing What Was I Doing reminders