na 1.2.32 → 1.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440413f1b22a8745d119a8b55098ad3fd9c36096f930ad5f25d6091a9c9cb496
-  data.tar.gz: 02e42b27ea06069b669fdded2929b4351990b9e3be35add61cd734a50d2fa28a
+  metadata.gz: d77588ce09a5a3cfc680b1866081dba5f56e75c8b51301cf0e1efee60c32f8f7
+  data.tar.gz: 06d73082ad5371cda4760df90c929c74963d76843b7b979dde59e46fdb933389
 SHA512:
-  metadata.gz: 3fae03d1566494bff4c792fa6921d975e94e9984688873e05e8936e97a3a0dc1f2134f6677218f66d53d6be87481100835fd66d4e30a27e1db42bf3cb09805c8
-  data.tar.gz: 3d3c6482675e0c880c51d7f0ea460225c869376db8d84a245c296ec23dceabd9bf481387fac05c06c88d73e914529beb4effd540ea90b9d558e30be1e1ffcc9d
+  metadata.gz: 07ee85d5f2f95ba2542ff15ca3b6c3736bd85d4a5b1bd9c76a7099296b3976d9b0e2478d6e2b8b84a824787c9fc05050b89153c316b7878c9743e3cd4cad3a8a
+  data.tar.gz: 0af252e545f390a539279747f7d89e87b5efaceb82db3adfa57ce037cd6e4b139e18aa2d90340dec14d9eb90f78c3b8963c5f7e92d59258f1711ea1dbb76462c

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+### 1.2.33
+
+2023-08-29 13:45
+
+#### NEW
+
+- `na update --edit` flag to open a single task in your default $EDITOR for modification and notes
+- Expand natural language dates in recognized date-based tags (@due, @start, @deferred, etc.)
+- Edit command now opens editor on matched action, previous edit
+
+#### IMPROVED
+
+- Allow multiple add or remove tags using comma-separated list
+
+#### FIXED
+
+- `na update --restore` irregularities
+- Failing if using gum to input search string
+
 ### 1.2.32
 
 2023-08-29 10:59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.32)
+    na (1.2.33)
       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.32
+The current version of `na` is 1.2.33
 .
 
 `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.32
+    1.2.33
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -103,12 +103,13 @@ COMMANDS
     changes, changelog  - Display the changelog
     complete, finish    - Find and mark an action as @done
     completed, finished - Display completed actions
-    edit                - Open a todo file in the default editor
+    edit                - Edit an existing action
     find, grep          - Find actions matching a search pattern
     help                - Shows a list of commands or help for one command
     init, create        - Create a new todo file in the current directory
     initconfig          - Initialize the config file using current global options
     next, show          - Show next actions
+    open                - Open a todo file in the default editor
     projects            - Show list of projects for a file
     prompt              - Show or install prompt hooks for the current shell
     saved               - Execute a saved search
@@ -170,28 +171,28 @@ EXAMPLES
 
 ```
 NAME
-    edit - Open a todo file in the default editor
+    edit - Edit an existing action
 
 SYNOPSIS
 
-    na [global options] edit [command options] 
+    na [global options] edit [command options] ACTION
 
 DESCRIPTION
-    Let the system choose the defualt, (e.g. TaskPaper), or specify a command line utility (e.g. vim).              If more than one todo file is found, a menu is displayed. 
+    Open a matching action in your default $EDITOR.   If multiple todo files are found in the current directory, a menu will   allow you to pick which file to act on.   Natural language dates are expanded in known date-based tags. 
 
 COMMAND OPTIONS
