na 1.1.13 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c240ef72b49cbb692ba1f55da9a36036d72bd51bb29549ea87262cceedfd51
-  data.tar.gz: e61a921f6af384ae5615f54116cb4e4e0c9472ab76d4a347fc50ea5633fc80a3
+  metadata.gz: d39a0b804774a7d07c6a1154e536798bdc2f09c20e76aa2ca776cc5111c02534
+  data.tar.gz: 66e180d9cf673293e2721d83c8187b06746e352252c7fb1575be33032c088b89
 SHA512:
-  metadata.gz: e577876361f3022e29d4c56e06d7c507fe05ac81da752debe476b481f92f671ee85ab25cb06e32a0608baf1b926454ea4e68aa6391e32ee7c5e7e02a5751dd11
-  data.tar.gz: 660039f2b13e23365ffa88fa8a59266f50941275830175458f867a26bfcbcd3553c8e5dc6ef70da1d1ab5946fc9d7a3361bdf932f8d63eda23c3c692657a5074
+  metadata.gz: 22e0487072dde7c1bf2f76f412ae20a3018fd038300bdb2aac2557ac77ed1909006c4457debbe31c0c32db57439dff2ec7b07a23f8ebda96ad00748a575a8595
+  data.tar.gz: 0e8175309ff9e1d43be62ec03cdd525e34b38c9ba9608e5edbfe90b97b315a43c397e7a318a624ba3f2fa210acc3f30bbadb47590de8a851fac4b092b133a327

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+### 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
+
+#### IMPROVED
+
+- Code cleanup
+- Highlight search terms in results
+
+#### FIXED
+
+- Multiple search terms overriding each other
+
 ### 1.1.13
 
 2022-10-06 06:28

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.13)
+    na (1.1.15)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-screen (~> 0.8, >= 0.8.1)

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.13
+The current version of `na` is 1.1.15
 .
 
 `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. 
@@ -37,7 +37,7 @@ You can list next actions in files in the current directory by typing `na`. By d
 
 #### Easy matching
 
-`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na next dev mark`. It will always look for the shortest match.
+`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na next dev/mark`. Creat paths by separating with / or :, separate multiple queries with spaces. na will always look for the shortest match for a path.
 
 #### Recursion
 
@@ -152,6 +152,8 @@ EXAMPLES
 
 Example: `na find cool feature idea`
 
+Unless `--exact` is specified, search is tokenized and combined with OR, so `na find cool feature idea` translates to `cool OR feature OR idea`, matching any string that contains any of the words. To make a token required, add a `+` before it (e.g. `cool +feature idea` is `(cool OR idea) AND feature`). Wildcards allowed (`*` and `?`), use `--regex` to interpret the search as a regular expression. Use `-v` to invert the results (display non-matching actions only).
+
 ```
 NAME
     find - Find actions matching a search pattern
@@ -229,7 +231,9 @@ EXAMPLES
 
 ##### tagged
 
-Example: `na tagged feature +maybe`
+Example: `na tagged feature +maybe`.
+
+Separate multiple tags with spaces or commas. By default tags are combined with OR, so actions matching any of the tags listed will be displayed. Use `+` to make a tag required and `!` to negate a tag (only display if the action does _not_ contain the tag). Use `-v` to invert the search and display all actions that _don't_ match.
 
 ```
 NAME

data/bin/na

@@ -269,11 +269,13 @@ class App
         tokens = Regexp.new(args.join(' '), Regexp::IGNORECASE)
       else
         tokens = []
-        args.each do |arg|
+        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
@@ -285,7 +287,13 @@ class App
                                         regex: options[:regex],
                                         project: options[:project],
                                         require_na: false)
-      NA.output_actions(actions, depth, files: files)
+      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
 
@@ -336,7 +344,8 @@ class App
                                         negate: options[:invert],
                                         project: options[:project],
                                         require_na: false)
-      NA.output_actions(actions, depth, files: files)
+      regexes = tags.delete_if { |token| token[:negate] }.map { |token| token[:token] }
+      NA.output_actions(actions, depth, files: files, regexes: regexes)
     end
   end
 

data/lib/na/action.rb

@@ -27,7 +27,7 @@ module NA
       EOINSPECT
     end
 
-    def pretty(extension: 'taskpaper', template: {})
+    def pretty(extension: 'taskpaper', template: {}, regexes: [])
       default_template = {
         file: '{xbk}',
         parent: '{c}',
@@ -67,7 +67,7 @@ module NA
       NA::Color.template(template[:output].gsub(/%filename/, filename)
                           .gsub(/%project/, project)
                           .gsub(/%parents?/, parents)
-                          .gsub(/%action/, action))
+                          .gsub(/%action/, action.highlight_search(regexes)))
     end
 
     def tags_match?(any: [], all: [], none: [])

data/lib/na/next_action.rb

@@ -80,8 +80,10 @@ module NA
       notify("{by}Task added to {bw}#{file}")
     end
 
-    def output_actions(actions, depth, files: nil)
-      template = if files&.count.positive?
+    def output_actions(actions, depth, files: nil, regexes: [])
+      return if files.nil?
+
+      template = if files.count.positive?
                    if files.count == 1
                      '%parent%action'
                    else
@@ -96,11 +98,10 @@ module NA
                  else
                    '%parent%action'
                  end
-      if files && @verbose
-        files.map { |f| notify("{dw}#{f}") }
-      end
 
-      puts actions.map { |action| action.pretty(template: { output: template }) }
+      files.map { |f| notify("{dw}#{f}") } if files && @verbose
+
+      puts(actions.map { |action| action.pretty(template: { output: template }, regexes: regexes) })
     end
 
     def parse_actions(depth: 1, query: nil, tag: nil, search: nil, negate: false, regex: false, project: nil, require_na: true)
@@ -136,7 +137,10 @@ module NA
           end
         else
           search.each do |t|
-            optional, required, negated = parse_search(t, negate)
+            opt, req, neg = parse_search(t, negate)
+            optional.concat(opt)
+            required.concat(req)
+            negated.concat(neg)
           end
         end
       end

data/lib/na/string.rb

@@ -5,9 +5,7 @@ class ::String
     prefix = match(/(^[ \t]+)/)
     return 0 if prefix.nil?
 
-    tabs = prefix[1].gsub(/  /, "\t").scan(/\t/).count
-
-    tabs
+    prefix[1].gsub(/  /, "\t").scan(/\t/).count
   end
 
   ##
@@ -17,25 +15,75 @@ 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)
-    gsub(/(\s|m)(@[^ ("']+)(?:(\()(.*?)(\)))?/, "\\1#{tag_color}\\2#{paren_color}\\3#{value_color}\\4#{paren_color}\\5#{last_color}")
+    gsub(/(\s|m)(@[^ ("']+)(?:(\()(.*?)(\)))?/,
+         "\\1#{tag_color}\\2#{paren_color}\\3#{value_color}\\4#{paren_color}\\5#{last_color}")
+  end
+
+  def highlight_search(regexes, color: '{y}', last_color: '{xg}')
+    string = dup
+    color = NA::Color.template(color)
+    regexes.each do |rx|
+      next if rx.nil?
+
+      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
+
+  # Returns the last escape sequence from a string.
+  #
+  # Actually returns all escape codes, with the assumption
+  # that the result of inserting them will generate the
+  # same color as was set at the end of the string.
+  # Because you can send modifiers like dark and bold
+  # separate from color codes, only using the last code
+  # may not render the same style.
+  #
+  # @return     [String]  All escape codes in string
+  #
+  def last_color
+    scan(/\e\[[\d;]+m/).join('').gsub(/\e\[0m/, '')
   end
 
   def dir_to_rx
-    split(%r{[/:]}).join('.*?/.*?') + '[^/]+$'
+    "#{split(%r{[/:]}).join('.*?/.*?')}[^/]+$"
   end
 
   def dir_matches(any: [], all: [])
-    matches_any(any.map { |token| token.dir_to_rx }) && matches_all(all.map { |token| token.dir_to_rx })
+    matches_any(any.map(&:dir_to_rx)) && matches_all(all.map(&:dir_to_rx))
   end
 
   def matches(any: [], all: [], none: [])
     matches_any(any) && matches_all(all) && matches_none(none)
   end
 
+  def wildcard_to_rx
+    gsub(/\./, '\\.').gsub(/\*/, '[^ ]*?').gsub(/\?/, '.')
+  end
+
+  def cap_first!
+    replace cap_first
+  end
+
+  def cap_first
+    sub(/^([a-z])(.*)$/) do
+      m = Regexp.last_match
+      m[1].upcase << m[2]
+    end
+  end
+
+  private
+
   def matches_none(regexes)
     regexes.each do |rx|
       return false if match(Regexp.new(rx, Regexp::IGNORECASE))
@@ -44,7 +92,6 @@ class ::String
   end
 
   def matches_any(regexes)
-    string = dup
     regexes.each do |rx|
       return true if match(Regexp.new(rx, Regexp::IGNORECASE))
     end
@@ -57,19 +104,4 @@ class ::String
     end
     true
   end
-
-  def wildcard_to_rx
-    gsub(/\./, '\\.').gsub(/\*/, '.*?').gsub(/\?/, '.')
-  end
-
-  def cap_first!
-    replace cap_first
-  end
-
-  def cap_first
-    sub(/^([a-z])(.*)$/) do
-      m = Regexp.last_match
-      m[1].upcase << m[2]
-    end
-  end
 end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.13'
+  VERSION = '1.1.15'
 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.12<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.14<!--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. 
 
@@ -36,7 +36,7 @@ You can list next actions in files in the current directory by typing `na`. By d
 
 #### Easy matching
 
-`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na next dev mark`. It will always look for the shortest match.
+`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na next dev/mark`. Creat paths by separating with / or :, separate multiple queries with spaces. na will always look for the shortest match for a path.
 
 #### Recursion
 
@@ -151,6 +151,8 @@ EXAMPLES
 
 Example: `na find cool feature idea`
 
+Unless `--exact` is specified, search is tokenized and combined with OR, so `na find cool feature idea` translates to `cool OR feature OR idea`, matching any string that contains any of the words. To make a token required, add a `+` before it (e.g. `cool +feature idea` is `(cool OR idea) AND feature`). Wildcards allowed (`*` and `?`), use `--regex` to interpret the search as a regular expression. Use `-v` to invert the results (display non-matching actions only).
+
 ```
 NAME
     find - Find actions matching a search pattern
@@ -228,7 +230,9 @@ EXAMPLES
 
 ##### tagged
 
-Example: `na tagged feature +maybe`
+Example: `na tagged feature +maybe`.
+
+Separate multiple tags with spaces or commas. By default tags are combined with OR, so actions matching any of the tags listed will be displayed. Use `+` to make a tag required and `!` to negate a tag (only display if the action does _not_ contain the tag). Use `-v` to invert the search and display all actions that _don't_ match.
 
 ```
 NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.15
 platform: ruby
 authors:
 - Brett Terpstra