na 1.2.68 → 1.2.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4bab4837fdfd785bf98e3cfb57be87b633b89cb96bdd113b123a32f0b36d345
-  data.tar.gz: b485160151d82ff3fc74725eaa481fe454aafbf82248f7fe1b8373ca17c2d2f8
+  metadata.gz: 56f715c29577f9b9e9d757574336719a2e288ccf3b115094e985bacb06e65fb8
+  data.tar.gz: d2fdb11e46d322f9efe4b3038ec2becd9a3becc51b8d7c4ff44ae028cd8912ac
 SHA512:
-  metadata.gz: 6e294883202f7ffbf90d2aca9868cd63d9abc6509eb9fed08177b7b616e5edf9247daa38a7bc1b2bcc1501f62888dde39f7a2c7f2c473aa6159d01f231bb88e1
-  data.tar.gz: ed451f210ba65a9c9fe375122842d37a572abd5ffc3a0c97ec06789450bc4fab1660e4cde5e9ce1d022ba27144a6dbf815043cf7e4479720ae3b69c4da2ae80a
+  metadata.gz: 2cad1158ba4c4477a88a949856bace92e261c435675ba56491e790a189299525168f1999fee5ecee7025f49dc54693bce3347034ea36782632dd3ddfb86835de
+  data.tar.gz: ea2f842e4cec6a2040bf730dfc60d683d15638b6db71496ab5e4b3b59bf566183a982d30ab65167e41a9eb6e0002c2061c135ebb22de0edd668b69e5575bb362

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.2.70
+
+2024-09-28 11:10
+
+#### 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
+
+### 1.2.69
+
+2024-09-28 11:09
+
+#### FIXED
+
+- - @fixed Matching parenthetical notes at the end of a task entry was too greedy
+
 ### 1.2.68
 
 2024-06-23 14:30

data/Gemfile.lock

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

data/bin/commands/add.rb

@@ -2,57 +2,57 @@
 
 class App
   extend GLI::App
-  desc 'Add a new next action'
+  desc "Add a new next action"
   long_desc 'Provides an easy way to store todos while you work. Add quick
   reminders and (if you set up Prompt Hooks) they\'ll automatically display
   next time you enter the directory.
 
   If multiple todo files are found in the current directory, a menu will
   allow you to pick to which file the action gets added.'
-  arg_name 'ACTION'
+  arg_name "ACTION"
   command :add do |c|
-    c.example 'na add "A cool feature I thought of @idea"', desc: 'Add a new action to the Inbox, including a tag'
+    c.example 'na add "A cool feature I thought of @idea"', desc: "Add a new action to the Inbox, including a tag"
     c.example 'na add "A bug I need to fix" -p 4 -n',
-              desc: 'Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note.'
+              desc: "Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note."
     c.example 'na add "An action item (with a note)"',
-              desc: 'A parenthetical at the end of an action is interpreted as a note'
+              desc: "A parenthetical at the end of an action is interpreted as a note"
 
-    c.desc 'Prompt for additional notes. STDIN input (piped) will be treated as a note if present.'
+    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.arg_name 'PRIO'
+    c.desc "Add a priority level 1-5"
+    c.arg_name "PRIO"
     c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
 
-    c.desc 'Add action to specific project'
-    c.arg_name 'PROJECT'
-    c.default_value 'Inbox'
+    c.desc "Add action to specific project"
+    c.arg_name "PROJECT"
+    c.default_value "Inbox"
     c.flag %i[to project proj]
 
-    c.desc 'Add task at [s]tart or [e]nd of target project'
-    c.arg_name 'POSITION'
+    c.desc "Add task at [s]tart or [e]nd of target project"
+    c.arg_name "POSITION"
     c.flag %i[at], must_match: /^[sbea].*?$/i
 
-    c.desc 'Add to a known todo file, partial matches allowed'
-    c.arg_name 'TODO_FILE'
+    c.desc "Add to a known todo file, partial matches allowed"
+    c.arg_name "TODO_FILE"
     c.flag %i[in todo]
 
-    c.desc 'Use a tag other than the default next action tag'
-    c.arg_name 'TAG'
+    c.desc "Use a tag other than the default next action tag"
+    c.arg_name "TAG"
     c.flag %i[t tag]
 
     c.desc 'Don\'t add next action tag to new entry'
     c.switch %i[x], negatable: false
 
-    c.desc 'Specify the file to which the task should be added'
-    c.arg_name 'PATH'
+    c.desc "Specify the file to which the task should be added"
+    c.arg_name "PATH"
     c.flag %i[f file]
 
-    c.desc 'Mark task as @done with date'
+    c.desc "Mark task as @done with date"
     c.switch %i[finish done], negatable: false
 
-    c.desc 'Search for files X directories deep'
-    c.arg_name 'DEPTH'
+    c.desc "Search for files X directories deep"
+    c.arg_name "DEPTH"
     c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
 
     c.action do |global_options, options, args|
@@ -87,33 +87,31 @@ class App
         options[:todo].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           todo.push({
-                      token: m['tok'],
-                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                      token: m["tok"],
+                      required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                      negate: !m["req"].nil? && m["req"] =~ /[!\-]/,
                     })
         end
         dirs = NA.match_working_dir(todo)
         if dirs.count.positive?
           target = dirs[0]
         else
-          todo = "#{options[:todo].sub(/#{NA.extension}$/, '')}.#{NA.extension}"
+          todo = "#{options[:todo].sub(/#{NA.extension}$/, "")}.#{NA.extension}"
           target = File.expand_path(todo)
           unless File.exist?(target)
-
             res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Specified file not found, create #{todo}"), default: true)
             NA.notify("#{NA.theme[:error]}Cancelled{x}", exit_code: 1) unless res
 
             basename = File.basename(target, ".#{NA.extension}")
             NA.create_todo(target, basename, template: global_options[:template])
           end
-
         end
       else
         files = NA.find_files(depth: options[:depth])
         if files.count.zero?
           res = NA.yn(NA::Color.template("#{NA.theme[:warning]}No todo file found, create one"), default: true)
           if res
-            basename = File.expand_path('.').split('/').last
+            basename = File.expand_path(".").split("/").last
             target = "#{basename}.#{NA.extension}"
             NA.create_todo(target, basename, template: global_options[:template])
             files = NA.find_files(depth: 1)
@@ -121,59 +119,58 @@ class App
         end
         target = files.count > 1 ? NA.select_file(files) : files[0]
         NA.notify("#{NA.theme[:error]}Cancelled{x}", exit_code: 1) unless files.count.positive? && File.exist?(target)
-
       end
 
       action = if args.count.positive?
-                 args.join(' ').strip
-               else
-                 NA.request_input(options, prompt: 'Enter a task')
-               end
+          args.join(" ").strip
+        else
+          NA.request_input(options, prompt: "Enter a task")
+        end
 
       if action.nil? || action.empty?
-        puts 'Empty input, cancelled'
+        puts "Empty input, cancelled"
         Process.exit 1
       end
 
+      note_rx = /^(.+) \(([^)]+)\)$/
+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]})"
+        action = "#{action.gsub(/@priority\(\d+\)/, "")} @priority(#{options[:priority]})"
       end
 
-      note_rx = /^(.+) \((.*?)\)$/
-      split_note = if action =~ note_rx
-                     n = Regexp.last_match(2)
-                     action.sub!(note_rx, '\1').strip!
-                     n
-                   end
-
       na_tag = NA.na_tag
       if options[:x]
-        na_tag = ''
+        na_tag = ""
       else
         na_tag = options[:tag] unless options[:tag].nil?
         na_tag = " @#{na_tag}"
       end
 
-      action = "#{action.gsub(/#{na_tag}\b/, '')}#{na_tag}"
+      action = "#{action.gsub(/#{na_tag}\b/, "")}#{na_tag}"
 
       stdin_note = NA.stdin ? NA.stdin.split("\n") : []
 
       line_note = if options[:note] && $stdin.isatty
-                    puts stdin_note unless stdin_note.nil?
-                    if TTY::Which.exist?('gum')
-                      args = ['--placeholder "Enter additional note, CTRL-d to save"']
-                      args << '--char-limit 0'
-                      args << '--width $(tput cols)'
-                      `gum write #{args.join(' ')}`.strip.split("\n")
-                    else
-                      NA.notify("#{NA.theme[:prompt]}Enter a note, {bw}CTRL-d#{NA.theme[:prompt]} to end editing#{NA.theme[:action]}")
-                      reader.read_multiline
-                    end
-                  end
+          puts stdin_note unless stdin_note.nil?
+          if TTY::Which.exist?("gum")
+            args = ['--placeholder "Enter additional note, CTRL-d to save"']
+            args << "--char-limit 0"
+            args << "--width $(tput cols)"
+            `gum write #{args.join(" ")}`.strip.split("\n")
+          else
+            NA.notify("#{NA.theme[:prompt]}Enter a note, {bw}CTRL-d#{NA.theme[:prompt]} to end editing#{NA.theme[:action]}")
+            reader.read_multiline
+          end
+        end
 
       note = stdin_note.empty? ? [] : stdin_note
-      note.concat(split_note) unless split_note.nil?
-      note.concat(line_note) unless line_note.nil?
+      note.<< split_note unless split_note.nil?
+      note << line_note unless line_note.nil?
 
       NA.add_action(target, options[:project], action, note, finish: options[:finish], append: append)
     end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.68'
+  VERSION = '1.2.70'
 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.67<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.68<!--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.68
+  version: 1.2.70
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-23 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos