doing 1.0.33 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381d875c7e4b8f3782e081c3a4bd6f0551c420b02d7dad20be8e2217b2dc4d59
-  data.tar.gz: dae9efcc7453831ff1c33e1d03a61986fed1540d33b0eb3a9990522b5e4452f1
+  metadata.gz: 9638a33587192a9a5146ace1e3d8e6937efb34922b7b93c71ba088880f136ed4
+  data.tar.gz: 07bc825013ac19e6b4a1b4ef3103ac0f04ce186575ec65c724e55664b74087d6
 SHA512:
-  metadata.gz: 6420c68b41773a9d3c54a0185c26fd972df2f69ad11cd17bd30d5c83789ed5b405172170a30e8f483c6cd164ac13e6c851a583dfbf0e3ec9bfd273606849ca71
-  data.tar.gz: eb0f1d56e64e731f341879840ca592d3c55402e3e6f2467567cb7f513811a172ac3d605f3358c75f75d0ed5d28126a50ffdfba1165510b5073745ccdf8c1948d
+  metadata.gz: '087fa6df46f96bb25ddb7904505e10669a5bb28104e0652b890a497067ed8255ec2d6ce9e3e54018372efdf86b7272bd4a81c09b1a93b99e8f90e09ed86af381'
+  data.tar.gz: e395fd115d20f77cd522d086fa19b1bde92a51ea7785cf3f8b16ae39004f490ebc918be798d70e3ce133effcc15948c774493ddf84e541fd0b3a3e83271e0d90

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/bin/doing

@@ -604,6 +604,13 @@ command :show do |c|
   c.default_value false
   c.switch [:totals], :default_value => false, :negatable => true
 
+  c.desc 'Sort tags by (name|time)'
+  default = 'time'
+  if wwid.config.has_key?('tag_sort')
+    default = wwid.config['tag_sort']
+  end
+  c.flag [:tag_sort], :default_value => default
+
   c.desc 'Only show items with recorded time intervals'
   c.default_value false
   c.switch [:only_timed], :default_value => false, :negatable => false
@@ -666,7 +673,9 @@ command :show do |c|
 
     options[:t] = true if options[:totals]
 
-    puts wwid.list_section({:section => section, :date_filter => dates, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :totals => options[:totals], :highlight => true, :only_timed => options[:only_timed]})
+    options[:sort_tags] = options[:tag_sort] =~ /^n/i
+
+    puts wwid.list_section({:section => section, :date_filter => dates, :count => options[:c].to_i, :tag_filter => tag_filter, :age => options[:a], :order => options[:s], :output => options[:output], :times => options[:t], :totals => options[:totals], :sort_tags => options[:sort_tags], :highlight => true, :only_timed => options[:only_timed]})
 
   end
 end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.33'
+  VERSION = '1.0.38'
 end

data/lib/doing/wwid.rb

@@ -188,6 +188,7 @@ class WWID
     @config['marker_tag'] ||= 'flagged'
     @config['marker_color'] ||= 'red'
     @config['default_tags'] ||= []
+    @config['tag_sort'] ||= 'time'
 
     @current_section = config['current_section']
     @default_template = config['templates']['default']['template']
@@ -581,6 +582,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 +605,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]
@@ -995,6 +998,7 @@ class WWID
     opt[:tags_color] ||= false
     opt[:times] ||= false
     opt[:totals] ||= false
+    opt[:sort_tags] ||= false
     opt[:search] ||= false
     opt[:only_timed] ||= false
     opt[:date_filter] ||= []
@@ -1178,7 +1182,7 @@ class WWID
         out = {
           'section' => section,
           'items' => items_out,
-          'timers' => tag_times("json")
+          'timers' => tag_times("json", opt[:sort_tags])
         }.to_json
       elsif opt[:output] == "timeline"
                 template =<<EOTEMPLATE
@@ -1261,7 +1265,7 @@ EOTEMPLATE
         style = css_template
       end
 
-      totals = opt[:totals] ? tag_times("html") : ""
+      totals = opt[:totals] ? tag_times("html", opt[:sort_tags]) : ""
       engine = Haml::Engine.new(template)
       puts engine.render(Object.new, { :@items => items_out, :@page_title => page_title, :@style => style, :@totals => totals })
     else
@@ -1351,7 +1355,7 @@ EOTEMPLATE
 
         out += output + "\n"
       }
-      out += tag_times if opt[:totals]
+      out += tag_times("text", opt[:sort_tags]) if opt[:totals]
     end
     return out
   end
@@ -1596,7 +1600,7 @@ EOTEMPLATE
   ##
   ## @param      format  (String) return format (html, json, or text)
   ##
-  def tag_times(format="text")
+  def tag_times(format="text", sort_by_name = false)
 
     return "" if @timers.empty?
 
@@ -1604,6 +1608,13 @@ EOTEMPLATE
 
     total = @timers.delete("All")
 
+    tags_data = @timers.delete_if { |k,v| v == 0}
+    if sort_by_name
+      sorted_tags_data = tags_data.sort_by{|k,v| k }.reverse
+    else
+      sorted_tags_data = tags_data.sort_by{|k,v| v }
+    end
+
     if format == "html"
       output =<<EOS
         <table>
@@ -1620,9 +1631,7 @@ EOTEMPLATE
         </thead>
         <tbody>
 EOS
-      @timers.sort_by {|k,v|
-        v
-      }.reverse.each {|k,v|
+      sorted_tags_data.reverse.each {|k,v|
         output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{"%02d:%02d:%02d" % fmt_time(v)}</td></tr>\n" if v > 0
       }
       tail =<<EOS
@@ -1641,7 +1650,7 @@ EOS
       output + tail
     elsif format == "json"
       output = []
-      @timers.delete_if { |k,v| v == 0}.sort_by{|k,v| v }.reverse.each {|k,v|
+      sorted_tags_data.reverse.each {|k,v|
         output << {
           'tag' => k,
           'seconds' => v,
@@ -1651,7 +1660,7 @@ EOS
       output
     else
       output = []
-      @timers.delete_if { |k,v| v == 0}.sort_by{|k,v| v }.reverse.each {|k,v|
+      sorted_tags_data.reverse.each {|k,v|
         spacer = ""
         (max - k.length).times do
           spacer += " "
@@ -1693,6 +1702,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.33
+  version: 1.0.38
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,22 +90,22 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.1.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        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.1.2
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 5.0.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -146,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.3.1
-  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.3.1
 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.
@@ -210,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