na 1.1.8 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b233e64c028a52fe153ef2a02449e90f511a9950c6454d9ed6f198fa79340f0
-  data.tar.gz: 0d2a00e4b387fb2917b22180f34a353038c8eb5a7944fea9570418de10e24c6b
+  metadata.gz: 7d9dd176974a6c4c20be90d5051c7608469ea7b105537a7859697e3be4050ea5
+  data.tar.gz: b201fecc68568c3b80c6626eb425929d2f50faf6a1bd5fe5bae076021ea0d8b1
 SHA512:
-  metadata.gz: ab2fe89531b2b4b278375cc35e62922e16101c910d9e95c913202bb1a5879facc00ce868420943cb2fcceb18309a9691bb2b76f8990b7b49f4675d93adb837e6
-  data.tar.gz: 4881155bbc7cb33600462ef01d939847bdca6456fe9c862ef194f9175503246bfc23ecf10983da555d381a113638dd6e6f6b09e17a985f29cdead7c3e082ef38
+  metadata.gz: 169372ba631178c20af2af22e461ba0a6c9fcb7e7e5421d71464b1f180ad766bcd2888d30305354554e24ab86c366c12ffdbab9cc2e0f6c7c03f48f402a32679
+  data.tar.gz: c6ea88026936d1f0fe6d9c822945bd7f9ecf351a67871d5fbe27673a2142ef03502fb1759d20d817b4ab8f435942cf6bbdfa24829e535c9684fe507549ac5bee

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.1.10
+
+2022-10-05 08:19
+
+#### FIXED
+
+- When adding a project, don't use Ruby #capitalize, which downcases the rest of the project name
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.8)
+    na (1.1.10)
       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.8
+The current version of `na` is 1.1.10
 .
 
 `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. 
@@ -37,7 +37,7 @@ You can list next actions in files in the current directory by typing `na`. By d
 
 #### Easy matching
 
-`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na dev mark`. It will always look for the shortest match.
+`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na next dev mark`. It will always look for the shortest match.
 
 #### Recursion
 

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,13 +90,8 @@ class App
         end
       end
 
-      if options[:tag] == NA.na_tag
-        tag = nil
-        require_na = true
-      else
-        tag = options[:tag]
-        require_na = false
-      end
+      NA.na_tag = options[:tag] unless options[:tag].nil?
+      require_na = true
 
       tag = [{ tag: tag, value: nil }]
       files, actions = NA.parse_actions(depth: depth,
@@ -127,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]
@@ -166,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')
@@ -176,6 +174,7 @@ class App
                  reader.read_multiline
                end
              end
+
       if options[:file]
         target = File.expand_path(options[:file])
         unless File.exist?(target)
@@ -208,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.cap_first}:\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.cap_first}:#{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/string.rb

@@ -48,4 +48,15 @@ class ::String
     end
     true
   end
+
+  def cap_first!
+    replace cap_first
+  end
+
+  def cap_first
+    sub(/^([a-z])(.*)$/) do
+      m = Regexp.last_match
+      m[1].upcase << m[2]
+    end
+  end
 end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.8'
+  VERSION = '1.1.10'
 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.7<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.9<!--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. 
 
@@ -36,7 +36,7 @@ You can list next actions in files in the current directory by typing `na`. By d
 
 #### Easy matching
 
-`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na dev mark`. It will always look for the shortest match.
+`na` features intelligent project matching. Every time it locates a todo file, it adds the project to the database. Once a project is recorded, you can list its actions by using any portion of the parent directories or file names. If your project is in `~/Sites/dev/markedapp`, you could quickly list its next actions by typing `na next dev mark`. It will always look for the shortest match.
 
 #### Recursion
 

metadata

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