na 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c64a806c23d11bc99a605308ab25e4bb1aa49a09c5a9a12ee525af5b521923cc
-  data.tar.gz: 8f96e949971d2a21e3cdf81ba669f0347236dcf876539a9fa541fd4619479459
+  metadata.gz: 03c4375b396333ce69e4064947e572686950926d68fdb5ae667525507d0a4ec7
+  data.tar.gz: 0eec2704ac51ed2c9840f41c235e86f0420ea4d67323afe6be743ae7a6ec1601
 SHA512:
-  metadata.gz: 74d2f119f26154192ff1c68f170efa7701a09784a84ab8f0a91fb5dd5a25f5ff1c2ac1add965b680a75499d28792f0b8760472d8e9996e2c278bbeda8599cc05
-  data.tar.gz: e82526a9cd103743e41fe8f66fd225fbc0e2160587ba4a4f518c2a465968395e4f69391493ea501620731e6167c0020a5b80d372ea0e4f89dfb4fd0ba69f3fd5
+  metadata.gz: 0c707ed84fcb1ecba18dcaa159e58a445df4e4be3940a6abc3c58c8a909293a98262c21fa48215d65abbd8234e56835279a94f9a8d214909c428b8713ac75f36
+  data.tar.gz: f46959d5c7869b53c32a6d454f805e966e3ed7fa2f5ae0eff03b65f173c4741bf285d17cde9cdb94a78fe1acac38a49fdcc04e3b57b7ef9499e7e976e0106ef8

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 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
+
+#### FIXED
+
+- Parsing of project hierarchy for an action
+
 ### 1.1.4
 
 2022-09-29 04:17

data/Gemfile.lock

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

@@ -242,7 +242,8 @@ class App
       end
 
       files, actions = NA.parse_actions(depth: depth,
-                                        search: tokens)
+                                        search: tokens,
+                                        require_na: false)
       NA.output_actions(actions, depth, files: files)
     end
   end
@@ -282,7 +283,8 @@ class App
       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,7 +97,7 @@ 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 = []
@@ -148,14 +148,15 @@ module NA
             if indent.zero?
               parent = [proj]
             elsif indent <= indent_level
-              parent.slice!(indent_level, parent.count - indent_level)
+              parent.slice!(indent, parent.count - indent)
               parent.push(proj)
             elsif indent > indent_level
               parent.push(proj)
-              indent_level = indent
             end
+
+            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)

data/lib/na/string.rb

@@ -5,7 +5,9 @@ class ::String
     prefix = match(/(^[ \t]+)/)
     return 0 if prefix.nil?
 
-    prefix[1].gsub(/  /, "\t").scan(/\t/).count
+    tabs = prefix[1].gsub(/  /, "\t").scan(/\t/).count
+
+    tabs
   end
 
   ##

data/lib/na/version.rb

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