na 1.2.15 → 1.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2ce71562668eb958d8056e6f226329839fe872575eb0f6dba5220aedbc09a5
-  data.tar.gz: c1461870c50b6665a0269c7be2e05130cf8c94ab1fd8a929b4566c391b81a8e4
+  metadata.gz: 8d8da07f9b65304b26e03aeeb38af43e72fb378eb016efdee8eac61b9c992609
+  data.tar.gz: 62710fb19fec1f6ddf4e06c4cc12b3f5c3d7a8fd646dc792593d72a4c01065df
 SHA512:
-  metadata.gz: f5fe87068b1ad84b747f35e255ddd64687c90733b9526e41c258e13557ccc9396b8025ef42acf3fd90a7facb6049a4907f099c36f8ef4977ac479aab5d451a07
-  data.tar.gz: 702e69f47f8baf069fe398ac3daac5615c56095377df31b91e93edb6a94dae8682ab4fb2574c8f57b419a6ddf2fc61938def7c598990c60aeb722ccb7af9f97b
+  metadata.gz: e7dee3f47d88e9dcdea8d10f585685452124de43e32b1279a057167bc86a96fc709c662064951c5690ff5b7c7f685b77268b29931e8cd5cd562220e95df96847
+  data.tar.gz: 794c1a1e458d61326165e56a21de4e2792a7a0247404fc584c7a6ecebea029892fd988ea602039a48006c5f5aeed7e883f8bff114346d01c5df1b5eb3a7e7d26

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.2.16
+
+2023-01-17 10:13
+
+#### NEW
+
+- `na next --nest` will output a TaskPaper format list of actions grouped under their respective files with the filename as the containing project
+
+#### FIXED
+
+- Better solution to target_proj nil error
+
 ### 1.2.15
 
 2022-11-28 10:58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.15)
+    na (1.2.16)
       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.15
+The current version of `na` is 1.2.16
 .
 
 `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.15
+    1.2.16
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -272,6 +272,7 @@ COMMAND OPTIONS
     --[no-]done                            - Include @done actions
     --[no-]exact                           - Search query is exact text match (not tokens)
     --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
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --[no-]regex                           - Search query is regular expression
@@ -376,6 +377,7 @@ COMMAND OPTIONS
     --[no-]done                            - Include @done actions
     --[no-]exact                           - Search query is exact text match (not tokens)
     --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
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     --[no-]regex                           - Search query is regular expression

data/bin/na

@@ -115,6 +115,9 @@ class App
     c.desc 'Include @done actions'
     c.switch %i[done]
 
+    c.desc 'Output actions nested by file'
+    c.switch %[nest]
+
     c.action do |global_options, options, args|
       if global_options[:add]
         cmd = ['add']
@@ -196,7 +199,11 @@ class App
                                          project: options[:project],
                                          require_na: require_na)
 
-      NA.output_actions(actions, depth, files: files, notes: options[:notes])
+      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
     end
   end
 

data/lib/na/next_action.rb

@@ -330,12 +330,8 @@ module NA
           contents.slice!(action.line, action.note.count + 1)
           next if delete
 
-          target_proj = action.project if target_proj.nil?
-
           projects = shift_index_after(projects, action.line, action.note.count + 1)
 
-          target_proj = projects.select { |proj| proj.project =~ /^#{target_proj.project}$/ }.first
-
           action = process_action(action, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
           target_proj = if target_proj
@@ -440,6 +436,32 @@ module NA
       puts(actions.map { |action| action.pretty(template: { output: template }, regexes: regexes, notes: notes) })
     end
 
+    def output_actions_by_file(actions, depth, files: nil, regexes: [], notes: false)
+      return if files.nil?
+
+      template = '%parent%action'
+
+      parent_files = {}
+
+      actions.each do |action|
+        if parent_files.key?(action.file)
+          parent_files[action.file].push(action)
+        else
+          parent_files[action.file] = [action]
+        end
+      end
+
+      out = []
+      parent_files.each do |k, v|
+        out.push("#{k.sub(%r{^\./}, '')}:")
+        v.each do |a|
+          out.push("  - [#{a.parent.join('/')}] #{a.action}")
+        end
+      end
+
+      puts out.join("\n")
+    end
+
     ##
     ## Read a todo file and create a list of actions
     ##

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.15'
+  VERSION = '1.2.16'
 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.14<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.15<!--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.15
+  version: 1.2.16
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-28 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake