na 1.2.35 → 1.2.38

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
@@ -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,73 +75,106 @@ 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)
-      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_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,
+                          notes: options[:notes],
+                          nest: options[:nest],
+                          nest_projects: options[:omnifocus])
     end
   end
 end

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/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/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
@@ -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,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({
@@ -88,13 +89,13 @@ class App
                     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 || options[:done]
+      tags.push({ tag: 'done', value: nil, negate: true }) unless search_for_done || options[:done]
       options[:done] = true if search_for_done
 
       tokens = nil
@@ -105,49 +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
 
-      NA.notify('{br}No actions matched search', exit_code: 1) if tags.empty? && tokens.empty?
-
-      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("#{NA.theme[:error]}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

@@ -8,24 +8,34 @@ class App
   /, :, or a space, e.g. `na todos code/marked`'
   arg_name 'QUERY', optional: true
   command %i[todos] do |c|
-    c.action do |_global_options, _options, args|
-      if args.count.positive?
-        all_req = args.join(' ') !~ /[+!\-]/
+    c.desc 'Open the todo database in an editor for manual modification'
+    c.switch %i[e edit]
 
-        tokens = [{ token: '*', required: all_req, negate: false }]
-        args.each do |arg|
-          arg.split(/ *, */).each do |a|
-            m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
-            tokens.push({
-                          token: m['tok'],
-                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                          negate: !m['req'].nil? && m['req'] =~ /[!\-]/
-                        })
+    c.action do |_global_options, options, args|
+      if options[:edit]
+        system("#{NA::Editor.default_editor(prefer_git_editor: false)} #{NA.database_path}")
+        editor = NA::Editor.default_editor(prefer_git_editor: false).highlight_filename
+        database = NA.database_path.highlight_filename
+        NA.notify("{b}#{NA.theme[:success]}Opened #{database}#{NA.theme[:success]} in #{editor}")
+      else
+        if args.count.positive?
+          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>.*?)$/)
+              tokens.push({
+                            token: m['tok'],
+                            required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                            negate: (!m['req'].nil? && m['req'] =~ /[!-]/) ? true : false
+                          })
+            end
           end
         end
-      end
 
-      NA.list_todos(query: tokens)
+        NA.list_todos(query: tokens)
+      end
     end
   end
 end

data/bin/commands/undo.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class App
+  extend GLI::App
+  desc 'Undo the last change'
+  long_desc 'Run without argument to undo most recent change'
+  arg_name 'FILE', optional: true, multiple: true
+  command %i[undo] do |c|
+    c.example 'na undo', desc: 'Undo the last change'
+    c.example 'na undo myproject', desc: 'Undo the last change to a file matching "myproject"'
+
+    c.action do |_global_options, options, args|
+      if args.empty?
+        NA.restore_last_modified_file
+      else
+        args.each do |arg|
+          NA.restore_last_modified_file(search: arg)
+        end
+      end
+    end
+  end
+end

data/bin/commands/update.rb

@@ -63,7 +63,7 @@ class App
     c.desc 'Delete an action'
     c.switch %i[delete], negatable: false
 
-    c.desc "Open action in editor (#{NA.default_editor}).
+    c.desc "Open action in editor (#{NA::Editor.default_editor}).
             Natural language dates will be parsed and converted in date-based tags."
     c.switch %i[edit], negatable: false
 
@@ -97,6 +97,8 @@ class App
         options[:tagged] << '+done'
       elsif !options[:remove].nil? && !options[:remove].empty?
         options[:tagged].concat(options[:remove])
+      elsif options[:finish]
+        options[:tagged] << '-done'
       end
 
       action = if args.count.positive?
@@ -109,8 +111,8 @@ 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[:filename]}> #{NA.theme[:action]}")).strip
                end
 
       if action
@@ -121,35 +123,34 @@ class App
           tokens = Regexp.new(action, Regexp::IGNORECASE)
         else
           tokens = []
-          all_req = action !~ /[+!\-]/ && !options[:or]
+          all_req = action !~ /[+!-]/ && !options[:or]
 
           action.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'] =~ /[!-]/ ? true : false
                         })
           end
         end
       end
 
       if (action.nil? || action.empty?) && options[:tagged].empty?
-        puts 'Empty input, cancelled'
-        Process.exit 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'] =~ /[!-]/ ? true : false
                   })
       end
 
@@ -168,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
@@ -180,13 +181,11 @@ class App
                       options[:project]
                     elsif NA.cwd_is == :project
                       NA.cwd
-                    else
-                      nil
                     end
 
       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]
@@ -196,7 +195,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'] =~ /[!-]/ ? true : false
                     })
         end
         dirs = NA.match_working_dir(todo)
@@ -205,17 +204,25 @@ 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?
+        files = NA.find_files_matching({
+                                         depth: options[:depth],
+                                         done: options[:done],
+                                         project: target_proj,
+                                         regex: options[:regex],
+                                         require_na: false,
+                                         search: tokens,
+                                         tag: tags
+                                       })
+        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
 
@@ -224,7 +231,7 @@ class App
         options[:project] = 'Archive'
       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, tokens,

data/bin/na

@@ -37,6 +37,7 @@ class App
   default_command :next
 
   NA::Color.coloring = $stdin.isatty
+  NA::Pager.paginate = $stdin.isatty
 
   desc 'Add a next action (deprecated, for backwards compatibility)'
   switch %i[a add], negatable: false
@@ -84,7 +85,7 @@ class App
 
   pre do |global, _command, _options, _args|
     NA.verbose = global[:debug]
-    NA::Pager.paginate = global[:pager]
+    NA::Pager.paginate = global[:pager] && $stdout.isatty
     NA::Color.coloring = global[:color]
     NA.extension = global[:ext]
     NA.na_tag = global[:na_tag]