doing 1.0.30 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b8804eda56710f55c158ade59d30d906291c552949141d13d758b4058cb6f0e
-  data.tar.gz: aee921d4b234b07f0e65d1b759da5faa160165de45d57341bac6bd0e75a63190
+  metadata.gz: 4a6e33a93b18f4a9e8ebd13602ba59ab98021296c7e7d5a7df848eba3b914c64
+  data.tar.gz: 0772cfb068a9ea75223c6d2e62292b44244b35db576ac9c0b350a4428fe46a05
 SHA512:
-  metadata.gz: 21b230f2ec73c53c1f7422d0111f776a97e030dec0510dbf5d88f68449128b01724206b11c1a94c233c1bf422b2904ebb993c72687542047f247745831032941
-  data.tar.gz: a80e50e594d3a46924afe6813df728ae576bb40c5c887cbefdc426f5fc428a8be983dc6f7c9f7466747b0e641245f04811e821e4ce3e59387865a65212c55969
+  metadata.gz: fd1d6f8e2c58ddb0282df2724adc64440185c093a85c9b9523dbe5ae64e02fedff32ccb87bad06a16dea6f0c4a688a082c8ab79e52b53120e156386375da019f
+  data.tar.gz: e2839e739b8a7fb5072f4d1c7f5d63ec0135971e0eca44411121c47409684b7dcc42738ce7566a80f32b527d5f8405c4926690b924b793234de88b1f5e8c6bca

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.30'
+  VERSION = '1.0.35'
 end

data/lib/doing/wwid.rb

@@ -201,13 +201,15 @@ class WWID
     #   end
     # end
 
-    File.open(@config_file, 'w') { |yf| YAML::dump(@config, yf) } unless @config == user_config
+    unless File.exists?(@config_file)
+      File.open(@config_file, 'w') { |yf| YAML::dump(@config, yf) }
+    end
 
     @config = @local_config.deep_merge(@config)
 
     @current_section = @config['current_section']
     @default_template = @config['templates']['default']['template']
-    @default_date_format = @config['templates']['default']['date_format']
+    @default_date_format = @config['templates']['default']['date_format'];
 
 
   end
@@ -579,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(' ')
 
@@ -600,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]
@@ -1691,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.30
+  version: 1.0.35
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-11-13 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,40 +72,40 @@ 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
+        version: 5.1.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.2
   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
+        version: 5.1.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.2
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -156,22 +150,22 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.1
     - - ">="
       - !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: 2.3.1
     - - ">="
       - !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.
@@ -193,7 +187,7 @@ homepage: http://brettterpstra.com/project/doing/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - doing
@@ -216,8 +210,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A command line tool for managing What Was I Doing reminders
 test_files: []