na 1.2.9 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d1d2b4c66a795f01e07e0df15418b4c3cac378e05d9840ba2e51b58bf48a14
-  data.tar.gz: 1486f0da182d56b54e15fc5deb39aa4ce6571b276d112cf7af4583ad0f3f4563
+  metadata.gz: df6c3659bf25a6c38341206f5b027ba52439eb030abd6dc81fa88664e712df53
+  data.tar.gz: 917116b10e650483bce8ea1da88da95383ca463e11c7161cf6df0551380ca4c0
 SHA512:
-  metadata.gz: a7eada283ae9fb6af012be91b2c0d9366efb88ac8d6b28057400b4ecbe6c4d66fdb37e11b7ee7c8bb68797ef27f016ab6352e5c249a10c6195b5731c8308f0a9
-  data.tar.gz: 7cadc34d3445cda5f47cbd57a3d68120031bba9f9e8307ceb1ea8df7419198c8c77782517f47d16beaa0f35eea3cc0df29b6895c9afa612dd2573c0260809728
+  metadata.gz: 7f636b24d884b8d1a568ada3b4112d71cb6c39a6204575ab3f44f8fdf38fb108306496dc460ec1f529d868811695f4f5bdc570d8f7789c5ee3b93aaae31211df
+  data.tar.gz: e683364f1c9b8eeb14b5492533ee4fa562651e674881efd3267bd692a89e3eda7adceb2afb34b2cd703af2cb1b04375afc1e5d406909a2e73991f5cc525eb56e

data/.travis.yml

@@ -4,7 +4,7 @@ sudo: required
 dist: trusty
 cache: bundler
 rvm:
-  - ruby-3.0.1
+  - ruby-3.0.0
 install:
   - gem install bundler --version '2.2.29'
   - bundle install

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.2.11
+
+2022-10-31 13:45
+
+#### FIXED
+
+- Frozen string error
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.9)
+    na (1.2.11)
       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.9
+The current version of `na` is 1.2.11
 .
 
 `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.9
+    1.2.11
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)

data/bin/na

@@ -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,7 +265,7 @@ module NA
       target_proj = nil
 
       if project
-        project.sub!(/:$/, '')
+        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)
@@ -291,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)
@@ -759,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.9'
+  VERSION = '1.2.11'
 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.8<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.10<!--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.9
+  version: 1.2.11
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-29 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake