na 1.2.21 → 1.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652b91a5481fa62e1bb36ae71256a38d3081ee43999c167d1f35dc5ebc1e8261
-  data.tar.gz: 0deae6f4ade63260609e22b2aa0b7b8b2a668a77e487292b082c856c9a633f92
+  metadata.gz: 156cd1491d6307f4e28005d50c7b7fd0bd9d40da460533fa5a52e0a472ead137
+  data.tar.gz: fc1900ffb0aa9984f039aa9ca8f3b85fb787069f31a7ed2d071c786b4fe2638b
 SHA512:
-  metadata.gz: d3f1cb74ed04440ae3f8b95d70f2ad1dbc263d57b539e6a00b0984c46b008a6567008ed8098506b1ab6c9a2d2aa2c040cb15b1ebebd1794e3d3a4a5bd375f733
-  data.tar.gz: 30164f4a176f01b4978abaf7b5c3b3489925e535935802c5c0ce56947fb5baf96a36b9f05081073479cd3710a6b922bed698f2458644a99a270adf2b7781a1e3
+  metadata.gz: 190d47fd1308faf2401234d9dc28c02ed61c89888a5fa96139ffad51a6ff41f0f48babb90971c132c3e890abeaf3177b878fa94363bd8a4f534b2eab7dadf43c
+  data.tar.gz: 6e40bf25ec1e3dd609181c467c4d885efbd9a634e8ab90424f4d443683d01d8594bace90df10c47cc12a498caae12e32efff20d0ad2d749508406bd838b05401

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 1.2.23
+
+2023-06-05 10:42
+
+#### FIXED
+
+- Actually implement the --template option
+
+### 1.2.22
+
+2023-06-05 10:35
+
+#### NEW
+
+- Global `--template PATH` option to define a template for new files, can be added to .na.rc
+
+#### IMPROVED
+
+- Help verbiage and examples
+
+#### FIXED
+
+- Variable assignment warnings
+
 ### 1.2.20
 
 2023-05-09 10:40

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.21)
+    na (1.2.23)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -33,6 +33,7 @@ GEM
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  x86_64-darwin-20
 
 DEPENDENCIES
   minitest (~> 5.14)

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.20
+The current version of `na` is 1.2.23
 .
 
 `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,22 +77,23 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.21
+    1.2.23
 
 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: 3)
+    -d, --depth=DEPTH       - Recurse to depth (default: 1)
     --[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)
     --version               - Display the program version
 
 COMMANDS
@@ -204,7 +205,7 @@ SYNOPSIS
     na [global options] find [command options] PATTERN
 
 DESCRIPTION
-    Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe` 
+    Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`,   add a - or ! to ignore matches containing that token. 
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
@@ -226,6 +227,9 @@ EXAMPLES
     # Find all actions containing feature, idea, and swift
     na find feature idea swift
 
+    # Find all actions containing feature and idea but NOT swift
+    na find feature idea -swift
+
     # Find all actions containing the exact text "feature idea"
     na find -x feature idea
 ```

data/bin/na

@@ -43,10 +43,14 @@ 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'
+  arg_name 'PATH'
+  flag %[template]
+
   desc 'Use current working directory as [p]roject, [t]ag, or [n]one'
   arg_name 'TYPE'
   flag %i[cwd_as], must_match: /^[ptn].*?$/i, default_value: 'none'
@@ -274,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
@@ -286,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
@@ -315,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
@@ -326,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
@@ -619,10 +623,12 @@ class App
 
   desc 'Find actions matching a search pattern'
   long_desc 'Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown
-  (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`'
+  (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`,
+  add a - or ! to ignore matches containing that token.'
   arg_name 'PATTERN'
   command %i[find grep] do |c|
     c.example 'na find feature idea swift', desc: 'Find all actions containing feature, idea, and swift'
+    c.example 'na find feature idea -swift', desc: 'Find all actions containing feature and idea but NOT swift'
     c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
 
     c.desc 'Interpret search pattern as regular expression'
@@ -900,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(' ')
@@ -917,7 +923,7 @@ class App
 
       end
 
-      NA.create_todo(target, project)
+      NA.create_todo(target, project, template: global_options[:template])
     end
   end
 
@@ -1098,7 +1104,7 @@ class App
     c.example 'na tagged "+maybe,+priority<=3" --save maybelater', description: 'save a search called "maybelater"'
     c.example 'na saved maybelater', description: 'perform the search named "maybelater"'
     c.example 'na saved maybe',
-              description: 'perform the search named "maybelater", assuming no other searches match "may"'
+              description: 'perform the search named "maybelater", assuming no other searches match "maybe"'
     c.example 'na maybe',
               description: 'na run with no command and a single argument automatically performs a matching saved search'
     c.example 'na saved', description: 'list available searches'

data/lib/na/action.rb

@@ -24,7 +24,7 @@ module NA
              else
                ''
              end
-      "(#{@file}:#{@line}) #{@project}:#{@parent.join('>')} | #{@action}#{@note}"
+      "(#{@file}:#{@line}) #{@project}:#{@parent.join('>')} | #{@action}#{note}"
     end
 
     def inspect

data/lib/na/colors.rb

@@ -306,7 +306,7 @@ module NA
       %w[r g b].each do |e|
         t << parts[e].hex
       end
-      color =
+
       "\e[#{is_bg ? '48' : '38'};2;#{t.join(';')}m"
     end
 

data/lib/na/next_action.rb

@@ -72,21 +72,25 @@ module NA
     ## @param      target    [String] The target path
     ## @param      basename  [String] The project base name
     ##
-    def create_todo(target, basename)
+    def create_todo(target, basename, template: nil)
       File.open(target, 'w') do |f|
-        content = <<~ENDCONTENT
-          Inbox:
-          #{basename}:
-          \tFeature Requests:
-          \tIdeas:
-          \tBugs:
-          Archive:
-          Search Definitions:
-          \tTop Priority @search(@priority = 5 and not @done)
-          \tHigh Priority @search(@priority > 3 and not @done)
-          \tMaybe @search(@maybe)
-          \tNext @search(@#{NA.na_tag} and not @done and not project = \"Archive\")
-        ENDCONTENT
+        if template && File.exist?(template)
+          content = IO.read(template)
+        else
+          content = <<~ENDCONTENT
+            Inbox:
+            #{basename}:
+            \tFeature Requests:
+            \tIdeas:
+            \tBugs:
+            Archive:
+            Search Definitions:
+            \tTop Priority @search(@priority = 5 and not @done)
+            \tHigh Priority @search(@priority > 3 and not @done)
+            \tMaybe @search(@maybe)
+            \tNext @search(@#{NA.na_tag} and not @done and not project = \"Archive\")
+          ENDCONTENT
+        end
         f.puts(content)
       end
       save_working_dir(target)
@@ -600,7 +604,6 @@ 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.project?

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.21'
+  VERSION = '1.2.23'
 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.20<!--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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.23
 platform: ruby
 authors:
 - Brett Terpstra
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos