na 1.2.35 → 1.2.37

data/lib/na/todo.rb

@@ -0,0 +1,183 @@
+# frozen_string_literal: true
+
+module NA
+  class Todo
+    attr_accessor :actions, :projects, :files
+
+    def initialize(options = {})
+      @files, @actions, @projects = parse(options)
+    end
+
+    ##
+    ## Read a todo file and create a list of actions
+    ##
+    ## @param      options  The options
+    ##
+    ## @option      depth       [Number] The directory depth to
+    ##                         search for files
+    ## @option      done        [Boolean] include @done actions
+    ## @option      query       [Hash] The todo file query
+    ## @option      tag         [Array] Tags to search for
+    ## @option      search      [String] A search string
+    ## @option      negate      [Boolean] Invert results
+    ## @option      regex       [Boolean] Interpret as regular
+    ##                         expression
+    ## @option      project     [String] The project
+    ## @option      require_na  [Boolean] Require @na tag
+    ## @option      file_path   [String] file path to parse
+    ##
+    def parse(options)
+      defaults = {
+        depth: 1,
+        done: false,
+        file_path: nil,
+        negate: false,
+        project: nil,
+        query: nil,
+        regex: false,
+        require_na: true,
+        search: nil,
+        tag: nil
+      }
+
+      settings = defaults.merge(options)
+
+      actions = NA::Actions.new
+      required = []
+      optional = []
+      negated = []
+      required_tag = []
+      optional_tag = []
+      negated_tag = []
+      projects = []
+
+      NA.notify("{dw}Tags: #{settings[:tag]}", debug:true)
+      NA.notify("{dw}Search: #{settings[:search]}", debug:true)
+
+      settings[:tag]&.each do |t|
+        unless t[:tag].nil?
+          if settings[:negate]
+            optional_tag.push(t) if t[:negate]
+            required_tag.push(t) if t[:required] && t[:negate]
+            negated_tag.push(t) unless t[:negate]
+          else
+            optional_tag.push(t) unless t[:negate]
+            required_tag.push(t) if t[:required] && !t[:negate]
+            negated_tag.push(t) if t[:negate]
+          end
+        end
+      end
+
+      unless settings[:search].nil? || settings[:search].empty?
+        if settings[:regex] || settings[:search].is_a?(String)
+          if settings[:negate]
+            negated.push(settings[:search])
+          else
+            optional.push(settings[:search])
+            required.push(settings[:search])
+          end
+        else
+          settings[:search].each do |t|
+            opt, req, neg = parse_search(t, settings[:negate])
+            optional.concat(opt)
+            required.concat(req)
+            negated.concat(neg)
+          end
+        end
+      end
+
+      files = if !settings[:file_path].nil?
+                [settings[:file_path]]
+              elsif settings[:query].nil?
+                NA.find_files(depth: settings[:depth])
+              else
+                NA.match_working_dir(settings[:query])
+              end
+
+      files.each do |file|
+        NA.save_working_dir(File.expand_path(file))
+        content = file.read_file
+        indent_level = 0
+        parent = []
+        in_action = false
+        content.split(/\n/).each.with_index do |line, idx|
+          if line.project?
+            in_action = false
+            proj = line.project
+            indent = line.indent_level
+
+            if indent.zero? # top level project
+              parent = [proj]
+            elsif indent <= indent_level # if indent level is same or less, split parent before indent level and append
+              parent.slice!(indent, parent.count - indent)
+              parent.push(proj)
+            else # if indent level is greater, append project to parent
+              parent.push(proj)
+            end
+
+            projects.push(NA::Project.new(parent.join(':'), indent, idx, idx))
+
+            indent_level = indent
+          elsif line.blank?
+            in_action = false
+          elsif line.action?
+            in_action = false
+
+            action = line.action
+            new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action, idx)
+
+            projects[-1].last_line = idx if projects.count.positive?
+
+            next if line.done? && !settings[:done]
+
+            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)
+            end
+
+            has_tag = !optional_tag.empty? || !required_tag.empty? || !negated_tag.empty?
+            next if has_tag && !new_action.tags_match?(any: optional_tag,
+                                                       all: required_tag,
+                                                       none: negated_tag)
+
+            actions.push(new_action)
+            in_action = true
+          elsif in_action
+            actions[-1].note.push(line.strip) if actions.count.positive?
+            projects[-1].last_line = idx if projects.count.positive?
+          end
+        end
+        projects = projects.dup
+      end
+
+      [files, actions, projects]
+    end
+
+    def parse_search(tag, negate)
+      required = []
+      optional = []
+      negated = []
+      new_rx = tag[:token].to_s.wildcard_to_rx
+
+      if negate
+        optional.push(new_rx) if tag[:negate]
+        required.push(new_rx) if tag[:required] && tag[:negate]
+        negated.push(new_rx) unless tag[:negate]
+      else
+        optional.push(new_rx) unless tag[:negate]
+        required.push(new_rx) if tag[:required] && !tag[:negate]
+        negated.push(new_rx) if tag[:negate]
+      end
+
+      [optional, required, negated]
+    end
+  end
+end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.35'
+  VERSION = '1.2.37'
 end

