na 1.2.22 → 1.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccb815bfd051b4cd15b198c14ff1bb1efcde847005d88aa4322d88aec4ac8d72
-  data.tar.gz: 75ce04d2a86f842668118e5e58497627c5616618479b7838f4f6fcd34baf910a
+  metadata.gz: 2f840ae45f83c67e9090e06825967148c02aae1fcb31171fb04fcaf5bc67ef71
+  data.tar.gz: 0aee7636a1b17b0a631b16df18a06e1e5dc62636e86eeae1b1f8e2486476063b
 SHA512:
-  metadata.gz: 2cee616b47b7ee5918d9062a48f38ff45ec4ee6a20fe3027b31c778d4fe7d08881ac5138498cc02b1e66c691c925a35f8b3d72a1ca23d034b48853ad7ac87540
-  data.tar.gz: d262fb01720b1b9daa30c26b75ef1771e047ba8879cc04ca66be6076a7c99aa143ed3d2a0b254785bee0c0f95fa76ab0cbf282199dc3fd0867c1ec12edc81df2
+  metadata.gz: 2d99c6628ec7bf9c01556bd4fba39456088c59e5702f6e5227a1c34dee73f8078fea15fd46d60f217b4ee2f5bc4e1e17fafa62c9aa9b585431c7acc955331608
+  data.tar.gz: eaeb4890a28bc8d3d8d0c12cb76e50d2e591e81b0eef104cae994b8ee0e0798cf693740a6160578e8a77329d503481e5231ef340980920f621e6ee5001ffa5e8

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.2.24
+
+2023-06-14 09:16
+
+### 1.2.23
+
+2023-06-05 10:42
+
+#### FIXED
+
+- Actually implement the --template option
+
 ### 1.2.22
 
 2023-06-05 10:35

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.22)
+    na (1.2.24)
       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.22
+The current version of `na` is 1.2.24
 .
 
 `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,23 +77,23 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.22
+    1.2.24
 
 GLOBAL OPTIONS
     -a, --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: start)
     --[no-]color            - Colorize output (default: enabled)
     --cwd_as=TYPE           - Use current working directory as [p]roject, [t]ag, or [n]one (default: none)
-    -d, --depth=DEPTH       - Recurse to depth (default: 1)
+    -d, --depth=DEPTH       - Recurse to depth (default: 3)
     --[no-]debug            - Display verbose output
     --ext=EXT               - File extension to consider a todo file (default: taskpaper)
-    -f, --file=PATH         - Use a single file as global todo, use --initconfig to make permanent (default: none)
+    -f, --file=PATH         - Use a single file as global todo, use initconfig to make permanent (default: none)
     --help                  - Show this message
     -n, --note              - Prompt for additional notes (deprecated, for backwards compatibility)
     -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
     -r, --[no-]recurse      - Recurse 3 directories deep (deprecated, for backwards compatability)
     -t, --na_tag=TAG        - Tag to consider a next action (default: na)
-    --template=PATH         - Provide a template for new/blank todo files, use --initconfig to make permanent (default: none)
+    --template=PATH         - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
     --version               - Display the program version
 
 COMMANDS

data/bin/na

@@ -43,11 +43,11 @@ class App
   arg_name 'PRIORITY'
   flag %i[p priority]
 
-  desc 'Use a single file as global todo, use --initconfig to make permanent'
+  desc 'Use a single file as global todo, use initconfig to make permanent'
   arg_name 'PATH'
   flag %i[f file]
 
-  desc 'Provide a template for new/blank todo files, use --initconfig to make permanent'
+  desc 'Provide a template for new/blank todo files, use initconfig to make permanent'
   arg_name 'PATH'
   flag %[template]
 
@@ -278,7 +278,7 @@ class App
           res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
           if res
             basename = File.basename(target, ".#{NA.extension}")
-            NA.create_todo(target, basename)
+            NA.create_todo(target, basename, template: global_options[:template])
           else
             puts NA::Color.template('{r}Cancelled{x}')
             Process.exit 1
@@ -290,7 +290,7 @@ class App
           res = NA.yn(NA::Color.template('{by}Specified file not found, create it'), default: true)
           if res
             basename = File.basename(target, ".#{NA.extension}")
-            NA.create_todo(target, basename)
+            NA.create_todo(target, basename, template: global_options[:template])
           else
             puts NA::Color.template('{r}Cancelled{x}')
             Process.exit 1
@@ -319,7 +319,7 @@ class App
             NA.notify('{r}Cancelled{x}', exit_code: 1) unless res
 
             basename = File.basename(target, ".#{NA.extension}")
-            NA.create_todo(target, basename)
+            NA.create_todo(target, basename, template: global_options[:template])
           end
 
         end
@@ -330,7 +330,7 @@ class App
           if res
             basename = File.expand_path('.').split('/').last
             target = "#{basename}.#{NA.extension}"
-            NA.create_todo(target, basename)
+            NA.create_todo(target, basename, template: global_options[:template])
             files = NA.find_files(depth: 1)
           end
         end
@@ -906,7 +906,7 @@ class App
     c.example 'na init', desc: 'Generate a new todo file, prompting for project name'
     c.example 'na init warpspeed', desc: 'Generate a new todo for a project called warpspeed'
 
-    c.action do |_global_options, _options, args|
+    c.action do |global_options, _options, args|
       reader = TTY::Reader.new
       if args.count.positive?
         project = args.join(' ')
@@ -923,7 +923,7 @@ class App
 
       end
 
-      NA.create_todo(target, project)
+      NA.create_todo(target, project, template: global_options[:template])
     end
   end
 

data/lib/na/next_action.rb

@@ -166,7 +166,7 @@ module NA
       [projects, selected]
     end
 
-    def insert_project(target, project)
+    def insert_project(target, project, projects)
       path = project.split(%r{[:/]})
       _, _, projects = parse_actions(file_path: target)
       built = []
@@ -196,9 +196,13 @@ module NA
         end
 
         if new_path.join('') =~ /Archive/i
-          content = "#{content.strip}\n#{input.join("\n")}"
+          line = projects.last.last_line
+          content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         else
-          content = "#{input.join("\n")}\n#{content}"
+          split = content.split(/\n/)
+          before = split.slice(0, projects.first.line).join("\n")
+          after = split.slice(projects.first.line, split.count - projects.first.line).join("\n")
+          content = "#{before}\n#{input.join("\n")}\n#{after}"
         end
 
         new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, input.count - 1, input.count - 1)
@@ -210,7 +214,7 @@ module NA
           input.push("#{"\t" * indent}#{part.cap_first}:")
           indent += 1
         end
-        content = content.split("\n").insert(line, input.join("\n")).join("\n")
+        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, line + input.count - 1)
       end
 
@@ -273,7 +277,7 @@ module NA
         if target_proj.nil?
           res = NA.yn(NA::Color.template("{y}Project {bw}#{project}{xy} doesn't exist, add it"), default: true)
           if res
-            target_proj = insert_project(target, project)
+            target_proj = insert_project(target, project, projects)
           else
             NA.notify('{x}Cancelled', exit_code: 1)
           end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.22'
+  VERSION = '1.2.24'
 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.21<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.22<!--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.22
+  version: 1.2.24
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos