na 1.2.70 → 1.2.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56f715c29577f9b9e9d757574336719a2e288ccf3b115094e985bacb06e65fb8
-  data.tar.gz: d2fdb11e46d322f9efe4b3038ec2becd9a3becc51b8d7c4ff44ae028cd8912ac
+  metadata.gz: feb11772caf2e24a24d6cc0ee5dbd2c56873ac0b45750683cec8b24ac70e07f0
+  data.tar.gz: f0225c850ee3ee2cc3358e400afd7b85eea969c0a085c1a1961444596aff762b
 SHA512:
-  metadata.gz: 2cad1158ba4c4477a88a949856bace92e261c435675ba56491e790a189299525168f1999fee5ecee7025f49dc54693bce3347034ea36782632dd3ddfb86835de
-  data.tar.gz: ea2f842e4cec6a2040bf730dfc60d683d15638b6db71496ab5e4b3b59bf566183a982d30ab65167e41a9eb6e0002c2061c135ebb22de0edd668b69e5575bb362
+  metadata.gz: c8195645b8793fb6f8bfe48d91f387058b24d83431e71959c5a381ea9663bc7429a2b71bac8591cc35cdc9bd75e0d123b9bcdc52d0ff9462babff5c2cda15e31
+  data.tar.gz: 7738332bf944fb5c9e67d48b91495ca92df2c7dc28673d290e4713258c8c89c6652649c2353bca7e397e954a6dfafed548a5ee417f574d60e7fbb258cec2902a

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+### 1.2.72
+
+2025-03-15 08:13
+
+#### NEW
+
+- --no_file option for `na next` to display without filename (instead of editing templates)
+
+#### IMPROVED
+
+- --priority in `na next` and `na add` accepts "h", "m", or "l" to equal 5, 3, 1
+
+#### FIXED
+
+- - - - @fixed Matching parenthetical notes at the end of a task entry was too greedy
+- - - - - @fixed Matching parenthetical notes at the end of a task entry was too greedy - Error in concat for line notes
+- - - - - @fixed Matching parenthetical notes at the end of a task entry was too greedy
+- - - - - - @fixed Matching parenthetical notes at the end of a task entry was too greedy - Error in concat for line notes
+
+### 1.2.71
+
+2024-09-28 11:12
+
+#### FIXED
+
+- - - @fixed Matching parenthetical notes at the end of a task entry was too greedy
+- - - - @fixed Matching parenthetical notes at the end of a task entry was too greedy
+- Error in concat for line notes
+
 ### 1.2.70
 
 2024-09-28 11:10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.70)
+    na (1.2.72)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -12,12 +12,37 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.2)
     chronic (0.10.2)
-    gli (2.21.1)
+    gli (2.21.5)
+    json (2.10.2)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     mdless (1.0.37)
     minitest (5.20.0)
+    parallel (1.26.3)
+    parser (3.3.7.1)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.1)
+    rainbow (3.1.1)
     rake (0.9.6)
     rdoc (4.3.0)
+    regexp_parser (2.10.0)
+    rubocop (1.74.0)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.38.1)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
     tty-cursor (0.7.1)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
