na 1.2.40 → 1.2.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2039d6fb16db44b000517f1f19d0928c5b82124abfe1c5416f98b892f21d88da
-  data.tar.gz: a21cd96adf698afdbf0ffd55eb43ae9c408c46cbcbec691aeb9d1052f1a55862
+  metadata.gz: 04412e8d8032341b954bd7cf3cd576262ca9598ba426e186bf5115183d664ce2
+  data.tar.gz: de6eee0c665411beaf485cd139bb8254cea08f610549bc2c94af2d89e463ab23
 SHA512:
-  metadata.gz: a1a9e7ac7341409792174d9ecce9b00379e9fa0a53c75d01d7abf8318d7336b417aa41d1a23d5a00628a8aef9fd1f3c53070b795220b7c94b0c5d8fa12781b63
-  data.tar.gz: 4033e29443e01ff8ee866f98255f9f2b008619d1a1f1b2e3420201a7efb99837eae612d3383234afb67c6c30fea16a1cad2199a273fd66c7d6ef21275d2aa0a5
+  metadata.gz: 74c57d212cbf93a6b855f81a7abb10c862febb576d39ce4389521b8c2d70a88bbd12532899eee92c814c8d12664cc4a2bb62978792d1b5f8851be465edc1bb86
+  data.tar.gz: e1ccd2d08d24c22aebb1d7542304f6262e8b05b75b1f567d9d6c6c234e2afe37cc306f01a97d374f73fe33cce9ab1cd1dc206b27a5be6dafd51f0e9f67657042

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.2.43
+
+2023-09-06 10:45
+
+### 1.2.42
+
+2023-09-06 10:32
+
+### 1.2.41
+
+2023-09-06 08:13
+
+#### NEW
+
+- Tag command
+
+#### FIXED
+
+- Nil error in action.pretty
+
 ### 1.2.40
 
 2023-09-06 08:11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.40)
+    na (1.2.43)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -13,8 +13,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     chronic (0.10.2)
-    gli (2.21.0)
-    mdless (1.0.33)
+    gli (2.21.1)
+    mdless (1.0.35)
     minitest (5.16.3)
     rake (0.9.6)
     rdoc (4.3.0)

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.40
+The current version of `na` is 1.2.43
 .
 
 `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.40
+    1.2.43
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)

data/bin/commands/tag.rb

@@ -0,0 +1,167 @@
+# frozen_string_literal: true
+
+class App
+  extend GLI::App
+  desc 'Add tags to matching action(s)'
+  long_desc 'Provides an easy way to tag existing actions.
+
+  Use !tag to remove a tag, use ~tag(new value) to change a tag or add a value.
+
+  If multiple todo files are found in the current directory, a menu will
+  allow you to pick which file to act on, or use --all to apply to all matches.'
+  arg_name 'TAG', mutliple: true
+  command %i[tag] do |c|
+    c.example 'na tag "project(warpspeed)" --search "An existing task"',
+              desc: 'Find "An existing task" action and add @project(warpspeed) to it'
+    c.example 'na tag "!project1" --tagged project2 --all',
+              desc: 'Find all actions tagged @project2 and remove @project1 from them'
+    c.example 'na tag "!project2" --all',
+              desc: 'Remove @project2 from all actions'
+    c.example 'na tag "~project(dirt nap)" --search "An existing task"',
+              desc: 'Find "An existing task" and change (or add) its @project tag value to "dirt nap"'
+
+    c.desc 'Use a known todo file, partial matches allowed'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo]
+
+    c.desc 'Include @done actions'
+    c.switch %i[done]
+
+    c.desc 'Specify the file to search for the task'
+    c.arg_name 'PATH'
+    c.flag %i[file]
+
+    c.desc 'Search for files X directories deep'
+    c.arg_name 'DEPTH'
+    c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
+
+    c.desc 'Match actions containing tag. Allows value comparisons'
+    c.arg_name 'TAG'
+    c.flag %i[tagged], multiple: true
+
+    c.desc 'Act on all matches immediately (no menu)'
+    c.switch %i[all], negatable: false
+
+    c.desc 'Filter results using search terms'
+    c.arg_name 'QUERY'
+    c.flag %i[search find grep], multiple: true
+
+    c.desc 'Interpret search pattern as regular expression'
+    c.switch %i[e regex], negatable: false
+
+    c.desc 'Match pattern exactly'
+    c.switch %i[x exact], negatable: false
+
+    c.action do |global_options, options, args|
+      tags = args.join(',').split(/ *, */)
+      options[:remove] = []
+      options[:tag] = []
+      tags.each do |tag|
+        if tag =~ /^[!-]/
+          options[:remove] << tag.sub(/^[!-]/, '').sub(/^@/, '')
+        elsif tag =~ /^~/
+          options[:remove] << tag.sub(/^~/, '').sub(/\(.*?\)$/, '').sub(/^@/, '')
+          options[:tag] << tag.sub(/^~/, '').sub(/^@/, '')
+        else
+          options[:tag] << tag.sub(/^@/, '')
+        end
+      end
+
+      if options[:search]
+        tokens = nil
+        if options[:exact]
+          tokens = options[:search]
+        elsif options[:regex]
+          tokens = Regexp.new(options[:search], Regexp::IGNORECASE)
+        else
+          action = options[:search].join(' ')
+          tokens = []
+          all_req = action !~ /[+!-]/ && !options[:or]
+
+          action.split(/ /).each do |arg|
+            m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+            tokens.push({
+                          token: m['tok'],
+                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                          negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                        })
+          end
+        end
+      end
+
+      if (tokens.nil? || tokens.empty?) && options[:tagged].empty?
+        NA.notify("#{NA.theme[:error]}Empty input, cancelled", exit_code: 1)
+      end
+
+      all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
+      tags = []
+      options[:tagged].join(',').split(/ *, */).each do |arg|
+        m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
+
+        tags.push({
+                    tag: m['tag'].wildcard_to_rx,
+                    comp: m['op'],
+                    value: m['val'],
+                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                    negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                  })
+      end
+
+      add_tags = options[:tag] ? options[:tag].join(',').split(/ *, */).map { |t| t.sub(/^@/, '').wildcard_to_rx } : []
+      remove_tags = options[:remove] ? options[:remove].join(',').split(/ *, */).map { |t| t.sub(/^@/, '').wildcard_to_rx } : []
+
+      if options[:file]
+        file = File.expand_path(options[:file])
+        NA.notify("#{NA.theme[:error]}File not found", exit_code: 1) unless File.exist?(file)
+
+        targets = [file]
+      elsif options[:todo]
+        todo = []
+        options[:todo].split(/ *, */).each do |a|
+          m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+          todo.push({
+                      token: m['tok'],
+                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                      negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                    })
+        end
+        dirs = NA.match_working_dir(todo)
+
+        if dirs.count == 1
+          targets = [dirs[0]]
+        elsif dirs.count.positive?
+          targets = NA.select_file(dirs, multiple: true)
+          NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless targets && targets.count.positive?
+        else
+          NA.notify("#{NA.theme[:error]}Todo not found", exit_code: 1) unless targets && targets.count.positive?
+
+        end
+      else
+        files = NA.find_files_matching({
+                                         depth: options[:depth],
+                                         done: options[:done],
+                                         regex: options[:regex],
+                                         require_na: false,
+                                         search: tokens,
+                                         tag: tags
+                                       })
+        NA.notify("#{NA.theme[:error]}No todo file found", exit_code: 1) if files.count.zero?
+
+        targets = files.count > 1 ? NA.select_file(files, multiple: true) : [files[0]]
+        NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless files.count.positive?
+
+      end
+
+      NA.notify("#{NA.theme[:error]}No search terms provided", exit_code: 1) if tokens.nil? && options[:tagged].empty?
+
+      targets.each do |target|
+        NA.update_action(target, tokens,
+                         add_tag: add_tags,
+                         all: options[:all],
+                         done: options[:done],
+                         remove_tag: remove_tags,
+                         tagged: tags)
+      end
+    end
+  end
+end

data/lib/na/action.rb

@@ -110,13 +110,13 @@ module NA
 
       if detect_width
         width = TTY::Screen.columns
-        prefix = NA::Color.uncolor(pretty(template: { output: template[:templates][:output].sub(/%action/, '') }, detect_width: false))
+        prefix = NA::Color.uncolor(pretty(template: { templates: { output: template[:templates][:output].sub(/%action/, '') } }, detect_width: false))
         indent = prefix.length
         action = action.wrap(width, indent)
       end
 
       # Replace variables in template string and output colorized
-      NA::Color.template(template[:output].gsub(/%filename/, filename)
+      NA::Color.template(template[:templates][:output].gsub(/%filename/, filename)
                           .gsub(/%project/, project)
                           .gsub(/%parents?/, parents)
                           .gsub(/%action/, action.highlight_search(regexes))

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.40'
+  VERSION = '1.2.43'
 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.39<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.41<!--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/test2.txt

@@ -0,0 +1,7 @@
+---
+comment: 2023
+keywords:
+---
+
+Inbox:
+	- Test @na

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.40
+  version: 1.2.43
 platform: ruby
 authors:
 - Brett Terpstra
@@ -220,6 +220,7 @@ files:
 - bin/commands/prompt.rb
 - bin/commands/restore.rb
 - bin/commands/saved.rb
+- bin/commands/tag.rb
 - bin/commands/tagged.rb
 - bin/commands/todos.rb
 - bin/commands/undo.rb
@@ -245,6 +246,7 @@ files:
 - na.rdoc
 - scripts/fixreadme.rb
 - src/_README.md
+- test2.txt
 homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT
@@ -271,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos