na 1.2.37 → 1.2.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35e6d784b55e397b8843663130837bcebb9041640a7833d650cedc9b783289e2
-  data.tar.gz: a1ba45d7ba0d77e122667bc5c93629832dc379ee5d2275076182849055c8d72e
+  metadata.gz: 13c74e296d8e9d6e252949394c5471a27b1c7d3619026383fc75590dcb5d6046
+  data.tar.gz: c67deb62ee0ad5c2b3cf35b5ca39cebe2f6780e675cb48fbaec260068111a33a
 SHA512:
-  metadata.gz: 1ee63a7b2bfd58496bf2047cd80a16f30bf255ca1edc8b0aa5a84a9abc8e4d1ccdd8082cd8f01fb8db60d5b73c7e2014f4f847369ac0d39274b5929ef8173f07
-  data.tar.gz: d0321cddedf590c96a18cbd1096c7982240cb8c172c9f3491e0569ecfdf8882955898056ff3fd56d9e529d91be2a9ca56f3003bdbf6f1517a9658d08a302ca30
+  metadata.gz: 4fd8a183c2fcadf9d128bab65267b841bdd253db40071cb87c3fa0dbfd1be0517d667ba64f21b28f0a24adfbc08cbefe79c3638ac63736698de34a21c81d0658
+  data.tar.gz: 8cb24b17379576cf4f86f709a277c2e075fb41c905d67750f09500471f5948f0d3cd2e0d66d9f29a073172e6808c8d4f2b2dd0afe3b6b223ff04ec493ccd8289

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+### 1.2.38
+
+2023-09-03 11:25
+
+#### NEW
+
+- Open the todos database in an editor with `na todos --edit`
+- A theme file is written to ~/.local/share/na/theme.yaml where you can modify the colors used for all displays
+- Allow tag=~PATTERN comparison for regex matching
+
+#### IMPROVED
+
+- Better error message for `na next` when no todo is matched
+- If STDOUT isn't a TTY, don't enable pagination, regardless of global setting
+- Allow --find or --grep as synonyms for --search
+
+#### FIXED
+
+- Date tags containing hyphens triggered OR searches because they were initially interpreted as negative tag searches
+- Templating irregularities
+- Error thrown when running without $EDITOR variable defined in environment
+
 ### 1.2.37
 
 2023-09-01 12:42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.36)
+    na (1.2.38)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)

data/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 1.2.37
+The current version of `na` is 1.2.38
 .
 
 `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. 
@@ -77,7 +77,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.37
+    1.2.38
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -114,6 +114,7 @@ COMMANDS
     prompt              - Show or install prompt hooks for the current shell
     restore, unfinish   - Find and remove @done tag from an action
     saved               - Execute a saved search
+    tag                 - Add tags to matching action(s)
     tagged              - Find actions matching a tag
     todos               - Show list of known todo files
     undo                - Undo the last change
@@ -291,7 +292,7 @@ COMMAND OPTIONS
     --omnifocus                            - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --regex                                - Search query is regular expression
-    --search=QUERY                         - Filter results using search terms (may be used more than once, default: none)
+    --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
 
@@ -402,7 +403,7 @@ COMMAND OPTIONS
     --omnifocus                            - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --regex                                - Search query is regular expression
-    --search=QUERY                         - Filter results using search terms (may be used more than once, default: none)
+    --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
 
@@ -428,10 +429,13 @@ NAME
 
 SYNOPSIS
 
-    na [global options] todos [QUERY]
+    na [global options] todos [command options] [QUERY]
 
 DESCRIPTION
-    Arguments will be interpreted as a query against which the   list of todos will be fuzzy matched. Separate directories with   /, :, or a space, e.g. `na todos code/marked`
+    Arguments will be interpreted as a query against which the   list of todos will be fuzzy matched. Separate directories with   /, :, or a space, e.g. `na todos code/marked` 
+
+COMMAND OPTIONS
+    -e, --[no-]edit - Open the todo database in an editor for manual modification
 ```
 
 ##### update
@@ -589,6 +593,75 @@ EXAMPLE
     na archive "An existing task"
 ```
 
+##### 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)`.
+
+```
+NAME
+    tag - Add tags to matching action(s)
+
+SYNOPSIS
+
+    na [global options] tag [command options] TAG
+
+DESCRIPTION
+    Provides an easy way to tag existing actions.   Use !tag to remove a tag, use ~tag(new value) to change a tag or add a value.   If multiple todo files are found in the current directory, a menu will   allow you to pick which file to act on, or use --all to apply to all matches. 
+
+COMMAND OPTIONS
+    --all                          - Act on all matches immediately (no menu)
+    -d, --depth=DEPTH              - Search for files X directories deep (default: 1)
+    --[no-]done                    - Include @done actions
+    -e, --regex                    - Interpret search pattern as regular expression
+    --file=PATH                    - Specify the file to search for the task (default: none)
+    --in, --todo=TODO_FILE         - Use a known todo file, partial matches allowed (default: none)
+    --search, --find, --grep=QUERY - Filter results using search terms (may be used more than once, default: none)
+    --tagged=TAG                   - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    -x, --exact                    - Match pattern exactly
+
+EXAMPLES
+
+    # Find "An existing task" action and add @project(warpspeed) to it
+    na tag "project(warpspeed)" --search "An existing task"
+
+    # Find all actions tagged @project2 and remove @project1 from them
+    na tag "!project1" --tagged project2 --all
+
+    # Remove @project2 from all actions
+    na tag "!project2" --all
+
+    # Find "An existing task" and change (or add) its @project tag value to "dirt nap"
+    na tag "~project(dirt nap)" --search "An existing task"
+```
+
+##### 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.
+
+```
+NAME
+    undo - Undo the last change
+
+SYNOPSIS
+
+    na [global options] undo [FILE]...
+
+DESCRIPTION
+    Run without argument to undo most recent change 
+
+EXAMPLES
+
+    # Undo the last change
+    na undo
+
+    # Undo the last change to a file matching "myproject"
+    na undo myproject
+```
+
 ### Configuration
 
 Global options such as todo extension and default next action tag can be stored permanently by using the `na initconfig` command. Run na with the global options you'd like to set, and add `initconfig` at the end of the command. A file will be written to `~/.na.rc`. You can edit this manually, or just update it using the `initconfig --force` command to overwrite it with new settings.

data/bin/commands/add.rb

@@ -62,25 +62,23 @@ class App
       if NA.global_file
         target = File.expand_path(NA.global_file)
         unless File.exist?(target)
-          res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Specified file not found, create it"), default: true)
           if res
             basename = File.basename(target, ".#{NA.extension}")
             NA.create_todo(target, basename, template: global_options[:template])
           else
-            puts NA::Color.template('{r}Cancelled{x}')
-            Process.exit 1
+            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
           end
         end
       elsif options[:file]
         target = File.expand_path(options[:file])
         unless File.exist?(target)
-          res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Specified file not found, create it"), default: true)
           if res
             basename = File.basename(target, ".#{NA.extension}")
             NA.create_todo(target, basename, template: global_options[:template])
           else
-            puts NA::Color.template('{r}Cancelled{x}')
-            Process.exit 1
+            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
           end
         end
       elsif options[:todo]
@@ -102,8 +100,8 @@ class App
           target = File.expand_path(todo)
           unless File.exist?(target)
 
-            res = NA.yn(NA::Color.template("{by}Specified file not found, create #{todo}"), default: true)
-            NA.notify('{r}Cancelled{x}', exit_code: 1) unless res
+            res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Specified file not found, create #{todo}"), default: true)
+            NA.notify("#{NA.theme[:error]}Cancelled{x}", exit_code: 1) unless res
 
             basename = File.basename(target, ".#{NA.extension}")
             NA.create_todo(target, basename, template: global_options[:template])
@@ -113,7 +111,7 @@ class App
       else
         files = NA.find_files(depth: options[:depth])
         if files.count.zero?
-          res = NA.yn(NA::Color.template('{by}No todo file found, create one'), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}No todo file found, create one"), default: true)
           if res
             basename = File.expand_path('.').split('/').last
             target = "#{basename}.#{NA.extension}"
