na 1.1.14 → 1.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2324b729bcc5e20eab3e063427fa5c6480274ea844fe72117e7f25c7e9801764
-  data.tar.gz: 68d00ee26f320e14afd0e6a72a072b2cf30c82beaaf7818962b90e7fa0884914
+  metadata.gz: 53c4f2d9b3198892662e241d57c5d5bea699736112e91bba9551b7a393b57e06
+  data.tar.gz: 8bfd9f4bfbdd36bd0547a11e7ec88a43873f21aa1a3b9069020884a866646bdd
 SHA512:
-  metadata.gz: b6b7fd0066ba41b9fa184ab3231cb8d7b68e68526bc380f21f2b12048de1c4a4eae24d2da8e47abe95c2389536e90ee32fa35ebdf786570745b8153c72d65e4a
-  data.tar.gz: 320264ba4f636f8a68804f7767bd09a4c2105adf684b603514d933003f06f72e2cebb978476a659c2a7ee716fbdaadf7f9fd507c3985ec2dc870162da2751414
+  metadata.gz: 33855d0a87b71590afb538be498addfa793a13f3a6865b6c9ccfc1691ded319c98df726f4960f95d70202d38106ec5a1c728c29d40b3e477b597f873d289b3fc
+  data.tar.gz: ce9ac4455e0018b2ff8df66d93c938779f831b8db722551a525e8bf49c1240b51038420d46a60d1e76c7d4ccd0d1964eadcfd5d28020667fd2c5ab78e9f3f1cc

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 1.1.16
+
+2022-10-06 16:47
+
+#### NEW
+
+- `--in todo/path` flag for `find` and `tagged` commands to specify a todo file from history
+
+### 1.1.15
+
+2022-10-06 16:12
+
+#### CHANGED
+
+- If no + or ! tokens are given in search, default to AND search for tokens
+
+#### IMPROVED
+
+- Better handling of color in search highlighting
+
+#### FIXED
+
+- --regex search broken
+
 ### 1.1.14
 
 2022-10-06 12:30

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    na (1.1.14)
+    na (1.1.16)
+      chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-screen (~> 0.8, >= 0.8.1)
@@ -10,6 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    chronic (0.10.2)
     gli (2.21.0)
     minitest (5.16.3)
     rake (0.9.6)

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.1.14
+The current version of `na` is 1.1.16
 .
 
 `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/bin/na

@@ -249,6 +249,10 @@ class App
     c.arg_name 'DEPTH'
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
+    c.desc 'Show actions from a specific todo file in history'
+    c.arg_name 'TODO_PATH'
+    c.flag %i[in]
+
     c.desc 'Show actions from a specific project'
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
@@ -269,23 +273,39 @@ class App
         tokens = Regexp.new(args.join(' '), Regexp::IGNORECASE)
       else
         tokens = []
+        all_req = args.join(' ') !~ /[+!\-]/
+
         args.join(' ').split(/ /).each do |arg|
           m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           tokens.push({
                         token: m['tok'],
-                        required: !m['req'].nil? && m['req'] == '+',
+                        required: all_req || (!m['req'].nil? && m['req'] == '+'),
                         negate: !m['req'].nil? && m['req'] =~ /[!\-]/
                       })
         end
       end
 
+      todo = nil
+      if options[:in]
+        todo = [{
+          token: options[:in],
+          required: true
+        }]
+      end
+
       files, actions = NA.parse_actions(depth: depth,
+                                        query: todo,
                                         search: tokens,
                                         negate: options[:invert],
                                         regex: options[:regex],
                                         project: options[:project],
                                         require_na: false)
-      regexes = tokens.delete_if { |token| token[:negate] }.map { |token| token[:token] }
+      if tokens.is_a?(Array)
+        regexes = tokens.delete_if { |token| token[:negate] }.map { |token| token[:token] }
+      else
+        regexes = [tokens]
+      end
+
       NA.output_actions(actions, depth, files: files, regexes: regexes)
     end
   end
@@ -305,6 +325,10 @@ class App
     c.default_value 1
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
+    c.desc 'Show actions from a specific todo file in history'
+    c.arg_name 'TODO_PATH'
+    c.flag %i[in]
+
     c.desc 'Show actions from a specific project'
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
@@ -322,7 +346,7 @@ class App
       tags = []
       args.join(',').split(/ *, */).each do |arg|
         # TODO: <> comparisons do nothing right now
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>*$\^]+)(?:(?<op>[=<>*$\^]+)(?<val>\S+))?$/)
+        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>*$\^]+)(?:(?<op>[=<>*$\^]+)(?<val>.*?))?$/)
         tags.push({
                     tag: m['tag'],
                     comp: m['op'],
@@ -332,7 +356,16 @@ class App
                   })
       end
 
+      todo = nil
+      if options[:in]
+        todo = [{
+          token: options[:in],
+          required: true
+        }]
+      end
+
       files, actions = NA.parse_actions(depth: depth,
+                                        query: todo,
                                         tag: tags,
                                         negate: options[:invert],
                                         project: options[:project],

data/lib/na/action.rb

@@ -136,26 +136,54 @@ module NA
 
       return false if tag_val.nil?
 
-      return case tag[:comp]
-             when /^>$/
-               tag_val.to_f > val.to_f
-             when /^<$/
-               tag_val.to_f < val.to_f
-             when /^<=$/
-               tag_val.to_f <= val.to_f
-             when /^>=$/
-               tag_val.to_f >= val.to_f
-             when /^==?$/
-               tag_val =~ /^#{val.wildcard_to_rx}$/
-             when /^\$=$/
-               tag_val =~ /#{val.wildcard_to_rx}$/i
-             when /^\*=$/
-               tag_val =~ /#{val.wildcard_to_rx}/i
-             when /^\^=$/
-               tag_val =~ /^#{val.wildcard_to_rx}/
-             else
-               false
-             end
+      begin
+        tag_date = Time.parse(tag_val)
+        date = Chronic.parse(val)
+
+        puts "Comparing #{tag_date} #{tag[:comp]} #{date}" if NA.verbose
+
+        case tag[:comp]
+        when /^>$/
+          tag_date > date
+        when /^<$/
+          tag_date < date
+        when /^<=$/
+          tag_date <= date
+        when /^>=$/
+          tag_date >= date
+        when /^==?$/
+          tag_date == date
+        when /^\$=$/
+          tag_val =~ /#{val.wildcard_to_rx}/i
+        when /^\*=$/
+          tag_val =~ /#{val.wildcard_to_rx}/i
+        when /^\^=$/
+          tag_val =~ /^#{val.wildcard_to_rx}/
+        else
+          false
+        end
+      rescue
+        case tag[:comp]
+        when /^>$/
+          tag_val.to_f > val.to_f
+        when /^<$/
+          tag_val.to_f < val.to_f
+        when /^<=$/
+          tag_val.to_f <= val.to_f
+        when /^>=$/
+          tag_val.to_f >= val.to_f
+        when /^==?$/
+          tag_val =~ /^#{val.wildcard_to_rx}$/
+        when /^\$=$/
+          tag_val =~ /#{val.wildcard_to_rx}$/i
+        when /^\*=$/
+          tag_val =~ /#{val.wildcard_to_rx}/i
+        when /^\^=$/
+          tag_val =~ /^#{val.wildcard_to_rx}/
+        else
+          false
+        end
+      end
     end
 
     def scan_tags

data/lib/na/string.rb

@@ -15,7 +15,7 @@ class ::String
   ##
   ## @return     [String] string with @tags highlighted
   ##
-  def highlight_tags(color: '{m}', value: '{y}', parens: '{m}', last_color: '{g}')
+  def highlight_tags(color: '{m}', value: '{y}', parens: '{m}', last_color: '{xg}')
     tag_color = NA::Color.template(color)
     paren_color = NA::Color.template(parens)
     value_color = NA::Color.template(value)
@@ -23,13 +23,19 @@ class ::String
          "\\1#{tag_color}\\2#{paren_color}\\3#{value_color}\\4#{paren_color}\\5#{last_color}")
   end
 
-  def highlight_search(regexes, color: '{y}')
+  def highlight_search(regexes, color: '{y}', last_color: '{xg}')
     string = dup
     color = NA::Color.template(color)
     regexes.each do |rx|
       next if rx.nil?
 
-      string.gsub!(/(#{rx.wildcard_to_rx})/i, "#{color}\\1#{NA::Color.template('{xg}')}")
+      rx = Regexp.new(rx.wildcard_to_rx, Regexp::IGNORECASE) if rx.is_a?(String)
+
+      string.gsub!(rx) do
+        m = Regexp.last_match
+        last = m.pre_match.last_color
+        "#{color}#{m[0]}#{NA::Color.template(last)}"
+      end
     end
     string
   end
@@ -62,7 +68,7 @@ class ::String
   end
 
   def wildcard_to_rx
-    gsub(/\./, '\\.').gsub(/\*/, '.*?').gsub(/\?/, '.')
+    gsub(/\./, '\\.').gsub(/\*/, '[^ ]*?').gsub(/\?/, '.')
   end
 
   def cap_first!

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.14'
+  VERSION = '1.1.16'
 end

data/lib/na.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require 'na/version'
+require 'time'
 require 'fileutils'
 require 'shellwords'
+require 'chronic'
 require 'tty-screen'
 require 'tty-reader'
 require 'tty-which'

data/na.gemspec

@@ -30,4 +30,5 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('tty-reader', '~> 0.9', '>= 0.9.0')
   s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')
   s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
+  s.add_runtime_dependency('chronic', '~> 0.10', '>= 0.10.2')
 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.1.13<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.15<!--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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.16
 platform: ruby
 authors:
 - Brett Terpstra
@@ -146,6 +146,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 description: A tool for managing a TaskPaper file of project todos for the current
   directory. Easily create "next actions" to come back to, add tags and priorities,
   and notes. Add prompt hooks to display your next actions automatically when cd'ing