na 1.1.7 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a47eb8254efd672fd4a240639516c3100244bada4809f40c6eba9fcb6ba4ea7
-  data.tar.gz: b44d9bbd6d91db44c3929bf64d2a45356297272de4a3ee246cf59921c9579d0c
+  metadata.gz: e1c1a61c33eaccbf930903d5adbc75fd4ef717b31bdb21539240535d03b71922
+  data.tar.gz: 1c1067564d9e0e8452512cf146ff9443ecc8a61456ed1d1d46dc5a76c5cf2280
 SHA512:
-  metadata.gz: f8951228d935af6e614ea068df59060a73c42078f2e63f71242f8a95dfab9225cb86298269a375d684fa3c7617061ef8fb12560fe16429eb80e6e8e7b3a71c25
-  data.tar.gz: d944ca6cf975bc996b481ae1764b824298440b63baa098d920fc3ac717c7504d9ab988f38965f2e20ce9844b763809dbb546836319cfc19a504c80ef177477c8
+  metadata.gz: a39268399afd4fdb653b5578f729967fca4c4313b1c0698e42b714d775257cbdae511380c895066ef7a399dc0637f806cc6890d6664919244cbacbca23a2182b
+  data.tar.gz: 7cc6f8938f297e23352d9b5d5bdfa6d3727d316cd6508dc29cf829e8a68939c30964e40036e04624921e157ccbcc45df2e71fd426a06d1e80d59cdcd8b80d98a

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.1.9
+
+2022-10-03 12:08
+
+#### NEW
+
+- `na add --to PROJECT` option to add an action to a project other than Inbox. Case insensitive but requires exact project match. Missing project will be created at top of file.
+
+#### FIXED
+
+- `-t ALT_TAG` functionality fixed
+
+### 1.1.8
+
+2022-10-02 16:40
+
+#### FIXED
+
+- `na next -t X` didn't replace @na tag in search, but appended to it
+
 ### 1.1.7
 
 2022-10-02 12:20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.7)
+    na (1.1.9)
       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.7
+The current version of `na` is 1.1.9
 .
 
 `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. 
@@ -22,6 +22,11 @@ It can also auto-display next actions when you enter a project directory, automa
 
 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're using Homebrew, you have the option to install via [brew-gem](https://github.com/sportngin/brew-gem):
+
+    brew install brew-gem
+    brew 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...
 
 

data/bin/na

@@ -23,7 +23,7 @@ class App
   desc 'Tag to consider a next action'
   default_value 'na'
   arg_name 'TAG'
-  flag :na_tag
+  flag %i[t na_tag]
 
   default_command :next
 
@@ -61,7 +61,6 @@ class App
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
     c.desc 'Alternate tag to search for'
-    c.default_value 'na'
     c.flag %i[t tag]
 
     c.action do |global_options, options, args|
@@ -91,11 +90,14 @@ class App
         end
       end
 
-      tag = options[:tag] == NA.na_tag ? nil : options[:tag]
+      NA.na_tag = options[:tag] unless options[:tag].nil?
+      require_na = true
+
       tag = [{ tag: tag, value: nil }]
       files, actions = NA.parse_actions(depth: depth,
                                         query: tokens,
-                                        tag: tag)
+                                        tag: tag,
+                                        require_na: require_na)
 
       NA.output_actions(actions, depth, files: files)
     end
@@ -119,6 +121,10 @@ class App
     c.desc 'Add a priority level 1-5'
     c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
 
+    c.desc 'Add action to specific project'
+    c.default_value 'Inbox'
+    c.flag %[to]
+
     c.desc 'Use a tag other than the default next action tag'
     c.arg_name 'TAG'
     c.flag %i[t tag]
@@ -158,7 +164,7 @@ class App
         na_tag = " @#{na_tag}"
       end
 
-      action = "#{action.gsub(/#{na_tag}/, '')}#{na_tag}"
+      action = "#{action.gsub(/#{na_tag}\b/, '')}#{na_tag}"
 
       note = if options[:note]
                if TTY::Which.exist?('gum')
@@ -168,6 +174,7 @@ class App
                  reader.read_multiline
                end
              end
+
       if options[:file]
         target = File.expand_path(options[:file])
         unless File.exist?(target)
@@ -200,7 +207,7 @@ class App
         end
       end
 
-      NA.add_action(target, action, note)
+      NA.add_action(target, options[:to], action, note)
     end
   end
 

data/lib/na/next_action.rb

@@ -57,16 +57,16 @@ module NA
       end
     end
 
-    def add_action(file, action, note = nil)
+    def add_action(file, project, action, note = nil)
       content = IO.read(file)
-      unless content =~ /^[ \t]*Inbox:/i
-        content = "Inbox: @inbox\n#{content}"
+      unless content =~ /^[ \t]*#{project}:/i
+        content = "#{project.capitalize}:\n#{content}"
       end
 
-      content.sub!(/^([ \t]*)Inbox:(.*?)$/) do
+      content.sub!(/^([ \t]*)#{project}:(.*?)$/i) do
         m = Regexp.last_match
         note = note.nil? ? '' : "\n#{m[1]}\t\t#{note.join('').strip}"
-        "#{m[1]}Inbox:#{m[2]}\n#{m[1]}\t- #{action}#{note}"
+        "#{m[1]}#{project.capitalize}:#{m[2]}\n#{m[1]}\t- #{action}#{note}"
       end
 
       File.open(file, 'w') { |f| f.puts content }
@@ -105,7 +105,7 @@ module NA
 
       tag&.each do |t|
         unless t[:tag].nil?
-          new_rx = " @#{t[:tag]}"
+          new_rx = " @#{t[:tag]}\\b"
           new_rx = "#{new_rx}\\(#{t[:value]}\\)" if t[:value]
 
           optional.push(new_rx) unless t[:negate]

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.7'
+  VERSION = '1.1.9'
 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.6<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.8<!--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. 
 
@@ -21,6 +21,11 @@ It can also auto-display next actions when you enter a project directory, automa
 
 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're using Homebrew, you have the option to install via [brew-gem](https://github.com/sportngin/brew-gem):
+
+    brew install brew-gem
+    brew 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][].-->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.9
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-02 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake