na 1.2.48 → 1.2.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979a9debf8199d1e1182caaefb4d412c03c66c0c9785fd1ac638af13d211686e
-  data.tar.gz: 16bdab2fa8d9f8c326351bcc4c92e29aa3fed23a1dc23acc2c72a22ca12ecd41
+  metadata.gz: ea683e8d5187cd53c25900fd1ec4bb269644cd83c7f95c591cd5abee20d6f7e4
+  data.tar.gz: 850ef4f8edf690a993c73088bef2fea5b4c47085d21f43e4f3097dbf202d3d9f
 SHA512:
-  metadata.gz: a0b05629b092b7e49c3b4c606ddb236387b9acf5edc6219a446ccebfc6a8ced5ab17629e78b5fc327c0eb0a4ec3203221e7b3a4d661cfcba224d44ae3798d48e
-  data.tar.gz: 702cfbe213a0aa67a249284511754613cd447cea62580a14982c4ef253d5b710a70438c5b6f27008b9a4191b3f52f0f2b5fa80de3a373c28c201f5c1dd043b00
+  metadata.gz: 3bb8a0ec11195980fffcc7b429e5157e4c60501840280c14d7228f5585067e6cbcea51492a7e844d59e633ba0d7908704619404e6bfcae0d09b6f5d75a56e112
+  data.tar.gz: 8b9c155dfbbe6ac51682db63f471b2393640aaebc73f2e97801c54a872ec89b87bcc8e9574892c6030ae8d1cfd7c5136f0da57680f4aa4bc2eb96edc9c74c09d

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 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
+
+#### FIXED
+
+- New project not being added when requested
+
 ### 1.2.48
 
 2023-09-08 10:19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.48)
+    na (1.2.50)
       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.48
+The current version of `na` is 1.2.50
 .
 
 `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.48
+    1.2.50
 
 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
@@ -192,6 +192,7 @@ module NA
       if final_match.nil?
         indent = 0
         input = []
+
         new_path.each do |part|
           input.push("#{"\t" * indent}#{part.cap_first}:")
           indent += 1
@@ -208,7 +209,7 @@ module NA
           content = "#{before}\n#{input.join("\n")}\n#{after}"
         end
 
-        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, input.count - 1, input.count - 1)
+        new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line, line + 1)
       else
         line = final_match.line + 1
         indent = final_match.indent + 1
@@ -274,21 +275,25 @@ module NA
         projects = find_projects(target)
 
         target_proj = if target_proj
-                        projects.select { |proj| proj.project =~ /^#{target_proj.project}$/ }.first
+                        projects.select { |proj| proj.project =~ /^#{target_proj.project}$/i }.first
                       else
-                        projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/ }.first
+                        projects.select { |proj| proj.project =~ /^#{add.parent.join(':')}$/i }.first
                       end
 
-        res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
+        if target_proj.nil?
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{add.project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
 
-        if res
-          target_proj = insert_project(target, project, projects)
-          projects << target_proj
-        else
-          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
-        end
+          if res
+            target_proj = insert_project(target, project, projects)
+            projects << target_proj
+          else
+            NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
+          end
 
-        NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
+          NA.notify("#{NA.theme[:error]}Error parsing project #{NA.theme[:filename]}#{target}", exit_code: 1) if target_proj.nil?
+
+          contents = target.read_file.split("\n")
+        end
 
         indent = "\t" * target_proj.indent
         note = note.split("\n") unless note.is_a?(Array)

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.48'
+  VERSION = '1.2.50'
 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.47<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.49<!--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.48
+  version: 1.2.50
 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