data/lib/na.rb

@@ -13,7 +13,10 @@ require 'na/hash'
 require 'na/colors'
 require 'na/string'
 require 'na/array'
+require 'na/todo'
+require 'na/actions'
 require 'na/project'
 require 'na/action'
+require 'na/editor'
 require 'na/next_action'
 require 'na/prompt'

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.34<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.35<!--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. 
 
@@ -69,7 +69,7 @@ You can mark todos as complete, delete them, add and remove tags, change priorit
 ### Usage
 
 ```
-@cli(bundle exec bin/na help)
+@cli(na help)
 ```
 
 #### Commands
@@ -87,13 +87,13 @@ Use the `--note` switch to add a note. If STDIN (piped) input is present when th
 Notes are not displayed by the `next/tagged/find` commands unless `--notes` is specified.
 
 ```
-@cli(bundle exec bin/na help add)
+@cli(na help add)
 ```
 
 ##### edit
 
 ```
-@cli(bundle exec bin/na help edit)
+@cli(na help edit)
 ```
 
 ##### find
@@ -103,13 +103,13 @@ Example: `na find cool feature idea`
 Unless `--exact` is specified, search is tokenized and combined with AND, so `na find cool feature idea` translates to `cool AND feature AND idea`, matching any string that contains all of the words. To make a token required and others optional, add a `+` before it (e.g. `cool +feature idea` is `(cool OR idea) AND feature`). Wildcards allowed (`*` and `?`), use `--regex` to interpret the search as a regular expression. Use `-v` to invert the results (display non-matching actions only).
 
 ```
-@cli(bundle exec bin/na help find)
+@cli(na help find)
 ```
 
 ##### init, create
 
 ```
-@cli(bundle exec bin/na help init)
+@cli(na help init)
 ```
 
 ##### next, show
@@ -123,7 +123,7 @@ Examples:
 To see all next actions across all known todos, use `na next "*"`. You can combine multiple arguments to see actions across multiple todos, e.g. `na next marked nvultra`.
 
 ```
-@cli(bundle exec bin/na help next)
+@cli(na help next)
 ```
 
 ##### projects
@@ -131,7 +131,7 @@ To see all next actions across all known todos, use `na next "*"`. You can combi
 List all projects in a file. If arguments are provided, they're used to match a todo file from history, otherwise the todo file(s) in the current directory will be used.
 
 ```
-@cli(bundle exec bin/na help projects)
+@cli(na help projects)
 ```
 
 ##### saved
@@ -146,7 +146,7 @@ Run `na saved` without an argument to list your saved searches.
 <!--JEKYLL{:.tip}-->
 
 ```
-@cli(bundle exec bin/na help saved)
+@cli(na help saved)
 ```
 
 ##### tagged
@@ -160,7 +160,7 @@ You can also perform value comparisons on tags. A value in a TaskPaper tag is ad
 To perform a string comparison, you can use `*=` (contains), `^=` (starts with), `$=` (ends with), or `=` (matches). E.g. `na tagged "note*=video"`.
 
 ```
-@cli(bundle exec bin/na help show)
+@cli(na help show)
 ```
 
 ##### todos
@@ -168,7 +168,7 @@ To perform a string comparison, you can use `*=` (contains), `^=` (starts with),
 List all known todo files from history.
 
 ```
-@cli(bundle exec bin/na help todos)
+@cli(na help todos)
 ```
 
 ##### update
@@ -206,7 +206,31 @@ Notes are not displayed by the `next/tagged/find` commands unless `--notes` is s
 See the help output for a list of all available actions.
 
 ```
-@cli(bundle exec bin/na help update)
+@cli(na help update)
+```
+
+##### changelog
+
+View recent changes with `na changelog` or `na changes`.
+
+```
+@cli(na help changelog)
+```
+
+##### complete
+
+Mark an action as complete, shortcut for `na update --finish`.
+
+```
+@cli(na help complete)
+```
+
+##### archive
+
+Mark an action as complete and move to archive, shortcut for `na update --archive`.
+
+```
+@cli(na help archive)
 ```
 
 ### Configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.35
+  version: 1.2.37
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-30 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,12 +222,15 @@ files:
 - bin/commands/saved.rb
 - bin/commands/tagged.rb
 - bin/commands/todos.rb
+- bin/commands/undo.rb
 - bin/commands/update.rb
 - bin/na
 - lib/na.rb
 - lib/na/action.rb
+- lib/na/actions.rb
 - lib/na/array.rb
 - lib/na/colors.rb
+- lib/na/editor.rb
 - lib/na/hash.rb
 - lib/na/help_monkey_patch.rb
 - lib/na/next_action.rb
@@ -235,6 +238,7 @@ files:
 - lib/na/project.rb
 - lib/na/prompt.rb
 - lib/na/string.rb
+- lib/na/todo.rb
 - lib/na/version.rb
 - na.gemspec
 - na.rdoc