na 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e91f1eeef1caa7f05d1dab98bd221d88d58ad1a0d928c88a399f8b1a491a200c
-  data.tar.gz: b08a5c6a2cfe97f0749e784e3a5d9a06ef458ce06162f0f62321d775069bce87
+  metadata.gz: e7e57d75babca99bccbea082d51f20180c8089b677d2ae6a7088931b0af43fd5
+  data.tar.gz: 813a861742e460996b8074ce1d7603e9d3b9856a9fd2f5ed4e85e5c04fffbea0
 SHA512:
-  metadata.gz: ea45a8a95a5f78fe551459ca4fe8302e96cfdc5d9de59bf1f145693c900baeee128275efb84823af5ea2827f3ecdb6f0d05c9a233b283cee03d09836cad4fb46
-  data.tar.gz: af359ef24ea273d166fb8b0dd91ddccaaa9d13c5c42ef00b65da8a78939d59936b9df8ca37dc778b46fa2a9a5b542584c339819e86bd3a9ade904ffd28ce791e
+  metadata.gz: f80bf3d000c6fe458c807e202a9da1aa09cf6d702b896abf93c494b876597d4efe352ed9132ce9ef3a820008794e795885c67cf41ebce374f10c675c1a5c77c2
+  data.tar.gz: 584e5f7da19d8c5d877897b2038e14164c6d5278201da89cc6cff8d21cc0aeb29b5be560f45dffc8a65f0756d1e3ee1e9f45760fe838485d21c8fe93bb3eefdf

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.2.1
+
+2022-10-22 10:18
+
+#### NEW
+
+- Added `--done` tag to next/find/tagged to include @done actions in the output
+- Use `na changes` to view the changelog and see recent changes
+
+#### IMPROVED
+
+- You can run `na SAVED_SEARCH` using any saved search (same as running `na saved SAVED_SEARCH` but niftier)
+
 ### 1.2.0
 
 2022-10-22 01:32

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    na (1.2.0)
+    na (1.2.1)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
+      mdless (~> 1.0, >= 1.0.32)
       tty-reader (~> 0.9, >= 0.9.0)
       tty-screen (~> 0.8, >= 0.8.1)
       tty-which (~> 0.5, >= 0.5.0)
@@ -13,6 +14,7 @@ GEM
   specs:
     chronic (0.10.2)
     gli (2.21.0)
+    mdless (1.0.32)
     minitest (5.16.3)
     rake (0.9.6)
     rdoc (4.3.0)

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.0
+The current version of `na` is 1.2.1
 .
 
 `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. 
@@ -59,7 +59,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.0
+    1.2.1
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -74,19 +74,20 @@ GLOBAL OPTIONS
     --version               - Display the program version
 
 COMMANDS
-    add          - Add a new next action
-    edit         - Open a todo file in the default editor
-    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
-    projects     - Show list of projects for a file
-    prompt       - Show or install prompt hooks for the current shell
-    saved        - Execute a saved search
-    tagged       - Find actions matching a tag
-    todos        - Show list of known todo files
-    update       - Update an existing action
+    add                - Add a new next action
+    changes, changelog - Display the changelog
+    edit               - Open a todo file in the default editor
+    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
+    projects           - Show list of projects for a file
+    prompt             - Show or install prompt hooks for the current shell
+    saved              - Execute a saved search
+    tagged             - Find actions matching a tag
+    todos              - Show list of known todo files
+    update             - Update an existing action
 ```
 
 #### Commands
@@ -177,6 +178,7 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: none)
+    --[no-]done                            - Include @done actions
     -e, --regex                            - Interpret search pattern as regular expression
     --in=TODO_PATH                         - Show actions from a specific todo file in history. May use wildcards (* and ?) (default: none)
     -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
@@ -234,6 +236,7 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: 2)
+    --[no-]done                            - Include @done actions
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
 
@@ -324,6 +327,7 @@ DESCRIPTION
 
 COMMAND OPTIONS
     -d, --depth=DEPTH                      - Recurse to depth (default: 2)
+    --[no-]done                            - Include @done actions
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
     -t, --tag=TAG                          - Alternate tag to search for (default: none)
 

data/bin/na

@@ -78,6 +78,9 @@ class App
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
 
+    c.desc 'Include @done actions'
+    c.switch %i[done]
+
     c.action do |global_options, options, args|
       if global_options[:add]
         cmd = ['add']
@@ -115,6 +118,7 @@ class App
 
       tag = [{ tag: tag, value: nil }, { tag: 'done', value: nil, negate: true}]
       files, actions, = NA.parse_actions(depth: depth,
+                                         done: options[:done],
                                          query: tokens,
                                          tag: tag,
                                          project: options[:project],
@@ -513,6 +517,9 @@ class App
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
 
+    c.desc 'Include @done actions'
+    c.switch %i[done]
+
     c.desc 'Show actions not matching search pattern'
     c.switch %i[v invert], negatable: false
 
@@ -563,6 +570,7 @@ class App
       end
 
       files, actions, = NA.parse_actions(depth: depth,
+                                         done: options[:done],
                                          query: todo,
                                          search: tokens,
                                          negate: options[:invert],
@@ -610,6 +618,9 @@ class App
     c.arg_name 'PROJECT[/SUBPROJECT]'
     c.flag %i[proj project]
 
+    c.desc 'Include @done actions'
+    c.switch %i[done]
+
     c.desc 'Show actions not matching tags'
     c.switch %i[v invert], negatable: false
 
@@ -661,6 +672,7 @@ class App
       end
 
       files, actions, = NA.parse_actions(depth: depth,
+                                         done: options[:done],
                                          query: todo,
                                          tag: tags,
                                          negate: options[:invert],
@@ -850,6 +862,24 @@ class App
     end
   end
 
+  desc 'Display the changelog'
+  command %i[changes changelog] do |c|
+    c.action do |_, _, _|
+      changelog = File.expand_path(File.join(File.dirname(__FILE__), '..', 'CHANGELOG.md'))
+      pagers = [
+        'mdless',
+        'mdcat',
+        'bat',
+        ENV['PAGER'],
+        'less -FXr',
+        ENV['GIT_PAGER'],
+        'more -r'
+      ]
+      pager = pagers.find { |cmd| TTY::Which.exist?(cmd.split.first) }
+      system %(#{pager} "#{changelog}")
+    end
+  end
+
   desc 'Execute a saved search'
   long_desc 'Run without argument to list saved searches'
   arg_name 'SEARCH_TITLE', optional: true
@@ -905,8 +935,8 @@ class App
   on_error do |exception|
     case exception
     when GLI::UnknownCommand
-      cmd = ['add']
-      cmd.concat(ARGV.unshift($first_arg)) if ARGV.count.positive?
+      cmd = ['saved']
+      cmd.concat(ARGV.unshift($first_arg))
 
       exit run(cmd)
     when SystemExit

data/lib/na/next_action.rb

@@ -404,7 +404,7 @@ module NA
     ## @param      require_na  [Boolean] Require @na tag
     ## @param      file        [String] file path to parse
     ##
-    def parse_actions(depth: 1, query: nil, tag: nil, search: nil, negate: false, regex: false, project: nil, require_na: true, file_path: nil)
+    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 = []
       required = []
       optional = []
@@ -482,7 +482,7 @@ module NA
             in_action = false
             # search_for_done = false
             # optional_tag.each { |t| search_for_done = true if t[:tag] =~ /done/ }
-            # next if line =~ /@done/ && !search_for_done
+            next if line =~ /@done/ && !done
 
             next if require_na && line !~ /@#{NA.na_tag}\b/
 

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/na.gemspec

@@ -31,4 +31,5 @@ spec = Gem::Specification.new do |s|
   s.add_runtime_dependency('tty-screen', '~> 0.8', '>= 0.8.1')
   s.add_runtime_dependency('tty-which', '~> 0.5', '>= 0.5.0')
   s.add_runtime_dependency('chronic', '~> 0.10', '>= 0.10.2')
+  s.add_runtime_dependency('mdless', '~> 1.0', '>= 1.0.32')
 end

data/src/README.md

@@ -9,7 +9,7 @@
 _If you're one of the rare people like me who find this useful, feel free to
 [buy me some coffee][donate]._
 
-The current version of `na` is <!--VER-->1.1.26<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.0<!--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.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brett Terpstra
@@ -166,6 +166,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.2
+- !ruby/object:Gem::Dependency
+  name: mdless
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.32
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.32
 description: A tool for managing a TaskPaper file of project todos for the current
   directory. Easily create "next actions" to come back to, add tags and priorities,
   and notes. Add prompt hooks to display your next actions automatically when cd'ing