na 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86cf7b6d0d90a97947ac3965432745d3b0b3da7e01a685b5a640901ed3e07aa0
-  data.tar.gz: 77fc609f98aa873d5044e47f647dfde977f8557ab2a7e4627b85ea6fc15d03bc
+  metadata.gz: 14ffbfb64ddda9c09900f1037c38d7f903b1ad16ae7d00e568ab07a7358973c7
+  data.tar.gz: f9fb349736f4cda36fb3d01ab624e93e78bcccae5b6a92853065539e25e0748c
 SHA512:
-  metadata.gz: e7f9272b539b71fed3c226ed903ff6a917a8f5e132f3f25b47d677f8af4b515c5afc0f061f3509a22cb9630859ed2a9716e8e913cadc54e7a74e40982a7759b7
-  data.tar.gz: 7d6ff09ad2172ee68cf172d7b521c0814ef36346624f35eebf17707ec9fb9fe316c3e9879a00268c949d08df544a01f5f7a9dad610c187a30c9b3cabe438d9c3
+  metadata.gz: 1b9b602e6bc966a29bdf7e3b37fc2dcd0c2ec69e4e7fe0af5cdc7df2495c337b1bcde0975dceb3d14e095b1cda95cc4b306d02cbd15fc9f3e0616b5ef56392c7
+  data.tar.gz: 5d7d8ca3b8bc07ced66eeeb5f70065047bb1a0e57585c6c3f7b915e67762769b19666fedd912773ba7eb09d46997f8a04354ab79b875cd292f33203a38429a89

data/CHANGELOG.md

@@ -1,18 +1,18 @@
-### 1.1.1
+### 1.1.2
 
-2022-09-28 04:49
+2022-09-28 06:37
 
-#### CHANGED
+#### IMPROVED
 
-- Belated minor version bump
+- Detailed instructions after installing prompt hooks
 
-### 1.0.8
+### 1.1.1
 
-2022-09-28 04:47
+2022-09-28 04:49
 
-### 1.0.7
+#### CHANGED
 
-2022-09-28 04:38
+- Belated minor version bump
 
 ### 1.0.6
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.0.8)
+    na (1.1.1)
       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.2
 .
 
 `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. 
@@ -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

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
@@ -113,7 +113,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 +213,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 +402,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/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.2'
 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.1<!--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. 
 
@@ -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):
-
-```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):
+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.
 
-```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

metadata

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