-    -a, --app=EDITOR    - Specify a Mac app (default: none)
-    -d, --depth=DEPTH   - Recurse to depth (default: 1)
-    -e, --editor=EDITOR - Specify an editor CLI (default: none)
-
-EXAMPLES
-
-    # Open the main todo file in the default editor
-    na edit
-
-    # Display a menu of all todo files three levels deep from the
-               current directory, open selection in vim.
-    na edit -d 3 -a vim
+    -d, --depth=DEPTH      - Search for files X directories deep (default: 1)
+    --[no-]done            - Include @done actions
+    -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)
+    --tagged=TAG           - Match actions containing tag. Allows value comparisons (may be used more than once, default: none)
+    -x, --exact            - Match pattern exactly
+
+EXAMPLE
+
+    # Find "An existing task" action and open it for editing
+    na edit "An existing task"
 ```
 
 ##### find
@@ -484,15 +485,16 @@ COMMAND OPTIONS
     --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 to the action (may be used more than once, 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 (may be used more than once, default: none)
+    -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

data/bin/commands/edit.rb

@@ -2,46 +2,149 @@
 
 class App
   extend GLI::App
-  desc 'Open a todo file in the default editor'
-  long_desc 'Let the system choose the defualt, (e.g. TaskPaper), or specify a command line utility (e.g. vim).
-             If more than one todo file is found, a menu is displayed.'
+  desc 'Edit an existing action'
+  long_desc 'Open a matching action in your default $EDITOR.
+
+  If multiple todo files are found in the current directory, a menu will
+  allow you to pick which file to act on.
+
+  Natural language dates are expanded in known date-based tags.'
+  arg_name 'ACTION'
   command %i[edit] do |c|
-    c.example 'na edit', desc: 'Open the main todo file in the default editor'
-    c.example 'na edit -d 3 -a vim', desc: 'Display a menu of all todo files three levels deep from the
-               current directory, open selection in vim.'
+    c.example 'na edit "An existing task"',
+              desc: 'Find "An existing task" action and open it for editing'
+
+    c.desc 'Use a known todo file, partial matches allowed'
+    c.arg_name 'TODO_FILE'
+    c.flag %i[in todo]
+
+    c.desc 'Include @done actions'
+    c.switch %i[done]
 
-    c.desc 'Recurse to depth'
+    c.desc 'Specify the file to search for the task'
+    c.arg_name 'PATH'
+    c.flag %i[file]
+
+    c.desc 'Search for files X directories deep'
     c.arg_name 'DEPTH'
-    c.default_value 1
-    c.flag %i[d depth], type: :integer, must_match: /^\d+$/
+    c.flag %i[d depth], must_match: /^[1-9]$/, type: :integer, default_value: 1
+
+    c.desc 'Match actions containing tag. Allows value comparisons'
+    c.arg_name 'TAG'
+    c.flag %i[tagged], multiple: true
 
-    c.desc 'Specify an editor CLI'
-    c.arg_name 'EDITOR'
-    c.flag %i[e editor]
+    c.desc 'Interpret search pattern as regular expression'
+    c.switch %i[e regex], negatable: false
 
-    c.desc 'Specify a Mac app'
-    c.arg_name 'EDITOR'
-    c.flag %i[a app]
+    c.desc 'Match pattern exactly'
+    c.switch %i[x exact], negatable: false
 
     c.action do |global_options, options, args|
-      depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
-                3
-              else
-                options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
-              end
-      files = NA.find_files(depth: depth)
-      files.delete_if { |f| f !~ /.*?(#{args.join('|')}).*?.#{NA.extension}/ } if args.count.positive?
-
-      file = if files.count > 1
-               NA.select_file(files)
-             else
-               files[0]
-             end
-
-      if options[:editor]
-        system options[:editor], file
+      options[:edit] = true
+      action = if args.count.positive?
+                 args.join(' ').strip
+               elsif $stdin.isatty && TTY::Which.exist?('gum') && options[:tagged].empty?
+                 opts = [
+                   %(--placeholder "Enter a task to search for"),
+                   '--char-limit=500',
+                   "--width=#{TTY::Screen.columns}"
+                 ]
+                 `gum input #{opts.join(' ')}`.strip
+               elsif $stdin.isatty && options[:tagged].empty?
+                 puts NA::Color.template('{bm}Enter search string:{x}')
+                 reader.read_line(NA::Color.template('{by}> {bw}')).strip
+               end
+
+      NA.notify('{br}Empty input{x}', exit_code: 1) unless action
+
+      if action
+        tokens = nil
+        if options[:exact]
+          tokens = action
+        elsif options[:regex]
+          tokens = Regexp.new(action, Regexp::IGNORECASE)
+        else
+          tokens = []
+          all_req = action !~ /[+!\-]/ && !options[:or]
+
+          action.split(/ /).each do |arg|
+            m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+            tokens.push({
+                          token: m['tok'],
+                          required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                          negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                        })
+          end
+        end
+      end
+
+      if (action.nil? || action.empty?) && options[:tagged].empty?
+        NA.notify('{br}Empty input, cancelled{x}', exit_code: 1)
+      end
+
+      all_req = options[:tagged].join(' ') !~ /[+!\-]/ && !options[:or]
+      tags = []
+      options[:tagged].join(',').split(/ *, */).each do |arg|
+        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>$\^]+?)(?:(?<op>[=<>]{1,2}|[*$\^]=)(?<val>.*?))?$/)
+
+        tags.push({
+                    tag: m['tag'].wildcard_to_rx,
+                    comp: m['op'],
+                    value: m['val'],
+                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                    negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                  })
+      end
+
+      target_proj = if 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)
+
+        targets = [file]
+      elsif options[:todo]
+        todo = []
+        options[:todo].split(/ *, */).each do |a|
+          m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
+          todo.push({
+                      token: m['tok'],
+                      required: all_req || (!m['req'].nil? && m['req'] == '+'),
+                      negate: !m['req'].nil? && m['req'] =~ /[!\-]/
+                    })
+        end
+        dirs = NA.match_working_dir(todo)
+
+        if dirs.count == 1
+          targets = [dirs[0]]
+        elsif dirs.count.positive?
+          targets = NA.select_file(dirs, multiple: true)
+          NA.notify('{r}Cancelled', exit_code: 1) unless targets && targets.count.positive?
+        else
+          NA.notify('{r}Todo not found', exit_code: 1) unless targets && targets.count.positive?
+
+        end
       else
-        NA.edit_file(file: file, app: options[:app])
+        files = NA.find_files(depth: options[:depth])
+        NA.notify('{r}No todo file found', exit_code: 1) if files.count.zero?
+
+        targets = files.count > 1 ? NA.select_file(files, multiple: true) : [files[0]]
+        NA.notify('{r}Cancelled{x}', exit_code: 1) unless files.count.positive?
+
+      end
+
+      NA.notify('{r}No search terms provided', exit_code: 1) if tokens.nil? && options[:tagged].empty?
+
+      targets.each do |target|
+        NA.update_action(target, tokens,
+                                 done: options[:done],
+                                 edit: options[:edit],
+                                 project: target_proj,
+                                 tagged: tags)
       end
     end
   end

data/bin/commands/open.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class App
+  extend GLI::App
+  desc 'Open a todo file in the default editor'
+  long_desc 'Let the system choose the defualt, (e.g. TaskPaper), or specify a command line utility (e.g. vim).
+             If more than one todo file is found, a menu is displayed.'
+  command %i[open] do |c|
+    c.example 'na open', desc: 'Open the main todo file in the default editor'
+    c.example 'na open -d 3 -a vim', desc: 'Display a menu of all todo files three levels deep from the
+               current directory, open selection in vim.'
+
+    c.desc 'Recurse to depth'
+    c.arg_name 'DEPTH'
+    c.default_value 1
+    c.flag %i[d depth], type: :integer, must_match: /^\d+$/
+
+    c.desc 'Specify an editor CLI'
+    c.arg_name 'EDITOR'
+    c.flag %i[e editor]
+
+    c.desc 'Specify a Mac app'
+    c.arg_name 'EDITOR'
+    c.flag %i[a app]
+
+    c.action do |global_options, options, args|
+      depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
+                3
+              else
+                options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
+              end
+      files = NA.find_files(depth: depth)
+      files.delete_if { |f| f !~ /.*?(#{args.join('|')}).*?.#{NA.extension}/ } if args.count.positive?
+
+      file = if files.count > 1
+               NA.select_file(files)
+             else
+               files[0]
+             end
+
+      if options[:editor]
+        system options[:editor], file
+      else
+        NA.edit_file(file: file, app: options[:app])
+      end
+    end
+  end
+end

data/bin/commands/update.rb

@@ -42,11 +42,12 @@ class App
     c.desc 'Include @done actions'
     c.switch %i[done]
 
-    c.desc 'Add a tag to the action, @tag(values) allowed'
+    c.desc 'Add a tag to the action, @tag(values) allowed, use multiple times or combine multiple tags with a comma'
     c.arg_name 'TAG'
     c.flag %i[t tag], multiple: true
 
-    c.desc 'Remove a tag to the action'
+    c.desc 'Remove a tag from the action, use multiple times or combine multiple tags with a comma,
+            wildcards (* and ?) allowed'
     c.arg_name 'TAG'
     c.flag %i[r remove], multiple: true
 
@@ -62,6 +63,10 @@ class App
     c.desc 'Delete an action'
     c.switch %i[delete], negatable: false
 
+    c.desc "Open action in editor (#{NA.default_editor}).
+            Natural language dates will be parsed and converted in date-based tags."
+    c.switch %i[edit], negatable: false
+
     c.desc 'Specify the file to search for the task'
     c.arg_name 'PATH'
     c.flag %i[file]
@@ -87,17 +92,22 @@ class App
       reader = TTY::Reader.new
       append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/i
 
-      options[:done] = true if options[:restore] || options[:remove] =~ /^done/
+      if options[:restore] || (!options[:remove].nil? && options[:remove].include?('done'))
+        options[:done] = true
+        options[:tagged] << '+done'
+      elsif !options[:remove].nil? && !options[:remove].empty?
+        options[:tagged].concat(options[:remove])
+      end
 
       action = if args.count.positive?
                  args.join(' ').strip
                elsif $stdin.isatty && TTY::Which.exist?('gum') && options[:tagged].empty?
-                 options = [
+                 opts = [
                    %(--placeholder "Enter a task to search for"),
                    '--char-limit=500',
                    "--width=#{TTY::Screen.columns}"
                  ]
-                 `gum input #{options.join(' ')}`.strip
+                 `gum input #{opts.join(' ')}`.strip
                elsif $stdin.isatty && options[:tagged].empty?
                  puts NA::Color.template('{bm}Enter search string:{x}')
                  reader.read_line(NA::Color.template('{by}> {bw}')).strip
@@ -144,8 +154,9 @@ class App
       end
 
       priority = options[:priority].to_i if options[:priority]&.to_i&.positive?
-      add_tags = options[:tag] ? options[:tag].map { |t| t.sub(/^@/, '').wildcard_to_rx } : []
-      remove_tags = options[:remove] ? options[:remove].map { |t| t.sub(/^@/, '').wildcard_to_rx } : []
+      add_tags = options[:tag] ? options[:tag].join(',').split(/ *, */).map { |t| t.sub(/^@/, '').wildcard_to_rx } : []
+      remove_tags = options[:remove] ? options[:remove].join(',').split(/ *, */).map { |t| t.sub(/^@/, '').wildcard_to_rx } : []
+      remove_tags << 'done' if options[:restore]
 
       stdin_note = NA.stdin ? NA.stdin.split("\n") : []
 
@@ -217,18 +228,19 @@ class App
 
       targets.each do |target|
         NA.update_action(target, tokens,
-                         priority: priority,
                          add_tag: add_tags,
-                         remove_tag: remove_tags,
-                         finish: options[:finish],
-                         project: target_proj,
+                         all: options[:all],
+                         append: append,
                          delete: options[:delete],
+                         done: options[:done],
+                         edit: options[:edit],
+                         finish: options[:finish],
                          note: note,
                          overwrite: options[:overwrite],
-                         tagged: tags,
-                         all: options[:all],
-                         done: options[:done],
-                         append: append)
+                         priority: priority,
+                         project: target_proj,
+                         remove_tag: remove_tags,
+                         tagged: tags)
       end
     end
   end

data/bin/na

@@ -6,6 +6,7 @@ require 'gli'
 require 'na/help_monkey_patch'
 require 'na'
 require 'fcntl'
+require 'tempfile'
 
 # Main application
 class App

data/lib/na/next_action.rb

@@ -45,6 +45,125 @@ module NA
       res.empty? ? default : res =~ /y/i
     end
 
+    def default_editor
+      editor ||= ENV['NA_EDITOR'] || ENV['GIT_EDITOR'] || ENV['EDITOR']
+
+      if editor.good? && TTY::Which.exist?(editor)
+        return editor
+      end
+
+      notify('No EDITOR environment variable, testing available editors', debug: true)
+      editors = %w[vim vi code subl mate mvim nano emacs]
+      editors.each do |ed|
+        try = TTY::Which.which(ed)
+        if try
+          notify("Using editor #{try}", debug: true)
+          return try
+        end
+      end
+
+      notify('{br}No editor found{x}', exit_code: 5)
+
+      nil
+    end
+
+    def editor_with_args
+      args_for_editor(default_editor)
+    end
+
+    def args_for_editor(editor)
+      return editor if editor =~ /-\S/
+
+      args = case editor
+             when /^(subl|code|mate)$/
+               ['-w']
+             when /^(vim|mvim)$/
+               ['-f']
+             else
+               []
+             end
+      "#{editor} #{args.join(' ')}"
+    end
+
+    ##
+    ## Create a process for an editor and wait for the file handle to return
+    ##
+    ## @param      input  [String] Text input for editor
+    ##
+    def fork_editor(input = '', message: :default)
+      # raise NonInteractive, 'Non-interactive terminal' unless $stdout.isatty || ENV['DOING_EDITOR_TEST']
+
+      notify('{br}No EDITOR variable defined in environment{x}', exit_code: 5) if default_editor.nil?
+
+      tmpfile = Tempfile.new(['na_temp', '.na'])
+
+      File.open(tmpfile.path, 'w+') do |f|
+        f.puts input
+        unless message.nil?
+          f.puts message == :default ? '# First line is the action, lines after are added as a note' : message
+        end
+      end
+
+      pid = Process.fork { system("#{editor_with_args} #{tmpfile.path}") }
+
+      trap('INT') do
+        begin
+          Process.kill(9, pid)
+        rescue StandardError
+          Errno::ESRCH
+        end
+        tmpfile.unlink
+        tmpfile.close!
+        exit 0
+      end
+
+      Process.wait(pid)
+
+      begin
+        if $?.exitstatus == 0
+          input = IO.read(tmpfile.path)
+        else
+          exit_now! 'Cancelled'
+        end
+      ensure
+        tmpfile.close
+        tmpfile.unlink
+      end
+
+      input.split(/\n/).delete_if(&:ignore?).join("\n")
+    end
+
+    ##
+    ## Takes a multi-line string and formats it as an entry
+    ##
+    ## @param      input  [String] The string to parse
+    ##
+    ## @return     [Array] [[String]title, [Note]note]
+    ##
+    def format_input(input)
+      notify('No content in entry', exit_code: 1) if input.nil? || input.strip.empty?
+
+      input_lines = input.split(/[\n\r]+/).delete_if(&:ignore?)
+      title = input_lines[0]&.strip
+      notify('{br}No content in first line{x}', exit_code: 1) if title.nil? || title.strip.empty?
+
+      title.expand_date_tags
+
+      note = if input_lines.length > 1
+               input_lines[1..-1]
+             else
+               []
+             end
+
+
+      unless note.empty?
+        note.map!(&:strip)
+        note.delete_if { |l| l =~ /^\s*$/ || l =~ /^#/ }
+      end
+
+      [title, note]
+    end
+
     ##
     ## Helper function to colorize the Y/N prompt
     ##
@@ -247,6 +366,8 @@ module NA
       string = "#{string.strip} @done(#{Time.now.strftime('%Y-%m-%d %H:%M')})" if finish && string !~ /(?<=\A| )@done/
 
       action.action = string
+      action.action.expand_date_tags
+      action.note = note unless note.empty?
 
       action
     end
@@ -254,18 +375,19 @@ module NA
     def update_action(target,
                       search,
                       add: nil,
-                      priority: 0,
                       add_tag: [],
-                      remove_tag: [],
-                      finish: false,
-                      project: nil,
+                      all: false,
+                      append: false,
                       delete: false,
+                      done: false,
+                      edit: false,
+                      finish: false,
                       note: [],
                       overwrite: false,
-                      tagged: nil,
-                      all: false,
-                      done: false,
-                      append: false)
+                      priority: 0,
+                      project: nil,
+                      remove_tag: [],
+                      tagged: nil)
 
       projects = find_projects(target)
 
@@ -339,6 +461,12 @@ module NA
 
           projects = shift_index_after(projects, action.line, action.note.count + 1)
 
+          if edit
+            new_action, new_note = format_input(fork_editor("#{action.action}\n#{action.note.join("\n")}"))
+            action.action = new_action
+            action.note = new_note
+          end
+
           action = process_action(action, priority: priority, finish: finish, add_tag: add_tag, remove_tag: remove_tag)
 
           target_proj = if target_proj

data/lib/na/string.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+REGEX_DAY = /^(mon|tue|wed|thur?|fri|sat|sun)(\w+(day)?)?$/i.freeze
+REGEX_CLOCK = '(?:\d{1,2}+(?::\d{1,2}+)?(?: *(?:am|pm))?|midnight|noon)'
+REGEX_TIME = /^#{REGEX_CLOCK}$/i.freeze
+
 # String helpers
 class ::String
   ##
@@ -12,6 +16,16 @@ class ::String
     !strip.empty?
   end
 
+  ##
+  ## Test if line should be ignored
+  ##
+  ## @return     [Boolean] line is empty or comment
+  ##
+  def ignore?
+    line = self
+    line =~ /^#/ || line.strip.empty?
+  end
+
   def read_file
     file = File.expand_path(self)
     raise "Missing file #{file}" unless File.exist?(file)
@@ -186,6 +200,105 @@ class ::String
     sub(/^#{ENV['HOME']}/, '~')
   end
 
+  ##
+  ## Convert (chronify) natural language dates
+  ## within configured date tags (tags whose value is
+  ## expected to be a date). Modifies string in place.
+  ##
+  ## @param      additional_tags  [Array] An array of
+  ##                              additional tags to
+  ##                              consider date_tags
+  ##
+  def expand_date_tags(additional_tags = nil)
+    iso_rx = /\d{4}-\d\d-\d\d \d\d:\d\d/
+
+    watch_tags = [
+      'due',
+      'start(?:ed)?',
+      'beg[ia]n',
+      'done',
+      'finished',
+      'completed?',
+      'waiting',
+      'defer(?:red)?'
+    ]
+
+    if additional_tags
+      date_tags = additional_tags
+      date_tags = date_tags.split(/ *, */) if date_tags.is_a?(String)
+      date_tags.map! do |tag|
+        tag.sub(/^@/, '').gsub(/\((?!\?:)(.*?)\)/, '(?:\1)').strip
+      end
+      watch_tags.concat(date_tags).uniq!
+    end
+
+    done_rx = /(?<=^| )@(?<tag>#{watch_tags.join('|')})\((?<date>.*?)\)/i
+
+    gsub!(done_rx) do
+      m = Regexp.last_match
+      t = m['tag']
+      d = m['date']
+      future = t =~ /^(done|complete)/ ? false : true
+      parsed_date = d =~ iso_rx ? Time.parse(d) : d.chronify(guess: :begin, future: future)
+      parsed_date.nil? ? m[0] : "@#{t}(#{parsed_date.strftime('%F %R')})"
+    end
+  end
+
+  ##
+  ## Converts input string into a Time object when input
+  ## takes on the following formats:
+  ##             - interval format e.g. '1d2h30m', '45m'
+  ##               etc.
+  ##             - a semantic phrase e.g. 'yesterday
+  ##               5:30pm'
+  ##             - a strftime e.g. '2016-03-15 15:32:04
+  ##               PDT'
+  ##
+  ## @param      options  Additional options
+  ##
+  ## @option options :future [Boolean] assume future date
+  ##                                   (default: false)
+  ##
+  ## @option options :guess  [Symbol] :begin or :end to
+  ##                                   assume beginning or end of
+  ##                                   arbitrary time range
+  ##
+  ## @return     [DateTime] result
+  ##
+  def chronify(**options)
+    now = Time.now
+    raise StandardError, "Invalid time expression #{inspect}" if to_s.strip == ''
+
+    secs_ago = if match(/^(\d+)$/)
+                 # plain number, assume minutes
+                 Regexp.last_match(1).to_i * 60
+               elsif (m = match(/^(?:(?<day>\d+)d)? *(?:(?<hour>\d+)h)? *(?:(?<min>\d+)m)?$/i))
+                 # day/hour/minute format e.g. 1d2h30m
+                 [[m['day'], 24 * 3600],
+                  [m['hour'], 3600],
+                  [m['min'], 60]].map { |qty, secs| qty ? (qty.to_i * secs) : 0 }.reduce(0, :+)
+               end
+
+    if secs_ago
+      res = now - secs_ago
+      notify(%(date/time string "#{self}" interpreted as #{res} (#{secs_ago} seconds ago)), debug: true)
+    else
+      date_string = dup
+      date_string = 'today' if date_string.match(REGEX_DAY) && now.strftime('%a') =~ /^#{Regexp.last_match(1)}/i
+      date_string = "#{options[:context].to_s} #{date_string}" if date_string =~ REGEX_TIME && options[:context]
+
+      res = Chronic.parse(date_string, {
+                            guess: options.fetch(:guess, :begin),
+                            context: options.fetch(:future, false) ? :future : :past,
+                            ambiguous_time_range: 8
+                          })
+
+      NA.notify(%(date/time string "#{self}" interpreted as #{res}), debug: true)
+    end
+
+    res
+  end
+
   private
 
   def matches_none(regexes)

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.32'
+  VERSION = '1.2.33'
 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.31<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.32<!--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.32
+  version: 1.2.33
 platform: ruby
 authors:
 - Brett Terpstra
@@ -215,6 +215,7 @@ files:
 - bin/commands/find.rb
 - bin/commands/init.rb
 - bin/commands/next.rb
+- bin/commands/open.rb
 - bin/commands/projects.rb
 - bin/commands/prompt.rb
 - bin/commands/saved.rb