na 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a40acdde96bfe4a27a093edf4e0f909b23b1c300d6be4f742323ac4e9233be
-  data.tar.gz: bfddb6edfe9cddf7a631819bd980708fd816d2853b3146f348c2095b1ca7aee2
+  metadata.gz: 9aab87ece3f35afbe5280d6c1b777c9d8dece4916f796eedb3dfebdbbeb5032e
+  data.tar.gz: 46b7eef3d84ede3a69f9497e4d0bb4fcc772fd159fbffe23f9749f3172bc2cdf
 SHA512:
-  metadata.gz: 77fd24c44ea1b7dba5fb2feb8d36e625972b7662c3032d96ffb7af28843cc08ad16f911fb58778b7cfc831b329859effb04134168517eb596f1da4e9d62cc001
-  data.tar.gz: 212c87e2f59706bd6ed9b5e4cec2ecbd629e9b344a7538f653d8b278dd0f9e62aeb2ceada2d2ed8ef12421fc8c54396ec6e2462b77fe28f90d90946a6aed3967
+  metadata.gz: 05bda9033431ce005ad32fb9cd1c711642504972ffa73131d1c989b90dd4b50089b53d9e6746df4555d87e9b65d8b3c2c3707023dd8a8287f8596f4583a727f5
+  data.tar.gz: d474663a84ca7ef0287f05c3c2ed6fa63b0fb3d6482337b33343bbfa71a7a7d1c4fe542f91d9c75797c48a4f073079b85a96ef6704d2056b193b7f891596cbf9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.0.7
+
+2022-09-28 04:38
+
+### 1.0.6
+
+2022-09-28 04:22
+
+#### NEW
+
+- `na prompt [show|install]` command to help with adding prompt hooks to your shell
+
 ### 1.0.5
 
 2022-09-28 01:53

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.0.4)
+    na (1.0.6)
       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.0.4.
+The current version of `na` is 1.0.6.
 
 `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. 
 
@@ -293,7 +293,6 @@ Fish (in ~/.config/fish/conf.d/*.fish):
 
 ```fish
 function __should_na --on-variable PWD
-	# function __should_na --on-event fish_prompt
 	test -s (basename $PWD)".taskpaper" && na
 end
 ```

data/bin/na

@@ -48,7 +48,7 @@ class App
   flag %i[d depth], type: :integer, must_match: /^\d+$/
 
   desc 'Display verbose output'
-  switch %i[verbose]
+  switch %i[debug]
 
   desc 'Show next actions'
   arg_name 'OPTIONAL_QUERY'
@@ -91,14 +91,12 @@ class App
         end
       end
 
-      tag = options[:tag] == global_options[:na_tag] ? nil : options[:tag]
+      tag = options[:tag] == NA.na_tag ? nil : options[:tag]
       files, actions = NA.parse_actions(depth: depth,
                                         query: tokens,
-                                        extension: global_options[:ext],
-                                        na_tag: global_options[:na_tag],
                                         tag: tag)
 
-      NA.output_actions(actions, depth, global_options[:ext], files: files)
+      NA.output_actions(actions, depth, files: files)
     end
   end
 
@@ -124,6 +122,9 @@ class App
     c.arg_name 'TAG'
     c.flag %i[t tag]
 
+    c.desc 'Don\'t add next action tag to new entry'
+    c.switch %i[x]
+
     c.desc 'Specify the file to which the task should be added'
     c.arg_name 'PATH'
     c.flag %i[f file]
@@ -148,10 +149,15 @@ class App
         action = "#{action.gsub(/@priority\(\d+\)/, '')} @priority(#{options[:priority]})"
       end
 
-      na_tag = global_options[:na_tag]
-      na_tag = options[:tag] unless options[:tag].nil?
+      na_tag = NA.na_tag
+      if options[:x]
+        na_tag = ''
+      else
+        na_tag = options[:tag] unless options[:tag].nil?
+        na_tag = " @#{na_tag}"
+      end
 
-      action = "#{action.gsub(/@#{na_tag}/, '')} @#{na_tag}"
+      action = "#{action.gsub(/#{na_tag}/, '')}#{na_tag}"
 
       note = if options[:note]
                if TTY::Which.exist?('gum')
@@ -167,7 +173,7 @@ class App
           print NA::Color.template('{by}Specified file not found, create it? {w}(y/{g}N{w}){x} ')
           res = reader.read_char
           if res =~ /y/i
-            basename = File.basename(target, ".#{global_options[:ext]}")
+            basename = File.basename(target, ".#{NA.extension}")
             NA.create_todo(target, basename)
           else
             puts NA::Color.template('{r}Cancelled{x}')
@@ -175,15 +181,15 @@ class App
           end
         end
       else
-        files = NA.find_files(depth: 1, extension: global_options[:ext])
+        files = NA.find_files(depth: 1)
         if files.count == 0
           print NA::Color.template('{by}No todo file found, create one? {w}(y/{g}N{w}){x} ')
           res = reader.read_char
           if res =~ /y/i
             basename = File.expand_path('.').split('/').last
-            target = "#{basename}.#{global_options[:ext]}"
+            target = "#{basename}.#{NA.extension}"
             NA.create_todo(target, basename)
-            files = NA.find_files(depth: 1, extension: global_options[:ext])
+            files = NA.find_files(depth: 1)
           end
         end
         target = files.count > 1 ? NA.select_file(files) : files[0]
@@ -193,7 +199,6 @@ class App
         end
       end
 
-      NA.save_working_dir(File.expand_path(target))
       NA.add_action(target, action, note)
     end
   end
@@ -236,10 +241,8 @@ class App
       end
 
       files, actions = NA.parse_actions(depth: depth,
-                                        extension: global_options[:ext],
-                                        na_tag: global_options[:na_tag],
                                         search: tokens)
-      NA.output_actions(actions, depth, global_options[:ext], files: files)
+      NA.output_actions(actions, depth, files: files)
     end
   end
 
@@ -278,10 +281,8 @@ class App
       end
 
       files, actions = NA.parse_actions(depth: depth,
-                                        extension: global_options[:ext],
-                                        na_tag: global_options[:na_tag],
                                         tag: tags)
-      NA.output_actions(actions, depth, global_options[:ext], files: files)
+      NA.output_actions(actions, depth, files: files)
     end
   end
 
@@ -300,7 +301,7 @@ class App
         project = reader.read_line(NA::Color.template('{y}Project name {bw}> {x}'), value: project).strip
       end
 
-      target = "#{project}.#{global_options[:ext]}"
+      target = "#{project}.#{NA.extension}"
 
       if File.exist?(target)
         print NA::Color.template("{r}File {bw}#{target}{r} already exists, overwrite it? {br}y{w}/{bg}N{x} ")
@@ -339,7 +340,7 @@ class App
               else
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               end
-      files = NA.find_files(depth: depth, extension: global_options[:ext])
+      files = NA.find_files(depth: depth)
       file = if files.count > 1
                NA.select_file(files)
              else
@@ -354,8 +355,59 @@ class App
     end
   end
 
+  desc 'Show or install prompt hooks for the current shell'
+  long_desc 'Installing the prompt hook allows you to automatically
+  list next actions when you cd into a directory'
+  command %i[prompt] do |c|
+    c.desc 'Output the prompt hook for the current shell to STDOUT. Pass an argument to specify a shell (zsh, bash, fish)'
+    c.arg_name '[SHELL]'
+    c.command %i[show] do |s|
+      s.action do |global_options, options, args|
+        if args.count.positive?
+          shell = args[0]
+        else
+          shell = File.basename(ENV['SHELL'])
+        end
+
+        case shell
+        when /^f/i
+          NA::Prompt.show_prompt_hook(:fish)
+        when /^z/i
+          NA::Prompt.show_prompt_hook(:zsh)
+        when /^b/i
+          NA::Prompt.show_prompt_hook(:bash)
+        end
+      end
+    end
+
+    c.desc 'Install the hook for the current shell to the appropriate startup file.'
+    c.arg_name '[SHELL]'
+    c.command %i[install] do |s|
+      s.action do |global_options, options, args|
+        if args.count.positive?
+          shell = args[0]
+        else
+          shell = File.basename(ENV['SHELL'])
+        end
+
+        case shell
+        when /^f/i
+          NA::Prompt.install_prompt_hook(:fish)
+        when /^z/i
+          NA::Prompt.install_prompt_hook(:zsh)
+        when /^b/i
+          NA::Prompt.install_prompt_hook(:bash)
+        end
+      end
+    end
+  end
+
+
+
   pre do |global, command, options, args|
-    NA.verbose = global[:verbose]
+    NA.verbose = global[:debug]
+    NA.extension = global[:ext]
+    NA.na_tag = global[:na_tag]
     true
   end
 

data/lib/na/next_action.rb

@@ -3,7 +3,7 @@
 # Next Action methods
 module NA
   class << self
-    attr_accessor :verbose
+    attr_accessor :verbose, :extension, :na_tag
 
     def create_todo(target, basename)
       File.open(target, 'w') do |f|
@@ -22,11 +22,13 @@ module NA
         ENDCONTENT
         f.puts(content)
       end
-      puts NA::Color.template("{y}Created {bw}#{target}{x}")
+      $stderr.puts NA::Color.template("{y}Created {bw}#{target}{x}")
     end
 
-    def find_files(depth: 1, extension: 'taskpaper')
-      `find . -name "*.#{extension}" -maxdepth #{depth}`.strip.split("\n")
+    def find_files(depth: 1)
+      files = `find . -name "*.#{NA.extension}" -maxdepth #{depth}`.strip.split("\n")
+      files.each { |f| save_working_dir(File.expand_path(f)) }
+      files
     end
 
     def select_file(files)
@@ -39,7 +41,7 @@ module NA
       elsif TTY::Which.exist?('fzf')
         res = choose_from(files, prompt: 'Use which file?')
         unless res
-          puts 'No file selected, cancelled'
+          $stderr.puts 'No file selected, cancelled'
           Process.exit 1
         end
 
@@ -69,17 +71,17 @@ module NA
 
       File.open(file, 'w') { |f| f.puts content }
 
-      puts NA::Color.template("{by}Task added to {bw}#{file}{x}")
+      $stderr.puts NA::Color.template("{by}Task added to {bw}#{file}{x}")
     end
 
-    def output_actions(actions, depth, extension, files: nil)
+    def output_actions(actions, depth, files: nil)
       template = if files&.count.positive?
                    if files.count == 1
                      '%parent%action'
                    else
                      '%filename%parent%action'
                    end
-                 elsif NA.find_files(depth: depth, extension: extension).count > 1
+                 elsif NA.find_files(depth: depth).count > 1
                    if depth > 1
                      '%filename%parent%action'
                    else
@@ -89,13 +91,13 @@ module NA
                    '%parent%action'
                  end
       if files && @verbose
-        puts files.map { |f| NA::Color.template("{dw}#{f}{x}") }
+        $stderr.puts files.map { |f| NA::Color.template("{dw}#{f}{x}") }
       end
 
       puts actions.map { |action| action.pretty(template: { output: template }) }
     end
 
-    def parse_actions(depth: 1, extension: 'taskpaper', na_tag: 'na', query: nil, tag: nil, search: nil)
+    def parse_actions(depth: 1, query: nil, tag: nil, search: nil)
       actions = []
       required = []
       optional = []
@@ -122,10 +124,10 @@ module NA
         end
       end
 
-      na_tag = "@#{na_tag.sub(/^@/, '')}"
+      na_tag = "@#{NA.na_tag.sub(/^@/, '')}"
 
       if query.nil?
-        files = find_files(depth: depth, extension: extension)
+        files = find_files(depth: depth)
       else
         files = match_working_dir(query)
       end
@@ -151,13 +153,15 @@ module NA
               indent_level = indent
             end
           elsif line =~ /^[ \t]*- / && line !~ / @done/
+            next unless line =~ /@#{NA.na_tag}\b/
+
             unless optional.empty? && required.empty?
               next unless line.matches(any: optional, all: required)
 
             end
 
-            action = line.sub(/^[ \t]*- /, '').sub(/ #{na_tag}/, '')
-            new_action = NA::Action.new(file, File.basename(file, ".#{extension}"), parent.dup, action)
+            action = line.sub(/^[ \t]*- /, '').sub(/ @#{NA.na_tag}\b/, '')
+            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action)
             actions.push(new_action)
           end
         end
@@ -220,7 +224,7 @@ module NA
         dirs.delete_if { |d| !d.matches(any: optional, all: required) }
         dirs.sort.uniq
       else
-        puts NA::Color.template('{r}No na database found{x}')
+        $stderr.puts NA::Color.template('{r}No na database found{x}')
         Process.exit 1
       end
     end
@@ -269,7 +273,7 @@ module NA
         if 'xdg-open'.available?
           `xdg-open #{Shellwords.escape(file)}`
         else
-          puts NA::Color.template('{r}Unable to determine executable for `open`.{x}')
+          $stderr.puts NA::Color.template('{r}Unable to determine executable for `open`.{x}')
         end
       end
     end

data/lib/na/prompt.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module NA
+  # Prompt Hooks
+  module Prompt
+    class << self
+      def prompt_hook(shell)
+        case shell
+        when :zsh
+          <<~EOHOOK
+            # zsh prompt hook for na
+            chpwd() { na next }
+          EOHOOK
+        when :fish
+          <<~EOHOOK
+            # Fish Prompt Command
+            function __should_na --on-variable PWD
+              test -s (basename $PWD)".#{NA.extension}" && na next
+            end
+          EOHOOK
+        when :bash
+          <<~EOHOOK
+            # Bash PROMPT_COMMAND for na
+            last_command_was_cd() {
+              [[ $(history 1|sed -e "s/^[ ]*[0-9]*[ ]*//") =~ ^((cd|z|j|jump|g|f|pushd|popd|exit)([ ]|$)) ]] && na next
+            }
+            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
+          EOHOOK
+        end
+      end
+
+      def prompt_file(shell)
+        files = {
+          zsh: '~/.zshrc',
+          fish: '~/.config/fish/conf.d/na.fish',
+          bash: '~/.bash_profile'
+        }
+
+        files[shell]
+      end
+
+      def show_prompt_hook(shell)
+        file = prompt_file(shell)
+
+        $stderr.puts NA::Color.template("{bw}# Add this to {y}#{file}{x}")
+        puts prompt_hook(shell)
+      end
+
+      def install_prompt_hook(shell)
+        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}")
+      end
+    end
+  end
+end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.0.5'
+  VERSION = '1.0.7'
 end

data/lib/na.rb

@@ -11,3 +11,4 @@ require 'na/colors.rb'
 require 'na/string.rb'
 require 'na/action.rb'
 require 'na/next_action.rb'
+require 'na/prompt.rb'

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.4<!--END VER-->.
+The current version of `na` is <!--VER-->1.0.6<!--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. 
 
@@ -293,7 +293,6 @@ Fish (in ~/.config/fish/conf.d/*.fish):
 
 ```fish
 function __should_na --on-variable PWD
-	# function __should_na --on-event fish_prompt
 	test -s (basename $PWD)".taskpaper" && na
 end
 ```

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Brett Terpstra
@@ -170,6 +170,7 @@ files:
 - lib/na/action.rb
 - lib/na/colors.rb
 - lib/na/next_action.rb
+- lib/na/prompt.rb
 - lib/na/string.rb
 - lib/na/version.rb
 - na.gemspec