na 1.2.98 → 1.2.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f82dc36deae233300843fac7ccd81408a28e4f8c29266ef036df11c731ef94a
-  data.tar.gz: 544b783521ff49f4e169fc7b4fb0be1523264217503d1685ef80d2aa2750a8fb
+  metadata.gz: e1cf2028aa8b5420b1943873ccd9defc0cea44ba83ed76d437d33fd2676d753d
+  data.tar.gz: a33b579fa622f70a4b3771dc86a63d324be2fd751aa87980c02ad1a6f1556221
 SHA512:
-  metadata.gz: 5abe2d76e969c58010a3d566074c3fc7d80817657f6f59c3a2039f5f0fe53028dec707be05db546642644b85ac9043006e8d86d0dbb2189465943af60442421d
-  data.tar.gz: 670c1efea7d6365266128bac5cc184001c3998056300cbb07fcde1a8b4cda8e9f1bf5e686acc14840b7fde9efcdea74b18c68fdf3dad334cdd0dbd393177d0cc
+  metadata.gz: b14815f0edac0f8d48ba15d0005e2c57b10e1db28e6fba687374d86b17cfd087eed8476a5e816d5ffb425009bfd20ee2b852a0fc5be5430efecc81d34843ae86
+  data.tar.gz: ea4ef1b69c4bac50a371362439de89b3721d07b42533cc1bcff9e377ead25b8034a25f2ab9c98e1889c6ea5beec636670d469a9388b4178ea5b79296942c6790

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-02-24 10:37:38 UTC using RuboCop version 1.81.7.
+# on 2026-02-27 15:51:35 UTC using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -24,7 +24,7 @@ Lint/UnusedMethodArgument:
 # Offense count: 58
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 309
+  Max: 326
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
@@ -40,12 +40,12 @@ Metrics/BlockNesting:
 # Offense count: 6
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 1495
+  Max: 1502
 
 # Offense count: 41
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 91
+  Max: 97
 
 # Offense count: 63
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
@@ -55,7 +55,7 @@ Metrics/MethodLength:
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 1497
+  Max: 1504
 
 # Offense count: 5
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -65,7 +65,7 @@ Metrics/ParameterLists:
 # Offense count: 39
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 104
+  Max: 110
 
 # Offense count: 1
 # Configuration parameters: ForbiddenDelimiters.
@@ -140,7 +140,7 @@ Style/YAMLFileRead:
   Exclude:
     - 'lib/na/theme.rb'
 
-# Offense count: 38
+# Offense count: 40
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 1.2.101
+
+2026-04-26 12:06
+
+#### CHANGED
+
+- Allow next --available with filters to match actions without the default @na tag.
+- Bump the gem version to 1.2.101.
+
+#### NEW
+
+- Add next --available/-a to show the first available action per project.
+
+#### FIXED
+
+- Match unique nested projects by leaf name in add/update
+- Make --color force colored output even when stdout is not a TTY.
+
+### 1.2.100
+
+2026-02-27 09:53
+
+#### FIXED
+
+- Match unique nested projects by leaf name in add/update
+
 ### 1.2.98
 
 2026-02-24 11:26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.98)
+    na (1.2.101)
       chronic (~> 0.10, >= 0.10.2)
       csv (~> 3.2)
       git (~> 3.0.0)

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.98.
+The current version of `na` is 1.2.101.
 
 
 ### Table of contents
@@ -257,7 +257,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.98
+    1.2.101
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -522,6 +522,7 @@ 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). 
 
 COMMAND OPTIONS
+    -a, --available                        - Show only the first available action per project
     --all                                  - Show next actions from all known todo files (in any directory)
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --divider=STRING                       - Divider string for text IO (default: none)

data/bin/commands/next.rb

@@ -25,6 +25,9 @@ class App
     c.desc "Show next actions from all known todo files (in any directory)"
     c.switch %i[all], negatable: false, default_value: false
 
+    c.desc "Show only the first available action per project"
+    c.switch %i[a available], negatable: false
+
     c.desc "Display matches from a known todo file anywhere in history (short name)"
     c.arg_name "TODO"
     c.flag %i[in todo], multiple: true
@@ -169,6 +172,8 @@ class App
         next
       end
 
+      available = options[:available]
+
       if options[:exact] || options[:regex]
         search = options[:search].join(" ")
       else
@@ -288,9 +293,22 @@ class App
       end
 
       NA.na_tag = options[:tag] unless options[:tag].nil?
-      require_na = true
 
-      tag = [{ tag: NA.na_tag, value: nil, required: true, negate: false }]
+      # When -a/--available is combined with --all or any filtering flags,
+      # relax the implicit NA_TAG requirement and show the first available
+      # action that matches the filters instead.
+      filtered_mode = options[:all] ||
+                      options[:save] ||
+                      !options[:tag].nil? ||
+                      options[:project] ||
+                      options[:tagged].any? ||
+                      options[:priority].any? ||
+                      (options[:search].respond_to?(:any?) && options[:search].any?)
+
+      require_na = !(available && filtered_mode)
+
+      tag = []
+      tag << { tag: NA.na_tag, value: nil, required: true, negate: false } if require_na
       tag << { tag: "done", value: nil, negate: true } unless options[:done]
       tag.concat(tags)
 
@@ -378,17 +396,24 @@ class App
           end
         end
       end
-      todo.actions.output(depth,
-                          { files: todo.files,
-                            nest: options[:nest],
-                            nest_projects: options[:omnifocus],
-                            notes: options[:notes],
-                            no_files: options[:no_file],
-                            times: options[:times],
-                            human: options[:human],
-                            only_timed: options[:only_timed],
-                            json_times: options[:json_times],
-                            only_times: options[:only_times] })
+
+      actions = if available
+                  todo.actions.first_available_per_project(require_na: require_na)
+                else
+                  todo.actions
+                end
+
+      actions.output(depth,
+                     { files: todo.files,
+                       nest: options[:nest],
+                       nest_projects: options[:omnifocus],
+                       notes: options[:notes],
+                       no_files: options[:no_file],
+                       times: options[:times],
+                       human: options[:human],
+                       only_timed: options[:only_timed],
+                       json_times: options[:json_times],
+                       only_times: options[:only_times] })
     end
   end
 end

data/bin/na

@@ -116,7 +116,7 @@ class App
     NA::Plugins.ensure_plugins_home
     NA.verbose = global[:debug]
     NA::Pager.paginate = global[:pager] && $stdout.isatty
-    NA::Color.coloring = global[:color] && $stdout.isatty
+    NA::Color.coloring = global[:color] && ($stdout.isatty || NA.globals.include?('--color'))
     NA.extension = global[:ext]
     NA.include_ext = global[:include_ext]
     NA.na_tag = global[:na_tag]

data/lib/na/actions.rb

@@ -7,6 +7,30 @@ module NA
       super
     end
 
+    # Return the first available action per project path.
+    #
+    # @param require_na [Boolean] If true, only consider actions with the NA tag
+    # @return [NA::Actions] A new Actions collection with at most one action per project
+    def first_available_per_project(require_na: true)
+      NA::Benchmark.measure('Actions.first_available_per_project') do
+        seen = {}
+        selected = NA::Actions.new
+
+        each do |action|
+          next if require_na && !action.respond_to?(:na?) ? false : (require_na && !action.na?)
+
+          project_path = Array(action.parent).join(':')
+          next if project_path.empty?
+          next if seen.key?(project_path)
+
+          seen[project_path] = true
+          selected << action
+        end
+
+        selected
+      end
+    end
+
     # Pretty print a list of actions
     #
     # @param depth [Integer] The depth of the action

data/lib/na/next_action.rb

@@ -502,7 +502,17 @@ module NA
         # If move is set, update add.parent to the target project
         add.parent = target_proj.project.split(':') if move && target_proj
         project_path = add.parent.join(':')
-        target_proj ||= projects.select { |proj| proj.project =~ /^#{project_path}$/i }.first
+        target_proj ||= projects.select { |proj| proj.project =~ /^#{Regexp.escape(project_path)}$/i }.first
+
+        if target_proj.nil? && !project_path.empty? && !project_path.include?(':')
+          # Fallback: if a bare leaf name was provided and it uniquely matches
+          # the final segment of an existing nested project, use that project
+          candidates = projects.select do |proj|
+            leaf = proj.project.to_s.split(':').last
+            leaf&.casecmp?(project_path)
+          end
+          target_proj = candidates.first if candidates.size == 1
+        end
 
         if target_proj.nil? && !project_path.empty?
           display_path = project_path.tr(':', '/')
@@ -515,7 +525,7 @@ module NA
           created_proj = insert_project(target, project_path)
           contents = target.read_file.split("\n")
           projects = find_projects(target)
-          target_proj = projects.select { |proj| proj.project =~ /^#{project_path}$/i }.first || created_proj
+          target_proj = projects.select { |proj| proj.project =~ /^#{Regexp.escape(project_path)}$/i }.first || created_proj
         end
 
         add.parent = target_proj.project.split(':') if target_proj

data/lib/na/version.rb

@@ -5,5 +5,5 @@
 module Na
   ##
   # Current version of the na gem.
-  VERSION = '1.2.98'
+  VERSION = '1.2.101'
 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.97<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.100<!--END VER-->.
 
 <!--GITHUB-->
 ### Table of contents

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.98
+  version: 1.2.101
 platform: ruby
 authors:
 - Brett Terpstra
@@ -360,7 +360,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A command line tool for adding and listing project todos
 test_files: []