na 1.2.37 → 1.2.38

data/lib/na/next_action.rb

@@ -7,6 +7,10 @@ module NA
 
     attr_accessor :verbose, :extension, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
 
+    def theme
+      @theme ||= NA::Theme.load_theme
+    end
+
     ##
     ## Output to STDERR
     ##
@@ -19,7 +23,7 @@ module NA
       return if debug && !NA.verbose
 
       if debug
-        $stderr.puts NA::Color.template("{xdw}#{msg}{x}")
+        $stderr.puts NA::Color.template("{x}#{NA.theme[:debug]}#{msg}{x}")
       else
         $stderr.puts NA::Color.template("{x}#{msg}{x}")
       end
@@ -100,7 +104,7 @@ module NA
         f.puts(content)
       end
       save_working_dir(target)
-      notify("{y}Created {bw}#{target}")
+      notify("#{NA.theme[:warning]}Created #{NA.theme[:file]}#{target}")
     end
 
     ##
@@ -116,7 +120,7 @@ module NA
     def select_file(files, multiple: false)
       res = choose_from(files, prompt: multiple ? 'Select files' : 'Select a file', multiple: multiple)
 
-      notify('{r}No file selected, cancelled', exit_code: 1) unless res && res.length.positive?
+      notify("#{NA.theme[:error]}No file selected, cancelled", exit_code: 1) unless res && res.length.positive?
 
       res
     end
@@ -143,7 +147,7 @@ module NA
                             done: done })
 
       unless todo.actions.count.positive?
-        NA.notify("{r}No matching actions found in {bw}#{File.basename(target, ".#{NA.extension}")}")
+        NA.notify("#{NA.theme[:error]}No matching actions found in #{File.basename(target, ".#{NA.extension}").highlight_filename}")
         return
       end
 
@@ -152,7 +156,7 @@ module NA
       options = todo.actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
       res = choose_from(options, prompt: 'Make a selection: ', multiple: true, sorted: true)
 
-      NA.notify('{r}Cancelled', exit_code: 1) unless res && res.length.positive?
+      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res && res.length.positive?
 
       selected = NA::Actions.new
       res.each do |result|
@@ -247,11 +251,11 @@ module NA
         project = project.sub(/:$/, '')
         target_proj = projects.select { |pr| pr.project =~ /#{project.gsub(/:/, '.*?:.*?')}/i }.first
         if target_proj.nil?
-          res = NA.yn(NA::Color.template("{y}Project {bw}#{project}{xy} doesn't exist, add it"), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
           if res
             target_proj = insert_project(target, project, projects)
           else
-            NA.notify('{x}Cancelled', exit_code: 1)
+            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
           end
         end
       end
@@ -270,7 +274,7 @@ module NA
                         projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/ }.first
                       end
 
-        NA.notify("{r}Error parsing project #{target}", exit_code: 1) if target_proj.nil?
+        NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
 
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)
@@ -364,7 +368,11 @@ module NA
       backup_file(target)
       File.open(target, 'w') { |f| f.puts contents.join("\n") }
 
-      add ? notify("{by}Task added to {bw}#{target}") : notify("{by}Task updated in {bw}#{target}")
+      if add
+        notify("#{NA.theme[:success]}Task added to #{NA.theme[:filename]}#{target}")
+      else
+        notify("#{NA.theme[:success]}Task updated in #{NA.theme[:filename]}#{target}")
+      end
     end
 
     ##
@@ -385,7 +393,6 @@ module NA
         else
           project = NA.cwd
         end
-        puts [add_tag, project]
       end
 
       action = Action.new(file, project, parent, action, nil, note)
@@ -519,12 +526,12 @@ module NA
     ##
     def match_working_dir(search, distance: 1, require_last: true)
       file = database_path
-      NA.notify('{r}No na database found', exit_code: 1) unless File.exist?(file)
+      NA.notify("#{NA.theme[:error]}No na database found", exit_code: 1) unless File.exist?(file)
 
       dirs = file.read_file.split("\n")
 
       optional = search.filter { |s| !s[:negate] }.map { |t| t[:token] }
-      required = search.filter { |s| s[:required] }.map { |t| t[:token] }
+      required = search.filter { |s| s[:required] && !s[:negate] }.map { |t| t[:token] }
       negated = search.filter { |s| s[:negate] }.map { |t| t[:token] }
 
       optional.push('*') if optional.count.zero? && required.count.zero? && negated.count.positive?
@@ -533,9 +540,9 @@ module NA
         optional = ['*']
       end
 
-      NA.notify("{dw}Optional directory regex: {x}#{optional.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
-      NA.notify("{dw}Required directory regex: {x}#{required.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
-      NA.notify("{dw}Negated directory regex: {x}#{negated.map { |t| t.dir_to_rx(distance: distance, require_last: false) }}", debug: true)
+      NA.notify("Optional directory regex: {x}#{optional.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
+      NA.notify("Required directory regex: {x}#{required.map { |t| t.dir_to_rx(distance: distance) }}", debug: true)
+      NA.notify("Negated directory regex: {x}#{negated.map { |t| t.dir_to_rx(distance: distance, require_last: false) }}", debug: true)
 
       if require_last
         dirs.delete_if { |d| !d.sub(/\.#{NA.extension}$/, '').dir_matches(any: optional, all: required, none: negated) }
@@ -546,9 +553,9 @@ module NA
         end
       end
 
-      dirs = dirs.sort.uniq
+      dirs = dirs.sort_by { |d| File.basename(d) }.uniq
       if dirs.empty? && require_last
-        NA.notify('{y}No matches, loosening search', debug: true)
+        NA.notify("#{NA.theme[:warning]}No matches, loosening search", debug: true)
         match_working_dir(search, distance: 2, require_last: false)
       else
         dirs
@@ -605,7 +612,7 @@ module NA
       if file
         restore_modified_file(file)
       else
-        NA.notify('{br}No matching file found')
+        NA.notify("#{NA.theme[:error]}No matching file found")
       end
     end
 
@@ -618,9 +625,9 @@ module NA
       bak_file = File.join(File.dirname(file), ".#{File.basename(file)}.bak")
       if File.exist?(bak_file)
         FileUtils.mv(bak_file, file)
-        NA.notify("{bg}Backup restored for #{file}")
+        NA.notify("#{NA.theme[:success]}Backup restored for #{file.highlight_filename}")
       else
-        NA.notify("{br}Backup file for #{file} not found")
+        NA.notify("#{NA.theme[:error]}Backup file for #{file.highlight_filename} not found")
       end
     end
 
@@ -698,13 +705,13 @@ module NA
              else
                file = database_path
                content = File.exist?(file) ? file.read_file.strip : ''
-               notify('{br}Database empty', exit_code: 1) if content.empty?
+               notify("#{NA.theme[:error]}Database empty", exit_code: 1) if content.empty?
 
                content.split(/\n/)
              end
 
       dirs.map! do |dir|
-        "{xdg}#{dir.sub(/^#{ENV['HOME']}/, '~').sub(%r{/([^/]+)\.#{NA.extension}$}, '/{xby}\1{x}')}"
+        dir.highlight_filename
       end
 
       puts NA::Color.template(dirs.join("\n"))
@@ -717,13 +724,13 @@ module NA
 
       if searches.key?(title)
         res = yn('Overwrite existing definition?', default: true)
-        notify('{r}Cancelled', exit_code: 0) unless res
+        notify("#{NA.theme[:error]}Cancelled", exit_code: 0) unless res
 
       end
 
       searches[title] = search
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
-      NA.notify("{y}Search #{title} saved", exit_code: 0)
+      NA.notify("#{NA.theme[:success]}Search #{NA.theme[:filename]}#{title}#{NA.theme[:success]} saved", exit_code: 0)
     end
 
     def load_searches
@@ -743,37 +750,37 @@ module NA
     end
 
     def delete_search(strings = nil)
-      NA.notify('{r}Name search required', exit_code: 1) if strings.nil? || strings.empty?
+      NA.notify("#{NA.theme[:error]}Name of search required", exit_code: 1) if strings.nil? || strings.empty?
 
       file = database_path(file: 'saved_searches.yml')
-      NA.notify('{r}No search definitions file found', exit_code: 1) unless File.exist?(file)
+      NA.notify("#{NA.theme[:error]}No search definitions file found", exit_code: 1) unless File.exist?(file)
 
       searches = YAML.safe_load(file.read_file)
       keys = searches.keys.delete_if { |k| k !~ /(#{strings.join('|')})/ }
 
-      res = yn(NA::Color.template(%({y}Remove #{keys.count > 1 ? 'searches' : 'search'} {bw}"#{keys.join(', ')}"{x})),
+      res = yn(NA::Color.template(%(#{NA.theme[:warning]}Remove #{keys.count > 1 ? 'searches' : 'search'} #{NA.theme[:file]}"#{keys.join(', ')}"{x})),
                default: false)
 
-      NA.notify('{r}Cancelled', exit_code: 1) unless res
+      NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res
 
       searches.delete_if { |k| keys.include?(k) }
 
       File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
 
-      NA.notify("{y}Deleted {bw}#{keys.count}{xy} #{keys.count > 1 ? 'searches' : 'search'}", exit_code: 0)
+      NA.notify("#{NA.theme[:warning]}Deleted {bw}#{keys.count}{x}#{NA.theme[:warning]} #{keys.count > 1 ? 'searches' : 'search'}", exit_code: 0)
     end
 
     def edit_searches
       file = database_path(file: 'saved_searches.yml')
       searches = load_searches
 
-      NA.notify('{r}No search definitions found', exit_code: 1) unless searches.count.positive?
+      NA.notify("#{NA.theme[:error]}No search definitions found", exit_code: 1) unless searches.count.positive?
 
-      editor = ENV['EDITOR']
-      NA.notify('{r}No $EDITOR defined', exit_code: 1) unless editor && TTY::Which.exist?(editor)
+      editor = NA.default_editor
+      NA.notify("#{NA.theme[:error]}No $EDITOR defined", exit_code: 1) unless editor && TTY::Which.exist?(editor)
 
       system %(#{editor} "#{file}")
-      NA.notify("Opened #{file} in #{editor}", exit_code: 0)
+      NA.notify("#{NA.theme[:success]}Opened #{file} in #{editor}", exit_code: 0)
     end
 
     ##
@@ -786,7 +793,7 @@ module NA
       backup = File.join(File.dirname(target), file)
       FileUtils.cp(target, backup)
       save_modified_file(target)
-      NA.notify("{dw}Backup file created at #{backup}", debug: true)
+      NA.notify("#{NA.theme[:warning]}Backup file created at #{backup.highlight_filename}", debug: true)
     end
 
     private
@@ -822,15 +829,15 @@ module NA
                 '--item.foreground=""'
               ]
               args.push '--no-limit' if multiple
-              puts NS::Color.template("{bw}#{prompt}{x}")
+              puts NS::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")
               `echo #{Shellwords.escape(options.join("\n"))}|#{TTY::Which.which('gum')} choose #{args.join(' ')}`.strip
             else
               reader = TTY::Reader.new
               puts
               options.each.with_index do |f, i|
-                puts NA::Color.template(format("{bw}%<idx> 2d{xw}) {y}%<action>s{x}\n", idx: i + 1, action: f))
+                puts NA::Color.template(format("#{NA.theme[:prompt]}%<idx> 2d{xw}) #{NA.theme[:file]}%<action>s{x}\n", idx: i + 1, action: f))
               end
-              result = reader.read_line(NA::Color.template("{bw}#{prompt}{x}")).strip
+              result = reader.read_line(NA::Color.template("#{NA.theme[:prompt]}#{prompt}{x}")).strip
               result.to_i&.positive? ? options[result.to_i - 1] : nil
             end
 
@@ -871,7 +878,7 @@ module NA
       if TTY::Which.exist?('xdg-open')
         `xdg-open #{Shellwords.escape(file)}`
       else
-        notify('{r}Unable to determine executable for `xdg-open`.')
+        notify("#{NA.theme[:error]}Unable to determine executable for `xdg-open`.")
       end
     end
   end

data/lib/na/pager.rb

@@ -44,7 +44,7 @@ module NA
           IO.select [input]
 
           begin
-            NA.notify("{dw}Pager #{pager}", debug: true)
+            NA.notify("#{NA.theme[:debug]}Pager #{pager}", debug: true)
             exec(pager)
           rescue SystemCallError => e
             raise Errors::DoingStandardError, "Pager error, #{e}"

data/lib/na/prompt.rb

@@ -14,7 +14,7 @@ module NA
                   when :tag
                     'na tagged $(basename "$PWD")'
                   else
-                    NA.notify('When using a global file, a prompt hook requires `--cwd_as [tag|project]`', exit_code: 1)
+                    NA.notify("#{NA.theme[:error]}When using a global file, a prompt hook requires `--cwd_as [tag|project]`", exit_code: 1)
                   end
                 else
                   'na next'
@@ -31,7 +31,7 @@ module NA
                   when :tag
                     'na tagged (basename "$PWD")'
                   else
-                    NA.notify('When using a global file, a prompt hook requires `--cwd_as [tag|project]`', exit_code: 1)
+                    NA.notify("#{NA.theme[:error]}When using a global file, a prompt hook requires `--cwd_as [tag|project]`", exit_code: 1)
                   end
                 else
                   'na next'
@@ -50,7 +50,7 @@ module NA
                   when :tag
                     'na tagged $(basename "$PWD")'
                   else
-                    NA.notify('When using a global file, a prompt hook requires `--cwd_as [tag|project]`', exit_code: 1)
+                    NA.notify("#{NA.theme[:error]}When using a global file, a prompt hook requires `--cwd_as [tag|project]`", exit_code: 1)
                   end
                 else
                   'na next'
@@ -83,7 +83,7 @@ module NA
       def show_prompt_hook(shell)
         file = prompt_file(shell)
 
-        NA.notify("{bw}# Add this to {y}#{file}{x}")
+        NA.notify("#{NA.theme[:warning]}# Add this to #{NA.theme[:filename]}#{file}")
         puts prompt_hook(shell)
       end
 
@@ -91,8 +91,8 @@ module NA
         file = prompt_file(shell)
 
         File.open(File.expand_path(file), 'a') { |f| f.puts prompt_hook(shell) }
-        NA.notify("{y}Added {bw}#{shell}{xy} prompt hook to {bw}#{file}{xy}.{x}")
-        NA.notify("{y}You may need to close the current terminal and open a new one to enable the script.{x}")
+        NA.notify("#{NA.theme[:success]}Added #{NA.theme[:filename]}#{shell}{x}#{NA.theme[:success]} prompt hook to #{NA.theme[:filename]}#{file}#{NA.theme[:success]}.")
+        NA.notify("#{NA.theme[:warning]}You may need to close the current terminal and open a new one to enable the script.")
       end
     end
   end

data/lib/na/string.rb

@@ -6,6 +6,15 @@ REGEX_TIME = /^#{REGEX_CLOCK}$/i.freeze
 
 # String helpers
 class ::String
+  ##
+  ## Insert a comment character at the start of every line
+  ##
+  ## @param      char  [String] The character to insert (default #)
+  ##
+  def comment(char = "#")
+    split(/\n/).map { |l| "# #{l}" }.join("\n")
+  end
+
   ##
   ## Tests if object is nil or empty
   ##
@@ -75,6 +84,17 @@ class ::String
     self =~ /@#{NA.na_tag}\b/
   end
 
+  ##
+  ## Colorize the dirname and filename of a path
+  ##
+  ## @return     Colorized string
+  ##
+  def highlight_filename
+    dir = File.dirname(self).shorten_path
+    file = File.basename(self, ".#{NA.extension}")
+    "#{NA.theme[:dirname]}#{dir}/#{NA.theme[:filename]}#{file}{x}"
+  end
+
   ##
   ## Colorize @tags with ANSI escapes
   ##
@@ -88,7 +108,7 @@ class ::String
   ##
   ## @return     [String] string with @tags highlighted
   ##
-  def highlight_tags(color: '{m}', value: '{y}', parens: '{m}', last_color: '{xg}')
+  def highlight_tags(color: NA.theme[:tags], value: NA.theme[:value], parens: NA.theme[:value_parens], last_color: NA.theme[:action])
     tag_color = NA::Color.template(color)
     paren_color = NA::Color.template(parens)
     value_color = NA::Color.template(value)
@@ -106,9 +126,9 @@ class ::String
   ## @param      last_color  [String] Color to restore after
   ##                         highlight
   ##
-  def highlight_search(regexes, color: '{y}', last_color: '{xg}')
+  def highlight_search(regexes, color: NA.theme[:search_highlight], last_color: NA.theme[:action])
     string = dup
-    color = NA::Color.template(color)
+    color = NA::Color.template(color.dup)
     regexes.each do |rx|
       next if rx.nil?
 

data/lib/na/theme.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module NA
+  module Theme
+    class << self
+      def template_help
+        <<~EOHELP
+          Use {X} placeholders to apply colors. Available colors are:
+
+          w: white, k: black, g: green, l: blue,
+          y: yellow, c: cyan, m: magenta, r: red,
+          W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
+          Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
+          d: dark, b: bold, u: underline, i: italic, x: reset
+
+          Multiple placeholders can be combined in a single {} pair.
+
+          You can also use {#RGB} and {#RRGGBB} to specify hex colors.
+          Add a b before the # to make the hex a background color ({b#fa0}).
+
+
+        EOHELP
+      end
+
+      def load_theme(template: {})
+        # Default colorization, can be overridden with full or partial template variable
+        default_template = {
+          parent: '{c}',
+          bracket: '{dc}',
+          parent_divider: '{xw}/',
+          action: '{bg}',
+          project: '{xbk}',
+          tags: '{m}',
+          value_parens: '{m}',
+          values: '{c}',
+          search_highlight: '{y}',
+          note: '{dw}',
+          dirname: '{dw}',
+          filename: '{xb}{#eccc87}',
+          prompt: '{m}',
+          success: '{bg}',
+          error: '{b}{#b61d2a}',
+          warning: '{by}',
+          debug: '{dw}',
+          templates: {
+            output: '%filename%parents| %action',
+            default: '%parent%action',
+            single_file: '%parent%action',
+            multi_file: '%filename%parent%action'
+          }
+        }
+
+        # Load custom theme
+        theme_file = NA.database_path(file: 'theme.yaml')
+        theme = if File.exist?(theme_file)
+                  YAML.load(IO.read(theme_file)) || {}
+                else
+                  {}
+                end
+        theme = default_template.merge(theme)
+
+        File.open(theme_file, 'w') do |f|
+          f.puts template_help.comment
+          f.puts YAML.dump(theme)
+        end
+
+        theme.merge(template)
+      end
+    end
+  end
+end

data/lib/na/todo.rb

@@ -51,8 +51,8 @@ module NA
       negated_tag = []
       projects = []
 
-      NA.notify("{dw}Tags: #{settings[:tag]}", debug:true)
-      NA.notify("{dw}Search: #{settings[:search]}", debug:true)
+      NA.notify("Tags: #{settings[:tag]}", debug:true)
+      NA.notify("Search: #{settings[:search]}", debug:true)
 
       settings[:tag]&.each do |t|
         unless t[:tag].nil?

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.37'
+  VERSION = '1.2.38'
 end

data/lib/na.rb

@@ -13,6 +13,7 @@ require 'na/hash'
 require 'na/colors'
 require 'na/string'
 require 'na/array'
+require 'na/theme'
 require 'na/todo'
 require 'na/actions'
 require 'na/project'

data/src/_README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is <!--VER-->1.2.35<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.37<!--END VER-->.
 
 `na` ("next action") is a command line tool designed to make it easy to see what your next actions are for any project, right from the command line. It works with TaskPaper-formatted files (but any plain text format will do), looking for `@na` tags (or whatever you specify) in todo files in your current folder. 
 
@@ -69,7 +69,7 @@ You can mark todos as complete, delete them, add and remove tags, change priorit
 ### Usage
 
 ```
-@cli(na help)
+@cli(bundle exec bin/na help)
 ```
 
 #### Commands
@@ -87,13 +87,13 @@ Use the `--note` switch to add a note. If STDIN (piped) input is present when th
 Notes are not displayed by the `next/tagged/find` commands unless `--notes` is specified.
 
 ```
-@cli(na help add)
+@cli(bundle exec bin/na help add)
 ```
 
 ##### edit
 
 ```
-@cli(na help edit)
+@cli(bundle exec bin/na help edit)
 ```
 
 ##### find
@@ -103,13 +103,13 @@ Example: `na find cool feature idea`
 Unless `--exact` is specified, search is tokenized and combined with AND, so `na find cool feature idea` translates to `cool AND feature AND idea`, matching any string that contains all of the words. To make a token required and others optional, add a `+` before it (e.g. `cool +feature idea` is `(cool OR idea) AND feature`). Wildcards allowed (`*` and `?`), use `--regex` to interpret the search as a regular expression. Use `-v` to invert the results (display non-matching actions only).
 
 ```
-@cli(na help find)
+@cli(bundle exec bin/na help find)
 ```
 
 ##### init, create
 
 ```
-@cli(na help init)
+@cli(bundle exec bin/na help init)
 ```
 
 ##### next, show
@@ -123,7 +123,7 @@ Examples:
 To see all next actions across all known todos, use `na next "*"`. You can combine multiple arguments to see actions across multiple todos, e.g. `na next marked nvultra`.
 
 ```
-@cli(na help next)
+@cli(bundle exec bin/na help next)
 ```
 
 ##### projects
@@ -131,7 +131,7 @@ To see all next actions across all known todos, use `na next "*"`. You can combi
 List all projects in a file. If arguments are provided, they're used to match a todo file from history, otherwise the todo file(s) in the current directory will be used.
 
 ```
-@cli(na help projects)
+@cli(bundle exec bin/na help projects)
 ```
 
 ##### saved
@@ -146,7 +146,7 @@ Run `na saved` without an argument to list your saved searches.
 <!--JEKYLL{:.tip}-->
 
 ```
-@cli(na help saved)
+@cli(bundle exec bin/na help saved)
 ```
 
 ##### tagged
@@ -160,7 +160,7 @@ You can also perform value comparisons on tags. A value in a TaskPaper tag is ad
 To perform a string comparison, you can use `*=` (contains), `^=` (starts with), `$=` (ends with), or `=` (matches). E.g. `na tagged "note*=video"`.
 
 ```
-@cli(na help show)
+@cli(bundle exec bin/na help show)
 ```
 
 ##### todos
@@ -168,7 +168,7 @@ To perform a string comparison, you can use `*=` (contains), `^=` (starts with),
 List all known todo files from history.
 
 ```
-@cli(na help todos)
+@cli(bundle exec bin/na help todos)
 ```
 
 ##### update
@@ -206,7 +206,7 @@ Notes are not displayed by the `next/tagged/find` commands unless `--notes` is s
 See the help output for a list of all available actions.
 
 ```
-@cli(na help update)
+@cli(bundle exec bin/na help update)
 ```
 
 ##### changelog
@@ -214,7 +214,7 @@ See the help output for a list of all available actions.
 View recent changes with `na changelog` or `na changes`.
 
 ```
-@cli(na help changelog)
+@cli(bundle exec bin/na help changelog)
 ```
 
 ##### complete
@@ -222,7 +222,7 @@ View recent changes with `na changelog` or `na changes`.
 Mark an action as complete, shortcut for `na update --finish`.
 
 ```
-@cli(na help complete)
+@cli(bundle exec bin/na help complete)
 ```
 
 ##### archive
@@ -230,7 +230,27 @@ Mark an action as complete, shortcut for `na update --finish`.
 Mark an action as complete and move to archive, shortcut for `na update --archive`.
 
 ```
-@cli(na help archive)
+@cli(bundle exec bin/na help archive)
+```
+
+##### tag
+
+Add, remove, or modify tags.
+
+Use `na tag TAGNAME --[search|tagged] SEARCH_STRING` to add a tag to matching action (use `--all` to apply to all matching actions). If you use `!TAGNAME` it will remove that tag (regardless of value). To change the value of an existing tag (or add it if it doesn't exist), use `~TAGNAME(NEW VALUE)`.
+
+```
+@cli(bundle exec bin/na help tag)
+```
+
+##### undo
+
+Undoes the last file change resulting from an add or update command. If no argument is given, it undoes whatever the last change in history was. If an argument is provided, it's used to match against the change history, finding a specific file to restore from backup.
+
+Only the most recent change can be undone.
+
+```
+@cli(bundle exec bin/na help undo)
 ```
 
 ### Configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.37
+  version: 1.2.38
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -238,6 +238,7 @@ files:
 - lib/na/project.rb
 - lib/na/prompt.rb
 - lib/na/string.rb
+- lib/na/theme.rb
 - lib/na/todo.rb
 - lib/na/version.rb
 - na.gemspec