na 1.2.91 → 1.2.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7527724409b28562f6096ec2c083bb19468fb84785db69b4464df521b7be35
-  data.tar.gz: e0d0d694f1750ddca5ff3b2db991e7d91e889729db533de8cab19b1b33888280
+  metadata.gz: 34119e46896bef108bcd426961bff8809cd81ef75054984d4735a84fbe8cdc58
+  data.tar.gz: 6d9d1c2faffce4ba6d4cab6f75ccb2c3364c9ced1b9a0552097189431a5faff9
 SHA512:
-  metadata.gz: 2e58f0cac92657a95323c4e99ed8f4e49278457f91b3c2b62e080623d8fa4de8c90bd13a7b1e33240b9976f0e418bdc1d7cd6402586589f93fd6e343b2c67df8
-  data.tar.gz: 004a679b4d4c5217f1658761da11d467f47c1fb66e6c9eb6e59e22d9963afa0f20457906ffa11c0d87030e0378be0e9dff9cbba19369208e58a38703d84c75f1
+  metadata.gz: e87485d65980548a49de41456198dceef2497c3b907285da0a98def36a6836ccc5ba65c1d7457d65ff0be51157e0ba3ca06593fff0d4c57afe89db5d5f9fe2aa
+  data.tar.gz: d8b96dad65a1119ae604c2e27f876bdd7b3db7b5d0a0f4945e5cad429764823e635c2687510f3dc09cd8a7e92c55b4945666a12f597e60b2c28aee27c1e9db7a

data/.cursor/commands/changelog.md

@@ -1,5 +1,7 @@
 Write a commmit message that uses @ labels to specify what type of change each line is. Apply @new, @fixed, @changed, @improved, and @breaking as appropriate to each line. Only add @ labels to changes that affect the user, not technical details. Technical details can be included in the commit, just don't add @ labels to those lines. Be sure to include a general description (< 60 characters) as the first line, followed by a line break.
 
+Do not add @tags to notes about documentation updates. Always focus on actual code changes we've made since the last commit when generating the commit message.
+
 
 Save this commit message to commit_message.txt. Overwrite existing contents.
 

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-10-29 10:08:55 UTC using RuboCop version 1.75.7.
+# on 2025-11-16 16:32:01 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
@@ -15,7 +15,7 @@ Lint/DuplicateBranch:
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
 # NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
@@ -24,7 +24,7 @@ Lint/UnusedMethodArgument:
 # Offense count: 49
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 281
+  Max: 309
 
 # Offense count: 11
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
@@ -40,22 +40,22 @@ Metrics/BlockNesting:
 # Offense count: 6
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 911
+  Max: 926
 
 # Offense count: 34
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
-  Max: 84
+  Max: 91
 
 # Offense count: 55
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 188
+  Max: 202
 
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 913
+  Max: 928
 
 # Offense count: 5
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -65,7 +65,7 @@ Metrics/ParameterLists:
 # Offense count: 33
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
-  Max: 97
+  Max: 104
 
 # Offense count: 1
 # Configuration parameters: ForbiddenDelimiters.
@@ -118,9 +118,9 @@ Style/YAMLFileRead:
   Exclude:
     - 'lib/na/theme.rb'
 
-# Offense count: 30
+# Offense count: 28
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 293

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.2.92
+
+2025-11-16 10:32
+
+#### NEW
+
+- Prompt to create missing project paths when using --to.
+
+#### FIXED
+
+- Insert newly created project sections at the correct hierarchy depth.
+- Display added actions with a single project path in confirmations.
+
 ### 1.2.91
 
 2025-11-11 18:17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.91)
+    na (1.2.92)
       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.91.
+The current version of `na` is 1.2.92.
 
 
 ### Table of contents
@@ -116,7 +116,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.91
+    1.2.92
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)

data/lib/na/action.rb

@@ -138,7 +138,7 @@ module NA
     # @example
     #   action.to_s #=> "{ project: 'Inbox', ... }"
     def to_s
-      note = if @note.count.positive?
+      note = if @note.any?
                "\n#{@note.join("\n")}"
              else
                ''
@@ -150,7 +150,7 @@ module NA
     #
     # @return [String]
     def to_s_pretty
-      note = if @note.count.positive?
+      note = if @note.any?
                "\n#{@note.join("\n")}"
              else
                ''
@@ -302,7 +302,7 @@ module NA
     # @param none [Array] Tags to match none
     # @return [Boolean]
     def tags_match?(any: [], all: [], none: [])
-      tag_matches_any(any) && tag_matches_all(all) && tag_matches_none(none)
+      tag_matches_any?(any) && tag_matches_all?(all) && tag_matches_none?(none)
     end
 
     # Check if action or note matches any, all, and none search criteria
@@ -313,9 +313,9 @@ module NA
     # @param include_note [Boolean] Include note in search
     # @return [Boolean]
     def search_match?(any: [], all: [], none: [], include_note: true)
-      search_matches_any(any, include_note: include_note) &&
-        search_matches_all(all, include_note: include_note) &&
-        search_matches_none(none, include_note: include_note)
+      search_matches_any?(any, include_note: include_note) &&
+        search_matches_all?(all, include_note: include_note) &&
+        search_matches_none?(none, include_note: include_note)
     end
 
     def scan_tags
@@ -338,7 +338,7 @@ module NA
     # @param regexes [Array] Regexes to check
     # @param include_note [Boolean] Include note in search
     # @return [Boolean]
-    def search_matches_none(regexes, include_note: true)
+    def search_matches_none?(regexes, include_note: true)
       regexes.each do |rx|
         regex = rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE)
         note_matches = include_note && @note.join(' ').match(regex)
@@ -352,7 +352,7 @@ module NA
     # @param regexes [Array] Regexes to check
     # @param include_note [Boolean] Include note in search
     # @return [Boolean]
-    def search_matches_any(regexes, include_note: true)
+    def search_matches_any?(regexes, include_note: true)
       return true if regexes.empty?
 
       regexes.each do |rx|
@@ -368,7 +368,7 @@ module NA
     # @param regexes [Array] Regexes to check
     # @param include_note [Boolean] Include note in search
     # @return [Boolean]
-    def search_matches_all(regexes, include_note: true)
+    def search_matches_all?(regexes, include_note: true)
       regexes.each do |rx|
         regex = rx.is_a?(Regexp) ? rx : Regexp.new(rx, Regexp::IGNORECASE)
         note_matches = include_note && @note.join(' ').match(regex)
@@ -381,7 +381,7 @@ module NA
     #
     # @param tags [Array] Tags to check
     # @return [Boolean]
-    def tag_matches_none(tags)
+    def tag_matches_none?(tags)
       tags.each do |tag|
         return false if compare_tag(tag)
       end
@@ -392,7 +392,7 @@ module NA
     #
     # @param tags [Array] Tags to check
     # @return [Boolean]
-    def tag_matches_any(tags)
+    def tag_matches_any?(tags)
       return true if tags.empty?
 
       tags.each do |tag|
@@ -405,7 +405,7 @@ module NA
     #
     # @param tags [Array] Tags to check
     # @return [Boolean]
-    def tag_matches_all(tags)
+    def tag_matches_all?(tags)
       tags.each do |tag|
         return false unless compare_tag(tag)
       end

data/lib/na/actions.rb

@@ -87,8 +87,8 @@ module NA
           # Optimize template selection
           template = if config[:no_files]
                        NA.theme[:templates][:no_file]
-                     elsif config[:files]&.count&.positive?
-                       config[:files].count == 1 ? NA.theme[:templates][:single_file] : NA.theme[:templates][:multi_file]
+                     elsif config[:files]&.any?
+                       config[:files].one? ? NA.theme[:templates][:single_file] : NA.theme[:templates][:multi_file]
                      elsif depth > 1
                        NA.theme[:templates][:multi_file]
                      else

data/lib/na/next_action.rb

@@ -272,13 +272,13 @@ module NA
                             tag: tagged,
                             done: done })
 
-      unless todo.actions.count.positive?
+      unless todo.actions.any?
         NA.notify("#{NA.theme[:error]}No matching actions found in #{File.basename(target,
                                                                                    ".#{NA.extension}").highlight_filename}")
         return [todo.projects, NA::Actions.new]
       end
 
-      return [todo.projects, todo.actions] if todo.actions.count == 1 || all
+      return [todo.projects, todo.actions] if todo.actions.one? || all
 
       # If target_line is specified, find the action at that specific line
       if target_line
@@ -327,13 +327,15 @@ module NA
       matches = nil
       path.each_with_index do |part, i|
         built.push(part)
-        matches = todo.projects.select { |proj| proj.project =~ /^#{built.join(':')}/i }
-        if matches.count.zero?
+        built_path = built.join(':')
+        matches = todo.projects.select { |proj| proj.project =~ /^#{Regexp.escape(built_path)}/i }
+        exact_match = matches.find { |proj| proj.project.casecmp(built_path).zero? }
+        if exact_match
+          last_match = exact_match
+        else
           final_match = last_match
           new_path = path.slice(i, path.count - i)
           break
-        else
-          last_match = matches.last
         end
       end
 
@@ -499,7 +501,24 @@ module NA
         projects = find_projects(target)
         # If move is set, update add.parent to the target project
         add.parent = target_proj.project.split(':') if move && target_proj
-        target_proj = projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/i }.first
+        project_path = add.parent.join(':')
+        target_proj ||= projects.select { |proj| proj.project =~ /^#{project_path}$/i }.first
+
+        if target_proj.nil? && !project_path.empty?
+          display_path = project_path.tr(':', '/')
+          prompt = NA::Color.template(
+            "#{NA.theme[:warning]}Project #{NA.theme[:file]}#{display_path}#{NA.theme[:warning]} doesn't exist, create it?"
+          )
+          should_create = NA.yn(prompt, default: true)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless should_create
+
+          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
+        end
+
+        add.parent = target_proj.project.split(':') if target_proj
         indent = target_proj ? ("\t" * target_proj.indent) : ''
 
         # Format note for insertion
@@ -681,6 +700,7 @@ module NA
     # @return [void]
     def add_action(file, project, action, note = [], priority: 0, finish: false, append: false, started_at: nil, done_at: nil, duration_seconds: nil)
       parent = project.split(%r{[:/]})
+      file_project = File.basename(file, ".#{NA.extension}")
 
       if NA.global_file
         if NA.cwd_is == :tag
@@ -690,7 +710,7 @@ module NA
         end
       end
 
-      action = Action.new(file, project, parent, action, nil, note)
+      action = Action.new(file, file_project, parent, action, nil, note)
 
       update_action(file, nil,
                     add: action,
@@ -869,7 +889,7 @@ module NA
       required = search.filter { |s| s[:required] && !s[:negate] }.map { |t| t[:token] }
       negated = search.filter { |s| s[:negate] }.map { |t| t[:token] }
 
-      optional.push('*') if optional.count.zero? && required.count.zero? && negated.count.positive?
+      optional.push('*') if optional.none? && required.none? && negated.any?
       if optional == negated
         required = ['*']
         optional = ['*']
@@ -886,7 +906,7 @@ module NA
       else
         dirs.delete_if do |d|
           !d.sub(/\.#{NA.extension}$/, '')
-            .dir_matches(any: optional, all: required, none: negated, distance: 2, require_last: false)
+            .dir_matches?(any: optional, all: required, none: negated, distance: 2, require_last: false)
         end
       end
 
@@ -1225,7 +1245,7 @@ module NA
       file = database_path(file: 'saved_searches.yml')
       searches = load_searches
 
-      NA.notify("#{NA.theme[:error]}No search definitions found", exit_code: 1) unless searches.count.positive?
+      NA.notify("#{NA.theme[:error]}No search definitions found", exit_code: 1) unless searches.any?
 
       editor = NA.default_editor
       NA.notify("#{NA.theme[:error]}No $EDITOR defined", exit_code: 1) unless editor && TTY::Which.exist?(editor)
@@ -1283,7 +1303,7 @@ module NA
               default_args = [%(--prompt="#{prompt}"), "--height=#{options.count + 2}", '--info=inline']
               default_args << '--multi' if multiple
               default_args << '--bind ctrl-a:select-all' if multiple
-              header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
+              header = "esc: cancel,#{' tab: multi-select, ctrl-a: select all,' if multiple} return: confirm"
               default_args << %(--header="#{header}")
               default_args.concat(fzf_args)
               options = NA::Color.uncolor(NA::Color.template(options.join("\n")))
@@ -1310,11 +1330,11 @@ module NA
                 mult_res = []
                 result = result.gsub(',', ' ').gsub(/ +/, ' ').split(/ /)
                 result.each do |r|
-                  mult_res << options[r.to_i - 1] if r.to_i&.positive?
+                  mult_res << options[r.to_i - 1] if r.to_i.positive?
                 end
                 mult_res.join("\n")
               else
-                result.to_i&.positive? ? options[result.to_i - 1] : nil
+                result.to_i.positive? ? options[result.to_i - 1] : nil
               end
             end
 

data/lib/na/string.rb

@@ -95,7 +95,7 @@ class ::String
   # Returns the project name if matched, otherwise nil.
   # @return [String, nil]
   def project
-    m = match(/^([ \t]*)([^\-][^@:]*?): *(@\S+ *)*$/)
+    m = match(/^([ \t]*)([^-][^@:]*?): *(@\S+ *)*$/)
     m ? m[2] : nil
   end
 
@@ -228,7 +228,7 @@ class ::String
   def dir_to_rx(distance: 1, require_last: true)
     "#{split(%r{[/:]}).map do |comp|
       comp.chars.join(".{0,#{distance}}").gsub('*', '[^ ]*?')
-    end.join('.*?/.*?')}#{require_last ? '[^/]*?$' : ''}"
+    end.join('.*?/.*?')}#{'[^/]*?$' if require_last}"
   end
 
   # Check if the string matches directory patterns using any, all, and none criteria.
@@ -238,11 +238,11 @@ class ::String
   # @param require_last [Boolean] Require last segment match
   # @param distance [Integer] Allowed character distance in regex
   # @return [Boolean] True if matches criteria
-  def dir_matches(any: [], all: [], none: [], require_last: true, distance: 1)
+  def dir_matches?(any: [], all: [], none: [], require_last: true, distance: 1)
     any_rx = any.map { |q| q.dir_to_rx(distance: distance, require_last: require_last) }
     all_rx = all.map { |q| q.dir_to_rx(distance: distance, require_last: require_last) }
     none_rx = none.map { |q| q.dir_to_rx(distance: distance, require_last: false) }
-    matches_any(any_rx) && matches_all(all_rx) && matches_none(none_rx)
+    matches_any?(any_rx) && matches_all?(all_rx) && matches_none?(none_rx)
   end
 
   # Check if the string matches any, all, and none regex patterns.
@@ -250,8 +250,8 @@ class ::String
   # @param all [Array] Patterns where all must match
   # @param none [Array] Patterns where none must match
   # @return [Boolean] True if matches criteria
-  def matches(any: [], all: [], none: [])
-    matches_any(any) && matches_all(all) && matches_none(none)
+  def matches?(any: [], all: [], none: [])
+    matches_any?(any) && matches_all?(all) && matches_none?(none)
   end
 
   # Convert wildcard characters to regular expressions
@@ -374,7 +374,7 @@ class ::String
   # Returns true if none of the regexes match the string.
   # @param regexes [Array] Array of regex patterns
   # @return [Boolean] True if none match
-  def matches_none(regexes)
+  def matches_none?(regexes)
     regexes.each do |rx|
       return false if match(Regexp.new(rx, Regexp::IGNORECASE))
     end
@@ -384,7 +384,7 @@ class ::String
   # Returns true if any of the regexes match the string.
   # @param regexes [Array] Array of regex patterns
   # @return [Boolean] True if any match
-  def matches_any(regexes)
+  def matches_any?(regexes)
     regexes.each do |rx|
       return true if match(Regexp.new(rx, Regexp::IGNORECASE))
     end
@@ -394,7 +394,7 @@ class ::String
   # Returns true if all of the regexes match the string.
   # @param regexes [Array] Array of regex patterns
   # @return [Boolean] True if all match
-  def matches_all(regexes)
+  def matches_all?(regexes)
     regexes.each do |rx|
       return false unless match(Regexp.new(rx, Regexp::IGNORECASE))
     end

data/lib/na/todo.rb

@@ -180,7 +180,7 @@ module NA
                 action = line.action
                 new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
 
-                projects[-1].last_line = idx if projects.count.positive?
+                projects[-1].last_line = idx if projects.any?
 
                 # Tag matching
                 has_tag = !optional_tag.empty? || !required_tag.empty? || !negated_tag.empty?
@@ -191,8 +191,8 @@ module NA
                 actions.push(new_action)
                 in_action = true
               elsif in_action
-                actions[-1].note.push(line.strip) if actions.count.positive?
-                projects[-1].last_line = idx if projects.count.positive?
+                actions[-1].note.push(line.strip) if actions.any?
+                projects[-1].last_line = idx if projects.any?
               end
             end
             projects = projects.dup

data/lib/na/version.rb

@@ -5,5 +5,5 @@
 module Na
   ##
   # Current version of the na gem.
-  VERSION = '1.2.91'
+  VERSION = '1.2.92'
 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.90<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.91<!--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.91
+  version: 1.2.92
 platform: ruby
 authors:
 - Brett Terpstra