na 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0a37d801443c68aaee6eee3b6c4a31461a61d4221c7a073beb0f176d7d7424
-  data.tar.gz: d04d6bd01a3104f6858e9a797af728486b80a8482b6644a09940a6272ae2ec4b
+  metadata.gz: 9aab87ece3f35afbe5280d6c1b777c9d8dece4916f796eedb3dfebdbbeb5032e
+  data.tar.gz: 46b7eef3d84ede3a69f9497e4d0bb4fcc772fd159fbffe23f9749f3172bc2cdf
 SHA512:
-  metadata.gz: 7ec40b0dd9ff9f154cc22e5d1cb2df700fae82e9c8118110d72b0ea3aeed46a0bd7543955e8b491f99816a9c5dea8ede5866534c362abbb771a3fefbe8d346d9
-  data.tar.gz: c66d44910edfe4200655b6775665ead7836b47dd7b8b20385da29ee21ce6ba38d5fef0f99b2da009385d9962204cf491d3ee928b2c255bd5d2ce278d8a4c15fa
+  metadata.gz: 05bda9033431ce005ad32fb9cd1c711642504972ffa73131d1c989b90dd4b50089b53d9e6746df4555d87e9b65d8b3c2c3707023dd8a8287f8596f4583a727f5
+  data.tar.gz: d474663a84ca7ef0287f05c3c2ed6fa63b0fb3d6482337b33343bbfa71a7a7d1c4fe542f91d9c75797c48a4f073079b85a96ef6704d2056b193b7f891596cbf9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.7
+
+2022-09-28 04:38
+
 ### 1.0.6
 
 2022-09-28 04:22

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.0.5)
+    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.5.
+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. 
 

data/bin/na

@@ -91,7 +91,7 @@ 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,
                                         tag: tag)
@@ -122,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]
@@ -147,9 +150,14 @@ class App
       end
 
       na_tag = NA.na_tag
-      na_tag = options[:tag] unless options[:tag].nil?
+      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')
@@ -191,7 +199,6 @@ class App
         end
       end
 
-      NA.save_working_dir(File.expand_path(target))
       NA.add_action(target, action, note)
     end
   end

data/lib/na/next_action.rb

@@ -26,7 +26,9 @@ module NA
     end
 
     def find_files(depth: 1)
-      `find . -name "*.#{NA.extension}" -maxdepth #{depth}`.strip.split("\n")
+      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)
@@ -151,12 +153,14 @@ 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.na_tag}/, '')
+            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

data/lib/na/prompt.rb

@@ -9,20 +9,20 @@ module NA
         when :zsh
           <<~EOHOOK
             # zsh prompt hook for na
-            chpwd() { na }
+            chpwd() { na next }
           EOHOOK
         when :fish
           <<~EOHOOK
             # Fish Prompt Command
             function __should_na --on-variable PWD
-              test -s (basename $PWD)".#{NA.extension}" && na
+              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
+              [[ $(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'"

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 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.5<!--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. 
 

metadata

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