na 1.2.57 → 1.2.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c03dd74aa5ba19d5a9c43177cdded736a7e679634ae0adedded1875a88c838e6
-  data.tar.gz: 46c70464363e14637bc72324c6731b971b97b03a385a07bd16aeb7b005eaebe9
+  metadata.gz: 271fbdd631a1b52f0f642ceb291de5b1827282b568d0b510d4cf3ab745660327
+  data.tar.gz: 730d5d92191a55c352282429f16215a0a2aab0087bb7072278034d44340ac0ac
 SHA512:
-  metadata.gz: ea8ad6bc44298b305cce2c77d8d6ca787bf3240f69f5494e9a580cef4d803c0b6aaa5205e75187901aba73358440192ed56ba2ff55e024a98914a02221b987ce
-  data.tar.gz: 8b842f443cec04f487700a8f2a31914df683c558dbb1ebcf8196d2987a8f5bb23344c60a26cbbfcac4caed8ed617a50d77634bbe80bf54d6628f7ff2e07c9987
+  metadata.gz: 9b67d5f684b95260f3df6b991b9ad86004ab0a55a088f71aaf7028ac41671538109315dbc8e96188cc4ab3efd37472d1da1d3bf2c1f51cd2af3757bf687f5463
+  data.tar.gz: 8c3af84aac1bcc1355dcc0eb116146c28cbb2da00d6d636516a58d533bb71aff02960034fcdad9773989e746a01d7e64e0865bf20f3896092ecb4edf7a1475df

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 1.2.59
+
+2023-10-03 07:43
+
+#### IMPROVED
+
+- Ignore all YAML headers, even with empty values (which can be mistaked for a project)
+
+#### FIXED
+
+- Inserting new project after first project or inside of existing project
+
+### 1.2.58
+
+2023-09-12 14:11
+
+#### NEW
+
+- `na next --all` to display next actions from all known todo files (any directory)
+
+#### IMPROVED
+
+- Middle truncate directory names longer than 1/3 of the screen width
+
 ### 1.2.57
 
 2023-09-11 16:43

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.57)
+    na (1.2.59)
       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.57
+The current version of `na` is 1.2.59
 .
 
 `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.57
+    1.2.59
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -284,6 +284,7 @@ DESCRIPTION
     Next actions are actions which contain the next action tag (default @na),   do not contain @done, and are not in the Archive project.   Arguments will target a todo file from history, whether it's in the current   directory or not. Todo file queries can include path components separated by /   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma). 
 
 COMMAND OPTIONS
+    --all                                  - Show next actions from all known todo files (in any directory)
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
     --exact                                - Search query is exact text match (not tokens)
@@ -397,6 +398,7 @@ DESCRIPTION
     Next actions are actions which contain the next action tag (default @na),   do not contain @done, and are not in the Archive project.   Arguments will target a todo file from history, whether it's in the current   directory or not. Todo file queries can include path components separated by /   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma). 
 
 COMMAND OPTIONS
+    --all                                  - Show next actions from all known todo files (in any directory)
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
     --exact                                - Search query is exact text match (not tokens)

data/bin/commands/next.rb

@@ -19,6 +19,9 @@ class App
     c.arg_name 'DEPTH'
     c.flag %i[d depth], type: :integer, must_match: /^[1-9]$/
 
+    c.desc 'Show next actions from all known todo files (in any directory)'
+    c.switch %i[all], negatable: false, default_value: false
+
     c.desc 'Display matches from a known todo file'
     c.arg_name 'TODO_FILE'
     c.flag %i[in todo], multiple: true
@@ -121,6 +124,7 @@ class App
       end
 
       args.concat(options[:in])
+      args << '*' if options[:all]
       if args.count.positive?
         all_req = args.join(' ') !~ /(?<=[, ])[+!-]/
 
@@ -137,9 +141,7 @@ class App
         end
       end
 
-      search_for_done = false
-      tags.each { |tag| search_for_done = true if tag[:tag] =~ /done/ }
-      options[:done] = true if search_for_done
+      options[:done] = true if tags.any? { |tag| tag[:tag] =~ /done/ }
 
       search_tokens = nil
       if options[:exact]

data/lib/na/next_action.rb

@@ -203,7 +203,7 @@ module NA
           content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         else
           split = content.split(/\n/)
-          line = todo.projects.first&.last_line || 0
+          line = todo.projects.first&.line || 0
           before = split.slice(0, line).join("\n")
           after = split.slice(line, split.count - 0).join("\n")
           content = "#{before}\n#{input.join("\n")}\n#{after}"
@@ -654,7 +654,6 @@ module NA
         File.open(db, 'w') { |f| f.puts }
         []
       end
-
     end
 
     def move_deprecated_backups

data/lib/na/string.rb

@@ -90,7 +90,7 @@ class ::String
   ## @return     Colorized string
   ##
   def highlight_filename
-    dir = File.dirname(self).shorten_path
+    dir = File.dirname(self).shorten_path.trunc_middle(TTY::Screen.columns / 3)
     file = NA.include_ext ? File.basename(self) : File.basename(self, ".#{NA.extension}")
     "#{NA.theme[:dirname]}#{dir}/#{NA.theme[:filename]}#{file}{x}"
   end
@@ -148,6 +148,16 @@ class ::String
     string
   end
 
+  def trunc_middle(max)
+    return self unless length > max
+
+    half = (max / 2).floor - 3
+    chars = split('')
+    pre = chars.slice(0, half)
+    post = chars.reverse.slice(0, half).reverse
+    "#{pre.join('')}[...]#{post.join('')}"
+  end
+
   def wrap(width, indent)
     return "\n#{self}" if width <= 80
 

data/lib/na/todo.rb

@@ -99,9 +99,14 @@ module NA
         content = file.read_file
         indent_level = 0
         parent = []
+        in_yaml = false
         in_action = false
         content.split(/\n/).each.with_index do |line, idx|
-          if line.project?
+          if in_yaml && line !~ /^(---|~~~)\s*$/
+            NA.notify("YAML: #{line}", debug: true)
+          elsif line =~ /^(---|~~~)\s*$/
+            in_yaml = !in_yaml
+          elsif line.project? && !in_yaml
             in_action = false
             proj = line.project
             indent = line.indent_level

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.57'
+  VERSION = '1.2.59'
 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.56<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.58<!--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. 
 

data/test.md

@@ -0,0 +1,16 @@
+---
+comment: 2023-09-03
+keywords:
+---
+Other New Project:
+	- testing @na
+Brand New Project:
+	- testing @na
+	- testing @na
+Project0:
+- Test1
+- Test2
+Project1:
+- Test4
+- Test5
+- Test6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.57
+  version: 1.2.59
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -247,6 +247,7 @@ files:
 - na.rdoc
 - scripts/fixreadme.rb
 - src/_README.md
+- test.md
 - test2.txt
 homepage: https://brettterpstra.com/projects/na/
 licenses: