doing 2.1.76 → 2.1.78

data/docs/doc/PhraseParser.html

@@ -105,7 +105,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:58 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/Status.html

@@ -316,7 +316,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:58 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/String.html

@@ -679,7 +679,7 @@ be recognized, e.g. %greensomething still finds
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:58 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/Symbol.html

@@ -127,7 +127,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:58 2023 by
+  Generated on Sat Mar 11 06:08:18 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/Time.html

@@ -411,7 +411,7 @@ entries get month/day/year/time</p>
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:58 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/TrueClass.html

@@ -235,7 +235,7 @@ has content</p>
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:58 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/_index.html

@@ -961,7 +961,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:57 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/file.README.html

@@ -71,7 +71,7 @@ you&#39;ve done.</strong></p>
 
 <!--README-->
 
-<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.75&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.77&lt;!--END VER--&gt;.</p>
 
 <p>Find all of the documentation in the <a href="https://github.com/ttscoff/doing/wiki">doing wiki</a>.</p>
 
@@ -153,7 +153,7 @@ with changes. Please target the <code>develop</code> branch with pull requests.<
 </div></div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:57 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/index.html

@@ -71,7 +71,7 @@ you&#39;ve done.</strong></p>
 
 <!--README-->
 
-<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.75&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.77&lt;!--END VER--&gt;.</p>
 
 <p>Find all of the documentation in the <a href="https://github.com/ttscoff/doing/wiki">doing wiki</a>.</p>
 
@@ -153,7 +153,7 @@ with changes. Please target the <code>develop</code> branch with pull requests.<
 </div></div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:57 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

data/docs/doc/top-level-namespace.html

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Mar 10 15:19:57 2023 by
+  Generated on Sat Mar 11 06:08:17 2023 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.28 (ruby-3.0.1).
 </div>

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.1.76
+v2.1.78
 
 === Global Options
 === --config_file arg

data/lib/doing/colors.rb

@@ -223,7 +223,8 @@ module Doing
       ##
       def template(input)
         input = input.join(' ') if input.is_a? Array
-        fmt = input.gsub(/\{(\w+)\}/) do
+        fmt = input.gsub(/%/, '%%')
+        fmt = fmt.gsub(/(?<!\\u|\$)\{(\w+)\}/i) do
           Regexp.last_match(1).split('').map { |c| "%<#{c}>s" }.join('')
         end
 
@@ -231,9 +232,9 @@ module Doing
                    y: yellow, c: cyan, m: magenta, r: red,
                    W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
                    Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
-                   b: bold, u: underline, i: italic, x: reset }
+                   d: dark, b: bold, u: underline, i: italic, x: reset }
 
-        format(fmt, colors)
+        fmt.empty? ? input : format(fmt, colors)
       end
     end
 

data/lib/doing/plugins/export/byday.rb

@@ -1,14 +1,17 @@
 # frozen_string_literal: true
 
-# title: Doing File Export
-# description: Export Doing format data
+# title: By Day Export
+# description: Export a table of items grouped by day with daily totals
 # author: Brett Terpstra
 # url: https://brettterpstra.com
 module Doing
   class ByDayExport
     def self.settings
       {
-        trigger: 'byday'
+        trigger: 'byday',
+        config: {
+          'item_width' => 60
+        }
       }
     end
 
@@ -34,28 +37,30 @@ module Doing
           total += duration
         end
       end
-
-      divider = "+----------+------------------------------------------------------------------------------------------------+--------+"
+      width = wwid.config['plugins']['byday']['item_width'].to_i || 60
+      divider = "{wd}+{xk}#{'-' *10}{wd}+{xk}#{'-' * width}{wd}+{xk}#{'-' * 8}{wd}+{x}"
       out = []
       out << divider
+      out << '{wd}|{xm}date      {wd}|{xbw}item#{' ' * (width - 4)}{wd}|{xy}duration{wd}|{x}'
+      out << divider
       days.each do |day, day_items|
         first = day_items.slice!(0, 1)[0]
         interval = wwid.get_interval(first, formatted: true) || '00:00:00'
-        out << "|#{day}|#{first.title.trunc(94).ljust(96)}|#{interval}|"
+        out << "{wd}|{xm}#{day}{wd}|{xbw}#{first.title.tag('done', remove: true).trunc(width - 2).ljust(width)}{wd}|{xy}#{interval}{wd}|{x}"
         day_items.each do |item|
           interval = wwid.get_interval(item, formatted: true) || '00:00:00'
-          out << "|          |#{item.title.trunc(94).ljust(96)}|#{interval}|"
+          out << "{wd}|          |{xbw}#{item.title.tag('done', remove: true).trunc(width - 2).ljust(width)}{wd}|{xy}#{interval}{wd}|{x}"
         end
         day_total = "Total: #{totals[day].time_string(format: :clock)}"
         out << divider
-        out << "|#{day_total.rjust(116)}|"
+        out << "{wd}|{xg}#{day_total.rjust(width + 20)}{wd}|{x}"
         out << divider
       end
       all_total = "Grand Total: #{total.time_string(format: :clock)}"
       out << divider
-      out << "|#{all_total.rjust(116)}|"
+      out << "{wd}|{xrb}#{all_total.rjust(width + 20)}{wd}|{x}"
       out << divider
-      Doing::Pager.page out.join("\n")
+      Doing::Pager.page Doing::Color.template(out.join("\n"))
     end
 
     Doing::Plugins.register 'byday', :export, self

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '2.1.76'
+  VERSION = '2.1.78'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.76
+  version: 2.1.78
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: github-markup
@@ -494,6 +494,7 @@ files:
 - docs/doc/Doing/ArrayCleanup.html
 - docs/doc/Doing/ArrayNestedHash.html
 - docs/doc/Doing/ArrayTags.html
+- docs/doc/Doing/ByDayExport.html
 - docs/doc/Doing/CLIFormat.html
 - docs/doc/Doing/CSVExport.html
 - docs/doc/Doing/CalendarImport.html