na 1.2.80 → 1.2.82

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 gem 'rake'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.80)
+    na (1.2.82)
       chronic (~> 0.10, >= 0.10.2)
       git (~> 3.0.0)
       gli (~> 2.21.0)
@@ -14,14 +14,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.0)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -30,11 +30,12 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    bigdecimal (3.3.1)
+    bump (0.6.1)
     chronic (0.10.2)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
+    diff-lcs (1.6.2)
     drb (2.2.3)
     git (3.0.2)
       activesupport (>= 5.0)
@@ -44,15 +45,29 @@ GEM
     gli (2.21.5)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    json (2.15.2)
     logger (1.7.0)
     mdless (1.0.37)
-    minitest (5.25.5)
-    ostruct (0.6.1)
+    minitest (5.26.0)
+    ostruct (0.6.3)
     process_executer (1.3.0)
     public_suffix (6.0.2)
     rake (13.3.0)
-    rchardet (1.9.0)
+    rchardet (1.10.0)
     rdoc (4.3.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.6)
     securerandom (0.4.1)
     tty-cursor (0.7.1)
     tty-reader (0.9.0)
@@ -65,7 +80,7 @@ GEM
     tty-which (0.5.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.0.4)
     wisper (2.0.1)
 
 PLATFORMS
@@ -82,10 +97,12 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
+  bump (~> 0.6.0)
   minitest (~> 5.14)
   na!
   rake
   rdoc (~> 4.3)
+  rspec (~> 3.0)
   tty-spinner (~> 0.9, >= 0.9.0)
 
 BUNDLED WITH

data/README.md

@@ -9,9 +9,9 @@
 _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.80.
+The current version of `na` is 1.2.82.
 
-`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. 
+`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.
 
 Used with Taskpaper files, it can add new action items quickly from the command line, automatically tagging them as next actions. It can also mark actions as completed, delete them, archive them, and move them between projects.
 
@@ -48,7 +48,7 @@ You can list next actions in files in the current directory by typing `na`. By d
 
 #### Adding todos
 
-You can also quickly add todo items from the command line with the `add` subcommand. The script will look for a file in the current directory with a `.taskpaper` extension (configurable). 
+You can also quickly add todo items from the command line with the `add` subcommand. The script will look for a file in the current directory with a `.taskpaper` extension (configurable).
 
 If found, it will try to locate an `Inbox:` project, or create one if it doesn't exist. Any arguments after `add` will be combined to create a new task in TaskPaper format. They will automatically be assigned as next actions (tagged `@na`) and will show up when `na` lists the tasks for the project.
 
@@ -76,7 +76,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.80
+    1.2.82
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -116,6 +116,7 @@ COMMANDS
     prompt              - Show or install prompt hooks for the current shell
     restore, unfinish   - Find and remove @done tag from an action
     saved               - Execute a saved search
+    scan                - Scan a directory tree for todo files and cache them
     tag                 - Add tags to matching action(s)
     tagged              - Find actions matching a tag
     todos               - Show list of known todo files
@@ -133,7 +134,7 @@ If you run the `add` command with no arguments, you'll be asked for input on the
 
 ###### Adding notes
 
-Use the `--note` switch to add a note. If STDIN (piped) input is present when this switch is used, it will be included in the note. A prompt will be displayed for adding additional notes, which will be appended to any STDIN note passed. Press CTRL-d to end editing and save the note. 
+Use the `--note` switch to add a note. If STDIN (piped) input is present when this switch is used, it will be included in the note. A prompt will be displayed for adding additional notes, which will be appended to any STDIN note passed. Press CTRL-d to end editing and save the note.
 
 Notes are not displayed by the `next/tagged/find` commands unless `--notes` is specified.
 
@@ -335,6 +336,7 @@ COMMAND OPTIONS
     --[no-]done                            - Include @done actions
     --exact                                - Search query is exact text match (not tokens)
     --file=TODO_FILE                       - Display matches from specific todo file ([relative] path) (default: none)
+    --hidden                               - Include hidden directories while traversing
     --in, --todo=TODO                      - Display matches from a known todo file anywhere in history (short name) (may be used more than once, default: none)
     --nest                                 - Output actions nested by file
     --no_file                              - No filename in output
@@ -426,6 +428,44 @@ EXAMPLES
     na saved
 ```
 
+##### scan
+
+Scan a directory tree for todo files and cache them in tdlist.txt. Avoids duplicates and can optionally prune non-existent entries.
+
+Scan reports how many files were added and, if --prune is used, how many were pruned. With --dry-run, it lists the full file paths that would be added and/or pruned.
+
+```
+NAME
+    scan - Scan a directory tree for todo files and cache them
+
+SYNOPSIS
+
+    na [global options] scan [command options] [PATH]
+
+DESCRIPTION
+    Searches PATH (default: current directory) for files matching the current NA.extension and adds their absolute paths to the tdlist.txt cache. Avoids duplicates. Optionally prunes non-existent entries from the cache. 
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH - Recurse to depth (1..N or i/inf for infinite) (default: 5)
+    --hidden          - Include hidden directories and files while scanning
+    -n, --dry-run     - Show what would be added/pruned, but do not write tdlist.txt
+    -p, --prune       - Prune removed files from cache after scan
+
+EXAMPLES
+
+    # Scan current directory up to default depth (5)
+    na scan
+
+    # Scan a specific path up to depth 3
+    na scan -d 3 ~/Projects
+
+    # Scan current directory recursively with no depth limit
+    na scan -d inf
+
+    # Prune non-existent entries from the cache (in addition to scanning)
+    na scan --prune
+```
+
 ##### tagged
 
 Example: `na tagged feature +maybe`.
@@ -438,45 +478,48 @@ To perform a string comparison, you can use `*=` (contains), `^=` (starts with),
 
 ```
 NAME
-    next - Show next actions
+    tagged - Find actions matching a tag
 
 SYNOPSIS
 
-    na [global options] next [command options] [QUERY]
+    na [global options] tagged [command options] TAG[=VALUE]
 
 DESCRIPTION
-    Next actions are actions which contain the next action tag (default @na),   do not contain @done, and are not in the Archive project.   Arguments will target a todo file from history, whether it's in the current   directory or not. Todo file queries can include path components separated by /   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma). 
+    Finds actions with tags matching the arguments. An action is shown if it   contains all of the tags listed. Add a + before a tag to make it required   and others optional. You can specify values using TAG=VALUE pairs.   Use <, >, and = for numeric comparisons, and *=, ^=, $=, or =~ (regex) for text comparisons.   Date comparisons use natural language (`na tagged "due<=today"`) and   are detected automatically. 
 
 COMMAND OPTIONS
-    --all                                  - Show next actions from all known todo files (in any directory)
-    -d, --depth=DEPTH                      - Recurse to depth (default: none)
+    -d, --depth=DEPTH                      - Recurse to depth (default: 1)
     --[no-]done                            - Include @done actions
     --exact                                - Search query is exact text match (not tokens)
-    --file=TODO_FILE                       - Display matches from specific todo file ([relative] path) (default: none)
-    --in, --todo=TODO                      - Display matches from a known todo file anywhere in history (short name) (may be used more than once, default: none)
+    --in=TODO_PATH                         - Show actions from a specific todo file in history. May use wildcards (* and ?) (default: none)
     --nest                                 - Output actions nested by file
     --no_file                              - No filename in output
     --[no-]notes                           - Include notes in output
+    -o, --or                               - Combine tags with OR, displaying actions matching ANY of the tags
     --omnifocus                            - Output actions nested by file and project
-    -p, --prio, --priority=PRIORITY        - Match actions with priority, allows <>= comparison (may be used more than once, default: none)
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --regex                                - Search query is regular expression
     --save=TITLE                           - Save this search for future use (default: none)
     --search, --find, --grep=QUERY         - Filter results using search terms (may be used more than once, default: none)
     --[no-]search_notes                    - Include notes in search (default: enabled)
-    -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)
+    -v, --invert                           - Show actions not matching tags
 
 EXAMPLES
 
-    # display the next actions from any todo files in the current directory
-    na next
+    # Show all actions tagged @maybe
+    na tagged maybe
 
-    # display the next actions from the current directory, traversing 3 levels deep
-    na next -d 3
+    # Show all actions tagged @feature AND @idea, recurse 3 levels
+    na tagged -d 3 "feature, idea"
 
-    # display next actions for a project you visited in the past
-    na next marked
+    # Show all actions tagged @feature OR @idea
+    na tagged --or "feature, idea"
+
+    # Show actions with @priority(4) or @priority(5)
+    na tagged "priority>=4"
+
+    # Show actions with a due date coming up in the next 2 days
+    na tagged "due<in 2 days"
 ```
 
 ##### todos
@@ -512,6 +555,8 @@ If more than one file is matched, a menu will be presented, multiple selections
 
 Any time an update action is carried out, a backup of the file before modification will be made in the same directory with a `.` prepended and `.bak` appended (e.g. `marked.taskpaper` is copied to `.marked.taskpaper.bak`). Only one undo step is available, but if something goes wrong (and this feature is still experimental, so be wary), you can just copy the ".bak" file back to the original.
 
+> **Note:** When using the `update` command, if you have [fzf](https://github.com/junegunn/fzf) installed, menus for selecting files or actions will support multi-select (tab to mark multiple, return to confirm). If [gum](https://github.com/charmbracelet/gum) is installed, multi-select is also supported (use j/k/x to navigate and mark). If neither is available, a simple prompt is used. This makes it easy to apply updates to multiple actions at once.
+
 ###### Marking a task as complete
 
 You can mark an action complete using `--finish`, which will add a dated @done tag to the action. You can also mark it @done and immediately move it to the Archive project using `--archive`.

data/Rakefile

@@ -207,3 +207,9 @@ end
 
 desc "alias for build"
 task package: :build
+
+desc 'Run tests with coverage'
+task :coverage do
+  ENV['COVERAGE'] = 'true'
+  Rake::Task[:test].invoke
+end

data/bin/commands/next.rb

@@ -19,6 +19,9 @@ class App
     c.arg_name "DEPTH"
     c.flag %i[d depth], type: :integer, must_match: /^[1-9]$/
 
+    c.desc "Include hidden directories while traversing"
+    c.switch %i[hidden], negatable: false, default_value: false
+
     c.desc "Show next actions from all known todo files (in any directory)"
     c.switch %i[all], negatable: false, default_value: false
 
@@ -217,6 +220,7 @@ class App
       file_path = options[:file] ? File.expand_path(options[:file]) : nil
 
       todo = NA::Todo.new({ depth: depth,
+                            hidden: options[:hidden],
                             done: options[:done],
                             file_path: file_path,
                             project: options[:project],

data/bin/commands/scan.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class App
+  extend GLI::App
+  desc 'Scan a directory tree for todo files and cache them'
+  long_desc 'Searches PATH (default: current directory) for files matching the current NA.extension
+and adds their absolute paths to the tdlist.txt cache. Avoids duplicates. Optionally prunes
+non-existent entries from the cache.'
+  arg_name 'PATH', optional: true
+  command %i[scan] do |c|
+    c.example 'na scan', desc: 'Scan current directory up to default depth (5)'
+    c.example 'na scan -d 3 ~/Projects', desc: 'Scan a specific path up to depth 3'
+    c.example 'na scan -d inf', desc: 'Scan current directory recursively with no depth limit'
+    c.example 'na scan --prune', desc: 'Prune non-existent entries from the cache (in addition to scanning)'
+
+    c.desc 'Recurse to depth (1..N or i/inf for infinite)'
+    c.arg_name 'DEPTH'
+    c.default_value '5'
+    c.flag %i[d depth], must_match: /^(\d+|i\w*)$/i
+
+    c.desc 'Prune removed files from cache after scan'
+    c.switch %i[p prune], negatable: false, default_value: false
+
+    c.desc 'Include hidden directories and files while scanning'
+    c.switch %i[hidden], negatable: false, default_value: false
+
+    c.desc 'Show what would be added/pruned, but do not write tdlist.txt'
+    c.switch %i[n dry-run], negatable: false, default_value: false
+
+    c.action do |_global_options, options, args|
+      base = args.first || Dir.pwd
+      ext = NA.extension
+
+      # Parse depth: numeric or starts-with-i for infinite
+      depth_arg = (options[:depth] || '5').to_s
+      infinite = depth_arg =~ /^i/i ? true : false
+      depth = infinite ? nil : depth_arg.to_i
+      depth = 5 if depth.nil? && !infinite
+
+      # Prepare existing cache
+      db = NA.database_path
+      existing = if File.exist?(db)
+                   File.read(db).split(/\n/).map(&:strip)
+                 else
+                   []
+                 end
+
+      found = []
+      Dir.chdir(base) do
+        patterns = if infinite
+                     ["*.#{ext}", "**/*.#{ext}"]
+                   else
+                     (1..[depth, 1].max).map { |d| (d > 1 ? ('*/' * (d - 1)) : '') + "*.#{ext}" }
+                   end
+        pattern = patterns.length == 1 ? patterns.first : "{#{patterns.join(',')}}"
+        files = Dir.glob(pattern, File::FNM_DOTMATCH)
+        # Exclude hidden dirs/files (any segment starting with '.') unless --hidden
+        files.reject! { |f| f.split('/').any? { |seg| seg.start_with?('.') && seg !~ /^\.\.?$/ } } unless options[:hidden]
+        found = files.map { |f| File.expand_path(f) }
+      end
+
+      merged = (existing + found).map(&:strip).uniq.sort
+      merged.select! { |f| File.exist?(f) } if options[:prune]
+
+      added_files = (merged - existing)
+      pruned_files = options[:prune] ? (existing - merged) : []
+      added = added_files.count
+      pruned = pruned_files.count
+
+      if options[:dry_run]
+        msg = "#{NA.theme[:success]}Dry run: would add #{added} file#{added == 1 ? '' : 's'}"
+        msg << ", prune #{pruned} file#{pruned == 1 ? '' : 's'}" if options[:prune]
+        NA.notify(msg)
+        NA.notify("{bw}Would add:{x}\n#{added_files.join("\n")}") if added_files.any?
+        NA.notify("{bw}Would prune:{x}\n#{pruned_files.join("\n")}") if options[:prune] && pruned_files.any?
+      else
+        File.open(db, 'w') { |f| f.puts merged.join("\n") }
+        msg = "#{NA.theme[:success]}Scan complete: #{NA.theme[:filename]}#{added}{x}#{NA.theme[:success]} added"
+        msg << ", #{NA.theme[:filename]}#{pruned}{x}#{NA.theme[:success]} pruned" if options[:prune]
+        NA.notify(msg)
+      end
+    end
+  end
+end