@@ -25,12 +50,16 @@ GEM
       wisper (~> 2.0)
     tty-screen (0.8.2)
     tty-which (0.5.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     wisper (2.0.1)
     yard (0.9.34)
 
 PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
+  arm64-darwin-24
   x86_64-darwin-20
 
 DEPENDENCIES
@@ -38,7 +67,8 @@ DEPENDENCIES
   na!
   rake (~> 0.9.2)
   rdoc (~> 4.3)
+  rubocop (~> 1.74)
   yard (~> 0.9, >= 0.9.26)
 
 BUNDLED WITH
-   2.2.29
+   2.6.6

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.70.
+The current version of `na` is 1.2.72.
 
 `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. 
 
@@ -76,14 +76,14 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.70
+    1.2.72
 
 GLOBAL OPTIONS
     -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)
+    -d, --depth=DEPTH       - Recurse to depth (default: 1)
     --[no-]debug            - Display verbose output
     --ext=EXT               - File extension to consider a todo file (default: taskpaper)
     -f, --file=PATH         - Use a single file as global todo, use initconfig to make permanent (default: none)
@@ -154,7 +154,7 @@ COMMAND OPTIONS
     --finish, --done                - Mark task as @done with date
     --in, --todo=TODO_FILE          - Add to a known todo file, partial matches allowed (default: none)
     -n, --note                      - Prompt for additional notes. STDIN input (piped) will be treated as a note if present.
-    -p, --priority=PRIO             - Add a priority level 1-5 (default: 0)
+    -p, --priority=PRIO             - Add a priority level 1-5 or h, m, l (default: 0)
     -t, --tag=TAG                   - Use a tag other than the default next action tag (default: none)
     --to, --project, --proj=PROJECT - Add action to specific project (default: Inbox)
     -x                              - Don't add next action tag to new entry
@@ -335,6 +335,7 @@ COMMAND OPTIONS
     --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)
     --nest                                 - Output actions nested by file
+    --no_file                              - No filename in output
     --[no-]notes                           - Include notes in output
     --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)
@@ -452,6 +453,7 @@ COMMAND OPTIONS
     --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)
     --nest                                 - Output actions nested by file
+    --no_file                              - No filename in output
     --[no-]notes                           - Include notes in output
     --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)

data/bin/commands/add.rb

@@ -20,9 +20,9 @@ class App
     c.desc "Prompt for additional notes. STDIN input (piped) will be treated as a note if present."
     c.switch %i[n note], negatable: false
 
-    c.desc "Add a priority level 1-5"
+    c.desc "Add a priority level 1-5 or h, m, l"
     c.arg_name "PRIO"
-    c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
+    c.flag %i[p priority], must_match: /[1-5hml]/, default_value: 0
 
     c.desc "Add action to specific project"
     c.arg_name "PROJECT"
@@ -59,6 +59,15 @@ class App
       reader = TTY::Reader.new
       append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/
 
+      priority = options[:priority]
+      if priority =~ /^[1-5]$/
+        priority = priority.to_i
+      elsif priority =~ /^[hml]$/
+        priority = NA.priority_map[priority]
+      else
+        priority = 0
+      end
+
       if NA.global_file
         target = File.expand_path(NA.global_file)
         unless File.exist?(target)
@@ -133,14 +142,14 @@ class App
       end
 
       note_rx = /^(.+) \(([^)]+)\)$/
-split_note = if action =~ note_rx
-    n = Regexp.last_match(2)
-    action.sub!(note_rx, '\1').strip!
-    n
-  end
+      split_note = if action =~ note_rx
+          n = Regexp.last_match(2)
+          action.sub!(note_rx, '\1').strip!
+          n
+        end
 
-      if options[:priority]&.to_i&.positive?
-        action = "#{action.gsub(/@priority\(\d+\)/, "")} @priority(#{options[:priority]})"
+      if priority&.to_i&.positive?
+        action = "#{action.gsub(/@priority\(\d+\)/, "")} @priority(#{priority})"
       end
 
       na_tag = NA.na_tag
@@ -170,7 +179,7 @@ split_note = if action =~ note_rx
 
       note = stdin_note.empty? ? [] : stdin_note
       note.<< split_note unless split_note.nil?
-      note << line_note unless line_note.nil?
+      note.concat(line_note) unless line_note.nil?
 
       NA.add_action(target, options[:project], action, note, finish: options[:finish], append: append)
     end

data/bin/commands/next.rb

@@ -68,6 +68,9 @@ class App
     c.desc 'Output actions nested by file'
     c.switch %i[nest], negatable: false
 
+    c.desc 'No filename in output'
+    c.switch %i[no_file], negatable: false
+
     c.desc 'Output actions nested by file and project'
     c.switch %i[omnifocus], negatable: false
 
@@ -76,6 +79,7 @@ class App
     c.flag %i[save]
 
     c.action do |global_options, options, args|
+      # For backward compatibility with na -a
       if global_options[:add]
         cmd = ['add']
         cmd.push('--note') if global_options[:note]
@@ -101,11 +105,17 @@ class App
       if options[:exact] || options[:regex]
         search = options[:search].join(' ')
       else
+        #  This regex matches the following:
+        #  @tag(value)
+        #  @tag=value (or > < >= <=)
+        #  @tag=~value
+        #  @tag ^= value (or *=, $=)
         rx = [
           '(?<=\A|[ ,])(?<req>[+!-])?@(?<tag>[^ *=<>$~\^,@(]+)',
           '(?:\((?<value>.*?)\)| *(?<op>=~|[=<>~]{1,2}|[*$\^]=) *',
           '(?<val>.*?(?=\Z|[,@])))?'
         ].join('')
+        # convert tag(value) to tag=value
         search = options[:search].join(' ').gsub(Regexp.new(rx)) do
           m = Regexp.last_match
           string = if m['value']
@@ -123,6 +133,18 @@ class App
       if options[:priority].count.positive?
         prios = options[:priority].join(',').split(/,/)
         options[:or] = true if prios.count > 1
+        prios.map! do |p|
+          p.sub(/([hml])$/) do
+            case Regexp.last_match[1]
+            when 'h'
+              NA.priority_map['h']
+            when 'm'
+              NA.priority_map['m']
+            when 'l'
+              NA.priority_map['l']
+            end
+          end
+        end
         prios.each do |p|
           options[:tagged] << if p =~ /^[<>=]{1,2}/
                                 "priority#{p}"
@@ -212,7 +234,8 @@ class App
                           files: todo.files,
                           nest: options[:nest],
                           nest_projects: options[:omnifocus],
-                          notes: options[:notes])
+                          notes: options[:notes],
+                          no_files: options[:no_file])
     end
   end
 end

data/lib/na/actions.rb

@@ -16,11 +16,12 @@ module NA
     ## @param      files    [Array] The files actions originally came from
     ## @param      regexes  [Array] The regexes used to gather actions
     ##
-    def output(depth, files: nil, regexes: [], notes: false, nest: false, nest_projects: false)
+    def output(depth, files: nil, regexes: [], notes: false, nest: false, nest_projects: false, no_files: false)
       return if files.nil?
 
       if nest
         template = NA.theme[:templates][:default]
+        template = NA.theme[:templates][:no_file] if no_files
 
         parent_files = {}
         out = []
@@ -41,6 +42,7 @@ module NA
           end
         else
           template = NA.theme[:templates][:default]
+          template = NA.theme[:templates][:no_file] if no_files
 
           each do |action|
             if parent_files.key?(action.file)
@@ -60,7 +62,10 @@ module NA
         end
         NA::Pager.page out.join("\n")
       else
-        template = if files.count.positive?
+        template =
+                    if no_files
+                      NA.theme[:templates][:no_file]
+                    elsif files.count.positive?
                      if files.count == 1
                        NA.theme[:templates][:single_file]
                      else

data/lib/na/hash.rb

@@ -35,4 +35,9 @@ class ::Hash
   def deep_thaw!
     replace deep_thaw
   end
+
+	def deep_merge(second)
+	    merger = proc { |_, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : Array === v1 && Array === v2 ? v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
+	    merge(second.to_h, &merger)
+	end
 end

data/lib/na/next_action.rb

@@ -30,6 +30,14 @@ module NA
       Process.exit exit_code if exit_code
     end
 
+    def priority_map
+      {
+        'h' => 5,
+        'm' => 3,
+        'l' => 1
+      }
+    end
+
     ##
     ## Display and read a Yes/No prompt
     ##

data/lib/na/theme.rb

@@ -46,7 +46,8 @@ module NA
             output: '%filename%parents| %action',
             default: '%parent%action',
             single_file: '%parent%action',
-            multi_file: '%filename%parent%action'
+            multi_file: '%filename%parent%action',
+            no_file: '%parent%action'
           }
         }
 
@@ -57,7 +58,7 @@ module NA
                 else
                   {}
                 end
-        theme = default_template.merge(theme)
+        theme = default_template.deep_merge(theme)
 
         File.open(theme_file, 'w') do |f|
           f.puts template_help.comment

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.70'
+  VERSION = '1.2.72'
 end

data/na.gemspec

@@ -1,5 +1,6 @@
 # Ensure we require the local version and not one we might have installed already
-require File.join([File.dirname(__FILE__),'lib','na','version.rb'])
+require './lib/na/version.rb'
+
 spec = Gem::Specification.new do |s|
   s.name = 'na'
   s.version = Na::VERSION
@@ -14,9 +15,7 @@ spec = Gem::Specification.new do |s|
     'Add prompt hooks to display your next actions automatically when cd\'ing into a directory.'
   ].join(' ')
   s.license = 'MIT'
-  s.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.strip =~ %r{^((test|spec|features)/|\.git|buildnotes|.*\.taskpaper)} }
-  end
+  s.files =`git ls-files -z`.split("\x0").reject { |f| f.strip =~ %r{^((test|spec|features)/|\.git|buildnotes|.*\.taskpaper)} }
   s.require_paths << 'lib'
   s.extra_rdoc_files = ['README.md','na.rdoc']
   s.rdoc_options << '--title' << 'na' << '--main' << 'README.md' << '--markup' << 'markdown'
@@ -26,6 +25,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rdoc', '~> 4.3')
   s.add_development_dependency('minitest', '~> 5.14')
   s.add_development_dependency('yard', '~> 0.9', '>= 0.9.26')
+  s.add_development_dependency('rubocop', '~> 1.74')
   s.add_runtime_dependency('gli','~> 2.21.0')
   s.add_runtime_dependency('tty-reader', '~> 0.9', '>= 0.9.0')
   s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')

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.68<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.71<!--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,13 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.70
+  version: 1.2.72
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-28 00:00:00.000000000 Z
+date: 2025-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,6 +71,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.26
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.74'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.74'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +267,6 @@ homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--title"
 - na
@@ -276,8 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.5
 specification_version: 4
 summary: A command line tool for adding and listing project todos
 test_files: []