na 1.2.17 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230088b77bc3f8e3aa56fe5ba96505678d0ef3b809a38eccf96fb8be2109cf3d
-  data.tar.gz: 87d16ea051d5c9c8e719777399cc4c3bb8ee3806c8ccbffaba80e1a429784844
+  metadata.gz: 580a58387aafdf48e220483783dff100a26f370e5ac685239dcf2cff416793cc
+  data.tar.gz: 04ec4cd4089b00ab65688e6fb88509971f01ef605b88956e9ecf4e523b175067
 SHA512:
-  metadata.gz: 98e10fb95e67d9a86c89b34a5b21f5aefb61a66a239b205720a9ecf2979a5e57a39009c52cd17a12dde1a772e29b6ec3f3feb074d408ea233b5b64abb76d0494
-  data.tar.gz: c7880dd277c7a82c12bc1781b5d1ed5be84b2eaf21a4e4dcbcc8ddd3d28820252cc3f67c57794b3239331a43ce81e303b087358d76ec32a40618d9bee3c4e367
+  metadata.gz: 4ff3cd0df2c68db3baa5022d5d9cb6dc7f61684aef2b50485cf4022ea4169dcc547b433fd2e42e454c21e29fb8dcd4f04fc7caaf9ae64de9e42dd0c57d4a882d
+  data.tar.gz: da239f2e39fbfbc514c321867b1068b1cc1e16e02e6b068cc1cd53024354baac2955442d0db8aed9ff495bb62ed68116f1f06ae6c0ddc0915cbe168ddc2a91b9

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.2.18
+
+2023-01-17 13:38
+
+#### IMPROVED
+
+- Format tags OmniFocus wouldn't recognize as @tags(TAG) in --nest output
+- Include notes in --nest output
+
 ### 1.2.17
 
 2023-01-17 11:23

data/Gemfile.lock

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

data/lib/na/next_action.rb

@@ -414,7 +414,7 @@ module NA
           current_parent = current_parent[par]
         end
 
-        current_parent[:actions].push(a.action)
+        current_parent[:actions].push(a)
       end
       parents
     end
@@ -425,7 +425,27 @@ module NA
       children.each do |k, v|
         if k.to_s =~ /actions/
           indent += "\t"
-          v.each { |a| out.push("#{indent}- #{a}")}
+
+          v.each do |a|
+            item = "#{indent}- #{a.action}"
+
+            unless a.tags.empty?
+              tags = []
+              a.tags.each do |k, v|
+                next if k =~ /^(due|flagged|done)$/
+
+                tag = k
+                tag += "-#{v}" unless v.nil? || v.empty?
+                tags.push(tag)
+              end
+
+              item += " @tags(#{tags.join(',')})" unless tags.empty?
+            end
+
+            item += "\n#{indent}\t#{a.note.join("\n#{indent}\t")}" if !a.note.empty?
+
+            out.push(item)
+          end
         else
           out.push("#{indent}#{k}:")
           out.concat(output_children(v, level + 1))
@@ -461,7 +481,7 @@ module NA
         out = []
         parent_files.each do |file, actions|
           projects = project_hierarchy(actions)
-          out.push("#{file.sub(%r{^./}, '')}:")
+          out.push("#{file.sub(%r{^./}, '').shorten_path}:")
           out.concat(output_children(projects, 0))
         end
         puts out.join("\n")

data/lib/na/string.rb

@@ -167,6 +167,15 @@ class ::String
     end
   end
 
+  ##
+  ## Replace home directory with tilde
+  ##
+  ## @return     [String] shortened path
+  ##
+  def shorten_path
+    sub(/^#{ENV['HOME']}/, '~')
+  end
+
   private
 
   def matches_none(regexes)

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.17'
+  VERSION = '1.2.18'
 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.16<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.17<!--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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - Brett Terpstra