na 1.1.12 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da1e1113960a99932feda46ee18cd7a8b9e8d309f479c9e3a6ec323d97db686a
-  data.tar.gz: 871fcae47831f04efcff94b7034abb70d32cb47b2f504247b94705ad015c191f
+  metadata.gz: 03c240ef72b49cbb692ba1f55da9a36036d72bd51bb29549ea87262cceedfd51
+  data.tar.gz: e61a921f6af384ae5615f54116cb4e4e0c9472ab76d4a347fc50ea5633fc80a3
 SHA512:
-  metadata.gz: c8e8c92c9d3a3ffa4a00fe8fcdd8ace94681e19f9ac53a3d8b988bcf4bd69d3b032765b4a870e3d9f660cd58b18783e97e8333cdb252164cb60f0062495210b5
-  data.tar.gz: de5596e85883b893afbe2ca43833fe60f82fd96ab12e1f2506d84d13a90644d5d403b748b6598c9fb4c4d4db3998bdd0e560a1c071f4f7c2946b5f75dd45c728
+  metadata.gz: e577876361f3022e29d4c56e06d7c507fe05ac81da752debe476b481f92f671ee85ab25cb06e32a0608baf1b926454ea4e68aa6391e32ee7c5e7e02a5751dd11
+  data.tar.gz: 660039f2b13e23365ffa88fa8a59266f50941275830175458f867a26bfcbcd3553c8e5dc6ef70da1d1ab5946fc9d7a3361bdf932f8d63eda23c3c692657a5074

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.12)
+    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.12
+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/lib/na/next_action.rb

@@ -136,28 +136,16 @@ module NA
           end
         else
           search.each do |t|
-            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
+            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))
@@ -207,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
     ##
@@ -234,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
     ##
@@ -276,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
 
@@ -289,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)}`
@@ -323,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

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.12'
+  VERSION = '1.1.13'
 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.1.11<!--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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.1.13
 platform: ruby
 authors:
 - Brett Terpstra