na 1.2.25 → 1.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb2c991e3e916c35ac9820504725f1e8b41f0030c0f87a0672ec4cfcc5190c09
-  data.tar.gz: 97de5c78cf2ce7f53a6268030b9c0fb5d4881c7f40e312d289207353fc53801a
+  metadata.gz: 890425bc1defde99d8f672fb531b736a6d4018487200c8e18ef5914478332144
+  data.tar.gz: ad8d9e5105f55080571e37a906fc1e3bdee3559c13898d1a4dcd706862405bc7
 SHA512:
-  metadata.gz: 74a6012339df8e359f39942c481905de44c066a1d0c464ce942de7590d23a80da3fe68b79f86215faeaa5efc831e3b88f96630b51ca2285967afbd9b24956e07
-  data.tar.gz: 134d9db7430525d873025c23b00bd57c2494038a8af9e4bb48d1544f39e804b065313ad4f542ebe871129fe09eda3fc4330ce796e870514e2370616e51291c22
+  metadata.gz: f36e78f1c60459a325ac2aa63e0de725772d84b6041bca125a06a5186458a4b4a58c219073e3dd4f04ac453b72a3ec446718b3db319f5046da4d97a5730d0c5e
+  data.tar.gz: f6db15840e9c67fb4aa14abce022df6482471ec1dd9ae870e5ac9cdb1a3dfafde0ce81623ae76a21d1dcdf1ad1503788d463a629f88138c46932707ab9883b34

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.2.26
+
+2023-08-21 10:26
+
+#### NEW
+
+- `na finish` and `na archive` subcommands as aliases for equivalant `update` commands
+
+#### FIXED
+
+- --archive flag for `na finish`
+
 ### 1.2.25
 
 2023-08-21 07:23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.25)
+    na (1.2.26)
       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.25
+The current version of `na` is 1.2.26
 .
 
 `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.25
+    1.2.26
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -98,7 +98,9 @@ GLOBAL OPTIONS
 
 COMMANDS
     add                - Add a new next action
+    archive            - Mark an action as @done and archive
     changes, changelog - Display the changelog
+    complete, finish   - Find and mark an action as @done
     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

data/bin/na

@@ -397,6 +397,102 @@ class App
     end
   end
 
+  desc 'Find and mark an action as @done'
+  arg_name 'ACTION'
+  command %i[complete finish] do |c|
+    c.example 'na complete "An existing task"',
+              desc: 'Find "An existing task" and mark @done'
+    c.example 'na finish "An existing task"',
+              desc: 'Alias for complete'
+
+    c.desc '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.'
+    c.switch %i[n note], negatable: false
+
+    c.desc 'Overwrite note instead of appending'
+    c.switch %i[o overwrite], negatable: false
+
+    c.desc 'Add a @done tag to action and move to Archive'
+    c.switch %i[a archive], negatable: false
+
+    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.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 'Act on all matches immediately (no menu)'
+    c.switch %i[all], negatable: false
+
+    c.desc 'Interpret search pattern as regular expression'
+    c.switch %i[e regex], negatable: false
+
+    c.desc 'Match pattern exactly'
+    c.switch %i[x exact], negatable: false
+
+    c.action do |global, options, args|
+      options[:finish] = true
+      options[:f] = true
+      options[:project] = 'Archive' if options[:archive]
+
+      cmd = commands[:update]
+      action = cmd.send(:get_action, nil)
+      action.call(global, options, args)
+    end
+  end
+
+  desc 'Mark an action as @done and archive'
+  arg_name 'ACTION'
+  command %i[archive] do |c|
+    c.example 'na archive "An existing task"',
+              desc: 'Find "An existing task", mark @done if needed, and move to archive'
+
+    c.desc '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.'
+    c.switch %i[n note], negatable: false
+
+    c.desc 'Overwrite note instead of appending'
+    c.switch %i[o overwrite], negatable: false
+
+    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.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 'Act on all matches immediately (no menu)'
+    c.switch %i[all], negatable: false
+
+    c.desc 'Interpret search pattern as regular expression'
+    c.switch %i[e regex], negatable: false
+
+    c.desc 'Match pattern exactly'
+    c.switch %i[x exact], negatable: false
+
+    c.action do |global, options, args|
+      options[:done] = true
+      options[:finish] = true
+      options[:project] = 'Archive'
+      options[:archive] = true
+      options[:a] = true
+      cmd = commands[:update]
+      action = cmd.send(:get_action, nil)
+      action.call(global, options, args)
+    end
+  end
+
   desc 'Update an existing action'
   long_desc 'Provides an easy way to complete, prioritize, and tag existing actions.
 
@@ -534,8 +630,8 @@ class App
       end
 
       priority = options[:priority].to_i if options[:priority]&.to_i&.positive?
-      add_tags = options[:tag].map { |t| t.sub(/^@/, '').wildcard_to_rx }
-      remove_tags = options[:remove].map { |t| t.sub(/^@/, '').wildcard_to_rx }
+      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 } : []
 
       stdin_note = NA.stdin ? NA.stdin.split("\n") : []
 
@@ -598,8 +694,10 @@ class App
 
       end
 
-      options[:finish] = true if options[:archive]
-      options[:project] = 'Archive' if options[:archive]
+      if options[:archive]
+        options[:finish] = true
+        options[:project] = 'Archive'
+      end
 
       NA.notify('{r}No search terms provided', exit_code: 1) if tokens.nil? && options[:tagged].empty?
 

data/lib/na/version.rb

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