na 1.2.34 → 1.2.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b14bfb4de93f7d04ffbb7685426941e279da422d00802c4320586c85f08e14b
-  data.tar.gz: 7a3e6c43f2118bbb5260e2d43e1fe135bc07db8f44489a47068b7733e8b57ec2
+  metadata.gz: 35e6d784b55e397b8843663130837bcebb9041640a7833d650cedc9b783289e2
+  data.tar.gz: a1ba45d7ba0d77e122667bc5c93629832dc379ee5d2275076182849055c8d72e
 SHA512:
-  metadata.gz: b9fbce0504e8a40bf1a9961fcde1c538135ed37d0ced7bc491db3158d8bdd2be01b118f3102a148e0ff9df465e9210fd45fbe82ae14e2400a1b01d0300fbac9d
-  data.tar.gz: 1715ad409675baca29123792064f4729d2d65123a5b0ac11343f165cb427bdf704f2fc810f41e91bf1847852108d5eda3de89d990bcd43621f22377fef77a896
+  metadata.gz: 1ee63a7b2bfd58496bf2047cd80a16f30bf255ca1edc8b0aa5a84a9abc8e4d1ccdd8082cd8f01fb8db60d5b73c7e2014f4f847369ac0d39274b5929ef8173f07
+  data.tar.gz: d0321cddedf590c96a18cbd1096c7982240cb8c172c9f3491e0569ecfdf8882955898056ff3fd56d9e529d91be2a9ca56f3003bdbf6f1517a9658d08a302ca30

data/CHANGELOG.md

@@ -1,3 +1,48 @@
+### 1.2.37
+
+2023-09-01 12:42
+
+#### NEW
+
+- `na undo` command to undo last change or last change to file specified in arguments
+
+#### IMPROVED
+
+- Disable pagination when using --omnifocus
+- Refactoring codebase
+- `--in TODO` option for `na complete`
+
+### 1.2.36
+
+2023-09-01 12:41
+
+#### NEW
+
+- `na undo` command to undo last change or last change to file specified in arguments
+
+#### IMPROVED
+
+- Disable pagination when using --omnifocus
+- Refactoring codebase
+- `--in TODO` option for `na complete`
+
+### 1.2.35
+
+2023-08-30 11:59
+
+#### IMPROVED
+
+- If a search string contains @tags and --exact or --regex isn't specified, the @tags will be extracted and passed as a --tagged search.
+- Tag handling (including values and comparisons) in tags extracted from search strings
+- `na complete --project PROJ` flag to move to a specific project
+- `na restore --project PROJ` flag to move restored action to
+- Exit gracefully if tagged command is run with invalid
+- Display action affected when using update command
+
+#### FIXED
+
+- Escape search for tokens to allow parenthesis and other
+
 ### 1.2.34
 
 2023-08-30 09:22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.34)
+    na (1.2.36)
       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.34
+The current version of `na` is 1.2.37
 .
 
 `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.34
+    1.2.37
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -104,7 +104,7 @@ COMMANDS
     complete, finish    - Find and mark an action as @done
     completed, finished - Display completed actions
     edit                - Edit an existing action
-    find, grep          - Find actions matching a search pattern
+    find, grep, search  - Find actions matching a search pattern
     help                - Shows a list of commands or help for one command
     init, create        - Create a new todo file in the current directory
     initconfig          - Initialize the config file using current global options
@@ -116,6 +116,7 @@ COMMANDS
     saved               - Execute a saved search
     tagged              - Find actions matching a tag
     todos               - Show list of known todo files
+    undo                - Undo the last change
     update              - Update an existing action
 ```
 
@@ -512,6 +513,82 @@ EXAMPLES
     na update --archive My cool action
 ```
 
+##### changelog
+
+View recent changes with `na changelog` or `na changes`.
+
+```
+NAME
+    changes - Display the changelog
+
+SYNOPSIS
+
+    na [global options] changes
+```
+
+##### complete
+
+Mark an action as complete, shortcut for `na update --finish`.
+
+```
+NAME
+    complete - Find and mark an action as @done
+
+SYNOPSIS
+
+    na [global options] complete [command options] ACTION
+
+COMMAND OPTIONS
+    -a, --archive                   - Add a @done tag to action and move to Archive
+    --all                           - Act on all matches immediately (no menu)
+    -d, --depth=DEPTH               - Search for files X directories deep (default: 1)
+    -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)
+    -n, --note                      - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
+    -o, --overwrite                 - Overwrite note instead of appending
+    --tagged=TAG                    - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    --to, --project, --proj=PROJECT - Move action to specific project (default: none)
+    -x, --exact                     - Match pattern exactly
+
+EXAMPLES
+
+    # Find "An existing task" and mark @done
+    na complete "An existing task"
+
+    # Alias for complete
+    na finish "An existing task"
+```
+
+##### archive
+
+Mark an action as complete and move to archive, shortcut for `na update --archive`.
+
+```
+NAME
+    archive - Mark an action as @done and archive
+
+SYNOPSIS
+
+    na [global options] archive [command options] ACTION
+
+COMMAND OPTIONS
+    --all             - Act on all matches immediately (no menu)
+    -d, --depth=DEPTH - Search for files X directories deep (default: 1)
+    --done            - Archive all done tasks
+    -e, --regex       - Interpret search pattern as regular expression
+    --file=PATH       - Specify the file to search for the task (default: none)
+    -n, --note        - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
+    -o, --overwrite   - Overwrite note instead of appending
+    --tagged=TAG      - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    -x, --exact       - Match pattern exactly
+
+EXAMPLE
+
+    # Find "An existing task", mark @done if needed, and move to archive
+    na archive "An existing task"
+```
+
 ### 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/complete.rb

@@ -20,10 +20,18 @@ class App
     c.desc 'Add a @done tag to action and move to Archive'
     c.switch %i[a archive], negatable: false
 
+    c.desc 'Move action to specific project'
+    c.arg_name 'PROJECT'
+    c.flag %i[to project proj]
+
     c.desc 'Specify the file to search for the task'
     c.arg_name 'PATH'
     c.flag %i[file]
 
+    c.desc 'Use a known todo file, partial matches allowed'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo]
+
     c.desc 'Search for files X directories deep'
     c.arg_name 'DEPTH'
     c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
@@ -44,7 +52,7 @@ class App
     c.action do |global, options, args|
       options[:finish] = true
       options[:f] = true
-      options[:project] = 'Archive' if options[:archive]
+      options[:project] = 'Archive' if options[:archive] && !options[:project]
 
       cmd = commands[:update]
       action = cmd.send(:get_action, nil)

data/bin/commands/edit.rb

@@ -140,11 +140,12 @@ class App
       NA.notify('{r}No search terms provided', exit_code: 1) if tokens.nil? && options[:tagged].empty?
 
       targets.each do |target|
-        NA.update_action(target, tokens,
-                                 done: options[:done],
-                                 edit: options[:edit],
-                                 project: target_proj,
-                                 tagged: tags)
+        NA.update_action(target,
+                         tokens,
+                         done: options[:done],
+                         edit: options[:edit],
+                         project: target_proj,
+                         tagged: tags)
       end
     end
   end

data/bin/commands/find.rb

@@ -7,7 +7,7 @@ class App
   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`,
   add a - or ! to ignore matches containing that token.'
   arg_name 'PATTERN'
-  command %i[find grep] do |c|
+  command %i[find grep search] do |c|
     c.example 'na find feature idea swift', desc: 'Find all actions containing feature, idea, and swift'
     c.example 'na find feature idea -swift', desc: 'Find all actions containing feature and idea but NOT swift'
     c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
@@ -64,17 +64,33 @@ class App
         NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')}")
       end
 
-
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               end
 
+      if options[:exact] || options[:regex]
+        search = args.join(' ')
+      else
+        search = args.join(' ').gsub(/(?<=\A|[ ,])(?<req>[+\-!])?@(?<tag>[^ *=<>$\^,@(]+)(?:\((?<value>.*?)\)| *(?<op>[=<>]{1,2}|[*$\^]=) *(?<val>.*?(?=\Z|[,@])))?/) do |arg|
+          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(/ +/, ' ').strip
+
       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,
@@ -85,54 +101,66 @@ class App
                   })
       end
 
+      search_for_done = false
+      tags.each { |tag| search_for_done = true if tag[:tag] =~ /done/ }
+      options[:done] = true if search_for_done
+
       tokens = nil
       if options[:exact]
-        tokens = args.join(' ')
+        tokens = search
       elsif options[:regex]
-        tokens = Regexp.new(args.join(' '), Regexp::IGNORECASE)
+        tokens = Regexp.new(search, Regexp::IGNORECASE)
       else
         tokens = []
-        all_req = args.join(' ') !~ /[+!\-]/ && !options[:or]
+        all_req = search !~ /[+!-]/ && !options[:or]
 
-        args.join(' ').split(/ /).each do |arg|
+        search.split(/ /).each do |arg|
           m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           tokens.push({
-                        token: m['tok'],
+                        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'] =~ /[!-]/
                       })
         end
       end
 
-      todo = nil
+      todos = nil
       if options[:in]
-        todo = []
+        todos = []
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
-          todo.push({
-                      token: m['tok'],
-                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
-                    })
+          todos.push({
+                       token: m['tok'],
+                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                       negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                     })
         end
       end
 
-      files, actions, = NA.parse_actions(depth: depth,
-                                         done: options[:done],
-                                         query: todo,
-                                         search: tokens,
-                                         tag: tags,
-                                         negate: options[:invert],
-                                         regex: options[:regex],
-                                         project: options[:project],
-                                         require_na: false)
+      todo = NA::Todo.new({
+                            depth: depth,
+                            done: options[:done],
+                            query: todos,
+                            search: tokens,
+                            tag: tags,
+                            negate: options[:invert],
+                            regex: options[:regex],
+                            project: options[:project],
+                            require_na: false
+                          })
+
       regexes = if tokens.is_a?(Array)
                   tokens.delete_if { |token| token[:negate] }.map { |token| token[:token] }
                 else
                   [tokens]
                 end
 
-      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest], nest_projects: options[:omnifocus])
+      todo.actions.output(depth,
+                          files: todo.files,
+                          regexes: regexes,
+                          notes: options[:notes],
+                          nest: options[:nest],
+                          nest_projects: options[:omnifocus])
     end
   end
 end

data/bin/commands/next.rb

@@ -52,10 +52,10 @@ class App
     c.switch %i[done]
 
     c.desc 'Output actions nested by file'
-    c.switch %[nest], negatable: false
+    c.switch %i[nest], negatable: false
 
     c.desc 'Output actions nested by file and project'
-    c.switch %[omnifocus], negatable: false
+    c.switch %i[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       if global_options[:add]
@@ -75,23 +75,23 @@ class App
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               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
 
       args.concat(options[:in])
       if args.count.positive?
-        all_req = args.join(' ') !~ /[+!\-]/
+        all_req = args.join(' ') !~ /[+!-]/
 
         tokens = []
         args.each do |arg|
@@ -100,7 +100,7 @@ class App
             tokens.push({
                           token: m['tok'],
                           required: !m['req'].nil? && m['req'] == '+',
-                          negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                          negate: !m['req'].nil? && m['req'] =~ /[!-]/
                         })
           end
         end
@@ -114,14 +114,14 @@ class App
           search = Regexp.new(options[:search].join(' '), Regexp::IGNORECASE)
         else
           search = []
-          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>.*?)$/)
             search.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
         end
@@ -133,15 +133,19 @@ class App
       tag = [{ tag: NA.na_tag, value: nil }]
       tag << { tag: 'done', value: nil, negate: true } unless options[:done]
       tag.concat(tags)
-      files, actions, = NA.parse_actions(depth: depth,
-                                         done: options[:done],
-                                         query: tokens,
-                                         tag: tag,
-                                         search: search,
-                                         project: options[:project],
-                                         require_na: require_na)
-
-      NA.output_actions(actions, depth, files: files, notes: options[:notes], nest: options[:nest], nest_projects: options[:omnifocus])
+      todo = NA::Todo.new({ depth: depth,
+                            done: options[:done],
+                            query: tokens,
+                            tag: tag,
+                            search: search,
+                            project: options[:project],
+                            require_na: require_na })
+      NA::Pager.paginate = false if options[:omnifocus]
+      todo.actions.output(depth,
+                          files: todo.files,
+                          notes: options[:notes],
+                          nest: options[:nest],
+                          nest_projects: options[:omnifocus])
     end
   end
 end

data/bin/commands/prompt.rb

@@ -9,6 +9,8 @@ class App
     c.desc 'Output the prompt hook for the current shell to STDOUT. Pass an argument to
             specify a shell (zsh, bash, fish)'
     c.arg_name 'SHELL', optional: true
+    c.default_command :show
+
     c.command %i[show] do |s|
       s.action do |_global_options, _options, args|
         shell = if args.count.positive?

data/bin/commands/restore.rb

@@ -17,6 +17,10 @@ class App
     c.desc 'Overwrite note instead of appending'
     c.switch %i[o overwrite], negatable: false
 
+    c.desc 'Move action to specific project'
+    c.arg_name 'PROJECT'
+    c.flag %i[to project proj]
+
     c.desc 'Specify the file to search for the task'
     c.arg_name 'PATH'
     c.flag %i[file]
@@ -43,7 +47,7 @@ class App
       options[:done] = true
       options[:finish] = false
       options[:f] = false
-      
+
       cmd = commands[:update]
       action = cmd.send(:get_action, nil)
       action.call(global, options, args)

data/bin/commands/tagged.rb

@@ -57,17 +57,18 @@ class App
     c.flag %i[save]
 
     c.desc 'Output actions nested by file'
-    c.switch %[nest], negatable: false
+    c.switch %i[nest], negatable: false
 
     c.desc 'Output actions nested by file and project'
-    c.switch %[omnifocus], negatable: false
+    c.switch %i[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       options[:nest] = true if options[:omnifocus]
 
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')}")
+        cmd = NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')
+        NA.save_search(title, cmd)
       end
 
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
@@ -78,22 +79,24 @@ 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({
-                    tag: m['tag'].wildcard_to_rx,
+                    tag: m['tag'].sub(/^@/, '').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
 
       search_for_done = false
       tags.each { |tag| search_for_done = true if tag[:tag] =~ /done/ }
-      tags.push({ tag: 'done', value: nil, negate: true}) unless search_for_done
+      tags.push({ tag: 'done', value: nil, negate: true }) unless search_for_done || options[:done]
+      options[:done] = true if search_for_done
 
       tokens = nil
       if options[:search]
@@ -103,47 +106,55 @@ 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>.*?)$/)
             tokens.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
         end
       end
 
-      todo = nil
+      todos = nil
       if options[:in]
-        todo = []
+        todos = []
+        all_req = options[:in] !~ /[+!-]/ && !options[:or]
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
-          todo.push({
-                      token: m['tok'],
-                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
-                    })
+          todos.push({
+                       token: m['tok'],
+                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                       negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                     })
         end
       end
 
-      files, actions, = NA.parse_actions(depth: depth,
-                                         done: options[:done],
-                                         query: todo,
-                                         search: tokens,
-                                         tag: tags,
-                                         negate: options[:invert],
-                                         project: options[:project],
-                                         require_na: false)
-      # regexes = tags.delete_if { |token| token[:negate] }.map { |token| token[:token] }
+      NA.notify('{br}No actions matched search', exit_code: 1) if tags.empty? && tokens.empty?
+
+      todo = NA::Todo.new({ depth: depth,
+                            done: options[:done],
+                            query: todos,
+                            search: tokens,
+                            tag: tags,
+                            negate: options[:invert],
+                            project: options[:project],
+                            require_na: false })
+
       regexes = if tokens.is_a?(Array)
                   tokens.delete_if { |token| token[:negate] }.map { |token| token[:token] }
                 else
                   [tokens]
                 end
-      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest], nest_projects: options[:omnifocus])
+      todo.actions.output(depth,
+                          files: todo.files,
+                          regexes: regexes,
+                          notes: options[:notes],
+                          nest: options[:nest],
+                          nest_projects: options[:omnifocus])
     end
   end
 end

data/bin/commands/todos.rb

@@ -10,16 +10,16 @@ class App
   command %i[todos] do |c|
     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|
           arg.split(/ *, */).each do |a|
-            m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+            m = a.match(/^(?<req>[+!-])?(?<tok>.*?)$/)
             tokens.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
         end