na 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2324b729bcc5e20eab3e063427fa5c6480274ea844fe72117e7f25c7e9801764
-  data.tar.gz: 68d00ee26f320e14afd0e6a72a072b2cf30c82beaaf7818962b90e7fa0884914
+  metadata.gz: d39a0b804774a7d07c6a1154e536798bdc2f09c20e76aa2ca776cc5111c02534
+  data.tar.gz: 66e180d9cf673293e2721d83c8187b06746e352252c7fb1575be33032c088b89
 SHA512:
-  metadata.gz: b6b7fd0066ba41b9fa184ab3231cb8d7b68e68526bc380f21f2b12048de1c4a4eae24d2da8e47abe95c2389536e90ee32fa35ebdf786570745b8153c72d65e4a
-  data.tar.gz: 320264ba4f636f8a68804f7767bd09a4c2105adf684b603514d933003f06f72e2cebb978476a659c2a7ee716fbdaadf7f9fd507c3985ec2dc870162da2751414
+  metadata.gz: 22e0487072dde7c1bf2f76f412ae20a3018fd038300bdb2aac2557ac77ed1909006c4457debbe31c0c32db57439dff2ec7b07a23f8ebda96ad00748a575a8595
+  data.tar.gz: 0e8175309ff9e1d43be62ec03cdd525e34b38c9ba9608e5edbfe90b97b315a43c397e7a318a624ba3f2fa210acc3f30bbadb47590de8a851fac4b092b133a327

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 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,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.14)
+    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.14
+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. 

data/bin/na

@@ -269,11 +269,13 @@ 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
@@ -285,7 +287,12 @@ class App
                                         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

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.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.13<!--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. 
 

metadata

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