@@ -122,7 +120,7 @@ class App
           end
         end
         target = files.count > 1 ? NA.select_file(files) : files[0]
-        NA.notify('{r}Cancelled{x}', exit_code: 1) unless files.count.positive? && File.exist?(target)
+        NA.notify("#{NA.theme[:error]}Cancelled{x}", exit_code: 1) unless files.count.positive? && File.exist?(target)
 
       end
 
@@ -131,8 +129,8 @@ class App
                elsif $stdin.isatty && TTY::Which.exist?('gum')
                  `gum input --placeholder "Enter a task" --char-limit=500 --width=#{TTY::Screen.columns}`.strip
                elsif $stdin.isatty
-                 puts NA::Color.template('{bm}Enter task:{x}')
-                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
+                 NA.notify("#{NA.theme[:prompt]}Enter task:")
+                 reader.read_line(NA::Color.template("#{NA.theme[:warning]}> #{NA.theme[:action]}")).strip
                end
 
       if action.nil? || action.empty?
@@ -171,7 +169,7 @@ class App
                       args << '--width $(tput cols)'
                       `gum write #{args.join(' ')}`.strip.split("\n")
                     else
-                      puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
+                      NA.notify("#{NA.theme[:prompt]}Enter a note, {bw}CTRL-d#{NA.theme[:prompt]} to end editing#{NA.theme[:action]}")
                       reader.read_multiline
                     end
                   end

data/bin/commands/edit.rb

@@ -51,11 +51,11 @@ class App
                  ]
                  `gum input #{opts.join(' ')}`.strip
                elsif $stdin.isatty && options[:tagged].empty?
-                 puts NA::Color.template('{bm}Enter search string:{x}')
-                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
+                 NA.notify("#{NA.theme[:prompt]}Enter search string:")
+                 reader.read_line(NA::Color.template("#{NA.theme[:warning]}> #{NA.theme[:action]}")).strip
                end
 
-      NA.notify('{br}Empty input{x}', exit_code: 1) unless action
+      NA.notify("#{NA.theme[:error]}Empty input", exit_code: 1) if (action.nil? || action.empty?) && options[:tagged].empty?
 
       if action
         tokens = nil
@@ -79,32 +79,28 @@ class App
       end
 
       if (action.nil? || action.empty?) && options[:tagged].empty?
-        NA.notify('{br}Empty input, cancelled{x}', exit_code: 1)
+        NA.notify("#{NA.theme[:error]}Empty input, cancelled", exit_code: 1)
       end
 
-      all_req = options[:tagged].join(' ') !~ /[+!\-]/ && !options[:or]
+      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
       tags = []
       options[:tagged].join(',').split(/ *, */).each do |arg|
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>$\^]+?)(?:(?<op>[=<>]{1,2}|[*$\^]=)(?<val>.*?))?$/)
+        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>*$\^~]+?)(?:(?<op>[=<>~]{1,2}|[*$\^]=)(?<val>.*?))?$/)
 
         tags.push({
                     tag: m['tag'].wildcard_to_rx,
                     comp: m['op'],
                     value: m['val'],
                     required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                    negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                    negate: !m['req'].nil? && m['req'] =~ /[!-]/
                   })
       end
 
-      target_proj = if NA.cwd_is == :project
-                      NA.cwd
-                    else
-                      nil
-                    end
+      target_proj = NA.cwd_is == :project ? NA.cwd : nil
 
       if options[:file]
         file = File.expand_path(options[:file])
-        NA.notify('{r}File not found', exit_code: 1) unless File.exist?(file)
+        NA.notify("#{NA.theme[:error]}File not found", exit_code: 1) unless File.exist?(file)
 
         targets = [file]
       elsif options[:todo]
@@ -114,7 +110,7 @@ class App
           todo.push({
                       token: m['tok'],
                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                      negate: !m['req'].nil? && m['req'] =~ /[!-]/
                     })
         end
         dirs = NA.match_working_dir(todo)
@@ -123,21 +119,21 @@ class App
           targets = [dirs[0]]
         elsif dirs.count.positive?
           targets = NA.select_file(dirs, multiple: true)
-          NA.notify('{r}Cancelled', exit_code: 1) unless targets && targets.count.positive?
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless targets && targets.count.positive?
         else
-          NA.notify('{r}Todo not found', exit_code: 1) unless targets && targets.count.positive?
+          NA.notify("#{NA.theme[:error]}Todo not found", exit_code: 1) unless targets && targets.count.positive?
 
         end
       else
         files = NA.find_files(depth: options[:depth])
-        NA.notify('{r}No todo file found', exit_code: 1) if files.count.zero?
+        NA.notify("#{NA.theme[:error]}No todo file found", exit_code: 1) if files.count.zero?
 
         targets = files.count > 1 ? NA.select_file(files, multiple: true) : [files[0]]
-        NA.notify('{r}Cancelled{x}', exit_code: 1) unless files.count.positive?
+        NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless files.count.positive?
 
       end
 
-      NA.notify('{r}No search terms provided', exit_code: 1) if tokens.nil? && options[:tagged].empty?
+      NA.notify("#{NA.theme[:error]}No search terms provided", exit_code: 1) if tokens.nil? && options[:tagged].empty?
 
       targets.each do |target|
         NA.update_action(target,

data/bin/commands/find.rb

@@ -73,7 +73,12 @@ class App
       if options[:exact] || options[:regex]
         search = args.join(' ')
       else
-        search = args.join(' ').gsub(/(?<=\A|[ ,])(?<req>[+\-!])?@(?<tag>[^ *=<>$\^,@(]+)(?:\((?<value>.*?)\)| *(?<op>[=<>]{1,2}|[*$\^]=) *(?<val>.*?(?=\Z|[,@])))?/) do |arg|
+        rx = [
+          '(?<=\A|[ ,])(?<req>[+!-])?@(?<tag>[^ *=<>$*\^,@(]+)',
+          '(?:\((?<value>.*?)\)| *(?<op>[=<>~]{1,2}|[*$\^]=) *',
+          '(?<val>.*?(?=\Z|[,@])))?'
+        ].join('')
+        search = args.join(' ').gsub(Regexp.new(rx)) do
           m = Regexp.last_match
           string = if m['value']
                      "#{m['req']}#{m['tag']}=#{m['value']}"
@@ -87,17 +92,17 @@ class App
 
       search = search.gsub(/ +/, ' ').strip
 
-      all_req = options[:tagged].join(' ') !~ /[+!\-]/ && !options[:or]
+      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
       tags = []
       options[:tagged].join(',').split(/ *, */).each do |arg|
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>$\^]+?) *(?:(?<op>[=<>]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
+        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$*~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
 
         tags.push({
                     tag: m['tag'].wildcard_to_rx,
                     comp: m['op'],
                     value: m['val'],
                     required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                    negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                    negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                   })
       end
 
@@ -112,14 +117,14 @@ class App
         tokens = Regexp.new(search, Regexp::IGNORECASE)
       else
         tokens = []
-        all_req = search !~ /[+!-]/ && !options[:or]
+        all_req = search !~ /(?<=[, ])[+!-]/ && !options[:or]
 
         search.split(/ /).each do |arg|
           m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           tokens.push({
                         token: Regexp.escape(m['tok']),
                         required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                        negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                        negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                       })
         end
       end

data/bin/commands/init.rb

@@ -14,7 +14,7 @@ class App
         project = args.join(' ')
       elsif
         project = File.expand_path('.').split('/').last
-        project = reader.read_line(NA::Color.template('{y}Project name {bw}> {x}'), value: project).strip if $stdin.isatty
+        project = reader.read_line(NA::Color.template("#{NA.theme[:prompt]}Project name #{NA.theme[:filename]}> "), value: project).strip if $stdin.isatty
       end
 
       target = "#{project}.#{NA.extension}"

data/bin/commands/next.rb

@@ -37,7 +37,7 @@ class App
 
     c.desc 'Filter results using search terms'
     c.arg_name 'QUERY'
-    c.flag %i[search], multiple: true
+    c.flag %i[search find grep], multiple: true
 
     c.desc 'Search query is regular expression'
     c.switch %i[regex], negatable: false
@@ -75,71 +75,100 @@ class App
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               end
 
-      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
+      if options[:exact] || options[:regex]
+        search = options[:search].join(' ')
+      else
+        rx = [
+          '(?<=\A|[ ,])(?<req>[+!-])?@(?<tag>[^ *=<>$~\^,@(]+)',
+          '(?:\((?<value>.*?)\)| *(?<op>=~|[=<>~]{1,2}|[*$\^]=) *',
+          '(?<val>.*?(?=\Z|[,@])))?'
+        ].join('')
+        search = options[:search].join(' ').gsub(Regexp.new(rx)) do
+          m = Regexp.last_match
+          string = if m['value']
+                     "#{m['req']}#{m['tag']}=#{m['value']}"
+                   else
+                     m[0]
+                   end
+          options[:tagged] << string.sub(/@/, '')
+          ''
+        end
+      end
+
+      search = search.gsub(/,/, '').gsub(/ +/, ' ') unless search.nil?
+
+      all_req = options[:tagged].join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
       tags = []
       options[:tagged].join(',').split(/ *, */).each do |arg|
-        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$\^]+?)(?:(?<op>[=<>]{1,2}|[*$\^]=)(?<val>.*?))?$/)
+        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$*~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
 
         tags.push({
                     tag: m['tag'].wildcard_to_rx,
                     comp: m['op'],
                     value: m['val'],
                     required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                    negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                    negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                   })
       end
 
       args.concat(options[:in])
       if args.count.positive?
-        all_req = args.join(' ') !~ /[+!-]/
+        all_req = args.join(' ') !~ /(?<=[, ])[+!-]/
 
         tokens = []
         args.each do |arg|
           arg.split(/ *, */).each do |a|
-            m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+            m = a.match(/^(?<req>[+!-])?(?<tok>.*?)$/)
             tokens.push({
                           token: m['tok'],
                           required: !m['req'].nil? && m['req'] == '+',
-                          negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                          negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
                         })
           end
         end
       end
 
-      search = nil
-      if options[:search]
-        if options[:exact]
-          search = options[:search].join(' ')
-        elsif options[:regex]
-          search = Regexp.new(options[:search].join(' '), Regexp::IGNORECASE)
-        else
-          search = []
-          all_req = options[:search].join(' ') !~ /[+!-]/ && !options[:or]
-
-          options[:search].join(' ').split(/ /).each do |arg|
-            m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
-            search.push({
-                          token: m['tok'],
-                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                          negate: !m['req'].nil? && m['req'] =~ /[!-]/
-                        })
-          end
+      search_for_done = false
+      tags.each { |tag| search_for_done = true if tag[:tag] =~ /done/ }
+      options[:done] = true if search_for_done
+
+      search_tokens = nil
+      if options[:exact]
+        search_tokens = search
+      elsif options[:regex]
+        search_tokens = Regexp.new(search, Regexp::IGNORECASE)
+      else
+        search_tokens = []
+        all_req = search !~ /(?<=[, ])[+!-]/ && !options[:or]
+
+        search.split(/ /).each do |arg|
+          m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+          search_tokens.push({
+                               token: m['tok'],
+                               required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                               negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                             })
         end
       end
 
       NA.na_tag = options[:tag] unless options[:tag].nil?
       require_na = true
 
-      tag = [{ tag: NA.na_tag, value: nil }]
+      tag = [{ tag: NA.na_tag, value: nil, required: true, negate: false }]
       tag << { tag: 'done', value: nil, negate: true } unless options[:done]
       tag.concat(tags)
+
       todo = NA::Todo.new({ depth: depth,
                             done: options[:done],
                             query: tokens,
                             tag: tag,
-                            search: search,
+                            search: search_tokens,
                             project: options[:project],
                             require_na: require_na })
+      if todo.files.empty?
+        NA.notify("#{NA.theme[:error]}No matches found for #{tokens[0][:token]}.
+                  Run `na todos` to see available todo files.")
+      end
       NA::Pager.paginate = false if options[:omnifocus]
       todo.actions.output(depth,
                           files: todo.files,

data/bin/commands/projects.rb

@@ -16,7 +16,7 @@ class App
 
     c.action do |_global_options, options, args|
       if args.count.positive?
-        all_req = args.join(' ') !~ /[+!-]/
+        all_req = args.join(' ') !~ /(?<=[, ])[+!-]/
 
         tokens = [{ token: '*', required: all_req, negate: false }]
         args.each do |arg|

data/bin/commands/saved.rb

@@ -25,8 +25,8 @@ class App
 
       if args.empty?
         searches = NA.load_searches
-        NA.notify("{bg}Saved searches stored in {bw}#{NA.database_path(file: 'saved_searches.yml')}")
-        NA.notify(searches.map { |k, v| "{y}#{k}: {w}#{v}" }.join("\n"), exit_code: 0)
+        NA.notify("#{NA.theme[:success]}Saved searches stored in #{NA.database_path(file: 'saved_searches.yml').highlight_filename}")
+        NA.notify(searches.map { |k, v| "#{NA.theme[:filename]}#{k}: #{NA.theme[:values]}#{v}" }.join("\n"))
       else
         args.each do |arg|
           searches = NA.load_searches
@@ -34,13 +34,12 @@ class App
           NA.delete_search(arg) if options[:delete]
 
           keys = searches.keys.delete_if { |k| k !~ /#{arg}/ }
-          NA.notify("{r}Search #{arg} not found", exit_code: 1) if keys.empty?
+          NA.notify("#{NA.theme[:error]}Search #{arg} not found", exit_code: 1) if keys.empty?
 
           key = keys[0]
           cmd = Shellwords.shellsplit(searches[key])
           run(cmd)
         end
-        exit
       end
     end
   end

data/bin/commands/tagged.rb

@@ -6,7 +6,7 @@ class App
   long_desc 'Finds actions with tags matching the arguments. An action is shown if it
   contains all of the tags listed. Add a + before a tag to make it required
   and others optional. You can specify values using TAG=VALUE pairs.
-  Use <, >, and = for numeric comparisons, and *=, ^=, and $= for text comparisons.
+  Use <, >, and = for numeric comparisons, and *=, ^=, $=, or =~ (regex) for text comparisons.
   Date comparisons use natural language (`na tagged "due<=today"`) and
   are detected automatically.'
   arg_name 'TAG[=VALUE]'
@@ -38,7 +38,7 @@ class App
 
     c.desc 'Filter results using search terms'
     c.arg_name 'QUERY'
-    c.flag %i[search], multiple: true
+    c.flag %i[search find grep], multiple: true
 
     c.desc 'Search query is regular expression'
     c.switch %i[regex], negatable: false
@@ -79,9 +79,9 @@ class App
 
       tags = []
 
-      all_req = args.join(' ') !~ /[+!-]/ && !options[:or]
+      all_req = args.join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
       args.join(',').split(/ *, */).each do |arg|
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>$\^]+?) *(?:(?<op>[=<>]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
+        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$*~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
         next if m.nil?
 
         tags.push({
@@ -106,7 +106,7 @@ class App
           tokens = Regexp.new(options[:search].join(' '), Regexp::IGNORECASE)
         else
           tokens = []
-          all_req = options[:search].join(' ') !~ /[+!-]/ && !options[:or]
+          all_req = options[:search].join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
 
           options[:search].join(' ').split(/ /).each do |arg|
             m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
@@ -122,7 +122,7 @@ class App
       todos = nil
       if options[:in]
         todos = []
-        all_req = options[:in] !~ /[+!-]/ && !options[:or]
+        all_req = options[:in] !~ /(?<=[, ])[+!-]/ && !options[:or]
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           todos.push({
@@ -133,7 +133,7 @@ class App
         end
       end
 
-      NA.notify('{br}No actions matched search', exit_code: 1) if tags.empty? && tokens.empty?
+      NA.notify("#{NA.theme[:error]}No actions matched search", exit_code: 1) if tags.empty? && tokens.empty?
 
       todo = NA::Todo.new({ depth: depth,
                             done: options[:done],