na 1.1.25 → 1.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62880dc0ab0313e02a68a0a7f40b36698a1d726000b38ade8681688b63f0c803
-  data.tar.gz: '0078690a38f209a84d3ee4cce9d75c189ac771d9db63c283bb815eb44518038b'
+  metadata.gz: abe0279bc67c68bbdd675f73c87ed92eaf9fd3b3527ea6160caeff51b95fc476
+  data.tar.gz: 355cd4c65381775e4b2fea514d855be15b557ba1961e59c272d0cddcefa172f4
 SHA512:
-  metadata.gz: f02db71885150be723a415da09fac878d0f4621ca91c58cc9eca11c3748a74406e54ca6f9cc16ed63ea8008325bd60ec8b694940c765ff19013e412465afb67f
-  data.tar.gz: ebb292d4689aaa942146f00c451faee7ecc8994e7feef0a9b498f7ab70cfbd97fcafcc80cf7f4e25a44837932f60f4f5bf891fec29b754a5f5f4d20fcef21a5f
+  metadata.gz: c434d27ed1659ce0a3879843150f17254a27ddfdb15fd1e223e826f4fdd4e45a58102fbc35cf89dfa8357c43a074eea40094b7e876ade3a2b08d95a2e1f95077
+  data.tar.gz: 4eab4522844ca97d70f9f6daa38a03dfcffd3ecaf9a0fcdb9a3532fcead64bd918676c1cf3c9f157b16ec667b1e4b206094b84e69e51f4751f0ca986b3395fe5

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.1.26
+
+2022-10-15 10:36
+
+#### IMPROVED
+
+- A parenthetical at the end of an action will be interpreted as a note. If --note is additionally supplied, entered note is concatenated to parenthetical note.
+- Allow multi-line notes
+
 ### 1.1.25
 
 2022-10-12 08:37

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.25)
+    na (1.1.26)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.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.1.25
+The current version of `na` is 1.1.26
 .
 
 `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. 
@@ -59,7 +59,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.1.25
+    1.1.26
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -122,6 +122,9 @@ EXAMPLES
 
     # Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note
     na add "A bug I need to fix" -p 4 -n
+
+    # A parenthetical at the end of an action is interpreted as a note
+    na add "An action item (with a note)"
 ```
 
 ##### edit

data/bin/na

@@ -133,6 +133,8 @@ class App
     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'
+    c.example 'na add "An action item (with a note)"',
+              desc: 'A parenthetical at the end of an action is interpreted as a note'
 
     c.desc 'Prompt for additional notes'
     c.switch %i[n note], negatable: false
@@ -181,6 +183,13 @@ class App
         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 = ''
@@ -191,17 +200,21 @@ class App
 
       action = "#{action.gsub(/#{na_tag}\b/, '')}#{na_tag}"
 
-      note = if options[:note]
-               if TTY::Which.exist?('gum')
-                 args = ['--placeholder "Enter a note, CTRL-d to save"']
-                 args << '--char-limit 0'
-                 args << '--width $(tput cols)'
-                 `gum write #{args.join(' ')}`.strip.split("\n")
-               else
-                 puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
-                 reader.read_multiline
-               end
-             end
+      line_note = if options[:note]
+                    if TTY::Which.exist?('gum')
+                      args = ['--placeholder "Enter a note, CTRL-d to save"']
+                      args << '--char-limit 0'
+                      args << '--width $(tput cols)'
+                      `gum write #{args.join(' ')}`.strip.split("\n")
+                    else
+                      puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
+                      reader.read_multiline
+                    end
+                  end
+
+      note = split_note.nil? ? [] : [split_note]
+      note.concat(line_note) unless line_note.nil?
+      note = nil if note.empty?
 
       if options[:file]
         target = File.expand_path(options[:file])

data/lib/na/next_action.rb

@@ -153,7 +153,8 @@ module NA
       # Insert the action at the top of the target project
       content.sub!(/^([ \t]*)#{project}:(.*?)$/i) do
         m = Regexp.last_match
-        note = note.nil? ? '' : "\n#{m[1]}\t\t#{note.join('').strip}"
+        indent = "\n#{m[1]}\t\t"
+        note = note.nil? ? '' : "#{indent}#{note.join(indent).strip}"
         "#{m[1]}#{project.cap_first}:#{m[2]}\n#{m[1]}\t- #{action}#{note}"
       end
 

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.25'
+  VERSION = '1.1.26'
 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.1.24<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.25<!--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.1.25
+  version: 1.1.26
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,22 +90,22 @@ dependencies:
   name: tty-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -130,22 +130,22 @@ dependencies:
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - na
@@ -225,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.16
+signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos
 test_files: []