na 1.1.19 → 1.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a57cbddd075c808316dbf206b6ff65d4d0caf307c4c27524faf94f6e86517d3
-  data.tar.gz: 2e0ff764b2a777eb5089c228f7979c131c7669557f033f657241052cd3345b53
+  metadata.gz: cca7f5724f71b44df5ad9ac04646a26b9258cb2fb491b0e93b15b6c1f29c68d2
+  data.tar.gz: 249da515ff5d4b44928b8401f691e337440f0abd60d78b7155a1e5490b981519
 SHA512:
-  metadata.gz: 4516162349290992f0a156161e3f3b1e7831ad383c38d9061ff44d267b862037e5cfb04796ac1143c4bdd1b60fa77b6c9576ee265add84abc19a5958d30dd8a6
-  data.tar.gz: 91c86e3ea2c36fd66cbbc7211c9ebab460af7a9ba14668bb1f55a7a14d7e8b5aaf2ff8b7795672ee7c3856a3ae47b0783a40033c427b2df69ff2c0c6c60697e4
+  metadata.gz: eb3e8285512ba4091326d3c20c5d69e671d7a2f310b6d11f3f7b36ba6b3b19ab237059b12aa091158515eff675d8f6df0e10436119714a5de718e1f8f45a84bb
+  data.tar.gz: 1244b815b5666fb758c0b6359a584a5a11e493ce4f30a8c7e325cd9438b1d8ebaee638115d3765954cf9335947648105447941603a168c53aeaeb1ed5a7e5031

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.1.20
+
+2022-10-07 03:16
+
+#### IMPROVED
+
+- Date comparisons that don't specify a time are automatically adjusted to "noon" to allow direct comparison of days
+
 ### 1.1.19
 
 2022-10-07 03:06

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.19)
+    na (1.1.20)
       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.19
+The current version of `na` is 1.1.20
 .
 
 `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/lib/na/action.rb

@@ -137,14 +137,14 @@ module NA
       return false if tag_val.nil?
 
       begin
-        if val =~ /^today$/i
-          val = 'today at 12am'
-          tag_val = tag_val.sub(/\d\d:\d\d/, '00:00')
-        end
-
         tag_date = Time.parse(tag_val)
         date = Chronic.parse(val)
 
+        unless val =~ /(\d:\d|a[mp]|now)/i
+          tag_date = Time.parse(tag_date.strftime('%Y-%m-%d 12:00'))
+          date = Time.parse(date.strftime('%Y-%m-%d 12:00'))
+        end
+
         puts "Comparing #{tag_date} #{tag[:comp]} #{date}" if NA.verbose
 
         case tag[:comp]

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.19'
+  VERSION = '1.1.20'
 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.18<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.19<!--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. 
 
@@ -51,7 +51,37 @@ If found, it will try to locate an `Inbox:` project, or create one if it doesn't
 ### Usage
 
 ```
-@cli(bundle exec bin/na help)
+NAME
+    na - Add and list next actions for the current project
+
+SYNOPSIS
+    na [global options] command [command options] [arguments...]
+
+VERSION
+    1.1.19
+
+GLOBAL OPTIONS
+    -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
+    -d, --depth=DEPTH       - Recurse to depth (default: 1)
+    --[no-]debug            - Display verbose output
+    --ext=EXT               - File extension to consider a todo file (default: taskpaper)
+    --help                  - Show this message
+    -n, --note              - Prompt for additional notes (deprecated, for backwards compatibility)
+    -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
+    -r, --[no-]recurse      - Recurse 3 directories deep (deprecated, for backwards compatability)
+    -t, --na_tag=TAG        - Tag to consider a next action (default: na)
+    --version               - Display the program version
+
+COMMANDS
+    add          - Add a new next action
+    edit         - Open a todo file in the default editor
+    find, grep   - Find actions matching a search pattern
+    help         - Shows a list of commands or help for one command
+    init, create - Create a new todo file in the current directory
+    initconfig   - Initialize the config file using current global options
+    next, show   - Show next actions
+    prompt       - Show or install prompt hooks for the current shell
+    tagged       - Find actions matching a tag
 ```
 
 #### Commands
@@ -63,13 +93,60 @@ Example: `na add This feature @idea I have`
 If you run the `add` command with no arguments, you'll be asked for input on the command line.
 
 ```
-@cli(bundle exec bin/na help add)
+NAME
+    add - Add a new next action
+
+SYNOPSIS
+
+    na [global options] add [command options] ACTION
+
+DESCRIPTION
+    Provides an easy way to store todos while you work. Add quick reminders and (if you set up Prompt Hooks)   they'll automatically display next time you enter the directory.   If multiple todo files are found in the current directory, a menu will allow you to pick to which   file the action gets added. 
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH   - Search for files X directories deep (default: 1)
+    -f, --file=PATH     - Specify the file to which the task should be added (default: none)
+    -n, --note          - Prompt for additional notes
+    -p, --priority=PRIO - Add a priority level 1-5 (default: 0)
+    -t, --tag=TAG       - Use a tag other than the default next action tag (default: none)
+    --to=PROJECT        - Add action to specific project (default: Inbox)
+    -x                  - Don't add next action tag to new entry
+
+EXAMPLES
+
+    # Add a new action to the Inbox, including a tag
+    na add "A cool feature I thought of @idea"
+
+    # Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note
+    na add "A bug I need to fix" -p 4 -n
 ```
 
 ##### edit
 
 ```
