na 1.2.18 → 1.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580a58387aafdf48e220483783dff100a26f370e5ac685239dcf2cff416793cc
-  data.tar.gz: 04ec4cd4089b00ab65688e6fb88509971f01ef605b88956e9ecf4e523b175067
+  metadata.gz: 20a02c7a0e5644aa0aef147e434a8d6dc9daa1705a50e9563255a7c2f6688267
+  data.tar.gz: a097a253c572eb83c2fd74b6ba978fbbe5f328d804cdd309af6a6e66e682d384
 SHA512:
-  metadata.gz: 4ff3cd0df2c68db3baa5022d5d9cb6dc7f61684aef2b50485cf4022ea4169dcc547b433fd2e42e454c21e29fb8dcd4f04fc7caaf9ae64de9e42dd0c57d4a882d
-  data.tar.gz: da239f2e39fbfbc514c321867b1068b1cc1e16e02e6b068cc1cd53024354baac2955442d0db8aed9ff495bb62ed68116f1f06ae6c0ddc0915cbe168ddc2a91b9
+  metadata.gz: 33c341298f6c7855dce8541f185aa46bf2d7d08cb5f97d709fda5fe1e0cf1537cec96297c80a88b1e69fb9089c7d15219d943dc4704a3fcca60be58b0e430ff6
+  data.tar.gz: 3c000719d4b5d7d2f6713c1865cdcc713878eac017379e40fffc98199843abbb23c4517b0a621ed80ae1b7d8a11d35633f820c48c38c8261ff833d39e23ae675

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+### 1.2.20
+
+2023-05-09 10:40
+
+#### FIXED
+
+- Allow single character projects
+- Allow parens in project title
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.18)
+    na (1.2.20)
       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.18
+The current version of `na` is 1.2.20
 .
 
 `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.18
+    1.2.20
 
 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/Rakefile

@@ -15,7 +15,7 @@ task :doc, [*Rake.application[:yard].arg_names] => [:yard]
 Rake::RDocTask.new do |rd|
   rd.main = "README.rdoc"
   rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
-  rd.title = 'Your application title'
+  rd.title = 'na'
 end
 
 spec = eval(File.read('na.gemspec'))

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

@@ -431,18 +431,18 @@ module NA
 
             unless a.tags.empty?
               tags = []
-              a.tags.each do |k, v|
-                next if k =~ /^(due|flagged|done)$/
+              a.tags.each do |key, val|
+                next if key =~ /^(due|flagged|done)$/
 
-                tag = k
-                tag += "-#{v}" unless v.nil? || v.empty?
+                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")}" if !a.note.empty?
+            item += "\n#{indent}\t#{a.note.join("\n#{indent}\t")}" unless a.note.empty?
 
             out.push(item)
           end
@@ -462,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{^./}, '').shorten_path}:")
-          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

@@ -35,7 +35,7 @@ class ::String
   end
 
   def project
-    m = match(/^([ \t]*)([^\-][^@()]+?): *(@\S+ *)*$/)
+    m = match(/^([ \t]*)([^\-][^@:]*?): *(@\S+ *)*$/)
     m ? m[2] : nil
   end
 

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.18'
+  VERSION = '1.2.20'
 end

data/scripts/fixreadme.rb

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 current_ver = `rake cver`
-src = 'src/README.md'
+src = 'src/_README.md'
 dest = 'README.md'
 
 readme = IO.read(src).force_encoding('ASCII-8BIT').encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')

data/src/{README.md → _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.17<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.19<!--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.18
+  version: 1.2.20
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -219,7 +219,7 @@ files:
 - na.gemspec
 - na.rdoc
 - scripts/fixreadme.rb
-- src/README.md
+- src/_README.md
 homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT