na 1.1.16 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c4f2d9b3198892662e241d57c5d5bea699736112e91bba9551b7a393b57e06
-  data.tar.gz: 8bfd9f4bfbdd36bd0547a11e7ec88a43873f21aa1a3b9069020884a866646bdd
+  metadata.gz: ca265b21ae87e7ce77028f5a5a61d335d54136998db65495aacda0d8f6ea1a67
+  data.tar.gz: 10c5a7a4d7dda293f9d10cee00255a3c7e91e36be5adaf57677ff57cac8352c4
 SHA512:
-  metadata.gz: 33855d0a87b71590afb538be498addfa793a13f3a6865b6c9ccfc1691ded319c98df726f4960f95d70202d38106ec5a1c728c29d40b3e477b597f873d289b3fc
-  data.tar.gz: ce9ac4455e0018b2ff8df66d93c938779f831b8db722551a525e8bf49c1240b51038420d46a60d1e76c7d4ccd0d1964eadcfd5d28020667fd2c5ab78e9f3f1cc
+  metadata.gz: cce03bc78f6622640b3d707b804af98838782786a6b9d026f50ab97715611a34fe26829d1c3b09850679779b5c838e8b41168922973f5e4cf94d3b25859c6746
+  data.tar.gz: aa8965262c15291fadada3b61be77d7da36710f4a77b4e32a3909e072c30b6a67fb3c5aa8969bb6361e71cbf6efbf7bec8cf9400e0646ba10a4246e82e526359

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.1.18
+
+2022-10-06 17:23
+
+#### FIXED
+
+- Update help to match new default AND searches
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.16)
+    na (1.1.17)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.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.1.16
+The current version of `na` is 1.1.18
 .
 
 `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. 
@@ -152,7 +152,7 @@ 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).
+Unless `--exact` is specified, search is tokenized and combined with AND, so `na find cool feature idea` translates to `cool AND feature AND idea`, matching any string that contains all of the words. To make a token required and others optional, 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
@@ -233,7 +233,7 @@ EXAMPLES
 
 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.
+Separate multiple tags with spaces or commas. By default tags are combined with AND, so actions matching all 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). When `+` and/or `!` are used, undecorated tokens become optional matches. Use `-v` to invert the search and display all actions that _don't_ match.
 
 ```
 NAME
@@ -254,7 +254,7 @@ EXAMPLES
     # Show all actions tagged @maybe
     na tagged +maybe
 
-    # Show all actions tagged either @feature or @idea, recurse 3 levels
+    # Show all actions tagged @feature and @idea, recurse 3 levels
     na tagged -d 3 feature idea
 ```
 

data/bin/na

@@ -235,9 +235,8 @@ class App
   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`'
   arg_name 'PATTERN'
   command %i[find grep] do |c|
-    c.example 'na find feature +idea +swift', desc: 'Find all actions containing feature, idea, and swift'
+    c.example 'na find feature idea swift', desc: 'Find all actions containing feature, idea, and swift'
     c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
-    c.example 'na find -d 3 swift obj-c', desc: 'Find all actions 3 directories deep containing either swift or obj-c'
 
     c.desc 'Interpret search pattern as regular expression'
     c.switch %i[e regex], negatable: false
@@ -316,9 +315,9 @@ class App
              You can specify values using TAG=VALUE pairs.'
   arg_name 'TAG [VALUE]'
   command %i[tagged] do |c|
-    c.example 'na tagged +maybe', desc: 'Show all actions tagged @maybe'
-    c.example 'na tagged -d 3 feature idea', desc: 'Show all actions tagged either @feature or @idea, recurse 3 levels'
-    c.example 'na tagged +priority=5', desc: 'Show actions with @priority(5)'
+    c.example 'na tagged maybe', desc: 'Show all actions tagged @maybe'
+    c.example 'na tagged -d 3 feature idea', desc: 'Show all actions tagged @feature and @idea, recurse 3 levels'
+    c.example 'na tagged priority>=4', desc: 'Show actions with @priority(4) or @priority(5)'
 
     c.desc 'Recurse to depth'
     c.arg_name 'DEPTH'
@@ -344,6 +343,8 @@ 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>.*?))?$/)
@@ -351,7 +352,7 @@ class App
                     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

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.16'
+  VERSION = '1.1.18'
 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.15<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.17<!--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. 
 
@@ -151,7 +151,7 @@ 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).
+Unless `--exact` is specified, search is tokenized and combined with AND, so `na find cool feature idea` translates to `cool AND feature AND idea`, matching any string that contains all of the words. To make a token required and others optional, 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
@@ -232,7 +232,7 @@ EXAMPLES
 
 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.
+Separate multiple tags with spaces or commas. By default tags are combined with AND, so actions matching all 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). When `+` and/or `!` are used, undecorated tokens become optional matches. Use `-v` to invert the search and display all actions that _don't_ match.
 
 ```
 NAME
@@ -253,7 +253,7 @@ EXAMPLES
     # Show all actions tagged @maybe
     na tagged +maybe
 
-    # Show all actions tagged either @feature or @idea, recurse 3 levels
+    # Show all actions tagged @feature and @idea, recurse 3 levels
     na tagged -d 3 feature idea
 ```
 

metadata

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