na 1.2.17 → 1.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230088b77bc3f8e3aa56fe5ba96505678d0ef3b809a38eccf96fb8be2109cf3d
-  data.tar.gz: 87d16ea051d5c9c8e719777399cc4c3bb8ee3806c8ccbffaba80e1a429784844
+  metadata.gz: 8c8bbd644e758263ac0301010b89259ad0e97debaba7d1cdfe51f4fd67e4c323
+  data.tar.gz: 8f0a1f3e385f8b82b2afd376d2316e43d993493bf10974fc82040de6d4b89a28
 SHA512:
-  metadata.gz: 98e10fb95e67d9a86c89b34a5b21f5aefb61a66a239b205720a9ecf2979a5e57a39009c52cd17a12dde1a772e29b6ec3f3feb074d408ea233b5b64abb76d0494
-  data.tar.gz: c7880dd277c7a82c12bc1781b5d1ed5be84b2eaf21a4e4dcbcc8ddd3d28820252cc3f67c57794b3239331a43ce81e303b087358d76ec32a40618d9bee3c4e367
+  metadata.gz: aad67239d2046f7347700da92676ae0c3652631413fbc0c17d533036007f0b5147d1d8b161b1b38aaecf124c5740077faf42b8dcc6cff6a76d37fe7398758d62
+  data.tar.gz: 2cf613349b29074b015e7394ba659b8200451eb950b965137b5c3b4a7a41108b98a70b4e66ac1bc3f6b23cd821b31de3a53db37cec8b662705af4af72042e334

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.2.19
+
+2023-01-17 16:49
+
+#### IMPROVED
+
+- `--nest` flag creates a flat list with project included in task title, `--omnifocus` creates OmniFocus-compatible project nesting
+
+### 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.19)
       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.19
 .
 
 `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.19
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -213,6 +213,7 @@ COMMAND OPTIONS
     --[no-]nest                            - Output actions nested by file
     --[no-]notes                           - Include notes in output
     -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
+    --[no-]omnifocus                       - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --save=TITLE                           - Save this search for future use (default: none)
     --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
@@ -275,6 +276,7 @@ COMMAND OPTIONS
     --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
     --[no-]nest                            - Output actions nested by file
     --[no-]notes                           - Include notes in output
+    --[no-]omnifocus                       - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --[no-]regex                           - Search query is regular expression
     --search=QUERY                         - Filter results using search terms (may be used more than once, default: none)
@@ -380,6 +382,7 @@ COMMAND OPTIONS
     --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
     --[no-]nest                            - Output actions nested by file
     --[no-]notes                           - Include notes in output
+    --[no-]omnifocus                       - Output actions nested by file and project
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --[no-]regex                           - Search query is regular expression
     --search=QUERY                         - Filter results using search terms (may be used more than once, default: none)

data/bin/na

@@ -118,6 +118,9 @@ class App
     c.desc 'Output actions nested by file'
     c.switch %[nest]
 
+    c.desc 'Output actions nested by file and project'
+    c.switch %[omnifocus]
+
     c.action do |global_options, options, args|
       if global_options[:add]
         cmd = ['add']
@@ -128,6 +131,8 @@ class App
         exit run(cmd)
       end
 
+      options[:nest] = true if options[:omnifocus]
+
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
@@ -199,7 +204,7 @@ class App
                                          project: options[:project],
                                          require_na: require_na)
 
-      NA.output_actions(actions, depth, files: files, notes: options[:notes], nest: options[:nest])
+      NA.output_actions(actions, depth, files: files, notes: options[:notes], nest: options[:nest], nest_projects: options[:omnifocus])
     end
   end
 
@@ -658,12 +663,18 @@ class App
     c.desc 'Output actions nested by file'
     c.switch %[nest]
 
+    c.desc 'Output actions nested by file and project'
+    c.switch %[omnifocus]
+
     c.action do |global_options, options, args|
+      options[:nest] = true if options[:omnifocus]
+
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
         NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')}")
       end
 
+
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
@@ -731,7 +742,7 @@ class App
                   [tokens]
                 end
 
-      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest])
+      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest], nest_projects: options[:omnifocus])
     end
   end
 
@@ -792,7 +803,12 @@ class App
     c.desc 'Output actions nested by file'
     c.switch %[nest]
 
+    c.desc 'Output actions nested by file and project'
+    c.switch %[omnifocus]
+
     c.action do |global_options, options, args|
+      options[:nest] = true if options[:omnifocus]
+
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
         NA.save_search(title, "#{NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')}")
@@ -871,7 +887,7 @@ class App
                 else
                   [tokens]
                 end
-      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest])
+      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest], nest_projects: options[:omnifocus])
     end
   end
 

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 |key, val|
+                next if key =~ /^(due|flagged|done)$/
+
+                tag = key
+                tag += "-#{val}" unless val.nil? || val.empty?
+                tags.push(tag)
+              end
+
+              item += " @tags(#{tags.join(',')})" unless tags.empty?
+            end
+
+            item += "\n#{indent}\t#{a.note.join("\n#{indent}\t")}" unless a.note.empty?
+
+            out.push(item)
+          end
         else
           out.push("#{indent}#{k}:")
           out.concat(output_children(v, level + 1))
@@ -442,31 +462,50 @@ module NA
     ## @param      files    [Array] The files actions originally came from
     ## @param      regexes  [Array] The regexes used to gather actions
     ##
-    def output_actions(actions, depth, files: nil, regexes: [], notes: false, nest: false)
+    def output_actions(actions, depth, files: nil, regexes: [], notes: false, nest: false, nest_projects: false)
       return if files.nil?
 
       if nest
         template = '%parent%action'
 
         parent_files = {}
+        out = []
 
-        actions.each do |action|
-          if parent_files.key?(action.file)
-            parent_files[action.file].push(action)
-          else
-            parent_files[action.file] = [action]
+        if nest_projects
+          actions.each do |action|
+            if parent_files.key?(action.file)
+              parent_files[action.file].push(action)
+            else
+              parent_files[action.file] = [action]
+            end
           end
-        end
 
-        out = []
-        parent_files.each do |file, actions|
-          projects = project_hierarchy(actions)
-          out.push("#{file.sub(%r{^./}, '')}:")
-          out.concat(output_children(projects, 0))
+          parent_files.each do |file, acts|
+            projects = project_hierarchy(acts)
+            out.push("#{file.sub(%r{^./}, '').shorten_path}:")
+            out.concat(output_children(projects, 0))
+          end
+        else
+          template = '%parent%action'
+
+          actions.each do |action|
+            if parent_files.key?(action.file)
+              parent_files[action.file].push(action)
+            else
+              parent_files[action.file] = [action]
+            end
+          end
+
+          parent_files.each do |k, v|
+            out.push("#{k.sub(%r{^\./}, '')}:")
+            v.each do |a|
+              out.push("\t- [#{a.parent.join('/')}] #{a.action}")
+              out.push("\t\t#{a.note.join("\n\t\t")}") unless a.note.empty?
+            end
+          end
         end
         puts out.join("\n")
       else
-
         template = if files.count.positive?
                      if files.count == 1
                        '%parent%action'

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.19'
 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.18<!--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.19
 platform: ruby
 authors:
 - Brett Terpstra