na 1.2.16 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d8da07f9b65304b26e03aeeb38af43e72fb378eb016efdee8eac61b9c992609
-  data.tar.gz: 62710fb19fec1f6ddf4e06c4cc12b3f5c3d7a8fd646dc792593d72a4c01065df
+  metadata.gz: 580a58387aafdf48e220483783dff100a26f370e5ac685239dcf2cff416793cc
+  data.tar.gz: 04ec4cd4089b00ab65688e6fb88509971f01ef605b88956e9ecf4e523b175067
 SHA512:
-  metadata.gz: e7dee3f47d88e9dcdea8d10f585685452124de43e32b1279a057167bc86a96fc709c662064951c5690ff5b7c7f685b77268b29931e8cd5cd562220e95df96847
-  data.tar.gz: 794c1a1e458d61326165e56a21de4e2792a7a0247404fc584c7a6ecebea029892fd988ea602039a48006c5f5aeed7e883f8bff114346d01c5df1b5eb3a7e7d26
+  metadata.gz: 4ff3cd0df2c68db3baa5022d5d9cb6dc7f61684aef2b50485cf4022ea4169dcc547b433fd2e42e454c21e29fb8dcd4f04fc7caaf9ae64de9e42dd0c57d4a882d
+  data.tar.gz: da239f2e39fbfbc514c321867b1068b1cc1e16e02e6b068cc1cd53024354baac2955442d0db8aed9ff495bb62ed68116f1f06ae6c0ddc0915cbe168ddc2a91b9

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 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
+
+#### IMPROVED
+
+- `--nest` works with `find` and `tagged`
+- `--nest` creates heirarchy of parent projects, indented TaskPaper style
+
 ### 1.2.16
 
 2023-01-17 10:13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.16)
+    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.16
+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.16
+    1.2.18
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -210,6 +210,7 @@ COMMAND OPTIONS
     --[no-]done                            - Include @done actions
     -e, --regex                            - Interpret search pattern as regular expression
     --in=TODO_PATH                         - Show actions from a specific todo file in history. May use wildcards (* and ?) (default: none)
+    --[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
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)

data/bin/na

@@ -199,11 +199,7 @@ class App
                                          project: options[:project],
                                          require_na: require_na)
 
-      if options[:nest]
-        NA.output_actions_by_file(actions, depth, files: files, notes: options[:notes])
-      else
-        NA.output_actions(actions, depth, files: files, notes: options[:notes])
-      end
+      NA.output_actions(actions, depth, files: files, notes: options[:notes], nest: options[:nest])
     end
   end
 
@@ -659,6 +655,9 @@ class App
     c.arg_name 'TITLE'
     c.flag %i[save]
 
+    c.desc 'Output actions nested by file'
+    c.switch %[nest]
+
     c.action do |global_options, options, args|
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
@@ -732,7 +731,7 @@ class App
                   [tokens]
                 end
 
-      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes])
+      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest])
     end
   end
 
@@ -790,6 +789,9 @@ class App
     c.arg_name 'TITLE'
     c.flag %i[save]
 
+    c.desc 'Output actions nested by file'
+    c.switch %[nest]
+
     c.action do |global_options, options, args|
       if options[:save]
         title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
@@ -869,7 +871,7 @@ class App
                 else
                   [tokens]
                 end
-      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes])
+      NA.output_actions(actions, depth, files: files, regexes: regexes, notes: options[:notes], nest: options[:nest])
     end
   end
 

data/lib/na/next_action.rb

@@ -18,7 +18,6 @@ module NA
 
       $stderr.puts NA::Color.template("{x}#{msg}{x}")
       Process.exit exit_code if exit_code
-
     end
 
     ##
@@ -403,6 +402,58 @@ module NA
       update_action(file, nil, add: action, project: project, add_tag: add_tag, priority: priority, finish: finish, append: append)
     end
 
+    def project_hierarchy(actions)
+      parents = { actions: []}
+      actions.each do |a|
+        parent = a.parent
+        current_parent = parents
+        parent.each do |par|
+          if !current_parent.key?(par)
+            current_parent[par] = { actions: [] }
+          end
+          current_parent = current_parent[par]
+        end
+
+        current_parent[:actions].push(a)
+      end
+      parents
+    end
+
+    def output_children(children, level = 1)
+      out = []
+      indent = "\t" * level
+      children.each do |k, v|
+        if k.to_s =~ /actions/
+          indent += "\t"
+
+          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))
+        end
+      end
+      out
+    end
+
     ##
     ## Pretty print a list of actions
     ##
@@ -411,55 +462,52 @@ 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)
+    def output_actions(actions, depth, files: nil, regexes: [], notes: false, nest: false)
       return if files.nil?
 
-      template = if files.count.positive?
-                   if files.count == 1
-                     '%parent%action'
-                   else
-                     '%filename%parent%action'
-                   end
-                 elsif find_files(depth: depth).count > 1
-                   if depth > 1
-                     '%filename%parent%action'
-                   else
-                     '%project%parent%action'
-                   end
-                 else
-                   '%parent%action'
-                 end
-      template += '%note' if notes
-
-      files.map { |f| notify("{dw}#{f}", debug: true) } if files
+      if nest
+        template = '%parent%action'
 
-      puts(actions.map { |action| action.pretty(template: { output: template }, regexes: regexes, notes: notes) })
-    end
+        parent_files = {}
 
-    def output_actions_by_file(actions, depth, files: nil, regexes: [], notes: false)
-      return if files.nil?
+        actions.each do |action|
+          if parent_files.key?(action.file)
+            parent_files[action.file].push(action)
+          else
+            parent_files[action.file] = [action]
+          end
+        end
 
-      template = '%parent%action'
+        out = []
+        parent_files.each do |file, actions|
+          projects = project_hierarchy(actions)
+          out.push("#{file.sub(%r{^./}, '').shorten_path}:")
+          out.concat(output_children(projects, 0))
+        end
+        puts out.join("\n")
+      else
 
-      parent_files = {}
+        template = if files.count.positive?
+                     if files.count == 1
+                       '%parent%action'
+                     else
+                       '%filename%parent%action'
+                     end
+                   elsif find_files(depth: depth).count > 1
+                     if depth > 1
+                       '%filename%parent%action'
+                     else
+                       '%project%parent%action'
+                     end
+                   else
+                     '%parent%action'
+                   end
+        template += '%note' if notes
 
-      actions.each do |action|
-        if parent_files.key?(action.file)
-          parent_files[action.file].push(action)
-        else
-          parent_files[action.file] = [action]
-        end
-      end
+        files.map { |f| notify("{dw}#{f}", debug: true) } if files
 
-      out = []
-      parent_files.each do |k, v|
-        out.push("#{k.sub(%r{^\./}, '')}:")
-        v.each do |a|
-          out.push("  - [#{a.parent.join('/')}] #{a.action}")
-        end
+        puts(actions.map { |action| action.pretty(template: { output: template }, regexes: regexes, notes: notes) })
       end
-
-      puts out.join("\n")
     end
 
     ##

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.16'
+  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.15<!--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.16
+  version: 1.2.18
 platform: ruby
 authors:
 - Brett Terpstra