doing 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29fa30c0d5f0a4518c9f766ba5cf05e2f3eb8805d1fabd8e63aa98d175d1f98e
-  data.tar.gz: e404f3b6bd79f56edcafb54748eee35016f89844ad0dc6310f9e8bafba6fa21f
+  metadata.gz: f92c16513eb9ede842ddfdcaf921d7f1facb6dc88d63a969f7a1e191ecddd4c9
+  data.tar.gz: 0a4c4825ada0fee869a40a60fd9a79fd22d5abd50b808e06290d58bbd50ecb60
 SHA512:
-  metadata.gz: f3aa358e80c84cd55b463cee561435f56cf78a2416dcc074e769742101ff556129fe9784ccdef2b2ab8cdff7e4e47d25afb2fae76c9aac979c91b6649169f0e5
-  data.tar.gz: 8e6b80d90fbc746558818ff8cbdecf935d459f4ef49c66a0865ac34910bfcb4de15ad9009f7e8b3d8c857122ee4e69b2e8583297355a5cc137ee8491a0e80349
+  metadata.gz: dec642c2e0d781cdd0b2a7d9ab6d295b95be05bd6f3b46dbe036feb2c431eb35fed2bc04449a54e7fe33f24b1a39a76113884658398a05d62f9336a4dacb250a
+  data.tar.gz: '09451b049c77702549f33a85a0b57dfe1197dbfbbe05d2791733913630a720f49e55613b031fa6de67e3b5af7726c43d19fc17c1becc9497c26f71139cdef341'

data/README.md

@@ -2,7 +2,7 @@
 
 **A command line tool for remembering what you were doing and tracking what you've done.**
 
-_If you're one of the rare people like me who find this useful, feel free to contribute to my [GitTip fund](https://www.gittip.com/ttscoff/) or just [buy me some coffee](http://brettterpstra.com/donate)._
+_If you're one of the rare people like me who find this useful, feel free to [buy me some coffee](http://brettterpstra.com/donate)._
 
 [Changelog](#changelog)
 
@@ -504,6 +504,10 @@ I'll try to document some of the code structure as I flesh it out. I'm currently
 
 ## Changelog
 
+#### 1.0.14
+
+Catching up on the changelog. Kind of. A lot has happened, mostly fixes.
+
 #### 1.0.8pre
 
 * JSON output option to view commands

data/bin/doing

@@ -525,7 +525,7 @@ arg_name 'section [tags]'
 command :show do |c|
   c.desc 'Tag boolean (AND,OR,NONE)'
   c.default_value "OR"
-  c.flag [:b,:boolean], :default_value => "OR"
+  c.flag [:b,:bool], :default_value => "OR"
 
   c.desc 'Max count to show'
   c.default_value 0
@@ -785,8 +785,13 @@ end
 
 desc 'List sections'
 command :sections do |c|
+  c.desc 'List in single column'
+  c.default_value false
+  c.switch [:c,:column], :default_value => false
+
   c.action do |global_options,options,args|
-    puts wwid.sections.join("\t")
+    joiner = options[:c] ? "\n" : "\t"
+    print wwid.sections.join(joiner)
   end
 end
 
@@ -909,8 +914,13 @@ end
 
 desc 'List available custom views'
 command :views do |c|
+  c.desc 'List in single column'
+  c.default_value false
+  c.switch [:c,:column], :default_value => false
+
   c.action do |global_options,options,args|
-    puts wwid.views.join("\t")
+    joiner = options[:c] ? "\n" : "\t"
+    print wwid.views.join(joiner)
   end
 end
 

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 end

data/lib/doing/wwid.rb

@@ -16,7 +16,7 @@ class String
       self.gsub(/(?mi)((http|https):\/\/)?([\w\-_]+(\.[\w\-_]+)+)([\w\-\.,\@?^=%&:\/~\+#]*[\w\-\@^=%&\/~\+#])?/) {|match|
         m = Regexp.last_match
         proto = m[1].nil? ? "http://" : ""
-        %Q{<a href="#{proto}#{m[0]}" title="link to #{m[0]}">[#{m[3]}]</a>}
+        %Q{<a href="#{proto}#{m[0]}" title="Link to #{m[0]}">[#{m[3]}]</a>}
       }.gsub(/\<(\w+:.*?)\>/) {|match|
         m = Regexp.last_match
         unless m[1] =~ /<a href/
@@ -521,7 +521,7 @@ class WWID
         if opt[:archive] && section != "Archive" && opt[:count] > 0
           # concat [count] items from [section] and archive section
           archived = @content[section]['items'][0..opt[:count]-1].map {|i|
-            i['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{i['section']}")
+            i['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{i['section']})")
           }.concat(@content['Archive']['items'])
           # chop [count] items off of [section] items
           @content[opt[:section]]['items'] = @content[opt[:section]]['items'][opt[:count]..-1]
@@ -604,7 +604,7 @@ class WWID
         if opt[:archive] && opt[:section] != "Archive"
           @results.push(%Q{Completed and archived "#{@content[opt[:section]]['items'][i]['title']}"})
           archive_item = @content[opt[:section]]['items'][i]
-          archive_item['title'] = i['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{i['section']}")
+          archive_item['title'] = i['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{i['section']})")
           @content['Archive']['items'].push(archive_item)
           @content[opt[:section]]['items'].delete_at(i)
         else
@@ -724,7 +724,7 @@ class WWID
         @content.each {|k,v|
           combined['items'] += v['items']
         }
-        section = opt[:tag_filter] ? opt[:tag_filter]['tags'].map {|tag| "@#{tag}"}.join(" + ") : "doing"
+        section = opt[:tag_filter] && opt[:tag_filter]['bool'] != 'NONE' ? opt[:tag_filter]['tags'].map {|tag| "@#{tag}"}.join(" + ") : "doing"
         opt[:section] = combined
       else
         section = guess_section(opt[:section])
@@ -1051,7 +1051,8 @@ EOT
         output.sub!(/%section/,item['section']) if item['section']
 
         if opt[:tags_color]
-          output.gsub!(/\s(@\S+(?:\(.*?\))?)/," #{colors[opt[:tags_color]]}\\1")
+          last_color = output.scan(/(\e\[[\d;]+m)[^\e]+@/)[-1][0]
+          output.gsub!(/\s(@[^ \(]+)/," #{colors[opt[:tags_color]]}\\1#{last_color}")
         end
         output.sub!(/%note/,note)
         output.sub!(/%odnote/,note.gsub(/^\t*/,""))
@@ -1139,8 +1140,7 @@ EOT
       }
       moved_items.each {|item|
         if label
-          item['title'] = item['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{section}")  unless section == "Currently"
-          # item['title'] += " @from(#{section})" unless section == "Currently" || item['title'] =~ /@from\(/
+          item['title'] = item['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{section})")  unless section == "Currently"
         end
       }
       @content[section]['items'] = moved_items
@@ -1157,8 +1157,7 @@ EOT
 
       items.each{|item|
         if label
-          item['title'] = item['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{section}")  unless section == "Currently"
-          # item['title'] += " @from(#{section})" unless section == "Currently"
+          item['title'] = item['title'].sub(/(?:@from\(.*?\))?(.*)$/,"\\1 @from(#{section})")  unless section == "Currently"
         end
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake