na 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e57d75babca99bccbea082d51f20180c8089b677d2ae6a7088931b0af43fd5
-  data.tar.gz: 813a861742e460996b8074ce1d7603e9d3b9856a9fd2f5ed4e85e5c04fffbea0
+  metadata.gz: ba10397406ce9b754a63fcd7787eb5cc22923d5564de8eca50cb8bb6000115e7
+  data.tar.gz: c7c47d9531177787b1615857135d8bc69ab3b3a3595aad30d357fa39f9b41fe5
 SHA512:
-  metadata.gz: f80bf3d000c6fe458c807e202a9da1aa09cf6d702b896abf93c494b876597d4efe352ed9132ce9ef3a820008794e795885c67cf41ebce374f10c675c1a5c77c2
-  data.tar.gz: 584e5f7da19d8c5d877897b2038e14164c6d5278201da89cc6cff8d21cc0aeb29b5be560f45dffc8a65f0756d1e3ee1e9f45760fe838485d21c8fe93bb3eefdf
+  metadata.gz: 6861532283cf20d55f9fddff1979209024301863f01dfbe1d79d83096e397ab94b59a45715f1d1486939afce8e2fbb2b90196bbca5cb8a93ae5d02636804442d
+  data.tar.gz: 9ebceba70f481a722c616d1ad819c23bd9dab13abebf68371fd966f0834585826596084e27bf27cc632515a4a7c7b162abedc4f997672cb7439ab22bf5ace8f1

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+### 1.2.2
+
+2022-10-25 14:30
+
+#### CHANGED
+
+- `na update --done` now means "include @done actions in search"
+- `na next --in QUERY` now searches for a known todo file (formerly required arguments, now both work)
+
+#### NEW
+
+- `--at [start|end]` switch for `add` and `update` to determine
+- Global `--file PATH` flag to specify a single global todo file,
+- `--add_at [start|end]` global flag that can be added to config to make permanent
+- `--finish` switch for `na add` to immediately mark an action as @done
+- `--cwd_as [project|tag]` global flag when using a global `--file` to determine if the current working directory (last element) is added as an @tag or parent project
+
+#### IMPROVED
+
+- Refactor `na add` to use improved task update code
+- Confirm target file before requesting task when running `na
+
 ### 1.2.1
 
 2022-10-22 10:18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.1)
+    na (1.2.2)
       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.1
+The current version of `na` is 1.2.2
 .
 
 `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. 
@@ -49,6 +49,10 @@ You can also quickly add todo items from the command line with the `add` subcomm
 
 If found, it will try to locate an `Inbox:` project, or create one if it doesn't exist. Any arguments after `add` will be combined to create a new task in TaskPaper format. They will automatically be assigned as next actions (tagged `@na`) and will show up when `na` lists the tasks for the project.
 
+#### Updating todos
+
+You can mark todos as complete, delete them, add and remove tags, change priority, and even move them between projects with the `na update` command.
+
 ### Usage
 
 ```
@@ -59,13 +63,16 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.1
+    1.2.2
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
+    --add_at=POSITION       - Add all new/moved entries at [s]tart or [e]nd of target project (default: end)
+    --cwd_as=TYPE           - Use current working directory as [p]roject, [t]ag, or [n]one (default: none)
     -d, --depth=DEPTH       - Recurse to depth (default: 1)
-    --[no-]debug            - Display verbose output
+    --[no-]debug            - Display verbose output (default: enabled)
     --ext=EXT               - File extension to consider a todo file (default: taskpaper)
+    -f, --file=PATH         - Use a single file as global todo, use --initconfig to make permanent (default: none)
     --help                  - Show this message
     -n, --note              - Prompt for additional notes (deprecated, for backwards compatibility)
     -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
@@ -110,8 +117,10 @@ DESCRIPTION
     Provides an easy way to store todos while you work. Add quick   reminders and (if you set up Prompt Hooks) they'll automatically display   next time you enter the directory.   If multiple todo files are found in the current directory, a menu will   allow you to pick to which file the action gets added. 
 
 COMMAND OPTIONS
+    --at=POSITION                   - Add task at [s]tart or [e]nd of target project (default: none)
     -d, --depth=DEPTH               - Search for files X directories deep (default: 1)
     -f, --file=PATH                 - Specify the file to which the task should be added (default: none)
+    --finish, --done                - Mark task as @done with date
     --in, --todo=TODO_FILE          - Add to a known todo file, partial matches allowed (default: none)
     -n, --note                      - Prompt for additional notes
     -p, --priority=PRIO             - Add a priority level 1-5 (default: 0)
@@ -235,8 +244,9 @@ DESCRIPTION
     Next actions are actions which contain the next action tag (default @na),   do not contain @done, and are not in the Archive project.   Arguments will target a todo file from history, whether it's in the current   directory or not. Todo file queries can include path components separated by /   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma). 
 
 COMMAND OPTIONS
-    -d, --depth=DEPTH                      - Recurse to depth (default: 2)
+    -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
+    --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
 
@@ -326,8 +336,9 @@ DESCRIPTION
     Next actions are actions which contain the next action tag (default @na),   do not contain @done, and are not in the Archive project.   Arguments will target a todo file from history, whether it's in the current   directory or not. Todo file queries can include path components separated by /   or :, and may use wildcards (`*` to match any text, `?` to match a single character). Multiple queries allowed (separate arguments or separated by comma). 
 
 COMMAND OPTIONS
-    -d, --depth=DEPTH                      - Recurse to depth (default: 2)
+    -d, --depth=DEPTH                      - Recurse to depth (default: none)
     --[no-]done                            - Include @done actions
+    --in, --todo=TODO_FILE                 - Display matches from a known todo file (may be used more than once, default: none)
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
 
@@ -391,10 +402,12 @@ DESCRIPTION
 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
-    -f, --finish, --done            - Add a @done tag to action
+    -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.
@@ -444,6 +457,16 @@ Note that I created a new YAML dictionary inside of the `:next:` command, and ad
 > **WARNING** Don't touch most of the settings at the top of the auto-generated file. Setting any of them to true will alter the way na interprets the commands you're running. Most of those options are there for backwards compatibility with the bash version of this tool and will eventually be removed.
 
 
+#### Working with a single global file
+
+na is designed to work with one or more TaskPaper files in each project directory, but if you prefer to use a single global TaskPaper file, you can add `--file PATH` as a global option and specify a single file. This will bypass the detection of any files in the current directory. Make it permanent by including the `--file` flag when running `initconfig`.
+
+When using a global file, you can additionally include `--cwd_as TYPE` to determine whether the current working directory is used as a tag or a project (default is neither). If you add `--cwd_as tag` to the global options (before the command), the last element of the current working directory will be appended as an @tag (e.g. if you're in ~/Code/project/doing, the action would be tagged @doing). If you use `--cwd_as project` the action will be put into a project with the same name as the current directory (e.g. `Doing:` from the previous example).
+
+#### Add tasks at the end of a project
+
+By default, tasks are added at the top of the target project (Inbox, etc.). If you prefer new tasks to go at the bottom by default, include `--add_at end` as a global option when running `initconfig`.
+
 ### Prompt Hooks
 
 You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. To install a prompt command for your current shell, just run `na prompt install`. It works with Zsh, Bash, and Fish. If you'd rather make the changes to your startup file yourself, run `na prompt show` to get the hook and instructions printed out for copying.

data/bin/na

@@ -39,6 +39,18 @@ class App
   arg_name 'PRIORITY'
   flag %i[p priority]
 
+  desc 'Use a single file as global todo, use --initconfig to make permanent'
+  arg_name 'PATH'
+  flag %i[f file]
+
+  desc 'Use current working directory as [p]roject, [t]ag, or [n]one'
+  arg_name 'TYPE'
+  flag %i[cwd_as], must_match: /^[ptn].*?$/i, default_value: 'none'
+
+  desc 'Add all new/moved entries at [s]tart or [e]nd of target project'
+  arg_name 'POSITION'
+  flag %i[add_at], default_value: 'start'
+
   desc 'Prompt for additional notes (deprecated, for backwards compatibility)'
   switch %i[n note], negatable: false
 
@@ -70,6 +82,10 @@ class App
     c.arg_name 'DEPTH'
     c.flag %i[d depth], type: :integer, must_match: /^[1-9]$/
 
+    c.desc 'Display matches from a known todo file'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo], multiple: true
+
     c.desc 'Alternate tag to search for'
     c.arg_name 'TAG'
     c.flag %i[t tag]
@@ -86,7 +102,7 @@ class App
         cmd = ['add']
         cmd.push('--note') if global_options[:note]
         cmd.concat(['--priority', global_options[:priority]]) if global_options[:priority]
-        cmd.push(ARGV.unshift($first_arg)) if ARGV.count > 2
+        cmd.push(ARGV.unshift(NA.command_line[0])) if NA.command_line.count > 1
 
         exit run(cmd)
       end
@@ -97,6 +113,7 @@ class App
                 options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
               end
 
+      args.concat(options[:in])
       if args.count.positive?
         all_req = false
 
@@ -155,6 +172,10 @@ class App
     c.default_value 'Inbox'
     c.flag %i[to project proj]
 
+    c.desc 'Add task at [s]tart or [e]nd of target project'
+    c.arg_name 'POSITION'
+    c.flag %i[at], must_match: /^[sbea].*?$/i
+
     c.desc 'Add to a known todo file, partial matches allowed'
     c.arg_name 'TODO_FILE'
     c.flag %i[in todo]
@@ -170,64 +191,31 @@ class App
     c.arg_name 'PATH'
     c.flag %i[f file]
 
+    c.desc 'Mark task as @done with date'
+    c.switch %i[finish done], negatable: false
+
     c.desc 'Search for files X directories deep'
     c.arg_name 'DEPTH'
     c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
 
-    c.action do |_global_options, options, args|
+    c.action do |global_options, options, args|
       reader = TTY::Reader.new
-      action = if args.count.positive?
-                 args.join(' ').strip
-               elsif TTY::Which.exist?('gum')
-                 `gum input --placeholder "Enter a task" --char-limit=500 --width=#{TTY::Screen.columns}`.strip
-               else
-                 puts NA::Color.template('{bm}Enter task:{x}')
-                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
-               end
-
-      if action.nil? || action.empty?
-        puts 'Empty input, cancelled'
-        Process.exit 1
-      end
-
-      if options[:priority]&.to_i&.positive?
-        action = "#{action.gsub(/@priority\(\d+\)/, '')} @priority(#{options[:priority]})"
-      end
-
-      note_rx = /^(.+) \((.*?)\)$/
-      split_note = if action =~ note_rx
-                     n = Regexp.last_match(2)
-                     action.sub!(note_rx, '\1').strip!
-                     n
-                   end
+      append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/
 
-      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}\b/, '')}#{na_tag}"
-
-      line_note = if options[:note]
-                    if TTY::Which.exist?('gum')
-                      args = ['--placeholder "Enter a note, CTRL-d to save"']
-                      args << '--char-limit 0'
-                      args << '--width $(tput cols)'
-                      `gum write #{args.join(' ')}`.strip.split("\n")
-                    else
-                      puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
-                      reader.read_multiline
-                    end
-                  end
-
-      note = split_note.nil? ? [] : [split_note]
-      note.concat(line_note) unless line_note.nil?
-      note = nil if note.empty?
-
-      if options[:file]
+      if NA.global_file
+        target = File.expand_path(NA.global_file)
+        unless File.exist?(target)
+          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, ".#{NA.extension}")
+            NA.create_todo(target, basename)
+          else
+            puts NA::Color.template('{r}Cancelled{x}')
+            Process.exit 1
+          end
+        end
+      elsif options[:file]
         target = File.expand_path(options[:file])
         unless File.exist?(target)
           print NA::Color.template('{by}Specified file not found, create it? {w}(y/{g}N{w}){x} ')
@@ -287,7 +275,58 @@ class App
         end
       end
 
-      NA.add_action(target, options[:project], action, note)
+      action = if args.count.positive?
+                 args.join(' ').strip
+               elsif TTY::Which.exist?('gum')
+                 `gum input --placeholder "Enter a task" --char-limit=500 --width=#{TTY::Screen.columns}`.strip
+               else
+                 puts NA::Color.template('{bm}Enter task:{x}')
+                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
+               end
+
+      if action.nil? || action.empty?
+        puts 'Empty input, cancelled'
+        Process.exit 1
+      end
+
+      if options[:priority]&.to_i&.positive?
+        action = "#{action.gsub(/@priority\(\d+\)/, '')} @priority(#{options[:priority]})"
+      end
+
+      note_rx = /^(.+) \((.*?)\)$/
+      split_note = if action =~ note_rx
+                     n = Regexp.last_match(2)
+                     action.sub!(note_rx, '\1').strip!
+                     n
+                   end
+
+      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}\b/, '')}#{na_tag}"
+
+      line_note = if options[:note]
+                    if TTY::Which.exist?('gum')
+                      args = ['--placeholder "Enter a note, CTRL-d to save"']
+                      args << '--char-limit 0'
+                      args << '--width $(tput cols)'
+                      `gum write #{args.join(' ')}`.strip.split("\n")
+                    else
+                      puts NA::Color.template('{bm}Enter a note, {bw}CTRL-d{bm} to end editing{bw}')
+                      reader.read_multiline
+                    end
+                  end
+
+      note = split_note.nil? ? [] : [split_note]
+      note.concat(line_note) unless line_note.nil?
+      note = [] if note.empty?
+
+      NA.add_action(target, options[:project], action, note, finish: options[:finish], append: append)
     end
   end
 
@@ -313,6 +352,10 @@ class App
     c.arg_name 'PRIO'
     c.flag %i[p priority], must_match: /[1-5]/, type: :integer, default_value: 0
 
+    c.desc 'When moving task, add at [s]tart or [e]nd of target project'
+    c.arg_name 'POSITION'
+    c.flag %i[at], must_match: /^[sbea].*?$/i
+
     c.desc 'Move action to specific project'
     c.arg_name 'PROJECT'
     c.flag %i[to project proj]
@@ -321,6 +364,9 @@ class App
     c.arg_name 'TODO_FILE'
     c.flag %i[in todo]
 
+    c.desc 'Include @done actions'
+    c.switch %i[done]
+
     c.desc 'Add a tag to the action, @tag(values) allowed'
     c.arg_name 'TAG'
     c.flag %i[t tag], multiple: true
@@ -330,7 +376,7 @@ class App
     c.flag %i[r remove], multiple: true
 
     c.desc 'Add a @done tag to action'
-    c.switch %i[f finish done], negatable: false
+    c.switch %i[f finish], negatable: false
 
     c.desc 'Add a @done tag to action and move to Archive'
     c.switch %i[a archive], negatable: false
@@ -359,8 +405,10 @@ class App
     c.desc 'Match pattern exactly'
     c.switch %i[x exact], negatable: false
 
-    c.action do |_global_options, options, args|
+    c.action do |global_options, options, args|
       reader = TTY::Reader.new
+      append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/i
+
       action = if args.count.positive?
                  args.join(' ').strip
                elsif TTY::Which.exist?('gum') && options[:tagged].empty?
@@ -433,6 +481,14 @@ class App
 
       note = line_note.nil? || line_note.empty? ? [] : line_note
 
+      target_proj = if options[:project]
+                      options[:project]
+                    elsif NA.cwd_is == :project
+                      NA.cwd
+                    else
+                      nil
+                    end
+
       if options[:file]
         file = File.expand_path(options[:file])
         NA.notify('{r}File not found', exit_code: 1) unless File.exist?(file)
@@ -478,12 +534,14 @@ class App
                          add_tag: add_tags,
                          remove_tag: remove_tags,
                          finish: options[:finish],
-                         project: options[:project],
+                         project: target_proj,
                          delete: options[:delete],
                          note: note,
                          overwrite: options[:overwrite],
                          tagged: tags,
-                         all: options[:all])
+                         all: options[:all],
+                         done: options[:done],
+                         append: append)
       end
     end
   end
@@ -922,21 +980,26 @@ class App
     NA.verbose = global[:debug]
     NA.extension = global[:ext]
     NA.na_tag = global[:na_tag]
+    NA.global_file = global[:file]
+    NA.cwd = File.basename(ENV['PWD'])
+    NA.cwd_is = if global[:cwd_as] =~ /^n/
+                  :none
+                else
+                  global[:cwd_as] =~ /^p/ ? :project : :tag
+                end
     NA.weed_cache_file
     true
   end
 
   post do |global, command, options, args|
-    # Post logic here
-    # Use skips_post before a command to skip this
-    # block on that command only
+    # post actions
   end
 
   on_error do |exception|
     case exception
     when GLI::UnknownCommand
       cmd = ['saved']
-      cmd.concat(ARGV.unshift($first_arg))
+      cmd.concat(ARGV.unshift(NA.command_line[0]))
 
       exit run(cmd)
     when SystemExit
@@ -947,8 +1010,9 @@ class App
   end
 end
 
-NA.command_line = ARGV
+NA.command_line = ARGV.dup
+NA.globals = NA.command_line.filter { |arg| arg =~ /^-/ }
+NA.command_line.delete_if { |arg| arg =~ /^-/ }
 @command = ARGV[0]
-$first_arg = ARGV[1]
 
 exit App.run(ARGV)

data/lib/na/action.rb

@@ -2,7 +2,9 @@
 
 module NA
   class Action < Hash
-    attr_reader :file, :project, :parent, :action, :tags, :line, :note
+    attr_reader :file, :project, :parent, :tags, :line, :note
+
+    attr_accessor :action
 
     def initialize(file, project, parent, action, idx, note = [])
       super()

data/lib/na/next_action.rb

@@ -3,21 +3,22 @@
 # Next Action methods
 module NA
   class << self
-    attr_accessor :verbose, :extension, :na_tag, :command_line
+    attr_accessor :verbose, :extension, :na_tag, :command_line, :globals, :global_file, :cwd_is, :cwd
 
     ##
     ## Output to STDERR
     ##
     ## @param      msg        [String] The message
-    ## @param      exit_code  [Number] The exit code, no exit if false
+    ## @param      exit_code  [Number] The exit code, no
+    ##                        exit if false
+    ## @param      debug      [Boolean] only display message if running :verbose
     ##
     def notify(msg, exit_code: false, debug: false)
       return if debug && !@verbose
 
       $stderr.puts NA::Color.template("{x}#{msg}{x}")
-      if exit_code
-        Process.exit exit_code
-      end
+      Process.exit exit_code if exit_code
+
     end
 
     ##
@@ -99,6 +100,8 @@ module NA
     ## @param      depth  [Number] The depth at which to search
     ##
     def find_files(depth: 1)
+      return [NA.global_file] if NA.global_file
+
       files = `find . -name "*.#{NA.extension}" -maxdepth #{depth}`.strip.split("\n")
       files.each { |f| save_working_dir(File.expand_path(f)) }
       files
@@ -152,10 +155,14 @@ module NA
       projects
     end
 
