na 1.2.20 → 1.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a02c7a0e5644aa0aef147e434a8d6dc9daa1705a50e9563255a7c2f6688267
-  data.tar.gz: a097a253c572eb83c2fd74b6ba978fbbe5f328d804cdd309af6a6e66e682d384
+  metadata.gz: 652b91a5481fa62e1bb36ae71256a38d3081ee43999c167d1f35dc5ebc1e8261
+  data.tar.gz: 0deae6f4ade63260609e22b2aa0b7b8b2a668a77e487292b082c856c9a633f92
 SHA512:
-  metadata.gz: 33c341298f6c7855dce8541f185aa46bf2d7d08cb5f97d709fda5fe1e0cf1537cec96297c80a88b1e69fb9089c7d15219d943dc4704a3fcca60be58b0e430ff6
-  data.tar.gz: 3c000719d4b5d7d2f6713c1865cdcc713878eac017379e40fffc98199843abbb23c4517b0a621ed80ae1b7d8a11d35633f820c48c38c8261ff833d39e23ae675
+  metadata.gz: d3f1cb74ed04440ae3f8b95d70f2ad1dbc263d57b539e6a00b0984c46b008a6567008ed8098506b1ab6c9a2d2aa2c040cb15b1ebebd1794e3d3a4a5bd375f733
+  data.tar.gz: 30164f4a176f01b4978abaf7b5c3b3489925e535935802c5c0ce56947fb5baf96a36b9f05081073479cd3710a6b922bed698f2458644a99a270adf2b7781a1e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.20)
+    na (1.2.21)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)

data/README.md

@@ -77,11 +77,12 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.20
+    1.2.21
 
 GLOBAL OPTIONS
-    -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
+    -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)
     --[no-]debug            - Display verbose output
@@ -210,10 +211,10 @@ COMMAND OPTIONS
     --[no-]done                            - Include @done actions
     -e, --regex                            - Interpret search pattern as regular expression
     --in=TODO_PATH                         - Show actions from a specific todo file in history. May use wildcards (* and ?) (default: none)
-    --[no-]nest                            - Output actions nested by file
+    --nest                                 - Output actions nested by file
     --[no-]notes                           - Include notes in output
     -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
-    --[no-]omnifocus                       - Output actions nested by file and project
+    --omnifocus                            - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --save=TITLE                           - Save this search for future use (default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
@@ -272,13 +273,13 @@ DESCRIPTION
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
-    --[no-]exact                           - Search query is exact text match (not tokens)
+    --exact                                - Search query is exact text match (not tokens)
     --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
-    --[no-]nest                            - Output actions nested by file
+    --nest                                 - Output actions nested by file
     --[no-]notes                           - Include notes in output
-    --[no-]omnifocus                       - Output actions nested by file and project
+    --omnifocus                            - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
-    --[no-]regex                           - Search query is regular expression
+    --regex                                - Search query is regular expression
     --search=QUERY                         - Filter results using search terms (may be used more than once, default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
@@ -338,8 +339,8 @@ DESCRIPTION
     Run without argument to list saved searches 
 
 COMMAND OPTIONS
-    -d, --[no-]delete - Delete the specified search definition
-    -e, --[no-]edit   - Open the saved search file in $EDITOR
+    -d, --delete - Delete the specified search definition
+    -e, --edit   - Open the saved search file in $EDITOR
 
 EXAMPLES
 
@@ -378,13 +379,13 @@ DESCRIPTION
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
-    --[no-]exact                           - Search query is exact text match (not tokens)
+    --exact                                - Search query is exact text match (not tokens)
     --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
-    --[no-]nest                            - Output actions nested by file
+    --nest                                 - Output actions nested by file
     --[no-]notes                           - Include notes in output
-    --[no-]omnifocus                       - Output actions nested by file and project
+    --omnifocus                            - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
-    --[no-]regex                           - Search query is regular expression
+    --regex                                - Search query is regular expression
     --search=QUERY                         - Filter results using search terms (may be used more than once, default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)

data/bin/na

@@ -34,7 +34,10 @@ class App
   NA::Color.coloring = $stdin.isatty
 
   desc 'Add a next action (deprecated, for backwards compatibility)'
-  switch %i[a add]
+  switch %i[a add], negatable: false
+
+  desc 'Colorize output'
+  switch %i[color], negatable: true, default_value: true
 
   desc 'Set a priority 0-5 (deprecated, for backwards compatibility)'
   arg_name 'PRIORITY'
@@ -104,10 +107,10 @@ class App
     c.flag %i[search], multiple: true
 
     c.desc 'Search query is regular expression'
-    c.switch %i[regex]
+    c.switch %i[regex], negatable: false
 
     c.desc 'Search query is exact text match (not tokens)'
-    c.switch %i[exact]
+    c.switch %i[exact], negatable: false
 
     c.desc 'Include notes in output'
     c.switch %i[notes], negatable: true, default_value: false
@@ -116,10 +119,10 @@ class App
     c.switch %i[done]
 
     c.desc 'Output actions nested by file'
-    c.switch %[nest]
+    c.switch %[nest], negatable: false
 
     c.desc 'Output actions nested by file and project'
-    c.switch %[omnifocus]
+    c.switch %[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       if global_options[:add]
@@ -248,7 +251,7 @@ class App
     c.flag %i[t tag]
 
     c.desc 'Don\'t add next action tag to new entry'
-    c.switch %i[x]
+    c.switch %i[x], negatable: false
 
     c.desc 'Specify the file to which the task should be added'
     c.arg_name 'PATH'
@@ -661,10 +664,10 @@ class App
     c.flag %i[save]
 
     c.desc 'Output actions nested by file'
-    c.switch %[nest]
+    c.switch %[nest], negatable: false
 
     c.desc 'Output actions nested by file and project'
-    c.switch %[omnifocus]
+    c.switch %[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       options[:nest] = true if options[:omnifocus]
@@ -785,10 +788,10 @@ class App
     c.flag %i[search], multiple: true
 
     c.desc 'Search query is regular expression'
-    c.switch %i[regex]
+    c.switch %i[regex], negatable: false
 
     c.desc 'Search query is exact text match (not tokens)'
-    c.switch %i[exact]
+    c.switch %i[exact], negatable: false
 
     c.desc 'Include @done actions'
     c.switch %i[done]
@@ -801,10 +804,10 @@ class App
     c.flag %i[save]
 
     c.desc 'Output actions nested by file'
-    c.switch %[nest]
+    c.switch %[nest], negatable: false
 
     c.desc 'Output actions nested by file and project'
-    c.switch %[omnifocus]
+    c.switch %[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       options[:nest] = true if options[:omnifocus]
@@ -1101,10 +1104,10 @@ class App
     c.example 'na saved', description: 'list available searches'
 
     c.desc 'Open the saved search file in $EDITOR'
-    c.switch %i[e edit]
+    c.switch %i[e edit], negatable: false
 
     c.desc 'Delete the specified search definition'
-    c.switch %i[d delete]
+    c.switch %i[d delete], negatable: false
 
     c.action do |_global_options, options, args|
       NA.edit_searches if options[:edit]
@@ -1128,6 +1131,7 @@ class App
 
   pre do |global, _command, _options, _args|
     NA.verbose = global[:debug]
+    NA::Color.coloring = global[:color]
     NA.extension = global[:ext]
     NA.na_tag = global[:na_tag]
     NA.global_file = global[:file]

data/lib/na/colors.rb

@@ -226,6 +226,7 @@ module NA
       ##
       def template(input)
         input = input.join(' ') if input.is_a? Array
+        return input.gsub(/(?<!\\)\{(\w+)\}/i, '') unless NA::Color.coloring?
 
         fmt = input.gsub(/%/, '%%')
         fmt = fmt.gsub(/(?<!\\)\{(\w+)\}/i) do

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.20'
+  VERSION = '1.2.21'
 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.19<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.20<!--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.20
+  version: 1.2.21
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake