na 1.2.49 → 1.2.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f4d4be5554378f0112d206fba77680a74a4a5d66a272400a27a5c1809aad1bf
-  data.tar.gz: e7e3506d44cce698a7bd951c771e783aa39d264db8dfb5aeb0d2c208e4a17265
+  metadata.gz: 5edc215f757a568603dff43b55a7e727d756cf4112771a898c7132ac5c335d34
+  data.tar.gz: 395a80b95e1e303d62000b036235a40199d6fb70eb56d854509681dcc78030a6
 SHA512:
-  metadata.gz: 7e6e46c762ca2a0e1248c8a34492ea1733a5598aa9b309521ea41edb751f07490e9adf431baddb45000adb8e8a07eec48111fdc56c9b2cdb94f5d0ce243db53c
-  data.tar.gz: e072634d013b304870e4fb9e3aa38e726e2915e45c461ac449e23140483c76bd781e052536280b98a6baa9c1198a42bde10d408adf4f66ed1de308dd1c15eed4
+  metadata.gz: 589d810297ff33afaa36d93b1ab006a9332ea908437008642b3d9810a90759f47cbeea1e4928e32381372b24f4e107786a7d53cae821fd1e49536683e6414584
+  data.tar.gz: 2f8418d040cdc7bda601220d35906b8f8d48e7be5ed4e6fbb07b8dc6674c52bcdfe07c43dda553c4a0161e9370411b75e9c4bd0dc7cc357a0cb2f73710efd447

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 1.2.51
+
+2023-09-09 13:20
+
+#### FIXED
+
+- Ensure new actions are added within newly created projects
+- When creating a subproject, ensure new project gets inserted
+
+### 1.2.50
+
+2023-09-09 08:04
+
+#### NEW
+
+- Global option `--include_ext` can be configured to use full
+
+#### FIXED
+
+- `--no-color` wasn't stripping templated hex codes
+
 ### 1.2.49
 
 2023-09-08 13:34

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.49)
+    na (1.2.51)
       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.49
+The current version of `na` is 1.2.51
 .
 
 `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.49
+    1.2.51
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -89,6 +89,7 @@ GLOBAL OPTIONS
     --ext=EXT               - File extension to consider a todo file (default: taskpaper)
     -f, --file=PATH         - Use a single file as global todo, use initconfig to make permanent (default: none)
     --help                  - Show this message
+    --include_ext           - Include file extension in display
     -n, --note              - Prompt for additional notes (deprecated, for backwards compatibility)
     -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
     --[no-]pager            - Enable pagination (default: enabled)

data/bin/na

@@ -26,6 +26,9 @@ class App
   arg_name 'EXT'
   flag :ext
 
+  desc 'Include file extension in display'
+  switch :include_ext, default_value: false, negatable: false
+
   desc 'Tag to consider a next action'
   default_value 'na'
   arg_name 'TAG'
@@ -86,8 +89,9 @@ class App
   pre do |global, _command, _options, _args|
     NA.verbose = global[:debug]
     NA::Pager.paginate = global[:pager] && $stdout.isatty
-    NA::Color.coloring = global[:color]
+    NA::Color.coloring = global[:color] && $stdout.isatty
     NA.extension = global[:ext]
+    NA.include_ext = global[:include_ext]
     NA.na_tag = global[:na_tag]
     NA.global_file = global[:file]
     NA.cwd = File.basename(ENV['PWD'])

data/lib/na/action.rb

@@ -89,7 +89,7 @@ module NA
 
       # Create the source filename string, substituting ~ for HOME and removing extension
       file = @file.sub(%r{^\./}, '').sub(/#{ENV['HOME']}/, '~')
-      file = file.sub(/\.#{extension}$/, '')
+      file = file.sub(/\.#{extension}$/, '') unless NA.include_ext
       # colorize the basename
       file = file.highlight_filename
       file_tpl = "#{template[:file]}#{file} {x}"

data/lib/na/colors.rb

@@ -232,7 +232,7 @@ module NA
       ##
       def template(input)
         input = input.join(' ') if input.is_a? Array
-        return input.gsub(/(?<!\\)\{(\w+)\}/i, '') unless NA::Color.coloring?
+        return input.gsub(/(?<!\\)\{#?(\w+)\}/i, '') unless NA::Color.coloring?
 
         input = input.gsub(/(?<!\\)\{((?:[fb]g?)?#[a-f0-9]{3,6})\}/i) do
                   hex = Regexp.last_match(1)

data/lib/na/next_action.rb

@@ -5,7 +5,7 @@ module NA
   class << self
     include NA::Editor
 
-    attr_accessor :verbose, :extension, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
+    attr_accessor :verbose, :extension, :include_ext, :na_tag, :command_line, :command, :globals, :global_file, :cwd_is, :cwd, :stdin
 
     def theme
       @theme ||= NA::Theme.load_theme
@@ -203,15 +203,15 @@ module NA
           content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         else
           split = content.split(/\n/)
-          line = todo.projects.first&.line || 0
+          line = todo.projects.first&.last_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}"
         end
 
-        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line, line + 1)
+        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line, line)
       else
-        line = final_match.line + 1
+        line = final_match.last_line + 1
         indent = final_match.indent + 1
         input = []
         new_path.each do |part|
@@ -292,9 +292,12 @@ module NA
 
           NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
 
+          projects = find_projects(target)
           contents = target.read_file.split("\n")
         end
 
+        pp projects.map(&:inspect)
+
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)
         note = if note.empty?

data/lib/na/string.rb

@@ -91,7 +91,7 @@ class ::String
   ##
   def highlight_filename
     dir = File.dirname(self).shorten_path
-    file = File.basename(self, ".#{NA.extension}")
+    file = NA.include_ext ? File.basename(self) : File.basename(self, ".#{NA.extension}")
     "#{NA.theme[:dirname]}#{dir}/#{NA.theme[:filename]}#{file}{x}"
   end
 

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.49'
+  VERSION = '1.2.51'
 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.48<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.50<!--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.49
+  version: 1.2.51
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake