na 1.1.6 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c4375b396333ce69e4064947e572686950926d68fdb5ae667525507d0a4ec7
-  data.tar.gz: 0eec2704ac51ed2c9840f41c235e86f0420ea4d67323afe6be743ae7a6ec1601
+  metadata.gz: 5b233e64c028a52fe153ef2a02449e90f511a9950c6454d9ed6f198fa79340f0
+  data.tar.gz: 0d2a00e4b387fb2917b22180f34a353038c8eb5a7944fea9570418de10e24c6b
 SHA512:
-  metadata.gz: 0c707ed84fcb1ecba18dcaa159e58a445df4e4be3940a6abc3c58c8a909293a98262c21fa48215d65abbd8234e56835279a94f9a8d214909c428b8713ac75f36
-  data.tar.gz: f46959d5c7869b53c32a6d454f805e966e3ed7fa2f5ae0eff03b65f173c4741bf285d17cde9cdb94a78fe1acac38a49fdcc04e3b57b7ef9499e7e976e0106ef8
+  metadata.gz: ab2fe89531b2b4b278375cc35e62922e16101c910d9e95c913202bb1a5879facc00ce868420943cb2fcceb18309a9691bb2b76f8990b7b49f4675d93adb837e6
+  data.tar.gz: 4881155bbc7cb33600462ef01d939847bdca6456fe9c862ef194f9175503246bfc23ecf10983da555d381a113638dd6e6f6b09e17a985f29cdead7c3e082ef38

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.1.8
+
+2022-10-02 16:40
+
+#### FIXED
+
+- `na next -t X` didn't replace @na tag in search, but appended to it
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.6)
+    na (1.1.8)
       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.6
+The current version of `na` is 1.1.8
 .
 
 `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. 
@@ -22,6 +22,11 @@ It can also auto-display next actions when you enter a project directory, automa
 
 Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
 
+If you're using Homebrew, you have the option to install via [brew-gem](https://github.com/sportngin/brew-gem):
+
+    brew install brew-gem
+    brew gem install na
+
 If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
 
 

data/bin/na

@@ -91,11 +91,19 @@ class App
         end
       end
 
-      tag = options[:tag] == NA.na_tag ? nil : options[:tag]
+      if options[:tag] == NA.na_tag
+        tag = nil
+        require_na = true
+      else
+        tag = options[:tag]
+        require_na = false
+      end
+
       tag = [{ tag: tag, value: nil }]
       files, actions = NA.parse_actions(depth: depth,
                                         query: tokens,
-                                        tag: tag)
+                                        tag: tag,
+                                        require_na: require_na)
 
       NA.output_actions(actions, depth, files: files)
     end
@@ -233,10 +241,11 @@ 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
@@ -273,12 +282,13 @@ 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
 

data/lib/na/next_action.rb

@@ -101,14 +101,16 @@ module NA
       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
@@ -158,8 +160,8 @@ module NA
           elsif line =~ /^[ \t]*- / && line !~ / @done/
             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.6'
+  VERSION = '1.1.8'
 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.5<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.7<!--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. 
 
@@ -21,6 +21,11 @@ It can also auto-display next actions when you enter a project directory, automa
 
 Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
 
+If you're using Homebrew, you have the option to install via [brew-gem](https://github.com/sportngin/brew-gem):
+
+    brew install brew-gem
+    brew gem install na
+
 If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
 
 <!--JEKYLL> You can find the na source code (MIT license) on [GitHub][].-->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Brett Terpstra