na 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77270e07e7c7d4332a5fb8ec87f4e9ad5496bd220d188e75adfb71026aff1180
-  data.tar.gz: a3521feaefc9573bd78344b6a16ae57719284bde611e8f9f6e664238fcc1b5c3
+  metadata.gz: a1d1d2b4c66a795f01e07e0df15418b4c3cac378e05d9840ba2e51b58bf48a14
+  data.tar.gz: 1486f0da182d56b54e15fc5deb39aa4ce6571b276d112cf7af4583ad0f3f4563
 SHA512:
-  metadata.gz: 2a714a764879036b9ad51626445e9ef920909da333e3fc6ecb18b8b3755cf8afad811c7baf1e3aea622a5d74b1ca41e1cf64c43541f772db9ae50cfc03c1de90
-  data.tar.gz: 06b865817db9731ded06c415f5c71a10a2f8b928b0f6da5ee9cca083f951e35ee716eaf6e2558daf89ec5378910286be4304fbdbe67e17756eae2be553fee0ea
+  metadata.gz: a7eada283ae9fb6af012be91b2c0d9366efb88ac8d6b28057400b4ecbe6c4d66fdb37e11b7ee7c8bb68797ef27f016ab6352e5c249a10c6195b5731c8308f0a9
+  data.tar.gz: 7cadc34d3445cda5f47cbd57a3d68120031bba9f9e8307ceb1ea8df7419198c8c77782517f47d16beaa0f35eea3cc0df29b6895c9afa612dd2573c0260809728

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 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
+
+#### IMPROVED
+
+- Empty lines in notes end a task in the parser
+- Moving a task to the end of a project respects line breaks
+
+#### FIXED
+
+- Moving action within same project to end not parsing correctly
+
 ### 1.2.7
 
 2022-10-28 07:29

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.7)
+    na (1.2.9)
       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.7
+The current version of `na` is 1.2.9
 .
 
 `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,11 +77,11 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.7
+    1.2.9
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
-    --add_at=POSITION       - Add all new/moved entries at [s]tart or [e]nd of target project (default: end)
+    --add_at=POSITION       - Add all new/moved entries at [s]tart or [e]nd of target project (default: start)
     --cwd_as=TYPE           - Use current working directory as [p]roject, [t]ag, or [n]one (default: none)
     -d, --depth=DEPTH       - Recurse to depth (default: 3)
     --[no-]debug            - Display verbose output

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|

data/lib/na/next_action.rb

@@ -127,7 +127,9 @@ module NA
 
     def shift_index_after(projects, idx, length = 1)
       projects.map do |proj|
-        proj.line = proj.line > idx ? proj.line - length : proj.line
+        proj.line = proj.line - length if proj.line > idx
+        proj.last_line = proj.last_line - length if proj.last_line > idx
+
         proj
       end
     end
@@ -196,7 +198,7 @@ module NA
           content = "#{input.join("\n")}\n#{content}"
         end
 
-        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, input.count - 1)
+        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, input.count - 1, input.count - 1)
       else
         line = final_match.line + 1
         indent = final_match.indent + 1
@@ -206,7 +208,7 @@ module NA
           indent += 1
         end
         content = content.split("\n").insert(line, input.join("\n")).join("\n")
-        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line + input.count - 1)
+        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line + input.count - 1, line + input.count - 1)
       end
 
       File.open(target, 'w') do |f|
@@ -263,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)
@@ -307,19 +310,18 @@ module NA
               break
             end
           end
-
           target_line = if this_idx == projects.length - 1
                           contents.count
                         else
-                          projects[this_idx + 1].line - 1
+                          projects[this_idx].last_line + 1
                         end
         else
-          target_line = target_proj.line
+          target_line = target_proj.line + 1
         end
 
         contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
       else
-        projects, actions = find_actions(target, search, tagged, done: done, all: all)
+        _, actions = find_actions(target, search, tagged, done: done, all: all)
 
         return if actions.nil?
 
@@ -329,6 +331,8 @@ module NA
 
           projects = shift_index_after(projects, action.line, action.note.count + 1)
 
+          target_proj = projects.select { |proj| proj.project =~ /^#{target_proj.project}$/ }.first
+
           action = process_action(action, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
           target_proj = if target_proj
@@ -347,14 +351,21 @@ module NA
           note = note.empty? ? '' : "\n#{indent}\t\t#{note.join("\n#{indent}\t\t").strip}"
 
           if append
-            this_idx = projects.index(target_proj)
-            if this_idx == projects.length - 1
-              target_line = contents.count
-            else
-              target_line = projects[this_idx + 1].line - 1
+            this_idx = 0
+            projects.each_with_index do |proj, idx|
+              if proj.line == target_proj.line
+                this_idx = idx
+                break
+              end
             end
+
+            target_line = if this_idx == projects.length - 1
+                            contents.count
+                          else
+                            projects[this_idx].last_line + 1
+                          end
           else
-            target_line = target_proj.line
+            target_line = target_proj.line + 1
           end
 
           contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
@@ -497,6 +508,7 @@ module NA
         content = file.read_file
         indent_level = 0
         parent = []
+        last_line = 0
         in_action = false
         content.split("\n").each.with_index do |line, idx|
           if line =~ /^([ \t]*)([^\-][^@()]+?): *(@\S+ *)*$/
@@ -513,20 +525,23 @@ module NA
               parent.push(proj)
             end
 
-            projects.push(NA::Project.new(parent.join(':'), indent, idx + 1))
+            projects.push(NA::Project.new(parent.join(':'), indent, idx, idx))
 
             indent_level = indent
+          elsif line.strip =~ /^$/
+            in_action = false
           elsif line =~ /^[ \t]*- /
             in_action = false
-            # search_for_done = false
-            # optional_tag.each { |t| search_for_done = true if t[:tag] =~ /done/ }
-            next if line =~ /@done/ && !done
-
-            next if require_na && line !~ /@#{NA.na_tag}\b/
 
             action = line.sub(/^[ \t]*- /, '')
             new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
 
+            projects[-1].last_line = idx if projects.count.positive?
+
+            next if line =~ /@done/ && !done
+
+            next if require_na && line !~ /@#{NA.na_tag}\b/
+
             has_search = !optional.empty? || !required.empty? || !negated.empty?
 
             next if has_search && !new_action.search_match?(any: optional,
@@ -545,10 +560,12 @@ module NA
 
             actions.push(new_action)
             in_action = true
-          else
-            actions[-1].note.push(line.strip) if actions.count.positive? && in_action
+          elsif in_action
+            actions[-1].note.push(line.strip) if actions.count.positive?
+            projects[-1].last_line = idx if projects.count.positive?
           end
         end
+        projects = projects.dup
       end
 
       [files, actions, projects]

data/lib/na/project.rb

@@ -2,24 +2,26 @@
 
 module NA
   class Project < Hash
-    attr_accessor :project, :indent, :line
+    attr_accessor :project, :indent, :line, :last_line
 
-    def initialize(project, indent = 0, line = 0)
+    def initialize(project, indent = 0, line = 0, last_line = 0)
       super()
       @project = project
       @indent = indent
       @line = line
+      @last_line = last_line
     end
 
     def to_s
-      { project: @project, indent: @indent, line: @line }.to_s
+      { project: @project, indent: @indent, line: @line, last_line: @last_line }.to_s
     end
 
     def inspect
       [
         "@project: #{@project}",
         "@indent: #{@indent}",
-        "@line: #{@line}"
+        "@line: #{@line}",
+        "@last_line: #{@last_line}"
       ].join(" ")
     end
   end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.7'
+  VERSION = '1.2.9'
 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.6<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.8<!--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.7
+  version: 1.2.9
 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