-@cli(bundle exec bin/na help edit)
+NAME
+    edit - Open a todo file in the default editor
+
+SYNOPSIS
+
+    na [global options] edit [command options] 
+
+DESCRIPTION
+    Let the system choose the defualt, (e.g. TaskPaper), or specify a command line utility (e.g. vim).              If more than one todo file is found, a menu is displayed. 
+
+COMMAND OPTIONS
+    -a, --app=EDITOR    - Specify a Mac app (default: none)
+    -d, --depth=DEPTH   - Recurse to depth (default: 1)
+    -e, --editor=EDITOR - Specify an editor CLI (default: none)
+
+EXAMPLES
+
+    # Open the main todo file in the default editor
+    na edit
+
+    # Display a menu of all todo files three levels deep from the
+               current directory, open selection in vim.
+    na edit -d 3 -a vim
 ```
 
 ##### find
@@ -79,13 +156,51 @@ Example: `na find cool feature idea`
 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).
 
 ```
-@cli(bundle exec bin/na help find)
+NAME
+    find - Find actions matching a search pattern
+
+SYNOPSIS
+
+    na [global options] find [command options] PATTERN
+
+DESCRIPTION
+    Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe` 
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH                      - Recurse to depth (default: none)
+    -e, --regex                            - Interpret search pattern as regular expression
+    --in=TODO_PATH                         - Show actions from a specific todo file in history (default: none)
+    -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
+    --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
+    -v, --invert                           - Show actions not matching search pattern
+    -x, --exact                            - Match pattern exactly
+
+EXAMPLES
+
+    # Find all actions containing feature, idea, and swift
+    na find feature idea swift
+
+    # Find all actions containing the exact text "feature idea"
+    na find -x feature idea
 ```
 
 ##### init, create
 
 ```
-@cli(bundle exec bin/na help init)
+NAME
+    init - Create a new todo file in the current directory
+
+SYNOPSIS
+
+    na [global options] init [PROJECT]
+
+EXAMPLES
+
+    # Generate a new todo file, prompting for project name
+    na init
+
+    # Generate a new todo for a project called warpspeed
+    na init warpspeed
 ```
 
 ##### next, show
@@ -97,7 +212,28 @@ Examples:
 - `na show marked2` (show next actions from another directory you've previously used na on)
 
 ```
-@cli(bundle exec bin/na help next)
+NAME
+    next - Show next actions
+
+SYNOPSIS
+
+    na [global options] next [command options] OPTIONAL_QUERY
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH                      - Recurse to depth (default: 2)
+    --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
+    -t, --tag=TAG                          - Alternate tag to search for (default: none)
+
+EXAMPLES
+
+    # display the next actions from any todo files in the current directory
+    na next
+
+    # display the next actions from the current directory, traversing 3 levels deep
+    na next -d 3
+
+    # display next actions for a project you visited in the past
+    na next marked
 ```
 
 ##### tagged
@@ -107,7 +243,39 @@ Example: `na tagged feature +maybe`.
 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.
 
 ```
-@cli(bundle exec bin/na help tagged)
+NAME
+    tagged - Find actions matching a tag
+
+SYNOPSIS
+
+    na [global options] tagged [command options] TAG [VALUE]
+
+DESCRIPTION
+    Finds actions with tags matching the arguments. An action is shown if it              contains all of the tags listed. Add a + before a tag to make it required              and others optional. You can specify values using TAG=VALUE pairs.              Use <, >, and = for numeric comparisons, and *=, ^=, and $= for text comparisons.              Date comparisons use natural language (`na tagged "due<=today"`) and              are detected automatically. 
+
+COMMAND OPTIONS
+    -d, --depth=DEPTH                      - Recurse to depth (default: 1)
+    --in=TODO_PATH                         - Show actions from a specific todo file in history (default: none)
+    -o, --or                               - Combine tags with OR, displaying actions matching ANY of the tags
+    --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
+    -v, --invert                           - Show actions not matching tags
+
+EXAMPLES
+
+    # Show all actions tagged @maybe
+    na tagged maybe
+
+    # Show all actions tagged @feature AND @idea, recurse 3 levels
+    na tagged -d 3 "feature, idea"
+
+    # Show all actions tagged @feature OR @idea
+    na tagged --or "feature, idea"
+
+    # Show actions with @priority(4) or @priority(5)
+    na tagged "priority>=4"
+
+    # Show actions with a due date coming up in the next 2 days
+    na tagged "due<in 2 days"
 ```
 
 ### Configuration

metadata

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