-    def find_actions(target, search, tagged = nil, all: false)
-      _, actions, projects = parse_actions(search: search, require_na: false, file_path: target, tag: tagged)
+    def find_actions(target, search, tagged = nil, all: false, done: false)
+      _, actions, projects = parse_actions(search: search, require_na: false, file_path: target, tag: tagged, done: done)
+
+      unless actions.count.positive?
+        NA.notify("{r}No matching actions found in {bw}#{File.basename(target, ".#{NA.extension}")}")
+        return
+      end
 
-      NA.notify('{r}No matching actions found', exit_code: 1) unless actions.count.positive?
       return [projects, actions] if actions.count == 1 || all
 
       options = actions.map { |action| "#{action.line} % #{action.parent.join('/')} : #{action.action}" }
@@ -248,8 +255,35 @@ module NA
       new_project
     end
 
+    def process_action(action, priority: 0, finish: false, add_tag: [], remove_tag: [], note: [])
+      string = action.action
+
+      if priority&.positive?
+        string.gsub!(/(?<=\A| )@priority\(\d+\)/, '').strip!
+        string += " @priority(#{priority})"
+      end
+
+      add_tag.each do |tag|
+        string.gsub!(/(?<=\A| )@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
+        string.strip!
+        string += " @#{tag}"
+      end
+
+      remove_tag.each do |tag|
+        string.gsub!(/(?<=\A| )@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
+        string.strip!
+      end
+
+      string = "#{string.strip} @done(#{Time.now.strftime('%Y-%m-%d %H:%M')})" if finish && string !~ /(?<=\A| )@done/
+
+      action.action = string
+
+      action
+    end
+
     def update_action(target,
                       search,
+                      add: nil,
                       priority: 0,
                       add_tag: [],
                       remove_tag: [],
@@ -259,7 +293,9 @@ module NA
                       note: [],
                       overwrite: false,
                       tagged: nil,
-                      all: false)
+                      all: false,
+                      done: false,
+                      append: false)
 
       projects = find_projects(target)
 
@@ -277,35 +313,12 @@ module NA
         end
       end
 
-      projects, actions = find_actions(target, search, tagged, all: all)
-
       contents = target.read_file.split(/\n/)
 
-      actions.sort_by(&:line).reverse.each do |action|
-        string = action.action
+      if add.is_a?(Action)
+        action = process_action(add, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
-        if priority&.positive?
-          string.gsub!(/@priority\(\d+\)/, '').strip!
-          string += " @priority(#{priority})"
-        end
-
-        add_tag.each do |tag|
-          string.gsub!(/@#{tag.gsub(/([()*?])/, '\\\\1')}(\(.*?\))?/, '')
-          string.strip!
-          string += " @#{tag}"
-        end
-
-        remove_tag.each do |tag|
-          string.gsub!(/@#{tag}(\(.*?\))?/, '')
-          string.strip!
-        end
-
-        string = "#{string.strip} @done(#{Time.now.strftime('%Y-%m-%d %H:%M')})" if finish && string !~ /@done/
-
-        contents.slice!(action.line, action.note.count + 1)
-        next if delete
-
-        projects = shift_index_after(projects, action.line, action.note.count + 1)
+        projects = find_projects(target)
 
         target_proj = if target_proj
                         projects.select { |proj| proj.project =~ /^#{target_proj.project}$/ }.first
@@ -320,13 +333,74 @@ module NA
                else
                  overwrite ? note : action.note.concat(note)
                end
+
         note = note.empty? ? '' : "\n#{indent}\t\t#{note.join("\n#{indent}\t\t").strip}"
-        contents.insert(target_proj.line, "#{indent}\t- #{string}#{note}")
+
+        if append
+          this_idx = 0
+          projects.each_with_index do |proj, idx|
+            if proj.line == target_proj.line
+              this_idx = idx
+              break
+            end
+          end
+
+          target_line = if this_idx == projects.length - 1
+                          contents.count
+                        else
+                          projects[this_idx + 1].line - 1
+                        end
+        else
+          target_line = target_proj.line
+        end
+
+        contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
+      else
+        projects, actions = find_actions(target, search, tagged, done: done, all: all)
+
+        return if actions.nil?
+
+        actions.sort_by(&:line).reverse.each do |action|
+          contents.slice!(action.line, action.note.count + 1)
+          next if delete
+
+          projects = shift_index_after(projects, action.line, action.note.count + 1)
+
+          action = process_action(action, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
+
+          target_proj = if target_proj
+                          projects.select { |proj| proj.project =~ /^#{target_proj.project}$/ }.first
+                        else
+                          projects.select { |proj| proj.project =~ /^#{action.parent.join(':')}$/ }.first
+                        end
+
+          indent = "\t" * target_proj.indent
+          note = note.split("\n") unless note.is_a?(Array)
+          note = if note.empty?
+                   action.note
+                 else
+                   overwrite ? note : action.note.concat(note)
+                 end
+          note = note.empty? ? '' : "\n#{indent}\t\t#{note.join("\n#{indent}\t\t").strip}"
+
+          if append
+            this_idx = projects.index(target_proj)
+            if this_idx == projects.length - 1
+              target_line = contents.count
+            else
+              target_line = projects[this_idx + 1].line - 1
+            end
+          else
+            target_line = target_proj.line
+          end
+
+          contents.insert(target_line, "#{indent}\t- #{action.action}#{note}")
+        end
       end
       backup_file(target)
       File.open(target, 'w') { |f| f.puts contents.join("\n") }
 
-      notify("{by}Task updated in {bw}#{target}")
+      add ? notify("{by}Task added to {bw}#{target}") : notify("{by}Task updated in {bw}#{target}")
     end
 
     ##
@@ -337,24 +411,22 @@ module NA
     ## @param      action   [String] The action
     ## @param      note     [String] The note
     ##
-    def add_action(file, project, action, note = nil)
-      content = file.read_file
-      # Insert the target project at the top if it doesn't exist
-      unless content =~ /^[ \t]*#{project}:/i
-        content = "#{project.cap_first}:\n#{content}"
-      end
+    def add_action(file, project, action, note = [], priority: 0, finish: false, append: false)
+      parent = project.split(%r{[:/]})
 
-      # Insert the action at the top of the target project
-      content.sub!(/^([ \t]*)#{project}:(.*?)$/i) do
-        m = Regexp.last_match
-        indent = "\n#{m[1]}\t\t"
-        note = note.nil? ? '' : "#{indent}#{note.join(indent).strip}"
-        "#{m[1]}#{project.cap_first}:#{m[2]}\n#{m[1]}\t- #{action}#{note}"
+      if NA.global_file
+        puts NA.global_file
+        if NA.cwd_is == :tag
+          add_tag = [NA.cwd]
+        else
+          project = NA.cwd
+        end
+        puts [add_tag, project]
       end
 
-      File.open(file, 'w') { |f| f.puts content }
+      action = Action.new(file, project, parent, action, nil, note)
 
-      notify("{by}Task added to {bw}#{file}")
+      update_action(file, nil, add: action, project: project, add_tag: add_tag, priority: priority, finish: finish, append: append)
     end
 
     ##
@@ -394,6 +466,7 @@ module NA
     ##
     ## @param      depth       [Number] The directory depth
     ##                         to search for files
+    ## @param      done        [Boolean] include @done actions
     ## @param      query       [Hash] The todo file query
     ## @param      tag         [Array] Tags to search for
     ## @param      search      [String] A search string
@@ -402,7 +475,7 @@ module NA
     ##                         regular expression
     ## @param      project     [String] The project
     ## @param      require_na  [Boolean] Require @na tag
-    ## @param      file        [String] file path to parse
+    ## @param      file_path   [String] file path to parse
     ##
     def parse_actions(depth: 1, done: false, query: nil, tag: nil, search: nil, negate: false, regex: false, project: nil, require_na: true, file_path: nil)
       actions = []
@@ -552,7 +625,9 @@ module NA
     end
 
     def list_projects(query: [], file_path: nil, depth: 1, paths: true)
-      files = if !file_path.nil?
+      files = if NA.global_file
+                [NA.global_file]
+              elsif !file_path.nil?
                 [file_path]
               elsif query.nil?
                 find_files(depth: depth)
@@ -740,6 +815,7 @@ module NA
 
       default_args = [%(--prompt="#{prompt}"), "--height=#{options.count + 2}", '--info=inline']
       default_args << '--multi' if multiple
+      default_args << '--bind ctrl-a:select-all'
       header = "esc: cancel,#{multiple ? ' tab: multi-select, ctrl-a: select all,' : ''} return: confirm"
       default_args << %(--header="#{header}")
       default_args.concat(fzf_args)

data/lib/na/project.rb

@@ -20,7 +20,7 @@ module NA
         "@project: #{@project}",
         "@indent: #{@indent}",
         "@line: #{@line}"
-      ].join("\n")
+      ].join(" ")
     end
   end
 end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 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.0<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.1<!--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. 
 
@@ -48,6 +48,10 @@ You can also quickly add todo items from the command line with the `add` subcomm
 
 If found, it will try to locate an `Inbox:` project, or create one if it doesn't exist. Any arguments after `add` will be combined to create a new task in TaskPaper format. They will automatically be assigned as next actions (tagged `@na`) and will show up when `na` lists the tasks for the project.
 
+#### Updating todos
+
+You can mark todos as complete, delete them, add and remove tags, change priority, and even move them between projects with the `na update` command.
+
 ### Usage
 
 ```
@@ -190,6 +194,16 @@ Note that I created a new YAML dictionary inside of the `:next:` command, and ad
 > **WARNING** Don't touch most of the settings at the top of the auto-generated file. Setting any of them to true will alter the way na interprets the commands you're running. Most of those options are there for backwards compatibility with the bash version of this tool and will eventually be removed.
 <!--JEKYLL{:.warn}-->
 
+#### Working with a single global file
+
+na is designed to work with one or more TaskPaper files in each project directory, but if you prefer to use a single global TaskPaper file, you can add `--file PATH` as a global option and specify a single file. This will bypass the detection of any files in the current directory. Make it permanent by including the `--file` flag when running `initconfig`.
+
+When using a global file, you can additionally include `--cwd_as TYPE` to determine whether the current working directory is used as a tag or a project (default is neither). If you add `--cwd_as tag` to the global options (before the command), the last element of the current working directory will be appended as an @tag (e.g. if you're in ~/Code/project/doing, the action would be tagged @doing). If you use `--cwd_as project` the action will be put into a project with the same name as the current directory (e.g. `Doing:` from the previous example).
+
+#### Add tasks at the end of a project
+
+By default, tasks are added at the top of the target project (Inbox, etc.). If you prefer new tasks to go at the bottom by default, include `--add_at end` as a global option when running `initconfig`.
+
 ### Prompt Hooks
 
 You can add a prompt command to your shell to have na automatically list your next actions when you `cd` into a directory. To install a prompt command for your current shell, just run `na prompt install`. It works with Zsh, Bash, and Fish. If you'd rather make the changes to your startup file yourself, run `na prompt show` to get the hook and instructions printed out for copying.

metadata

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