na 1.2.13 → 1.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d39100de907ee238aac6e9f51cb976e0736822294bc602cec67886aecba12e0
-  data.tar.gz: 9936c5bb6fb340d1a9ef756b3b6245560021685e7a538c0a72d10e300ecf527d
+  metadata.gz: da1fc18252895707dfb04a598aca5ac535b4c65959b564d11d56497796a09249
+  data.tar.gz: 7d483b22ddd0015b02bbea54c5026ba11b3cfc58597d790eed5d0902bbb285ba
 SHA512:
-  metadata.gz: 3c6c082c7f2d104916449a1a984191c3e9c06f53f64a6c5860200569d2981e677dc0fc05a47472f186fee46867ccdb0fc5a52925789242ebef87ae441d36f758
-  data.tar.gz: f5f3a48fecd5debb35e9d9e03eb3e6f85565912f478395100e63934edfae0b32171a7b4619c474645c7562de426de24e0d6d62312dff9e198423c6850823d6ca
+  metadata.gz: bfde6ccd9c352ef8932df8937218701b54db37994d1d0642323b4bc69a5bb6bf566588a9a4908a37312dc7b9787547427bf68609b124dfe752c3acec5b807bb8
+  data.tar.gz: 87ce30671ba3cc2bf415744df17df187e834966db481c7e5b2310eb873315a68061541f9342c0578f51d8d93f8a0accdde6df6030393d1d28aaacbfc33ac170e

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 1.2.14
+
+2022-11-12 10:57
+
+#### NEW
+
+- `na find --tagged` allows narrowing search results with tag queries
+- `na tagged --search` allows narrowing tag results with text search
+- `na next` accepts --tagged and --search (as well as --exact and --regex) for filtering actions
+
+#### FIXED
+
+- Error when a todo file contained a task without a project
+
 ### 1.2.13
 
 2022-11-01 12:43

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.13)
+    na (1.2.14)
       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.13
+The current version of `na` is 1.2.14
 .
 
 `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.13
+    1.2.14
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -214,6 +214,7 @@ COMMAND OPTIONS
     -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --save=TITLE                           - Save this search for future use (default: none)
+    --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
     -v, --invert                           - Show actions not matching search pattern
     -x, --exact                            - Match pattern exactly
 
@@ -269,10 +270,14 @@ DESCRIPTION
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
+    --[no-]exact                           - Search query is exact text match (not tokens)
     --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
     --[no-]notes                           - Include notes in output
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
+    --[no-]regex                           - Search query is regular expression
+    --search=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)
 
 EXAMPLES
 
@@ -369,10 +374,14 @@ DESCRIPTION
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
+    --[no-]exact                           - Search query is exact text match (not tokens)
     --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
     --[no-]notes                           - Include notes in output
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
+    --[no-]regex                           - Search query is regular expression
+    --search=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)
 
 EXAMPLES
 

data/bin/na

@@ -95,6 +95,20 @@ class App
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
 
+    c.desc 'Match actions containing tag. Allows value comparisons'
+    c.arg_name 'TAG'
+    c.flag %i[tagged], multiple: true
+
+    c.desc 'Filter results using search terms'
+    c.arg_name 'QUERY'
+    c.flag %i[search], multiple: true
+
+    c.desc 'Search query is regular expression'
+    c.switch %i[regex]
+
+    c.desc 'Search query is exact text match (not tokens)'
+    c.switch %i[exact]
+
     c.desc 'Include notes in output'
     c.switch %i[notes], negatable: true, default_value: false
 
@@ -117,6 +131,20 @@ class App
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               end
 
+      all_req = options[:tagged].join(' ') !~ /[+!\-]/ && !options[:or]
+      tags = []
+      options[:tagged].join(',').split(/ *, */).each do |arg|
+        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'] =~ /[!\-]/
+                  })
+      end
+
       args.concat(options[:in])
       if args.count.positive?
         all_req = args.join(' ') !~ /[+!\-]/
@@ -134,14 +162,37 @@ class App
         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
+        end
+      end
+
       NA.na_tag = options[:tag] unless options[:tag].nil?
       require_na = true
 
-      tag = [{ tag: tag, value: nil }, { tag: 'done', value: nil, negate: true}]
+      tag = [{ tag: NA.na_tag, value: nil }, { tag: 'done', value: nil, negate: true }]
+      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)
 
@@ -587,6 +638,10 @@ class App
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
 
+    c.desc 'Match actions containing tag. Allows value comparisons'
+    c.arg_name 'TAG'
+    c.flag %i[tagged], multiple: true
+
     c.desc 'Include @done actions'
     c.switch %i[done]
 
@@ -600,7 +655,7 @@ class App
     c.action do |global_options, options, args|
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '')}")
+        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
@@ -608,6 +663,21 @@ class App
               else
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               end
+
+      all_req = options[:tagged].join(' ') !~ /[+!\-]/ && !options[:or]
+      tags = []
+      options[:tagged].join(',').split(/ *, */).each do |arg|
+        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'] =~ /[!\-]/
+                  })
+      end
+
       tokens = nil
       if options[:exact]
         tokens = args.join(' ')
@@ -644,6 +714,7 @@ class App
                                          done: options[:done],
                                          query: todo,
                                          search: tokens,
+                                         tag: tags,
                                          negate: options[:invert],
                                          regex: options[:regex],
                                          project: options[:project],
@@ -692,6 +763,16 @@ class App
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
 
+    c.desc 'Filter results using search terms'
+    c.arg_name 'QUERY'
+    c.flag %i[search], multiple: true
+
+    c.desc 'Search query is regular expression'
+    c.switch %i[regex]
+
+    c.desc 'Search query is exact text match (not tokens)'
+    c.switch %i[exact]
+
     c.desc 'Include @done actions'
     c.switch %i[done]
 
@@ -705,7 +786,7 @@ class App
     c.action do |global_options, options, args|
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '')}")
+        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
@@ -733,6 +814,27 @@ class App
       tags.each { |tag| search_for_done = true if tag[:tag] =~ /done/ }
       tags.push({ tag: 'done', value: nil, negate: true}) unless search_for_done
 
+      tokens = nil
+      if options[:search]
+        if options[:exact]
+          tokens = options[:search].join(' ')
+        elsif options[:regex]
+          tokens = Regexp.new(options[:search].join(' '), Regexp::IGNORECASE)
+        else
+          tokens = []
+          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'] =~ /[!\-]/
+                        })
+          end
+        end
+      end
+
       todo = nil
       if options[:in]
         todo = []
@@ -749,11 +851,17 @@ class App
       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] }
+      # regexes = tags.delete_if { |token| token[:negate] }.map { |token| token[:token] }
+      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])
     end
   end

data/lib/na/next_action.rb

@@ -512,36 +512,36 @@ module NA
         last_line = 0
         in_action = false
         content.split("\n").each.with_index do |line, idx|
-          if line !~ /^[ \t]*- / && line =~ /^([ \t]*)([^\-][^@()]+?): *(@\S+ *)*$/
+          if line.project?
             in_action = false
-            proj = Regexp.last_match(2)
+            proj = line.project
             indent = line.indent_level
 
-            if indent.zero?
+            if indent.zero? # top level project
               parent = [proj]
-            elsif indent <= indent_level
+            elsif indent <= indent_level # if indent level is same or less, split parent before indent level and append
               parent.slice!(indent, parent.count - indent)
               parent.push(proj)
-            elsif indent > indent_level
+            else # if indent level is greater, append project to parent
               parent.push(proj)
             end
 
             projects.push(NA::Project.new(parent.join(':'), indent, idx, idx))
 
             indent_level = indent
-          elsif line.strip =~ /^$/
+          elsif line.blank?
             in_action = false
-          elsif line =~ /^[ \t]*- /
+          elsif line.action?
             in_action = false
 
-            action = line.sub(/^[ \t]*- /, '')
+            action = line.action
             new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
 
             projects[-1].last_line = idx if projects.count.positive?
 
-            next if line =~ /@done/ && !done
+            next if line.done? && !done
 
-            next if require_na && line !~ /@#{NA.na_tag}\b/
+            next if require_na && !line.na?
 
             has_search = !optional.empty? || !required.empty? || !negated.empty?
 
@@ -600,11 +600,11 @@ module NA
       db_dir = File.expand_path('~/.local/share/na')
       db_file = 'tdlist.txt'
       file = File.join(db_dir, db_file)
-      if File.exist?(file)
-        dirs = file.read_file.split("\n")
-        dirs.delete_if { |f| !File.exist?(f) }
-        File.open(file, 'w') { |f| f.puts dirs.join("\n") }
-      end
+      return unless File.exist?(file)
+
+      dirs = file.read_file.split("\n")
+      dirs.delete_if { |f| !File.exist?(f) }
+      File.open(file, 'w') { |f| f.puts dirs.join("\n") }
     end
 
     def list_projects(query: [], file_path: nil, depth: 1, paths: true)
@@ -624,7 +624,7 @@ module NA
         output = if paths
                    "{bg}#{parts.join('{bw}/{bg}')}{x}"
                  else
-                   parts.fill("{bw}—{bg}", 0..-2)
+                   parts.fill('{bw}—{bg}', 0..-2)
                    "{bg}#{parts.join(' ')}{x}"
                  end
 
@@ -633,15 +633,15 @@ module NA
     end
 
     def list_todos(query: [])
-      if query
-        dirs = match_working_dir(query, distance: 2, require_last: false)
-      else
-        file = database_path
-        content = File.exist?(file) ? file.read_file.strip : ''
-        notify('{br}Database empty', exit_code: 1) if content.empty?
-
-        dirs = content.split(/\n/)
-      end
+      dirs = if query
+               match_working_dir(query, distance: 2, require_last: false)
+             else
+               file = database_path
+               content = File.exist?(file) ? file.read_file.strip : ''
+               notify('{br}Database empty', exit_code: 1) if content.empty?
+
+               content.split(/\n/)
+             end
 
       dirs.map! do |dir|
         "{xg}#{dir.sub(/^#{ENV['HOME']}/, '~').sub(%r{/([^/]+)\.#{NA.extension}$}, '/{xbw}\1{x}')}"

data/lib/na/string.rb

@@ -22,6 +22,35 @@ class ::String
     prefix[1].gsub(/  /, "\t").scan(/\t/).count
   end
 
+  def action?
+    self =~ /^[ \t]*- /
+  end
+
+  def blank?
+    strip =~ /^$/
+  end
+
+  def project?
+    !action? && self =~ /:( +@\S+(\([^)]*\))?)*$/
+  end
+
+  def project
+    m = match(/^([ \t]*)([^\-][^@()]+?): *(@\S+ *)*$/)
+    m ? m[2] : nil
+  end
+
+  def action
+    sub(/^[ \t]*- /, '')
+  end
+
+  def done?
+    self =~ /@done/
+  end
+
+  def na?
+    self =~ /@#{NA.na_tag}\b/
+  end
+
   ##
   ## Colorize @tags with ANSI escapes
   ##

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.13'
+  VERSION = '1.2.14'
 end

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.12<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.13<!--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. 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.13
+  version: 1.2.14
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-01 00:00:00.000000000 Z
+date: 2022-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake