na 1.1.15 → 1.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39a0b804774a7d07c6a1154e536798bdc2f09c20e76aa2ca776cc5111c02534
-  data.tar.gz: 66e180d9cf673293e2721d83c8187b06746e352252c7fb1575be33032c088b89
+  metadata.gz: d1f08f513ef3290991ee52c4688331b2725ddc192875bb28fea96f167da4c410
+  data.tar.gz: 7f354ea08863cc9c1c1df2b852fc8d6eb692d9a33dbf796f43e1e4bc639a27f1
 SHA512:
-  metadata.gz: 22e0487072dde7c1bf2f76f412ae20a3018fd038300bdb2aac2557ac77ed1909006c4457debbe31c0c32db57439dff2ec7b07a23f8ebda96ad00748a575a8595
-  data.tar.gz: 0e8175309ff9e1d43be62ec03cdd525e34b38c9ba9608e5edbfe90b97b315a43c397e7a318a624ba3f2fa210acc3f30bbadb47590de8a851fac4b092b133a327
+  metadata.gz: b74b4c889bfd689398064a826be50599a75f7306cd45acef3abfd5704d23a284abac6b655d9344ebfcec23ec283a52b891fd3426c8cbec6c90fe2ead70665f38
+  data.tar.gz: d960babf95647b691ecb5f16b93b7e872121c2208a79cfc2dab9be6d88479e59e8f3013697338e2dfd62f062dd1a4e07e335c46fedc41c6a1e2c440a4774a9c7

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.1.17
+
+2022-10-06 17:02
+
+#### CHANGED
+
+- Default to AND search with `tagged` unless a "+" or "!" is specified
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    na (1.1.15)
+    na (1.1.17)
+      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.15
+The current version of `na` is 1.1.17
 .
 
 `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]
@@ -281,7 +285,16 @@ class App
         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],
@@ -312,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]
@@ -327,19 +344,30 @@ class App
               end
 
       tags = []
+
+      all_req = args.join(' ') !~ /[+!\-]/
       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'],
                     value: m['val'],
-                    required: !m['req'].nil? && m['req'] == '+',
+                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
                     negate: !m['req'].nil? && m['req'] =~ /[!\-]/
                   })
       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/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.15'
+  VERSION = '1.1.17'
 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.14<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.16<!--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.15
+  version: 1.1.17
 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