na 1.1.10 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d9dd176974a6c4c20be90d5051c7608469ea7b105537a7859697e3be4050ea5
-  data.tar.gz: b201fecc68568c3b80c6626eb425929d2f50faf6a1bd5fe5bae076021ea0d8b1
+  metadata.gz: da1e1113960a99932feda46ee18cd7a8b9e8d309f479c9e3a6ec323d97db686a
+  data.tar.gz: 871fcae47831f04efcff94b7034abb70d32cb47b2f504247b94705ad015c191f
 SHA512:
-  metadata.gz: 169372ba631178c20af2af22e461ba0a6c9fcb7e7e5421d71464b1f180ad766bcd2888d30305354554e24ab86c366c12ffdbab9cc2e0f6c7c03f48f402a32679
-  data.tar.gz: c6ea88026936d1f0fe6d9c822945bd7f9ecf351a67871d5fbe27673a2142ef03502fb1759d20d817b4ab8f435942cf6bbdfa24829e535c9684fe507549ac5bee
+  metadata.gz: c8e8c92c9d3a3ffa4a00fe8fcdd8ace94681e19f9ac53a3d8b988bcf4bd69d3b032765b4a870e3d9f660cd58b18783e97e8333cdb252164cb60f0062495210b5
+  data.tar.gz: de5596e85883b893afbe2ca43833fe60f82fd96ab12e1f2506d84d13a90644d5d403b748b6598c9fb4c4d4db3998bdd0e560a1c071f4f7c2946b5f75dd45c728

data/CHANGELOG.md

@@ -1,3 +1,31 @@
+### 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
+
+#### IMPROVED
+
+- Respect na_tag setting when creating new todo file
+- Code cleanup
+
 ### 1.1.10
 
 2022-10-05 08:19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.10)
+    na (1.1.12)
       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.10
+The current version of `na` is 1.1.12
 .
 
 `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

@@ -1,8 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
 require 'gli'
 require 'na'
 
+# Main application
 class App
   extend GLI::App
 
@@ -17,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'
@@ -45,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]
@@ -56,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']
@@ -97,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)
@@ -119,11 +129,13 @@ 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 %[to]
+    c.flag %i[to]
 
     c.desc 'Use a tag other than the default next action tag'
     c.arg_name 'TAG'
@@ -136,7 +148,11 @@ class App
     c.arg_name 'PATH'
     c.flag %i[f file]
 
-    c.action do |global_options, options, args|
+    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?
                  args.join(' ').strip
@@ -168,7 +184,10 @@ class App
 
       note = if options[:note]
                if TTY::Which.exist?('gum')
-                 `gum write --placeholder "Enter a note, CTRL-d to save" --width $(tput cols) --char-limit 0`.strip.split("\n")
+                 args = ['--placeholder "Enter a note, CTRL-d to save"']
+                 args << '--char-limit 0'
+                 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}')
                  reader.read_multiline
@@ -189,8 +208,8 @@ class App
           end
         end
       else
-        files = NA.find_files(depth: 1)
-        if files.count == 0
+        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
           if res =~ /y/i
@@ -215,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
@@ -237,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|
@@ -251,15 +281,18 @@ 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
   end
 
-
   desc 'Find actions matching a tag'
   long_desc 'Finds actions with tags matching the arguments. An action is shown if it
-  contains any of the tags listed. Add a + before a tag to make it required. You can specify values using TAG=VALUE pairs.'
+             contains any of the tags listed. Add a + before a tag to make it required.
+             You can specify values using TAG=VALUE pairs.'
   arg_name 'TAG [VALUE]'
   command %i[tagged] do |c|
     c.example 'na tagged +maybe', desc: 'Show all actions tagged @maybe'
@@ -271,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
@@ -279,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'],
@@ -293,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
@@ -304,7 +346,7 @@ class App
     c.example 'na init', desc: 'Generate a new todo file, prompting for project name'
     c.example 'na init warpspeed', desc: 'Generate a new todo for a project called warpspeed'
 
-    c.action do |global_options, _, args|
+    c.action do |_global_options, _options, args|
       reader = TTY::Reader.new
       if args.count.positive?
         project = args.join(' ')
@@ -346,7 +388,7 @@ class App
     c.arg_name 'EDITOR'
     c.flag %i[a app]
 
-    c.action do |global_options, options, args|
+    c.action do |global_options, options, _args|
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
@@ -371,15 +413,16 @@ class App
   long_desc 'Installing the prompt hook allows you to automatically
   list next actions when you cd into a directory'
   command %i[prompt] do |c|
-    c.desc 'Output the prompt hook for the current shell to STDOUT. Pass an argument to specify a shell (zsh, bash, fish)'
+    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]'
     c.command %i[show] do |s|
-      s.action do |global_options, options, args|
-        if args.count.positive?
-          shell = args[0]
-        else
-          shell = File.basename(ENV['SHELL'])
-        end
+      s.action do |_global_options, _options, args|
+        shell = if args.count.positive?
+                  args[0]
+                else
+                  File.basename(ENV['SHELL'])
+                end
 
         case shell
         when /^f/i
@@ -395,12 +438,12 @@ class App
     c.desc 'Install the hook for the current shell to the appropriate startup file.'
     c.arg_name '[SHELL]'
     c.command %i[install] do |s|
-      s.action do |global_options, options, args|
-        if args.count.positive?
-          shell = args[0]
-        else
-          shell = File.basename(ENV['SHELL'])
-        end
+      s.action do |_global_options, _options, args|
+        shell = if args.count.positive?
+                  args[0]
+                else
+                  File.basename(ENV['SHELL'])
+                end
 
         case shell
         when /^f/i
@@ -414,7 +457,7 @@ class App
     end
   end
 
-  pre do |global, command, options, args|
+  pre do |global, _command, _options, _args|
     NA.verbose = global[:debug]
     NA.extension = global[:ext]
     NA.na_tag = global[:na_tag]
@@ -432,9 +475,7 @@ class App
     case exception
     when GLI::UnknownCommand
       cmd = ['add']
-      if ARGV.count.positive?
-        cmd.concat(ARGV.unshift($first_arg))
-      end
+      cmd.concat(ARGV.unshift($first_arg)) if ARGV.count.positive?
 
       exit run(cmd)
     when SystemExit

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

@@ -5,10 +5,17 @@ module NA
   class << self
     attr_accessor :verbose, :extension, :na_tag
 
+    def notify(msg, exit_code: false)
+      $stderr.puts NA::Color.template("{x}#{msg}{x}")
+      if exit_code && exit_code.is_a?(Number)
+        Process.exit exit_code
+      end
+    end
+
     def create_todo(target, basename)
       File.open(target, 'w') do |f|
         content = <<~ENDCONTENT
-          Inbox: @inbox
+          Inbox:
           #{basename}:
           \tFeature Requests:
           \tIdeas:
@@ -18,11 +25,11 @@ module NA
           \tTop Priority @search(@priority = 5 and not @done)
           \tHigh Priority @search(@priority > 3 and not @done)
           \tMaybe @search(@maybe)
-          \tNext @search(@na and not @done and not project = \"Archive\")
+          \tNext @search(@#{NA.na_tag} and not @done and not project = \"Archive\")
         ENDCONTENT
         f.puts(content)
       end
-      $stderr.puts NA::Color.template("{y}Created {bw}#{target}{x}")
+      notify("{y}Created {bw}#{target}")
     end
 
     def find_files(depth: 1)
@@ -41,8 +48,7 @@ module NA
       elsif TTY::Which.exist?('fzf')
         res = choose_from(files, prompt: 'Use which file?')
         unless res
-          $stderr.puts 'No file selected, cancelled'
-          Process.exit 1
+          notify('{r}No file selected, cancelled', exit_code: 1)
         end
 
         res.strip
@@ -71,7 +77,7 @@ module NA
 
       File.open(file, 'w') { |f| f.puts content }
 
-      $stderr.puts NA::Color.template("{by}Task added to {bw}#{file}{x}")
+      notify("{by}Task added to {bw}#{file}")
     end
 
     def output_actions(actions, depth, files: nil)
@@ -91,40 +97,56 @@ module NA
                    '%parent%action'
                  end
       if files && @verbose
-        $stderr.puts files.map { |f| NA::Color.template("{dw}#{f}{x}") }
+        files.map { |f| notify("{dw}#{f}") }
       end
 
       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]
+            new_rx = t[:token].to_s.wildcard_to_rx
+
+            if negate
+              optional.push(new_rx) if t[:negate]
+              required.push(new_rx) if t[:required] && t[:negate]
+              negated.push(new_rx) unless t[:negate]
+            else
+              optional.push(new_rx) unless t[:negate]
+              required.push(new_rx) if t[:required] && !t[:negate]
+              negated.push(new_rx) if t[:negate]
+            end
           end
         end
       end
@@ -160,13 +182,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
@@ -188,11 +221,7 @@ module NA
     def choose_from(options, prompt: 'Make a selection: ', multiple: false, sorted: true, fzf_args: [])
       return nil unless $stdout.isatty
 
-      # fzf_args << '-1' # User is expecting a menu, and even if only one it seves as confirmation
-      default_args = []
-      default_args << %(--prompt="#{prompt}")
-      default_args << "--height=#{options.count + 2}"
-      default_args << '--info=inline'
+      default_args = [%(--prompt="#{prompt}"), "--height=#{options.count + 2}", '--info=inline']
       default_args << '--multi' if multiple
       header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
       default_args << %(--header="#{header}")
@@ -205,33 +234,50 @@ module NA
       res
     end
 
+    ##
+    ## Get path to database of known todo files
+    ##
+    ## @return     [String] File path
+    ##
     def database_path
       db_dir = File.expand_path('~/.local/share/na')
+      # Create directory if needed
       FileUtils.mkdir_p(db_dir) unless File.directory?(db_dir)
       db_file = 'tdlist.txt'
       File.join(db_dir, db_file)
     end
 
-    def match_working_dir(search)
+    ##
+    ## Find a matching path using semi-fuzzy matching.
+    ## Search tokens can include ! and + to negate or make
+    ## required.
+    ##
+    ## @param      search    [Array] search tokens to match
+    ## @param      distance  [Integer] allowed distance
+    ##                       between characters
+    ##
+    def match_working_dir(search, distance: 1)
       optional = []
       required = []
 
       search&.each do |t|
-        new_rx = t[:token].to_s.split('').join('.{0,1}')
+        # Make "search" into "s.{0,1}e.{0,1}a.{0,1}r.{0,1}c.{0,1}h"
+        new_rx = t[:token].to_s.split('').join(".{0,#{distance}}")
 
         optional.push(new_rx)
         required.push(new_rx) if t[:required]
       end
 
+      match_dir(optional, required)
+    end
+
+    def match_dir(optional, required)
       file = database_path
-      if File.exist?(file)
-        dirs = IO.read(file).split("\n")
-        dirs.delete_if { |d| !d.matches(any: optional, all: required) }
-        dirs.sort.uniq
-      else
-        $stderr.puts NA::Color.template('{r}No na database found{x}')
-        Process.exit 1
-      end
+      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.sort.uniq
     end
 
     def save_working_dir(todo_file)
@@ -258,6 +304,26 @@ module NA
       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)}`
+      else
+        `open #{Shellwords.escape(file)}`
+      end
+    end
+
+    def win_open(file)
+      `start #{Shellwords.escape(file)}`
+    end
+
+    def linux_open(file)
+      if TTY::Which.exist?('xdg-open')
+        `xdg-open #{Shellwords.escape(file)}`
+      else
+        notify('{r}Unable to determine executable for `xdg-open`.')
+      end
+    end
+
     ##
     ## Platform-agnostic open command
     ##
@@ -267,19 +333,11 @@ module NA
       os = RbConfig::CONFIG['target_os']
       case os
       when /darwin.*/i
-        if app
-          `open -a "#{app}" #{Shellwords.escape(file)}`
-        else
-          `open #{Shellwords.escape(file)}`
-        end
+        darwin_open(file, app: app)
       when /mingw|mswin/i
-        `start #{Shellwords.escape(file)}`
+        win_open(file)
       else
-        if 'xdg-open'.available?
-          `xdg-open #{Shellwords.escape(file)}`
-        else
-          $stderr.puts NA::Color.template('{r}Unable to determine executable for `open`.{x}')
-        end
+        linux_open(file)
       end
     end
   end

data/lib/na/string.rb

@@ -49,6 +49,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.10'
+  VERSION = '1.1.12'
 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.9<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.11<!--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.10
+  version: 1.1.12
 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