na 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3bf171b4029a85c4a1277e989eef561e81306c925e1f816b75158885020df8d
-  data.tar.gz: e006d499ca796b2d40ee5079fd67c48a36c492882cecb252786805eaeddc3f3e
+  metadata.gz: 7a47eb8254efd672fd4a240639516c3100244bada4809f40c6eba9fcb6ba4ea7
+  data.tar.gz: b44d9bbd6d91db44c3929bf64d2a45356297272de4a3ee246cf59921c9579d0c
 SHA512:
-  metadata.gz: ad1811c1c5c6a9e9198d43ecb2b2fd8b3b14e6290a0b31e48822b4123bf156b5774d97334dba4ecb6f239e645356d087a98e238c64392cc50f47645dd4d2f05b
-  data.tar.gz: 235473855acaefc65b28eb88cfb21646a98573ad2e2d37fe2c33e5415671ea9b2f8d03e070913a534e21a31632794c3a44ca604da9acbe9e75b8f3c720cd1393
+  metadata.gz: f8951228d935af6e614ea068df59060a73c42078f2e63f71242f8a95dfab9225cb86298269a375d684fa3c7617061ef8fb12560fe16429eb80e6e8e7b3a71c25
+  data.tar.gz: d944ca6cf975bc996b481ae1764b824298440b63baa098d920fc3ac717c7504d9ab988f38965f2e20ce9844b763809dbb546836319cfc19a504c80ef177477c8

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.1.7
+
+2022-10-02 12:20
+
+#### IMPROVED
+
+- You can use !token to add negative values to tag/search queries, e.g. `na tagged +maybe !waiting`
+
+### 1.1.6
+
+2022-10-02 11:46
+
+#### CHANGED
+
+- `na find` and `na tagged` now operate on all actions, not just actions tagged @na. If you want to limit to @na actions, just include +na in the query.
+
 ### 1.1.5
 
 2022-10-01 11:32

data/Gemfile.lock

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

@@ -233,16 +233,18 @@ class App
       else
         tokens = []
         args.each do |arg|
-          m = arg.match(/^(?<req>\+)?(?<tok>.*?)$/)
+          m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           tokens.push({
                         token: m['tok'],
-                        required: !m['req'].nil?
+                        required: !m['req'].nil? && m['req'] == '+',
+                        negate: !m['req'].nil? && m['req'] =~ /[!\-]/
                       })
         end
       end
 
       files, actions = NA.parse_actions(depth: depth,
-                                        search: tokens)
+                                        search: tokens,
+                                        require_na: false)
       NA.output_actions(actions, depth, files: files)
     end
   end
@@ -272,17 +274,19 @@ class App
       tags = []
       args.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'],
                     value: m['val'],
-                    required: !m['req'].nil?
+                    required: !m['req'].nil? && m['req'] == '+',
+                    negate: !m['req'].nil? && m['req'] =~ /[!\-]/
                   })
       end
 
       files, actions = NA.parse_actions(depth: depth,
-                                        tag: tags)
+                                        tag: tags,
+                                        require_na: false)
       NA.output_actions(actions, depth, files: files)
     end
   end

data/lib/na/next_action.rb

@@ -97,18 +97,20 @@ module NA
       puts actions.map { |action| action.pretty(template: { output: template }) }
     end
 
-    def parse_actions(depth: 1, query: nil, tag: nil, search: nil)
+    def parse_actions(depth: 1, query: nil, tag: nil, search: nil, require_na: true)
       actions = []
       required = []
       optional = []
+      negated = []
 
       tag&.each do |t|
         unless t[:tag].nil?
           new_rx = " @#{t[:tag]}"
           new_rx = "#{new_rx}\\(#{t[:value]}\\)" if t[:value]
 
-          optional.push(new_rx)
-          required.push(new_rx) if t[:required]
+          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
 
@@ -120,8 +122,9 @@ module NA
           search.each do |t|
             new_rx = t[:token].to_s
 
-            optional.push(new_rx)
-            required.push(new_rx) if t[:required]
+            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
@@ -140,7 +143,6 @@ module NA
         indent_level = 0
         parent = []
         content.split("\n").each do |line|
-          new_action = nil
           if line =~ /([ \t]*)([^\-]+.*?): *(@\S+ *)*$/
             proj = Regexp.last_match(2)
             indent = line.indent_level
@@ -156,10 +158,10 @@ module NA
 
             indent_level = indent
           elsif line =~ /^[ \t]*- / && line !~ / @done/
-            next unless line =~ /@#{NA.na_tag}\b/
+            next if require_na && line !~ /@#{NA.na_tag}\b/
 
-            unless optional.empty? && required.empty?
-              next unless line.matches(any: optional, all: required)
+            unless optional.empty? && required.empty? && negated.empty?
+              next unless line.matches(any: optional, all: required, none: negated)
 
             end
 

data/lib/na/string.rb

@@ -24,8 +24,15 @@ class ::String
     gsub(/(\s|m)(@[^ ("']+)(?:(\()(.*?)(\)))?/, "\\1#{tag_color}\\2#{paren_color}\\3#{value_color}\\4#{paren_color}\\5#{last_color}")
   end
 
-  def matches(any: [], all: [])
-    matches_any(any) && matches_all(all)
+  def matches(any: [], all: [], none: [])
+    matches_any(any) && matches_all(all) && matches_none(none)
+  end
+
+  def matches_none(regexes)
+    regexes.each do |rx|
+      return false if match(Regexp.new(rx, Regexp::IGNORECASE))
+    end
+    true
   end
 
   def matches_any(regexes)

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.5'
+  VERSION = '1.1.7'
 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.4<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.6<!--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.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-01 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake