na 1.2.46 → 1.2.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0847ca8c8b5746d6e0f099c5bfc38d00dd01353acc7bceda6c5c6423ed16630f'
-  data.tar.gz: 6e7eecaf402a4268826095e6b46b4f1fad26a7e454b6162a6ef113f04e91a660
+  metadata.gz: 979a9debf8199d1e1182caaefb4d412c03c66c0c9785fd1ac638af13d211686e
+  data.tar.gz: 16bdab2fa8d9f8c326351bcc4c92e29aa3fed23a1dc23acc2c72a22ca12ecd41
 SHA512:
-  metadata.gz: 794d54bd290f665f51bb1d74846c83a4406ba76568132591ab19fe146bbbbce844be4e6fff2be05c73170f3666a87edc5446bf1380d1a7c8ded9848fbba9c4a9
-  data.tar.gz: de1cea81c7612bf8beaa0b73243aa687e9325d46e0c93d139cda87d6792fb99a2614812671b68f6ae9961adde9040c669ce73c5ae1f39d1215820187345ca21b
+  metadata.gz: a0b05629b092b7e49c3b4c606ddb236387b9acf5edc6219a446ccebfc6a8ced5ab17629e78b5fc327c0eb0a4ec3203221e7b3a4d661cfcba224d44ae3798d48e
+  data.tar.gz: 702cfbe213a0aa67a249284511754613cd447cea62580a14982c4ef253d5b710a70438c5b6f27008b9a4191b3f52f0f2b5fa80de3a373c28c201f5c1dd043b00

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 1.2.48
+
+2023-09-08 10:19
+
+#### FIXED
+
+- Error when `na add --to PROJECT` was a project that didn't exist
+
+### 1.2.47
+
+2023-09-07 10:47
+
+#### NEW
+
+- `na update --search OLD_TEXT --replace NEW_TEXT` (added --replace)
+
+#### IMPROVED
+
+- When not showing notes, add an asterisk in the template note
+- When showing notes, indent to the beginning of the action
+
 ### 1.2.46
 
 2023-09-06 21:25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.46)
+    na (1.2.48)
       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.46
+The current version of `na` is 1.2.48
 .
 
 `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,7 +77,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.46
+    1.2.48
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -503,7 +503,9 @@ COMMAND OPTIONS
     -p, --priority=PRIO                    - Add/change a priority level 1-5 (default: 0)
     --proj, --project=PROJECT[/SUBPROJECT] - Affect actions from a specific project (default: none)
     -r, --remove=TAG                       - Remove a tag from the action, use multiple times or combine multiple tags with a comma,             wildcards (* and ?) allowed (may be used more than once, default: none)
+    --replace=TEXT                         - Use with --find to find and replace with new text. Enables --exact when used (default: none)
     --restore                              - Remove @done tag from action
+    --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     -t, --tag=TAG                          - Add a tag to the action, @tag(values) allowed, use multiple times or combine multiple tags with a comma (may be used more than once, default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
     --to, --move=PROJECT                   - Move action to specific project (default: none)
@@ -556,6 +558,7 @@ COMMAND OPTIONS
     -n, --note                             - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
     -o, --overwrite                        - Overwrite note instead of appending
     --proj, --project=PROJECT[/SUBPROJECT] - Affect actions from a specific project (default: none)
+    --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
     --to, --move=PROJECT                   - Move action to specific project (default: none)
     -x, --exact                            - Match pattern exactly
@@ -591,6 +594,7 @@ COMMAND OPTIONS
     -n, --note                             - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
     -o, --overwrite                        - Overwrite note instead of appending
     --proj, --project=PROJECT[/SUBPROJECT] - Affect actions from a specific project (default: none)
+    --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
     -x, --exact                            - Match pattern exactly
 

data/bin/commands/archive.rb

@@ -37,6 +37,10 @@ class App
     c.desc 'Act on all matches immediately (no menu)'
     c.switch %i[all], negatable: false
 
+    c.desc 'Filter results using search terms'
+    c.arg_name 'QUERY'
+    c.flag %i[search find grep], multiple: true
+
     c.desc 'Interpret search pattern as regular expression'
     c.switch %i[e regex], negatable: false
 
@@ -48,9 +52,13 @@ class App
     c.flag %i[in todo]
 
     c.action do |global, options, args|
+      args.concat(options[:search])
+
       if options[:done]
         options[:tagged] << 'done'
         options[:all] = true
+      else
+        options[:tagged] << '-done'
       end
 
       options[:done] = true

data/bin/commands/complete.rb

@@ -40,6 +40,10 @@ class App
     c.arg_name 'DEPTH'
     c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
 
+    c.desc 'Filter results using search terms'
+    c.arg_name 'QUERY'
+    c.flag %i[search find grep], multiple: true
+
     c.desc 'Match actions containing tag. Allows value comparisons'
     c.arg_name 'TAG'
     c.flag %i[tagged], multiple: true
@@ -54,6 +58,8 @@ class App
     c.switch %i[x exact], negatable: false
 
     c.action do |global, options, args|
+      args.concat(options[:search])
+
       options[:finish] = true
       options[:f] = true
       options[:to] = 'Archive' if options[:archive] && !options[:to]

data/bin/commands/update.rb

@@ -55,6 +55,10 @@ class App
     c.arg_name 'TAG'
     c.flag %i[r remove], multiple: true
 
+    c.desc 'Use with --find to find and replace with new text. Enables --exact when used'
+    c.arg_name 'TEXT'
+    c.flag %i[replace]
+
     c.desc 'Add a @done tag to action'
     c.switch %i[f finish], negatable: false
 
@@ -79,6 +83,10 @@ class App
     c.arg_name 'DEPTH'
     c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
 
+    c.desc 'Filter results using search terms'
+    c.arg_name 'QUERY'
+    c.flag %i[search find grep], multiple: true
+
     c.desc 'Match actions containing tag. Allows value comparisons'
     c.arg_name 'TAG'
     c.flag %i[tagged], multiple: true
@@ -95,6 +103,8 @@ class App
     c.action do |global_options, options, args|
       reader = TTY::Reader.new
 
+      args.concat(options[:search])
+
       append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/i
 
       if options[:restore] || (!options[:remove].nil? && options[:remove].include?('done'))
@@ -106,6 +116,8 @@ class App
         options[:tagged] << '-done'
       end
 
+      options[:exact] = true unless options[:replace].nil?
+
       action = if args.count.positive?
                  args.join(' ').strip
                else
@@ -244,6 +256,7 @@ class App
                          priority: priority,
                          project: options[:project],
                          remove_tag: remove_tags,
+                         replace: options[:replace],
                          tagged: tags)
       end
     end

data/lib/na/action.rb

@@ -95,13 +95,6 @@ module NA
       file_tpl = "#{template[:file]}#{file} {x}"
       filename = NA::Color.template(file_tpl)
 
-      # Add notes if needed
-      note = if notes && @note.count.positive?
-               NA::Color.template("\n#{@note.map { |l| "  #{template[:note]}• #{l}{x}" }.join("\n")}")
-             else
-               ''
-             end
-
       # colorize the action and highlight tags
       @action.gsub!(/\{(.*?)\}/, '\\{\1\\}')
       action = NA::Color.template("#{template[:action]}#{@action.sub(/ @#{NA.na_tag}\b/, '')}{x}")
@@ -112,9 +105,27 @@ module NA
 
       if detect_width
         width = TTY::Screen.columns
-        prefix = NA::Color.uncolor(pretty(template: { templates: { output: template[:templates][:output].sub(/%action/, '') } }, detect_width: false))
+        prefix = NA::Color.uncolor(pretty(template: { templates: { output: template[:templates][:output].sub(/%action/, '').sub(/%note/, '') } }, detect_width: false))
         indent = prefix.length
+
+        # Add notes if needed
+        note = if notes && @note.count.positive?
+                 NA::Color.template(@note.wrap(width, indent, template[:note]))
+               elsif !notes && @note.count.positive?
+                 action += "#{template[:note]}*"
+               else
+                 ''
+               end
+
         action = action.wrap(width, indent)
+      else
+        note = if notes && @note.count.positive?
+                 NA::Color.template("\n#{@note.map { |l| "  #{template[:note]}• #{l.wrap(width, indent)}{x}" }.join("\n")}")
+               elsif !notes && @note.count.positive?
+                 action += "#{template[:note]}*"
+               else
+                 ''
+               end
       end
 
       # Replace variables in template string and output colorized

data/lib/na/actions.rb

@@ -79,7 +79,7 @@ module NA
 
         files.map { |f| NA.notify(f, debug: true) } if files
 
-        output = map { |action| action.pretty(template: { output: template }, regexes: regexes, notes: notes) }
+        output = map { |action| action.pretty(template: { templates: { output: template } }, regexes: regexes, notes: notes) }
         NA::Pager.page(output.join("\n"))
       end
     end

data/lib/na/array.rb

@@ -10,4 +10,11 @@ class ::Array
   def remove_bad
     compact.map { |x| x.is_a?(String) ? x.strip : x }.select(&:good?)
   end
+
+  def wrap(width, indent, color)
+    map! do |l|
+      "#{color}#{' ' * indent }• #{l.wrap(width, indent)}{x}"
+    end
+    "\n#{join("\n")}"
+  end
 end

data/lib/na/colors.rb

@@ -84,7 +84,7 @@ module NA
     # Array of attribute keys only
     ATTRIBUTE_NAMES = ATTRIBUTES.transpose.first
 
-    # Returns true if NA::Color supports the +feature+.
+    # Returns true if Color supports the +feature+.
     #
     # The feature :clear, that is mixing the clear color attribute into String,
     # is only supported on ruby implementations, that do *not* already

data/lib/na/next_action.rb

@@ -244,6 +244,7 @@ module NA
                       project: nil,
                       move: nil,
                       remove_tag: [],
+                      replace: nil,
                       tagged: nil)
 
       projects = find_projects(target)
@@ -278,6 +279,15 @@ module NA
                         projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/ }.first
                       end
 
+        res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
+
+        if res
+          target_proj = insert_project(target, project, projects)
+          projects << target_proj
+        else
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
+        end
+
         NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
 
         indent = "\t" * target_proj.indent
@@ -328,6 +338,9 @@ module NA
             action.note = new_note
           end
 
+          # If replace is defined, use search to search and replace text in action
+          action.action.sub!(Regexp.new(Regexp.escape(search), Regexp::IGNORECASE), replace) if replace
+
           action.process(priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
           target_proj = if target_proj

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.46'
+  VERSION = '1.2.48'
 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.45<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.47<!--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.46
+  version: 1.2.48
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,6 @@ files:
 - na.rdoc
 - scripts/fixreadme.rb
 - src/_README.md
-- test2.txt
 homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT

data/test2.txt

@@ -1,7 +0,0 @@
----
-comment: 2023
-keywords:
----
-
-Inbox:
-	- Test @na