na 1.2.8 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5d95b5e069cbe51ad597f9af95744a84590e9513d28dd53c5710c477c59e19e
-  data.tar.gz: bbaefe5d4151348443260a940f143e83d5514967886caa8d4a0e5848f01860a1
+  metadata.gz: 848e54e708d4cbd9f5ef710e25b5c0b877cde54f6dc7f85f9cf4f0ffefb6bb6b
+  data.tar.gz: 6ecc93bec183a94a12f1f6ac870647a9d89120df09f3e859bab812a9c5cd9327
 SHA512:
-  metadata.gz: 9747348a856378659ab51925aace1eb7f0e056003e6f3a06bc53cb23c3f954f3b2cbd60b4c598db4e2e537052be665eda10871718f2aa517b19d9ef28a2ab82a
-  data.tar.gz: 7d2dff9e215a1e05a70aa31a0abb10d98d8a2937936192c74a6f952c195e292b8f24bffd5968a0d2190b7f0548ffaaeb699c10066781566f68950ca62a0314d7
+  metadata.gz: fe0da137c601074516d58dc7add5dfc6dc5cabef2decd7e61ac0af59bd63b4c5effe306654e0fd18e434bd57af454242c5f3db6256f6c7c5f834274f1ef2b533
+  data.tar.gz: 183cfecfdeeddad0105b27fda2dd826bbe4172a6b22c7e40ece42d9a86fd18fc95d7e35c34bd07fecc64c920562857d279fa7c42926fec432e2ef8312c5678fb

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.2.10
+
+2022-10-29 15:59
+
+#### FIXED
+
+- Better handling of tokenized search for todo matching with multiple arguments
+- Guard for error parsing project name
+
+### 1.2.9
+
+2022-10-29 10:50
+
+#### FIXED
+
+- Na next with a todo search wasn't requiring a match
+
 ### 1.2.8
 
 2022-10-28 11:52

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.8)
+    na (1.2.10)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)

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.2.8
+The current version of `na` is 1.2.10
 .
 
 `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. 
@@ -77,7 +77,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.8
+    1.2.10
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)

data/bin/na

@@ -119,7 +119,7 @@ class App
 
       args.concat(options[:in])
       if args.count.positive?
-        all_req = false
+        all_req = args.join(' ') !~ /[+!\-]/
 
         tokens = []
         args.each do |arg|
@@ -127,7 +127,7 @@ class App
             m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
             tokens.push({
                           token: m['tok'],
-                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                          required: !m['req'].nil? && m['req'] == '+',
                           negate: !m['req'].nil? && m['req'] =~ /[!\-]/
                         })
           end

data/lib/na/next_action.rb

@@ -265,6 +265,7 @@ module NA
       target_proj = nil
 
       if project
+        project.sub!(/:$/, '')
         target_proj = projects.select { |pr| pr.project =~ /#{project.gsub(/:/, '.*?:.*?')}/i }.first
         if target_proj.nil?
           res = NA.yn(NA::Color.template("{y}Project {bw}#{project}{xy} doesn't exist, add it"), default: true)
@@ -290,6 +291,7 @@ module NA
                         projects.select { |proj| proj.project =~ /^#{action.parent.join(':')}$/ }.first
                       end
 
+        NA.notify("{r}Error parsing project #{target_proj}", exit_code: 1) if target_proj.nil?
 
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)
@@ -758,12 +760,12 @@ module NA
 
       dirs = file.read_file.split("\n")
 
-      optional = search.map { |t| t[:token] }
+      optional = search.filter { |s| !s[:negate] }.map { |t| t[:token] }
       required = search.filter { |s| s[:required] }.map { |t| t[:token] }
       negated = search.filter { |s| s[:negate] }.map { |t| t[:token] }
 
-      optional.push('*') if required.count.zero? && negated.count.positive?
-      if required == negated
+      optional.push('*') if optional.count.zero? && required.count.zero? && negated.count.positive?
+      if optional == negated
         required = ['*']
         optional = ['*']
       end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.8'
+  VERSION = '1.2.10'
 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.2.7<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.9<!--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.2.8
+  version: 1.2.10
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake