na 1.1.11 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b309ba145cf0859f1a9011cf62268261766338d79cb956810fab9c64863c37f2
-  data.tar.gz: 6fc7e065d4d85bf70b9122634414274e6a44d640ffffeeee7409e9102115f11d
+  metadata.gz: 03c240ef72b49cbb692ba1f55da9a36036d72bd51bb29549ea87262cceedfd51
+  data.tar.gz: e61a921f6af384ae5615f54116cb4e4e0c9472ab76d4a347fc50ea5633fc80a3
 SHA512:
-  metadata.gz: 63ee0b1ac9370533379956e8cd5f6571c8d39731c12c02404b2912d5cb97f49d32c988e4d23c12c50d1b2080412296bc58351680122abd26281580c49d93f722
-  data.tar.gz: b7500123c7ea092acc42ccba0873942fe871bd201405e3ef2faa66f3d155c3d0ac60b530078d962114a4d0d66bdb8ea427b1452873c14e2b06419cb2675e822e
+  metadata.gz: e577876361f3022e29d4c56e06d7c507fe05ac81da752debe476b481f92f671ee85ab25cb06e32a0608baf1b926454ea4e68aa6391e32ee7c5e7e02a5751dd11
+  data.tar.gz: 660039f2b13e23365ffa88fa8a59266f50941275830175458f867a26bfcbcd3553c8e5dc6ef70da1d1ab5946fc9d7a3361bdf932f8d63eda23c3c692657a5074

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+### 1.1.13
+
+2022-10-06 06:28
+
+#### IMPROVED
+
+- When specifying arguments to `next`, allow paths separated by / to do more exact matching
+
+### 1.1.12
+
+2022-10-06 05:42
+
+#### NEW
+
+- `na add -d X` to allow adding new actions to todo files in subdirectories
+- You can now perform <>= queries on tag values (`na tagged "priority>=3"`)
+- You can now perform string matches on tag values (`na tagged "note*=markdown"`)
+- You can use `--project X` to display only actions within a specific project. Specify subprojects with a path, e.g. `na/bugs`. Partial matches allowed, works with `next`, `find`, and `tagged`
+- Find and tagged recognize * and ? as wildcards
+- --regex flag for find command
+- --invert command (like grep -v) for find
+- -v/--invert for tagged command
+
+#### IMPROVED
+
+- Require value 1-9 for --depth option
+
 ### 1.1.11
 
 2022-10-05 08:56

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.11)
+    na (1.1.13)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-screen (~> 0.8, >= 0.8.1)

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.1.11
+The current version of `na` is 1.1.13
 .
 
 `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. 

data/bin/na

@@ -20,7 +20,7 @@ class App
 
   desc 'File extension to consider a todo file'
   default_value 'taskpaper'
-  arg_name 'FILE_EXTENSION'
+  arg_name 'EXT'
   flag :ext
 
   desc 'Tag to consider a next action'
@@ -48,7 +48,7 @@ class App
   desc 'Recurse to depth'
   arg_name 'DEPTH'
   default_value 1
-  flag %i[d depth], type: :integer, must_match: /^\d+$/
+  flag %i[d depth], type: :integer, must_match: /^[1-9]$/
 
   desc 'Display verbose output'
   switch %i[debug]
@@ -59,13 +59,19 @@ class App
     c.example 'na next', desc: 'display the next actions from any todo files in the current directory'
     c.example 'na next -d 3', desc: 'display the next actions from the current directory, traversing 3 levels deep'
     c.example 'na next marked', desc: 'display next actions for a project you visited in the past'
+
     c.desc 'Recurse to depth'
     c.arg_name 'DEPTH'
-    c.flag %i[d depth], type: :integer, must_match: /^\d+$/
+    c.flag %i[d depth], type: :integer, must_match: /^[1-9]$/
 
     c.desc 'Alternate tag to search for'
+    c.arg_name 'TAG'
     c.flag %i[t tag]
 
+    c.desc 'Show actions from a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[proj project]
+
     c.action do |global_options, options, args|
       if global_options[:add]
         cmd = ['add']
@@ -100,6 +106,7 @@ class App
       files, actions = NA.parse_actions(depth: depth,
                                         query: tokens,
                                         tag: tag,
+                                        project: options[:project],
                                         require_na: require_na)
 
       NA.output_actions(actions, depth, files: files)
@@ -122,9 +129,11 @@ class App
     c.switch %i[n note], negatable: false
 
     c.desc 'Add a priority level 1-5'
+    c.arg_name 'PRIO'
     c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
 
     c.desc 'Add action to specific project'
+    c.arg_name 'PROJECT'
     c.default_value 'Inbox'
     c.flag %i[to]
 
@@ -139,6 +148,10 @@ class App
     c.arg_name 'PATH'
     c.flag %i[f file]
 
+    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
+
     c.action do |_global_options, options, args|
       reader = TTY::Reader.new
       action = if args.count.positive?
@@ -195,7 +208,7 @@ class App
           end
         end
       else
-        files = NA.find_files(depth: 1)
+        files = NA.find_files(depth: options[:depth])
         if files.count.zero?
           print NA::Color.template('{by}No todo file found, create one? {w}(y/{g}N{w}){x} ')
           res = reader.read_char
@@ -221,19 +234,28 @@ class App
   long_desc 'Search tokens are separated by spaces. Actions matching any token in the pattern will be shown
   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`'
   arg_name 'PATTERN'
-  command %i[find] do |c|
+  command %i[find grep] do |c|
     c.example 'na find feature +idea +swift', desc: 'Find all actions containing feature, idea, and swift'
     c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
     c.example 'na find -d 3 swift obj-c', desc: 'Find all actions 3 directories deep containing either swift or obj-c'
 
+    c.desc 'Interpret search pattern as regular expression'
+    c.switch %i[e regex], negatable: false
+
     c.desc 'Match pattern exactly'
     c.switch %i[x exact], negatable: false
 
     c.desc 'Recurse to depth'
     c.arg_name 'DEPTH'
-    c.default_value 1
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
+    c.desc 'Show actions from a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[proj project]
+
+    c.desc 'Show actions not matching search pattern'
+    c.switch %i[v invert], negatable: false
+
     c.action do |global_options, options, args|
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
@@ -243,6 +265,8 @@ class App
       tokens = nil
       if options[:exact]
         tokens = args.join(' ')
+      elsif options[:regex]
+        tokens = Regexp.new(args.join(' '), Regexp::IGNORECASE)
       else
         tokens = []
         args.each do |arg|
@@ -257,6 +281,9 @@ class App
 
       files, actions = NA.parse_actions(depth: depth,
                                         search: tokens,
+                                        negate: options[:invert],
+                                        regex: options[:regex],
+                                        project: options[:project],
                                         require_na: false)
       NA.output_actions(actions, depth, files: files)
     end
@@ -277,6 +304,13 @@ class App
     c.default_value 1
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
+    c.desc 'Show actions from a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[proj project]
+
+    c.desc 'Show actions not matching tags'
+    c.switch %i[v invert], negatable: false
+
     c.action do |global_options, options, args|
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
@@ -285,9 +319,9 @@ class App
               end
 
       tags = []
-      args.each do |arg|
+      args.join(',').split(/ *, */).each do |arg|
         # TODO: <> comparisons do nothing right now
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>]+)(?:(?<op>[=<>]+)(?<val>\S+))?$/)
+        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>*$\^]+)(?:(?<op>[=<>*$\^]+)(?<val>\S+))?$/)
         tags.push({
                     tag: m['tag'],
                     comp: m['op'],
@@ -299,6 +333,8 @@ class App
 
       files, actions = NA.parse_actions(depth: depth,
                                         tag: tags,
+                                        negate: options[:invert],
+                                        project: options[:project],
                                         require_na: false)
       NA.output_actions(actions, depth, files: files)
     end

data/lib/na/action.rb

@@ -2,7 +2,7 @@
 
 module NA
   class Action < Hash
-    attr_reader :file, :project, :parent, :action
+    attr_reader :file, :project, :parent, :action, :tags
 
     def initialize(file, project, parent, action)
       super()
@@ -11,6 +11,7 @@ module NA
       @project = project
       @parent = parent
       @action = action
+      @tags = scan_tags
     end
 
     def to_s
@@ -68,5 +69,106 @@ module NA
                           .gsub(/%parents?/, parents)
                           .gsub(/%action/, action))
     end
+
+    def tags_match?(any: [], all: [], none: [])
+      tag_matches_any(any) && tag_matches_all(all) && tag_matches_none(none)
+    end
+
+    def search_match?(any: [], all: [], none: [])
+      search_matches_any(any) && search_matches_all(all) && search_matches_none(none)
+    end
+
+    private
+
+    def search_matches_none(regexes)
+      regexes.each do |rx|
+        return false if @action.match(Regexp.new(rx, Regexp::IGNORECASE))
+      end
+      true
+    end
+
+    def search_matches_any(regexes)
+      return true if regexes.empty?
+
+      regexes.each do |rx|
+        return true if @action.match(Regexp.new(rx, Regexp::IGNORECASE))
+      end
+      false
+    end
+
+    def search_matches_all(regexes)
+      regexes.each do |rx|
+        return false unless @action.match(Regexp.new(rx, Regexp::IGNORECASE))
+      end
+      true
+    end
+
+    def tag_matches_none(tags)
+      tags.each do |tag|
+        return false if compare_tag(tag)
+      end
+      true
+    end
+
+    def tag_matches_any(tags)
+      return true if tags.empty?
+
+      tags.each do |tag|
+        return true if compare_tag(tag)
+      end
+      false
+    end
+
+    def tag_matches_all(tags)
+      tags.each do |tag|
+        return false unless compare_tag(tag)
+      end
+      true
+    end
+
+    def compare_tag(tag)
+      return false unless @tags.key?(tag[:tag])
+
+      return true if tag[:comp].nil?
+
+      tag_val = @tags[tag[:tag]]
+      val = tag[:value]
+
+      return false if tag_val.nil?
+
+      return case tag[:comp]
+             when /^>$/
+               tag_val.to_f > val.to_f
+             when /^<$/
+               tag_val.to_f < val.to_f
+             when /^<=$/
+               tag_val.to_f <= val.to_f
+             when /^>=$/
+               tag_val.to_f >= val.to_f
+             when /^==?$/
+               tag_val =~ /^#{val.wildcard_to_rx}$/
+             when /^\$=$/
+               tag_val =~ /#{val.wildcard_to_rx}$/i
+             when /^\*=$/
+               tag_val =~ /#{val.wildcard_to_rx}/i
+             when /^\^=$/
+               tag_val =~ /^#{val.wildcard_to_rx}/
+             else
+               false
+             end
+    end
+
+    def scan_tags
+      tags = {}
+      rx = /(?<= |^)@(?<tag>\S+?)(?:\((?<value>.*?)\))?(?= |$)/
+      all_tags = []
+      @action.scan(rx) { all_tags << Regexp.last_match }
+      all_tags.each do |m|
+        tag = m.named_captures.symbolize_keys
+        tags[tag[:tag]] = tag[:value]
+      end
+
+      tags
+    end
   end
 end

data/lib/na/hash.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ::Hash
+  def symbolize_keys
+    each_with_object({}) { |(k, v), hsh| hsh[k.to_sym] = v.is_a?(Hash) ? v.symbolize_keys : v }
+  end
+end

data/lib/na/next_action.rb

@@ -103,45 +103,49 @@ module NA
       puts actions.map { |action| action.pretty(template: { output: template }) }
     end
 
-    def parse_actions(depth: 1, query: nil, tag: nil, search: nil, require_na: true)
+    def parse_actions(depth: 1, query: nil, tag: nil, search: nil, negate: false, regex: false, project: nil, require_na: true)
       actions = []
       required = []
       optional = []
       negated = []
+      required_tag = []
+      optional_tag = []
+      negated_tag = []
 
       tag&.each do |t|
         unless t[:tag].nil?
-          new_rx = " @#{t[:tag]}\\b"
-          new_rx = "#{new_rx}\\(#{t[:value]}\\)" if t[:value]
-
-          optional.push(new_rx) unless t[:negate]
-          required.push(new_rx) if t[:required] && !t[:negate]
-          negated.push(new_rx) if t[:negate]
+          if negate
+            optional_tag.push(t) if t[:negate]
+            required_tag.push(t) if t[:required] && t[:negate]
+            negated_tag.push(t) unless t[:negate]
+          else
+            optional_tag.push(t) unless t[:negate]
+            required_tag.push(t) if t[:required] && !t[:negate]
+            negated_tag.push(t) if t[:negate]
+          end
         end
       end
 
       unless search.nil?
-        if search.is_a?(String)
-          optional.push(search)
-          required.push(search)
+        if regex || search.is_a?(String)
+          if negate
+            negated.push(search)
+          else
+            optional.push(search)
+            required.push(search)
+          end
         else
           search.each do |t|
-            new_rx = t[:token].to_s
-
-            optional.push(new_rx) unless t[:negate]
-            required.push(new_rx) if t[:required] && !t[:negate]
-            negated.push(new_rx) if t[:negate]
+            optional, required, negated = parse_search(t, negate)
           end
         end
       end
 
-      na_tag = "@#{NA.na_tag.sub(/^@/, '')}"
-
-      if query.nil?
-        files = find_files(depth: depth)
-      else
-        files = match_working_dir(query)
-      end
+      files = if query.nil?
+                find_files(depth: depth)
+              else
+                match_working_dir(query)
+              end
 
       files.each do |file|
         save_working_dir(File.expand_path(file))
@@ -166,13 +170,24 @@ module NA
           elsif line =~ /^[ \t]*- / && line !~ / @done/
             next if require_na && line !~ /@#{NA.na_tag}\b/
 
-            unless optional.empty? && required.empty? && negated.empty?
-              next unless line.matches(any: optional, all: required, none: negated)
+            action = line.sub(/^[ \t]*- /, '').sub(/ @#{NA.na_tag}\b/, '')
+            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action)
 
+            has_search = !optional.empty? || !required.empty? || !negated.empty?
+            next if has_search && !new_action.search_match?(any: optional,
+                                                            all: required,
+                                                            none: negated)
+
+            if project
+              rx = project.split(%r{[/:]}).join('.*?/.*?')
+              next unless parent.join('/') =~ Regexp.new(rx, Regexp::IGNORECASE)
             end
 
-            action = line.sub(/^[ \t]*- /, '').sub(/ @#{NA.na_tag}\b/, '')
-            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action)
+            has_tag = !optional_tag.empty? || !required_tag.empty? || !negated_tag.empty?
+            next if has_tag && !new_action.tags_match?(any: optional_tag,
+                                                       all: required_tag,
+                                                       none: negated_tag)
+
             actions.push(new_action)
           end
         end
@@ -180,6 +195,40 @@ module NA
       [files, actions]
     end
 
+    def edit_file(file: nil, app: nil)
+      os_open(file, app: app) if file && File.exist?(file)
+    end
+
+    ##
+    ## Platform-agnostic open command
+    ##
+    ## @param      file  [String] The file to open
+    ##
+    def os_open(file, app: nil)
+      os = RbConfig::CONFIG['target_os']
+      case os
+      when /darwin.*/i
+        darwin_open(file, app: app)
+      when /mingw|mswin/i
+        win_open(file)
+      else
+        linux_open(file)
+      end
+    end
+
+    def weed_cache_file
+      db_dir = File.expand_path('~/.local/share/na')
+      db_file = 'tdlist.txt'
+      file = File.join(db_dir, db_file)
+      if File.exist?(file)
+        dirs = IO.read(file).split("\n")
+        dirs.delete_if { |f| !File.exist?(f) }
+        File.open(file, 'w') { |f| f.puts dirs.join("\n") }
+      end
+    end
+
+    private
+
     ##
     ## Generate a menu of options and allow user selection
     ##
@@ -207,6 +256,25 @@ module NA
       res
     end
 
+    def parse_search(tag, negate)
+      required = []
+      optional = []
+      negated = []
+      new_rx = tag[:token].to_s.wildcard_to_rx
+
+      if negate
+        optional.push(new_rx) if tag[:negate]
+        required.push(new_rx) if tag[:required] && tag[:negate]
+        negated.push(new_rx) unless tag[:negate]
+      else
+        optional.push(new_rx) unless tag[:negate]
+        required.push(new_rx) if tag[:required] && !tag[:negate]
+        negated.push(new_rx) if tag[:negate]
+      end
+
+      [optional, required, negated]
+    end
+
     ##
     ## Get path to database of known todo files
     ##
@@ -249,7 +317,7 @@ module NA
       notify('{r}No na database found', exit_code: 1) unless File.exist?(file)
 
       dirs = IO.read(file).split("\n")
-      dirs.delete_if { |d| !d.matches(any: optional, all: required) }
+      dirs.delete_if { |d| !d.dir_matches(any: optional, all: required) }
       dirs.sort.uniq
     end
 
@@ -262,21 +330,6 @@ module NA
       File.open(file, 'w') { |f| f.puts dirs.join("\n") }
     end
 
-    def weed_cache_file
-      db_dir = File.expand_path('~/.local/share/na')
-      db_file = 'tdlist.txt'
-      file = File.join(db_dir, db_file)
-      if File.exist?(file)
-        dirs = IO.read(file).split("\n")
-        dirs.delete_if { |f| !File.exist?(f) }
-        File.open(file, 'w') { |f| f.puts dirs.join("\n") }
-      end
-    end
-
-    def edit_file(file: nil, app: nil)
-      os_open(file, app: app) if file && File.exist?(file)
-    end
-
     def darwin_open(file, app: nil)
       if app
         `open -a "#{app}" #{Shellwords.escape(file)}`
@@ -296,22 +349,5 @@ module NA
         notify('{r}Unable to determine executable for `xdg-open`.')
       end
     end
-
-    ##
-    ## Platform-agnostic open command
-    ##
-    ## @param      file  [String] The file to open
-    ##
-    def os_open(file, app: nil)
-      os = RbConfig::CONFIG['target_os']
-      case os
-      when /darwin.*/i
-        darwin_open(file, app: app)
-      when /mingw|mswin/i
-        win_open(file)
-      else
-        linux_open(file)
-      end
-    end
   end
 end

data/lib/na/string.rb

@@ -24,6 +24,14 @@ class ::String
     gsub(/(\s|m)(@[^ ("']+)(?:(\()(.*?)(\)))?/, "\\1#{tag_color}\\2#{paren_color}\\3#{value_color}\\4#{paren_color}\\5#{last_color}")
   end
 
+  def dir_to_rx
+    split(%r{[/:]}).join('.*?/.*?') + '[^/]+$'
+  end
+
+  def dir_matches(any: [], all: [])
+    matches_any(any.map { |token| token.dir_to_rx }) && matches_all(all.map { |token| token.dir_to_rx })
+  end
+
   def matches(any: [], all: [], none: [])
     matches_any(any) && matches_all(all) && matches_none(none)
   end
@@ -36,6 +44,7 @@ class ::String
   end
 
   def matches_any(regexes)
+    string = dup
     regexes.each do |rx|
       return true if match(Regexp.new(rx, Regexp::IGNORECASE))
     end
@@ -49,6 +58,10 @@ class ::String
     true
   end
 
+  def wildcard_to_rx
+    gsub(/\./, '\\.').gsub(/\*/, '.*?').gsub(/\?/, '.')
+  end
+
   def cap_first!
     replace cap_first
   end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.11'
+  VERSION = '1.1.13'
 end

data/lib/na.rb

@@ -1,14 +1,14 @@
-require 'na/version.rb'
+# frozen_string_literal: true
 
-# Add requires for other files you add to your project here, so
-# you just need to require this one file in your bin file
+require 'na/version'
 require 'fileutils'
 require 'shellwords'
 require 'tty-screen'
 require 'tty-reader'
 require 'tty-which'
-require 'na/colors.rb'
-require 'na/string.rb'
-require 'na/action.rb'
-require 'na/next_action.rb'
-require 'na/prompt.rb'
+require 'na/hash'
+require 'na/colors'
+require 'na/string'
+require 'na/action'
+require 'na/next_action'
+require 'na/prompt'

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.1.10<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.12<!--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.1.11
+  version: 1.1.13
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,6 +169,7 @@ files:
 - lib/na.rb
 - lib/na/action.rb
 - lib/na/colors.rb
+- lib/na/hash.rb
 - lib/na/next_action.rb
 - lib/na/prompt.rb
 - lib/na/string.rb