na 1.2.45 → 1.2.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 999328238e283419f4e31a30244177baed7a0aca57b5c112dc29434d68c039f0
-  data.tar.gz: 6d0182ffc278c67ed1d44701d0e7fb7ec68de947ad592fefa2e4494bf8ca09d4
+  metadata.gz: '0847ca8c8b5746d6e0f099c5bfc38d00dd01353acc7bceda6c5c6423ed16630f'
+  data.tar.gz: 6e7eecaf402a4268826095e6b46b4f1fad26a7e454b6162a6ef113f04e91a660
 SHA512:
-  metadata.gz: a0e0db55f26d7a136c179ebd1a391e3822cee860e72b22bc227d2d5321fd8ec659619ed33f3cfb93e8ca25d3da7d072b12ceea9717c8f4bd499dd9ab2dd814a2
-  data.tar.gz: 3bf8afbfd84a9b19699c0bdfa443c3e0b46f4557188e5a3d19b9cf99123e0fff3a3baa943b31f1c084435e4e37ea7f59c90a3dfaa1825cdea93d5d88f83fc2c5
+  metadata.gz: 794d54bd290f665f51bb1d74846c83a4406ba76568132591ab19fe146bbbbce844be4e6fff2be05c73170f3666a87edc5446bf1380d1a7c8ded9848fbba9c4a9
+  data.tar.gz: de1cea81c7612bf8beaa0b73243aa687e9325d46e0c93d139cda87d6792fb99a2614812671b68f6ae9961adde9040c669ce73c5ae1f39d1215820187345ca21b

data/.travis.yml

@@ -4,7 +4,7 @@ sudo: required
 dist: trusty
 cache: bundler
 rvm:
-  - ruby-3.0.0
+  - ruby-3.1.0
 install:
   - gem install bundler --version '2.2.29'
   - bundle install

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.2.46
+
+2023-09-06 21:25
+
+#### IMPROVED
+
+- Add `--project` to archive and update
+- Add `--project` flag to complete
+
+#### FIXED
+
+- Error when creating new project in todo file
+
 ### 1.2.45
 
 2023-09-06 19:19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.45)
+    na (1.2.46)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)

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.2.45
+The current version of `na` is 1.2.46
 .
 
 `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. 
@@ -77,7 +77,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.45
+    1.2.46
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -487,26 +487,27 @@ DESCRIPTION
     Provides an easy way to complete, prioritize, and tag existing actions.   If multiple todo files are found in the current directory, a menu will   allow you to pick which file to act on. 
 
 COMMAND OPTIONS
-    -a, --archive                   - Add a @done tag to action and move to Archive
-    --all                           - Act on all matches immediately (no menu)
-    --at=POSITION                   - When moving task, add at [s]tart or [e]nd of target project (default: none)
-    -d, --depth=DEPTH               - Search for files X directories deep (default: 1)
-    --delete                        - Delete an action
-    --[no-]done                     - Include @done actions
-    -e, --regex                     - Interpret search pattern as regular expression
-    --edit                          - Open action in editor (vim).             Natural language dates will be parsed and converted in date-based tags.
-    -f, --finish                    - Add a @done tag to action
-    --file=PATH                     - Specify the file to search for the task (default: none)
-    --in, --todo=TODO_FILE          - Use a known todo file, partial matches allowed (default: none)
-    -n, --note                      - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
-    -o, --overwrite                 - Overwrite note instead of appending
-    -p, --priority=PRIO             - Add/change a priority level 1-5 (default: 0)
-    -r, --remove=TAG                - Remove a tag from the action, use multiple times or combine multiple tags with a comma,             wildcards (* and ?) allowed (may be used more than once, default: none)
-    --restore                       - Remove @done tag from action
-    -t, --tag=TAG                   - Add a tag to the action, @tag(values) allowed, use multiple times or combine multiple tags with a comma (may be used more than once, default: none)
-    --tagged=TAG                    - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
-    --to, --project, --proj=PROJECT - Move action to specific project (default: none)
-    -x, --exact                     - Match pattern exactly
+    -a, --archive                          - Add a @done tag to action and move to Archive
+    --all                                  - Act on all matches immediately (no menu)
+    --at=POSITION                          - When moving task, add at [s]tart or [e]nd of target project (default: none)
+    -d, --depth=DEPTH                      - Search for files X directories deep (default: 1)
+    --delete                               - Delete an action
+    --[no-]done                            - Include @done actions
+    -e, --regex                            - Interpret search pattern as regular expression
+    --edit                                 - Open action in editor (vim).             Natural language dates will be parsed and converted in date-based tags.
+    -f, --finish                           - Add a @done tag to action
+    --file=PATH                            - Specify the file to search for the task (default: none)
+    --in, --todo=TODO_FILE                 - Use a known todo file, partial matches allowed (default: none)
+    -n, --note                             - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
+    -o, --overwrite                        - Overwrite note instead of appending
+    -p, --priority=PRIO                    - Add/change a priority level 1-5 (default: 0)
+    --proj, --project=PROJECT[/SUBPROJECT] - Affect actions from a specific project (default: none)
+    -r, --remove=TAG                       - Remove a tag from the action, use multiple times or combine multiple tags with a comma,             wildcards (* and ?) allowed (may be used more than once, default: none)
+    --restore                              - Remove @done tag from action
+    -t, --tag=TAG                          - Add a tag to the action, @tag(values) allowed, use multiple times or combine multiple tags with a comma (may be used more than once, default: none)
+    --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    --to, --move=PROJECT                   - Move action to specific project (default: none)
+    -x, --exact                            - Match pattern exactly
 
 EXAMPLES
 
@@ -546,17 +547,18 @@ SYNOPSIS
     na [global options] complete [command options] ACTION
 
 COMMAND OPTIONS
-    -a, --archive                   - Add a @done tag to action and move to Archive
-    --all                           - Act on all matches immediately (no menu)
-    -d, --depth=DEPTH               - Search for files X directories deep (default: 1)
-    -e, --regex                     - Interpret search pattern as regular expression
-    --file=PATH                     - Specify the file to search for the task (default: none)
-    --in, --todo=TODO_FILE          - Use a known todo file, partial matches allowed (default: none)
-    -n, --note                      - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
-    -o, --overwrite                 - Overwrite note instead of appending
-    --tagged=TAG                    - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
-    --to, --project, --proj=PROJECT - Move action to specific project (default: none)
-    -x, --exact                     - Match pattern exactly
+    -a, --archive                          - Add a @done tag to action and move to Archive
+    --all                                  - Act on all matches immediately (no menu)
+    -d, --depth=DEPTH                      - Search for files X directories deep (default: 1)
+    -e, --regex                            - Interpret search pattern as regular expression
+    --file=PATH                            - Specify the file to search for the task (default: none)
+    --in, --todo=TODO_FILE                 - Use a known todo file, partial matches allowed (default: none)
+    -n, --note                             - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
+    -o, --overwrite                        - Overwrite note instead of appending
+    --proj, --project=PROJECT[/SUBPROJECT] - Affect actions from a specific project (default: none)
+    --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    --to, --move=PROJECT                   - Move action to specific project (default: none)
+    -x, --exact                            - Match pattern exactly
 
 EXAMPLES
 
@@ -580,15 +582,17 @@ SYNOPSIS
     na [global options] archive [command options] ACTION
 
 COMMAND OPTIONS
-    --all             - Act on all matches immediately (no menu)
-    -d, --depth=DEPTH - Search for files X directories deep (default: 1)
-    --done            - Archive all done tasks
-    -e, --regex       - Interpret search pattern as regular expression
-    --file=PATH       - Specify the file to search for the task (default: none)
-    -n, --note        - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
-    -o, --overwrite   - Overwrite note instead of appending
-    --tagged=TAG      - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
-    -x, --exact       - Match pattern exactly
+    --all                                  - Act on all matches immediately (no menu)
+    -d, --depth=DEPTH                      - Search for files X directories deep (default: 1)
+    --done                                 - Archive all done tasks
+    -e, --regex                            - Interpret search pattern as regular expression
+    --file=PATH                            - Specify the file to search for the task (default: none)
+    --in, --todo=TODO_FILE                 - Use a known todo file, partial matches allowed (default: none)
+    -n, --note                             - Prompt for additional notes. Input will be appended to any existing note.     If STDIN input (piped) is detected, it will be used as a note.
+    -o, --overwrite                        - Overwrite note instead of appending
+    --proj, --project=PROJECT[/SUBPROJECT] - Affect actions from a specific project (default: none)
+    --tagged=TAG                           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    -x, --exact                            - Match pattern exactly
 
 EXAMPLE
 

data/bin/commands/archive.rb

@@ -30,6 +30,10 @@ class App
     c.arg_name 'TAG'
     c.flag %i[tagged], multiple: true
 
+    c.desc 'Affect actions from a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[proj project]
+
     c.desc 'Act on all matches immediately (no menu)'
     c.switch %i[all], negatable: false
 
@@ -39,15 +43,20 @@ class App
     c.desc 'Match pattern exactly'
     c.switch %i[x exact], negatable: false
 
+    c.desc 'Use a known todo file, partial matches allowed'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo]
+
     c.action do |global, options, args|
       if options[:done]
-        options[:tagged] = ['done']
+        options[:tagged] << 'done'
         options[:all] = true
       end
 
       options[:done] = true
+      options['done'] = true
       options[:finish] = true
-      options[:project] = 'Archive'
+      options[:move] = 'Archive'
       options[:archive] = true
       options[:a] = true
 

data/bin/commands/complete.rb

@@ -22,7 +22,11 @@ class App
 
     c.desc 'Move action to specific project'
     c.arg_name 'PROJECT'
-    c.flag %i[to project proj]
+    c.flag %i[to move]
+
+    c.desc 'Affect actions from a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[proj project]
 
     c.desc 'Specify the file to search for the task'
     c.arg_name 'PATH'
@@ -52,7 +56,8 @@ class App
     c.action do |global, options, args|
       options[:finish] = true
       options[:f] = true
-      options[:project] = 'Archive' if options[:archive] && !options[:project]
+      options[:to] = 'Archive' if options[:archive] && !options[:to]
+      options[:move] = 'Archive' if options[:archive] && !options[:move]
 
       cmd = commands[:update]
       action = cmd.send(:get_action, nil)

data/bin/commands/update.rb

@@ -33,7 +33,11 @@ class App
 
     c.desc 'Move action to specific project'
     c.arg_name 'PROJECT'
-    c.flag %i[to project proj]
+    c.flag %i[to move]
+
+    c.desc 'Affect actions from a specific project'
+    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.flag %i[proj project]
 
     c.desc 'Use a known todo file, partial matches allowed'
     c.arg_name 'TODO_FILE'
@@ -90,6 +94,7 @@ class App
 
     c.action do |global_options, options, args|
       reader = TTY::Reader.new
+
       append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/i
 
       if options[:restore] || (!options[:remove].nil? && options[:remove].include?('done'))
@@ -97,7 +102,7 @@ class App
         options[:tagged] << '+done'
       elsif !options[:remove].nil? && !options[:remove].empty?
         options[:tagged].concat(options[:remove])
-      elsif options[:finish]
+      elsif options[:finish] && !options[:done]
         options[:tagged] << '-done'
       end
 
@@ -168,8 +173,8 @@ class App
       note = stdin_note.empty? ? [] : stdin_note
       note.concat(line_note) unless line_note.nil? || line_note.empty?
 
-      target_proj = if options[:project]
-                      options[:project]
+      target_proj = if options[:move]
+                      options[:move]
                     elsif NA.cwd_is == :project
                       NA.cwd
                     end
@@ -204,7 +209,7 @@ class App
         files = NA.find_files_matching({
                                          depth: options[:depth],
                                          done: options[:done],
-                                         project: target_proj,
+                                         project: options[:project],
                                          regex: options[:regex],
                                          require_na: false,
                                          search: tokens,
@@ -219,7 +224,7 @@ class App
 
       if options[:archive]
         options[:finish] = true
-        options[:project] = 'Archive'
+        options[:move] = 'Archive'
       end
 
       NA.notify("#{NA.theme[:error]}No search terms provided", exit_code: 1) if tokens.nil? && options[:tagged].empty?
@@ -233,10 +238,11 @@ class App
                          done: options[:done],
                          edit: options[:edit],
                          finish: options[:finish],
+                         move: target_proj,
                          note: note,
                          overwrite: options[:overwrite],
                          priority: priority,
-                         project: target_proj,
+                         project: options[:project],
                          remove_tag: remove_tags,
                          tagged: tags)
       end

data/lib/na/action.rb

@@ -59,6 +59,7 @@ module NA
       @project: #{@project}
       @parent: #{@parent.join('>')}
       @action: #{@action}
+      @tags: #{@tags}
       @note: #{@note}
       EOINSPECT
     end
@@ -102,6 +103,7 @@ module NA
              end
 
       # colorize the action and highlight tags
+      @action.gsub!(/\{(.*?)\}/, '\\{\1\\}')
       action = NA::Color.template("#{template[:action]}#{@action.sub(/ @#{NA.na_tag}\b/, '')}{x}")
       action = action.highlight_tags(color: template[:tags],
                                      parens: template[:value_parens],
@@ -184,7 +186,6 @@ module NA
       return false if keys.empty?
 
       key = keys[0]
-
       return true if tag[:comp].nil?
 
       tag_val = @tags[key]

data/lib/na/next_action.rb

@@ -139,10 +139,11 @@ module NA
       todo.projects
     end
 
-    def find_actions(target, search, tagged = nil, all: false, done: false)
+    def find_actions(target, search, tagged = nil, all: false, done: false, project: nil)
       todo = NA::Todo.new({ search: search,
                             require_na: false,
                             file_path: target,
+                            project: project,
                             tag: tagged,
                             done: done })
 
@@ -241,6 +242,7 @@ module NA
                       overwrite: false,
                       priority: 0,
                       project: nil,
+                      move: nil,
                       remove_tag: [],
                       tagged: nil)
 
@@ -248,13 +250,14 @@ module NA
 
       target_proj = nil
 
-      if project
-        project = project.sub(/:$/, '')
-        target_proj = projects.select { |pr| pr.project =~ /#{project.gsub(/:/, '.*?:.*?')}/i }.first
+      if move
+        move = move.sub(/:$/, '')
+        target_proj = projects.select { |pr| pr.project =~ /#{move.gsub(/:/, '.*?:.*?')}/i }.first
         if target_proj.nil?
-          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{project}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
+          res = NA.yn(NA::Color.template("#{NA.theme[:warning]}Project #{NA.theme[:file]}#{move}#{NA.theme[:warning]} doesn't exist, add it"), default: true)
           if res
-            target_proj = insert_project(target, project, projects)
+            target_proj = insert_project(target, move, projects)
+            projects << target_proj
           else
             NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1)
           end
@@ -308,7 +311,7 @@ module NA
 
         notify(add.pretty)
       else
-        _, actions = find_actions(target, search, tagged, done: done, all: all)
+        _, actions = find_actions(target, search, tagged, done: done, all: all, project: project)
 
         return if actions.nil?
 
@@ -489,23 +492,22 @@ module NA
         tag: nil
       }
       opts = defaults.merge(options)
-
       files = find_files(depth: options[:depth])
-
       files.delete_if do |file|
-        todo = NA::Todo.new({
-                              depth: options[:depth],
-                              done: options[:done],
-                              file_path: file,
-                              negate: options[:negate],
-                              project: options[:project],
-                              query: options[:query],
-                              regex: options[:regex],
-                              require_na: options[:require_na],
-                              search: options[:search],
-                              tag: options[:tag]
-                            })
-        todo.actions.length.zero?
+        cmd_options = {
+          depth: options[:depth],
+          done: options[:done],
+          file_path: file,
+          negate: options[:negate],
+          project: options[:project],
+          query: options[:query],
+          regex: options[:regex],
+          require_na: options[:require_na],
+          search: options[:search],
+          tag: options[:tag]
+        }
+        todo = NA::Todo.new(cmd_options)
+        todo.actions.empty?
       end
 
       files

data/lib/na/todo.rb

@@ -61,7 +61,7 @@ module NA
             required_tag.push(t) if t[:required] && t[:negate]
             negated_tag.push(t) unless t[:negate]
           else
-            optional_tag.push(t) unless t[:negate]
+            optional_tag.push(t) unless t[:negate] || t[:required]
             required_tag.push(t) if t[:required] && !t[:negate]
             negated_tag.push(t) if t[:negate]
           end
@@ -133,11 +133,9 @@ module NA
             next if settings[:require_na] && !line.na?
 
             has_search = !optional.empty? || !required.empty? || !negated.empty?
-
             next if has_search && !new_action.search_match?(any: optional,
                                                             all: required,
                                                             none: negated)
-
             if settings[:project]
               rx = settings[:project].split(%r{[/:]}).join('.*?/')
               next unless parent.join('/') =~ Regexp.new("#{rx}.*?", Regexp::IGNORECASE)

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.45'
+  VERSION = '1.2.46'
 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.2.44<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.45<!--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.2.45
+  version: 1.2.46
 platform: ruby
 authors:
 - Brett Terpstra