na 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cf7b6d0d90a97947ac3965432745d3b0b3da7e01a685b5a640901ed3e07aa0
-  data.tar.gz: 77fc609f98aa873d5044e47f647dfde977f8557ab2a7e4627b85ea6fc15d03bc
+  metadata.gz: 182588b3837e44b8361cc7c77b1bb52e95323deb7be15062af5487bcca016c3d
+  data.tar.gz: c46e5ed7493ac655419e41154036913493fb21a5d73de68acd7d10923ea464f0
 SHA512:
-  metadata.gz: e7f9272b539b71fed3c226ed903ff6a917a8f5e132f3f25b47d677f8af4b515c5afc0f061f3509a22cb9630859ed2a9716e8e913cadc54e7a74e40982a7759b7
-  data.tar.gz: 7d6ff09ad2172ee68cf172d7b521c0814ef36346624f35eebf17707ec9fb9fe316c3e9879a00268c949d08df544a01f5f7a9dad610c187a30c9b3cabe438d9c3
+  metadata.gz: 91a8e4a51b093c696c691f240f2aa80d7775cd187c74954273bd477c9efbff8180dc14b895e98d1b825c26e2a87ef5393998dce741fc377cfe7a7cae4550d750
+  data.tar.gz: 82ff75620de7508e307f64f6d62286590ff8d68c657870ae4d11f91cd44fc8c6a09dcde14316768862b4dac5c889febbc87cdf46eb7b509457e8e7faaacc163c

data/CHANGELOG.md

@@ -1,18 +1,26 @@
-### 1.1.1
+### 1.1.3
 
-2022-09-28 04:49
+2022-09-28 07:12
 
-#### CHANGED
+#### FIXED
 
-- Belated minor version bump
+- `na next --tag X` not working
+
+### 1.1.2
+
+2022-09-28 06:37
 
-### 1.0.8
+#### IMPROVED
+
+- Detailed instructions after installing prompt hooks
 
-2022-09-28 04:47
+### 1.1.1
 
-### 1.0.7
+2022-09-28 04:49
 
-2022-09-28 04:38
+#### CHANGED
+
+- Belated minor version bump
 
 ### 1.0.6
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.0.8)
+    na (1.1.3)
       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.1
+The current version of `na` is 1.1.3
 .
 
 `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. 
@@ -18,6 +18,14 @@ Used with Taskpaper files, it can add new todo items quickly from the command li
 
 It can also auto-display next actions when you enter a project directory, automatically locating any todo files and listing their next actions when you `cd` to the project (optionally recursive). See the [Prompt Hooks](#prompt-hooks) section for details.
 
+### Installation
+
+Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
+
+If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
+
+
+
 ### Features
 
 You can list next actions in files in the current directory by typing `na`. By default, `na` looks for `*.taskpaper` files and extracts items tagged `@na` and not `@done`. All of these can be changed in the configuration.
@@ -36,14 +44,6 @@ You can also quickly add todo items from the command line with the `add` subcomm
 
 If found, it will try to locate an `Inbox:` project, or create one if it doesn't exist. Any arguments after `add` will be combined to create a new task in TaskPaper format. They will automatically be assigned as next actions (tagged `@na`) and will show up when `na` lists the tasks for the project.
 
-### Installation
-
-Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
-
-If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
-
-
-
 ### Usage
 
 ```
@@ -54,18 +54,18 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.0.4
+    1.1.1
 
 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=FILE_EXTENSION    - File extension to consider a todo file (default: taskpaper)
     --help                  - Show this message
     -n, --[no-]note         - Prompt for additional notes (deprecated, for backwards compatibility)
     --na_tag=TAG            - Tag to consider a next action (default: na)
     -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) (default: enabled)
-    --[no-]verbose          - Display verbose output
     --version               - Display the program version
 
 COMMANDS
@@ -76,6 +76,7 @@ COMMANDS
     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
 ```
 
@@ -85,6 +86,8 @@ COMMANDS
 
 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.
+
 ```
 NAME
     add - Add a new next action
@@ -98,9 +101,10 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -f, --file=PATH    - Specify the file to which the task should be added (default: none)
-    -n, --[no-]note    - Prompt for additional notes
+    -n, --note         - Prompt for additional notes
     -p, --priority=arg - Add a priority level 1-5 (default: 0)
     -t, --tag=TAG      - Use a tag other than the default next action tag (default: none)
+    -x                 - Don't add next action tag to new entry
 
 EXAMPLES
 
@@ -156,7 +160,7 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -d, --depth=DEPTH - Recurse to depth (default: 1)
-    -x, --[no-]exact  - Match pattern exactly
+    -x, --exact       - Match pattern exactly
 
 EXAMPLES
 
@@ -273,36 +277,15 @@ Note that I created a new YAML dictionary inside of the `:next:` command, and ad
 
 ### Prompt Hooks
 
-You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. Add the appropriate command to your login file for your shell:
-
-_(You can add `-r` to any of these calls to na to automatically recurse 3 directories deep)_
-
-Bash (in ~/.bash_profile):
+You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. To install a prompt command for your current shell, just run `na prompt install`. It works with Zsh, Bash, and Fish. If you'd rather make the changes to your startup file yourself, run `na prompt show` to get the hook and instructions printed out for copying.
 
-```bash
-last_command_was_cd() {
-	[[ $(history 1|sed -e "s/^[ ]*[0-9]*[ ]*//") =~ ^((cd|z|j|jump|g|f|pushd|popd|exit)([ ]|$)) ]] && na
-}
-if [[ -z "$PROMPT_COMMAND" ]]; then
-	PROMPT_COMMAND="eval 'last_command_was_cd'"
-else
-	echo $PROMPT_COMMAND | grep -v -q "last_command_was_cd" && PROMPT_COMMAND="$PROMPT_COMMAND;"'eval "last_command_was_cd"'
-fi
-```
+> You can also get output for shells other than the one you're currently using by adding "bash", "zsh", or "fish" to the show or install command.
 
-Fish (in ~/.config/fish/conf.d/*.fish):
 
-```fish
-function __should_na --on-variable PWD
-	test -s (basename $PWD)".taskpaper" && na
-end
-```
+> You can add `-r` to any of the calls to na to automatically recurse 3 directories deep, or just set the depth config permanently
 
-Zsh (in ~/.zshrc):
 
-```zsh
-chpwd() { na }
-```
+After installing a hook, you'll need to close your terminal and start a new session to initialize the new commands.
 
 
 ### Misc
@@ -313,4 +296,9 @@ If you have [gum][] installed, na will use it for command line input when adding
 [donate]: http://brettterpstra.com/donate/
 [github]: https://github.com/ttscoff/na_gem/
 
+
 PayPal link: [paypal.me/ttscoff](https://paypal.me/ttscoff)
+
+## Changelog
+
+See [CHANGELOG.md](https://github.com/ttscoff/na_gem/blob/master/CHANGELOG.md)

data/bin/na

@@ -37,7 +37,7 @@ class App
   flag %i[p priority]
 
   desc 'Prompt for additional notes (deprecated, for backwards compatibility)'
-  switch %i[n note]
+  switch %i[n note], negatable: false
 
   desc 'Recurse 3 directories deep (deprecated, for backwards compatability)'
   switch %i[r recurse], default_value: false, negatable: true
@@ -92,6 +92,7 @@ class App
       end
 
       tag = options[:tag] == NA.na_tag ? nil : options[:tag]
+      tag = [{ tag: tag, value: nil }]
       files, actions = NA.parse_actions(depth: depth,
                                         query: tokens,
                                         tag: tag)
@@ -113,7 +114,7 @@ class App
               desc: 'Add a new action to the Inbox, set its @priority to 4, and prompt for an additional note'
 
     c.desc 'Prompt for additional notes'
-    c.switch %i[n note]
+    c.switch %i[n note], negatable: false
 
     c.desc 'Add a priority level 1-5'
     c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
@@ -213,7 +214,7 @@ class App
     c.example 'na find -d 3 swift obj-c', desc: 'Find all actions 3 directories deep containing either swift or obj-c'
 
     c.desc 'Match pattern exactly'
-    c.switch %i[x exact]
+    c.switch %i[x exact], negatable: false
 
     c.desc 'Recurse to depth'
     c.arg_name 'DEPTH'
@@ -402,12 +403,11 @@ class App
     end
   end
 
-
-
   pre do |global, command, options, args|
     NA.verbose = global[:debug]
     NA.extension = global[:ext]
     NA.na_tag = global[:na_tag]
+    NA.weed_cache_file
     true
   end
 

data/lib/na/next_action.rb

@@ -81,7 +81,7 @@ module NA
                    else
                      '%filename%parent%action'
                    end
-                 elsif NA.find_files(depth: depth).count > 1
+                 elsif find_files(depth: depth).count > 1
                    if depth > 1
                      '%filename%parent%action'
                    else
@@ -103,11 +103,13 @@ module NA
       optional = []
 
       tag&.each do |t|
-        new_rx = " @#{t[:tag]}"
-        new_rx = "#{new_rx}\\(#{t[:value]}\\)" if t[:value]
+        unless t[:tag].nil?
+          new_rx = " @#{t[:tag]}"
+          new_rx = "#{new_rx}\\(#{t[:value]}\\)" if t[:value]
 
-        optional.push(new_rx)
-        required.push(new_rx) if t[:required]
+          optional.push(new_rx)
+          required.push(new_rx) if t[:required]
+        end
       end
 
       unless search.nil?

data/lib/na/prompt.rb

@@ -54,7 +54,8 @@ module NA
         file = prompt_file(shell)
 
         File.open(File.expand_path(file), 'a') { |f| f.puts prompt_hook(shell) }
-        $stderr.puts NA::Color.template("{y}Added {bw}#{shell}{xy} prompt hook to {bw}#{file}{x}")
+        $stderr.puts NA::Color.template("{y}Added {bw}#{shell}{xy} prompt hook to {bw}#{file}{xy}.{x}")
+        $stderr.puts NA::Color.template("{y}You may need to close the current terminal and open a new one to enable the script.{x}")
       end
     end
   end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.1'
+  VERSION = '1.1.3'
 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.0.8<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.2<!--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. 
 
@@ -17,6 +17,14 @@ Used with Taskpaper files, it can add new todo items quickly from the command li
 
 It can also auto-display next actions when you enter a project directory, automatically locating any todo files and listing their next actions when you `cd` to the project (optionally recursive). See the [Prompt Hooks](#prompt-hooks) section for details.
 
+### Installation
+
+Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
+
+If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
+
+<!--JEKYLL> You can find the na source code (MIT license) on [GitHub][].-->
+
 ### Features
 
 You can list next actions in files in the current directory by typing `na`. By default, `na` looks for `*.taskpaper` files and extracts items tagged `@na` and not `@done`. All of these can be changed in the configuration.
@@ -35,14 +43,6 @@ You can also quickly add todo items from the command line with the `add` subcomm
 
 If found, it will try to locate an `Inbox:` project, or create one if it doesn't exist. Any arguments after `add` will be combined to create a new task in TaskPaper format. They will automatically be assigned as next actions (tagged `@na`) and will show up when `na` lists the tasks for the project.
 
-### Installation
-
-Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
-
-If you don't have Ruby/RubyGems, you can install them pretty easily with Homebrew, rvm, or asdf. I can't swear this tool is worth the time, but there _are_ a lot of great gems available...
-
-<!--JEKYLL> You can find the na source code (MIT license) on [GitHub][].-->
-
 ### Usage
 
 ```
@@ -53,18 +53,18 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.0.4
+    1.1.1
 
 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=FILE_EXTENSION    - File extension to consider a todo file (default: taskpaper)
     --help                  - Show this message
     -n, --[no-]note         - Prompt for additional notes (deprecated, for backwards compatibility)
     --na_tag=TAG            - Tag to consider a next action (default: na)
     -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) (default: enabled)
-    --[no-]verbose          - Display verbose output
     --version               - Display the program version
 
 COMMANDS
@@ -75,6 +75,7 @@ COMMANDS
     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
 ```
 
@@ -84,6 +85,8 @@ COMMANDS
 
 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.
+
 ```
 NAME
     add - Add a new next action
@@ -97,9 +100,10 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -f, --file=PATH    - Specify the file to which the task should be added (default: none)
-    -n, --[no-]note    - Prompt for additional notes
+    -n, --note         - Prompt for additional notes
     -p, --priority=arg - Add a priority level 1-5 (default: 0)
     -t, --tag=TAG      - Use a tag other than the default next action tag (default: none)
+    -x                 - Don't add next action tag to new entry
 
 EXAMPLES
 
@@ -155,7 +159,7 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -d, --depth=DEPTH - Recurse to depth (default: 1)
-    -x, --[no-]exact  - Match pattern exactly
+    -x, --exact       - Match pattern exactly
 
 EXAMPLES
 
@@ -272,36 +276,15 @@ Note that I created a new YAML dictionary inside of the `:next:` command, and ad
 
 ### Prompt Hooks
 
-You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. Add the appropriate command to your login file for your shell:
-
-_(You can add `-r` to any of these calls to na to automatically recurse 3 directories deep)_
-
-Bash (in ~/.bash_profile):
+You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. To install a prompt command for your current shell, just run `na prompt install`. It works with Zsh, Bash, and Fish. If you'd rather make the changes to your startup file yourself, run `na prompt show` to get the hook and instructions printed out for copying.
 
-```bash
-last_command_was_cd() {
-	[[ $(history 1|sed -e "s/^[ ]*[0-9]*[ ]*//") =~ ^((cd|z|j|jump|g|f|pushd|popd|exit)([ ]|$)) ]] && na
-}
-if [[ -z "$PROMPT_COMMAND" ]]; then
-	PROMPT_COMMAND="eval 'last_command_was_cd'"
-else
-	echo $PROMPT_COMMAND | grep -v -q "last_command_was_cd" && PROMPT_COMMAND="$PROMPT_COMMAND;"'eval "last_command_was_cd"'
-fi
-```
-
-Fish (in ~/.config/fish/conf.d/*.fish):
-
-```fish
-function __should_na --on-variable PWD
-	test -s (basename $PWD)".taskpaper" && na
-end
-```
+> You can also get output for shells other than the one you're currently using by adding "bash", "zsh", or "fish" to the show or install command.
+<!--JEKYLL{:.tip}-->
 
-Zsh (in ~/.zshrc):
+> You can add `-r` to any of the calls to na to automatically recurse 3 directories deep, or just set the depth config permanently
+<!--JEKYLL{:.tip}-->
 
-```zsh
-chpwd() { na }
-```
+After installing a hook, you'll need to close your terminal and start a new session to initialize the new commands.
 
 
 ### Misc
@@ -312,8 +295,10 @@ If you have [gum][] installed, na will use it for command line input when adding
 [donate]: http://brettterpstra.com/donate/
 [github]: https://github.com/ttscoff/na_gem/
 
-<!--GITHUB-->PayPal link: [paypal.me/ttscoff](https://paypal.me/ttscoff)<!--END GITHUB-->
-<!--END README-->
+<!--GITHUB-->
+PayPal link: [paypal.me/ttscoff](https://paypal.me/ttscoff)
+
 ## Changelog
 
 See [CHANGELOG.md](https://github.com/ttscoff/na_gem/blob/master/CHANGELOG.md)
+<!--END GITHUB--><!--END README-->

metadata

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