doing 2.1.93 → 2.1.97

data/docs/doc/_index.html

@@ -961,7 +961,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Feb 10 04:26:33 2026 by
+  Generated on Sat Feb 14 06:59:18 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.38 (ruby-3.4.4).
 </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.90&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.94&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 Tue Feb 10 04:26:33 2026 by
+  Generated on Sat Feb 14 06:59:18 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.38 (ruby-3.4.4).
 </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.90&lt;!--END VER--&gt;.</p>
+<p>The current version of <code>doing</code> is &lt;!--VER--&gt;2.1.94&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 Tue Feb 10 04:26:33 2026 by
+  Generated on Sat Feb 14 06:59:18 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.38 (ruby-3.4.4).
 </div>

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

@@ -216,7 +216,7 @@
 </div>
 
       <div id="footer">
-  Generated on Tue Feb 10 04:26:33 2026 by
+  Generated on Sat Feb 14 06:59:18 2026 by
   <a href="https://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.38 (ruby-3.4.4).
 </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.93
+v2.1.97
 
 === Global Options
 === --config_file arg
@@ -346,6 +346,22 @@ Autotag last entry (or entries) not marked @done
 
 
 
+==== Command: <tt>budget  [TAG [AMOUNT]]</tt>
+Set, list, and remove tag time budgets
+
+Manage simple time budgets for tags.
+
+Run without arguments to list configured budgets.
+
+Use `doing budget TAG AMOUNT` to set a budget (e.g. `doing budget dev 100h`).
+
+Use `doing budget TAG --remove` to delete a budget.
+===== Options
+===== -r|--remove
+Delete specified tag budget
+
+
+
 ==== Command: <tt>cancel  COUNT</tt>
 End last X entries with no time tracked
 

data/lib/completion/_doing.zsh

@@ -12,6 +12,7 @@ function _doing() {
                   'archive:Move entries between sections'
                   'move:Move entries between sections'
                   'autotag:Autotag last entry or filtered entries'
+                  'budget:Set'
                   'cancel:End last X entries with no time tracked'
                   'changes:List recent changes in Doing'
                   'changelog:List recent changes in Doing'
@@ -82,6 +83,9 @@ function _doing() {
             autotag) 
                 args=( "--bool[Boolean]:BOOLEAN:" {'(--count)-c','(-c)--count'}"[How many recent entries to autotag]:COUNT:" "--force[Don't ask permission to autotag all entries when count is 0]" {'(--interactive)-i','(-i)--interactive'}"[Select item(s) to tag from a menu of matching entries]" {'(--section)-s','(-s)--section'}"[Section]:SECTION_NAME:" "--search[Autotag entries matching search filter]:QUERY:" "--tag[Autotag the last X entries containing TAG]:TAG:" {'(--unfinished)-u','(-u)--unfinished'}"[Autotag last entry]" )
             ;;
+            budget) 
+                args=( {'(--remove)-r','(-r)--remove'}"[Delete specified tag budget]" )
+            ;;
             cancel) 
                 args=( {'(--archive)-a','(-a)--archive'}"[Archive entries]" "--bool[Boolean used to combine multiple tags]:BOOLEAN:" "--case[Case sensitivity for search string matching [(c)ase-sensitive]:TYPE:" {'(--interactive)-i','(-i)--interactive'}"[Select item(s) to cancel from a menu of matching entries]" "--not[Cancel items that *don't* match search/tag filters]" {'(--section)-s','(-s)--section'}"[Section]:NAME:" "--search[Filter entries using a search query]:QUERY:" "--tag[Filter entries by tag]:TAG:" {'(--unfinished)-u','(-u)--unfinished'}"[Cancel last entry]" "--val[Perform a tag value query]:QUERY:" {'(--exact)-x','(-x)--exact'}"[Force exact search string matching]" )
             ;;

data/lib/completion/doing.bash

@@ -48,6 +48,16 @@ _doing_autotag() {
   fi
 }
 
+_doing_budget() {
+  
+  if [[ "$token" == --* ]]; then
+    COMPREPLY=( $( compgen -W '--remove' -- $token ) )
+  elif [[ "$token" == -* ]]; then
+    COMPREPLY=( $( compgen -W '-r --remove' -- $token ) )
+  
+  fi
+}
+
 _doing_cancel() {
   
   if [[ "$token" == --* ]]; then
@@ -456,6 +466,7 @@ _doing()
   if [[ $last =~ (again|resume) ]]; then _doing_again
     elif [[ $last =~ (archive|move) ]]; then _doing_archive
     elif [[ $last =~ (autotag) ]]; then _doing_autotag
+    elif [[ $last =~ (budget) ]]; then _doing_budget
     elif [[ $last =~ (cancel) ]]; then _doing_cancel
     elif [[ $last =~ (changes|changelog) ]]; then _doing_changes
     elif [[ $last =~ (completion) ]]; then _doing_completion

data/lib/completion/doing.fish

@@ -138,6 +138,7 @@ __fish_doing_complete_args tag
 complete -xc doing -n '__fish_doing_needs_command' -a 'again resume' -d Repeat\ last\ entry\ as\ new\ entry
 complete -xc doing -n '__fish_doing_needs_command' -a 'archive move' -d Move\ entries\ between\ sections
 complete -xc doing -n '__fish_doing_needs_command' -a 'autotag' -d Autotag\ last\ entry\ or\ filtered\ entries
+complete -xc doing -n '__fish_doing_needs_command' -a 'budget' -d Set
 complete -xc doing -n '__fish_doing_needs_command' -a 'cancel' -d End\ last\ X\ entries\ with\ no\ time\ tracked
 complete -xc doing -n '__fish_doing_needs_command' -a 'changes changelog' -d List\ recent\ changes\ in\ Doing
 complete -xc doing -n '__fish_doing_needs_command' -a 'colors' -d List\ available\ color\ variables\ for\ configuration\ templates\ and\ views
@@ -214,6 +215,7 @@ complete -c doing -l section -s s -f -r -n '__fish_doing_using_command autotag'
 complete -c doing -l search  -f -r -n '__fish_doing_using_command autotag' -d Autotag\ entries\ matching\ search\ filter
 complete -c doing -l tag  -f -r -n '__fish_doing_using_command autotag' -d Autotag\ the\ last\ X\ entries\ containing\ TAG
 complete -c doing -l unfinished -s u -f  -n '__fish_doing_using_command autotag' -d Autotag\ last\ entry
+complete -c doing -l remove -s r -f  -n '__fish_doing_using_command budget' -d Delete\ specified\ tag\ budget
 complete -c doing -l archive -s a -f  -n '__fish_doing_using_command cancel' -d Archive\ entries
 complete -c doing -l bool  -f -r -n '__fish_doing_using_command cancel' -d Boolean\ used\ to\ combine\ multiple\ tags
 complete -c doing -l case  -f -r -n '__fish_doing_using_command cancel' -d Case\ sensitivity\ for\ search\ string\ matching\ \[\(c\)ase-sensitive

data/lib/completion/doing.ts

@@ -598,6 +598,20 @@ const completionSpec: Fig.Spec = {
 
     },
 
+    {
+      name: "budget",
+      description: "Set",
+      options: [
+          {
+            name: ["-r", "--remove"],
+            description: "Delete specified tag budget",
+            
+          },
+
+        ],
+
+    },
+
     {
       name: "cancel",
       description: "End last X entries with no time tracked",

data/lib/doing/configuration.rb

@@ -41,6 +41,8 @@ module Doing
       'never_finish' => [],
       'date_tags' => ['done', 'defer(?:red)?', 'waiting'],
 
+      'budgets' => {},
+
       'timer_format' => 'text',
       'interval_format' => 'text',
 
@@ -175,8 +177,8 @@ module Doing
 
       return @config_file if @force_answer
 
-      if @additional_configs&.count&.positive? || create
-        choices = [@config_file].concat(@additional_configs)
+      if additional_configs&.count&.positive? || create
+        choices = [@config_file].concat(additional_configs)
         choices.push('Create a new .doingrc in the current directory') if create && !File.exist?('.doingrc')
         res = Doing::Prompt.choose_from(choices.uniq.sort.reverse,
                                         sorted: false,

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

@@ -28,6 +28,7 @@ module Doing
 
       totals = {}
       total = 0
+      tag_totals = Hash.new(0)
 
       days.each do |day, day_items|
         day_items.each do |item|
@@ -35,8 +36,40 @@ module Doing
           duration = item.interval || 0
           totals[day] += duration
           total += duration
+
+          item.title.scan(/(?mi)@(\S+?)(\(.*\))?(?=\s|$)/).each do |m|
+            tag = m[0].downcase
+            next if tag == 'done'
+
+            tag_totals[tag] += duration
+          end
         end
       end
+
+      budgets = Doing.setting('budgets', {}) || {}
+      budgets = budgets.transform_keys { |k| k.to_s.downcase }
+      budgets_total = 0
+
+      budget_fmt = lambda do |secs|
+        secs = secs.to_i
+        return '0h' if secs <= 0
+
+        minutes = (secs / 60).to_i
+        hours = (minutes / 60).to_i
+        mins = (minutes % 60).to_i
+        return format('%<h>dh', h: hours) if mins.zero?
+        return format('%<m>dm', m: mins) if hours.zero?
+
+        format('%<h>dh%<m>dm', h: hours, m: mins)
+      end
+
+      budgets.each do |tag, budget_secs|
+        used = tag_totals[tag].to_i
+        remaining = budget_secs.to_i - used
+        remaining = 0 if remaining.negative?
+        budgets_total += remaining
+      end
+
       width = wwid.config['plugins']['byday']['item_width'].to_i || 60
       divider = "{wd}+{xk}#{'-' * 10}{wd}+{xk}#{'-' * width}{wd}+{xk}#{'-' * 8}{wd}+{x}"
       out = []
@@ -54,11 +87,17 @@ module Doing
           out << "{wd}|          |{xbw}#{title}{wd}|{xy}#{interval}{wd}|{x}"
         end
         day_total = "Total: #{totals[day].time_string(format: :clock)}"
+        if budgets_total.positive?
+          day_total += " (total budgets left #{budget_fmt.call(budgets_total)})"
+        end
         out << divider
         out << "{wd}|{xg}#{day_total.rjust(width + 20)}{wd}|{x}"
         out << divider
       end
       all_total = "Grand Total: #{total.time_string(format: :clock)}"
+      if budgets_total.positive?
+        all_total += " (total budgets left #{budget_fmt.call(budgets_total)})"
+      end
       out << "{wd}|{xrb}#{all_total.rjust(width + 20)}{wd}|{x}"
       out << divider
       Doing::Color.template(out.join("\n"))

data/lib/doing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doing
-  VERSION = '2.1.93'
+  VERSION = '2.1.97'
 end

data/lib/doing/wwid/timers.rb

@@ -16,6 +16,34 @@ module Doing
 
       @timers.delete('meanwhile')
 
+      timers_snapshot = @timers.dup
+
+      budgets = Doing.setting('budgets', {}) || {}
+      budgets = budgets.transform_keys { |k| k.to_s.downcase }
+      remaining_map = {}
+      budgets_total = 0
+
+      budget_fmt = lambda do |secs|
+        secs = secs.to_i
+        return '0h' if secs <= 0
+
+        minutes = (secs / 60).to_i
+        hours = (minutes / 60).to_i
+        mins = (minutes % 60).to_i
+        return format('%dh', hours) if mins.zero?
+        return format('%dm', mins) if hours.zero?
+
+        format('%dh%dm', hours, mins)
+      end
+
+      budgets.each do |tag, budget_secs|
+        used = timers_snapshot[tag].to_i
+        remaining = budget_secs.to_i - used
+        remaining = 0 if remaining.negative?
+        remaining_map[tag] = remaining
+        budgets_total += remaining
+      end
+
       max = @timers.keys.sort_by(&:length).reverse[0].length + 1
 
       total = @timers.delete('All')
@@ -47,9 +75,13 @@ module Doing
           <tbody>
 EOHEAD
         sorted_tags_data.reverse.each do |k, v|
-          if v.positive?
-            output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{v.time_string(format: :clock)}</td></tr>\n"
+          next unless v.positive?
+
+          budget_str = ''
+          if remaining_map.key?(k) && remaining_map[k].positive?
+            budget_str = " (budget left #{budget_fmt.call(remaining_map[k])})"
           end
+          output += "<tr><td style='text-align:left;'>#{k}</td><td style='text-align:left;'>#{v.time_string(format: :clock)}#{budget_str}</td></tr>\n"
         end
         tail = <<EOTAIL
         <tr>
@@ -59,7 +91,7 @@ EOHEAD
         <tfoot>
         <tr>
           <td style="text-align:left;"><strong>Total</strong></td>
-          <td style="text-align:left;">#{total.time_string(format: :clock)}</td>
+          <td style="text-align:left;">#{total.time_string(format: :clock)}#{" (total budgets left #{budget_fmt.call(budgets_total)})" if budgets_total.positive?}</td>
         </tr>
         </tfoot>
         </table>
@@ -73,7 +105,13 @@ EOTAIL
           | #{'-' * (pad - 1)}: | :------- |
         EOHEADER
         sorted_tags_data.reverse.each do |k, v|
-          output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)} |\n" if v.positive?
+          next unless v.positive?
+
+          budget_str = ''
+          if remaining_map.key?(k) && remaining_map[k].positive?
+            budget_str = " (budget left #{budget_fmt.call(remaining_map[k])})"
+          end
+          output += "| #{' ' * (pad - k.length)}#{k} | #{v.time_string(format: :clock)}#{budget_str} |\n"
         end
         tail = '[Tag Totals]'
         output + tail
@@ -83,7 +121,10 @@ EOTAIL
           output << {
             'tag' => k,
             'seconds' => v,
-            'formatted' => v.time_string(format: :clock)
+            'formatted' => v.time_string(format: :clock),
+            'budget' => budgets[k],
+            'remaining' => remaining_map[k],
+            'remaining_formatted' => (remaining_map[k] && remaining_map[k].positive? ? budget_fmt.call(remaining_map[k]) : nil)
           }
         end
         output
@@ -94,17 +135,33 @@ EOTAIL
           (max - k.length).times do
             spacer += ' '
           end
-          output.push("┃ #{spacer}#{k}:#{v.time_string(format: :hm)} ┃")
+          line = "┃ #{spacer}#{k}:#{v.time_string(format: :hm)}"
+          if remaining_map.key?(k) && remaining_map[k].positive?
+            line += " (budget left #{budget_fmt.call(remaining_map[k])})"
+          end
+          line += ' ┃'
+          output.push(line)
+        end
+
+        total_content = "┃ #{' ' * (max - 6)}total: #{total.time_string(format: :hm)}"
+        total_content += " (total budgets left #{budget_fmt.call(budgets_total)})" if budgets_total.positive?
+        total_content += ' ┃'
+        max_line_len = (output + [total_content]).map(&:length).max
+
+        pad_line = lambda do |line|
+          pad = max_line_len - line.length
+          pad.positive? ? "#{line[0..-3]} #{' ' * pad}┃" : line
         end
+        output = output.map { |l| pad_line.call(l) }
 
         header = '┏━━ Tag Totals '
-        (max - 2).times { header += '━' }
+        [(max_line_len - 16), 0].max.times { header += '━' }
         header += '┓'
         footer = '┗'
-        (max + 12).times { footer += '━' }
+        [(max_line_len - 2), 0].max.times { footer += '━' }
         footer += '┛'
         divider = '┣'
-        (max + 12).times { divider += '━' }
+        [(max_line_len - 2), 0].max.times { divider += '━' }
         divider += '┫'
         output = output.empty? ? '' : "\n#{header}\n#{output.join("\n")}"
         output += "\n#{divider}"
@@ -113,10 +170,12 @@ EOTAIL
           spacer += ' '
         end
         total_time = total.time_string(format: :hm)
-        total = "┃ #{spacer}total: "
-        total += total_time
-        total += ' ┃'
-        output += "\n#{total}"
+        total_line = "┃ #{spacer}total: "
+        total_line += total_time
+        total_line += " (total budgets left #{budget_fmt.call(budgets_total)})" if budgets_total.positive?
+        total_line += ' ┃'
+        total_line = pad_line.call(total_line)
+        output += "\n#{total_line}"
         output += "\n#{footer}"
         output
       else
@@ -126,11 +185,19 @@ EOTAIL
           (max - k.length).times do
             spacer += ' '
           end
-          output.push("#{k}:#{spacer}#{v.time_string(format: :clock)}")
+          line = "#{k}:#{spacer}#{v.time_string(format: :clock)}"
+          if remaining_map.key?(k) && remaining_map[k].positive?
+            line += " (budget left #{budget_fmt.call(remaining_map[k])})"
+          end
+          output.push(line)
         end
 
         output = output.empty? ? '' : "\n--- Tag Totals ---\n#{output.join("\n")}"
-        output += "\n\nTotal tracked: #{total.time_string(format: :clock)}\n"
+        output += "\n\nTotal tracked: #{total.time_string(format: :clock)}"
+        if budgets_total.positive?
+          output += " (total budgets left #{budget_fmt.call(budgets_total)})"
+        end
+        output += "\n"
         output
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 2.1.93
+  version: 2.1.97
 platform: ruby
 authors:
 - Brett Terpstra
@@ -514,6 +514,7 @@ files:
 - _config.yml
 - bin/commands/again.rb
 - bin/commands/archive.rb
+- bin/commands/budget.rb
 - bin/commands/cancel.rb
 - bin/commands/changes.rb
 - bin/commands/choose.rb