na 1.2.53 → 1.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cecace1a262d294c8ef240dd6413f488b736fc04b7a5edaff413df8184ce2c8
-  data.tar.gz: 2d34dedd3c0cedc257ad1e7761afab581522aed6d97aa48ad53f4e1b424b1c68
+  metadata.gz: 3d67defa193fd36e28d744d1b42a56ef6815db6b4994b07a5d7fa4af447ca14c
+  data.tar.gz: cf5e9a3e396ad102e0b15481873affcea80d1bb0a7571136992957d920de5db7
 SHA512:
-  metadata.gz: a46c75398d031fa5a4d029ab99bf6df3cdc3958cbda22de87402480f5327afcfaed5b9353df6515a7610990b5d97e5553e37a94186402c0af0cb817bb7b59674
-  data.tar.gz: 705c122dbd8714a18676b633f201707a515d69e3e24ddbce2c008cce498e3ccdf4f9b3829f3e28e474b5aaa1e41de93ed775da14bc414db16649bece9ab185cc
+  metadata.gz: 38fbd19efd1897a91c1a0c0440a390748a8e51ab481c9b2b41b0011644623f9b091be8b26ff23afdeb8f990b42e2ba924c6df4634eb6fec4aa17a9c60fd40b6e
+  data.tar.gz: 79b7d7b7f016d5307fc7604ddafebea525a3c4ce5f3fa7a923921b2502dec4ba697dc8f4c59cab4df9d2ed90b487a3566e230d9f2d6cb258881a1ff16fab7f31

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.2.54
+
+2023-09-11 10:11
+
+#### IMPROVED
+
+- Allow selection of action if no search text is provided for tag command
+- If the terminal is less than 60 columns wide, don't indent or wrap (for display on mobile devices)
+
 ### 1.2.53
 
 2023-09-10 08:26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.53)
+    na (1.2.54)
       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.53
+The current version of `na` is 1.2.54
 .
 
 `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.53
+    1.2.54
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -660,11 +660,14 @@ NAME
 
 SYNOPSIS
 
-    na [global options] undo [FILE]...
+    na [global options] undo [command options] [FILE]...
 
 DESCRIPTION
     Run without argument to undo most recent change 
 
+COMMAND OPTIONS
+    -s, --[no-]select, --[no-]choose - Select from available undo files
+
 EXAMPLES
 
     # Undo the last change

data/Test.todo.markdown

@@ -3,19 +3,31 @@ comment: 2023-09-03
 keywords: 
 ---
 
-2023-09-08:
-Project2:
-	- new_task @na
-	- new_task @na
+Project3:
 Project0:
-	- other task @na
-	- other task @na
-	- There, that's better @na
+	- This is another task @na
+	- How about this one? @na
+	- what happens now? @na
 	Subproject:
-		- new_task 2 @na
+		- Bollocks @na
+		Subsub:
+			- Hey, I think it's all working @na
+			- Is this at the end? @na
+	- This better work @na
+2023-09-08:
+	Project2:
+		- new_task @na
 		- new_task @na
-		- new_task 2 @na
-Project1:
-	- Test4
-	- Test5
-	- Test6
+		- test task @na
+	Project0:
+		- other task @na
+		- other task @na
+		- There, that's better @na
+		Subproject:
+			- new_task 2 @na
+			- new_task @na
+			- new_task 2 @na
+	Project1:
+		- Test4
+		- Test5
+		- Test6

data/bin/commands/tag.rb

@@ -89,10 +89,6 @@ class App
         end
       end
 
-      if (tokens.nil? || tokens.empty?) && options[:tagged].empty?
-        NA.notify("#{NA.theme[:error]}Empty input, cancelled", exit_code: 1)
-      end
-
       all_req = options[:tagged].join(' ') !~ /[+!-]/ && !options[:or]
       tags = []
       options[:tagged].join(',').split(/ *, */).each do |arg|

data/bin/commands/undo.rb

@@ -6,11 +6,20 @@ class App
   long_desc 'Run without argument to undo most recent change'
   arg_name 'FILE', optional: true, multiple: true
   command %i[undo] do |c|
+    c.desc 'Select from available undo files'
+    c.switch %i[s select choose]
+
     c.example 'na undo', desc: 'Undo the last change'
     c.example 'na undo myproject', desc: 'Undo the last change to a file matching "myproject"'
 
     c.action do |_global_options, options, args|
-      if args.empty?
+      if options[:select]
+        options = IO.read(NA.database_path(file: 'last_modified.txt')).strip.split(/\n/)
+        res = NA.choose_from(options, sorted: false)
+        NA.notify("#{NA.theme[:error]}Cancelled", exit_code: 1) unless res
+
+        NA.restore_modified_file(res)
+      elsif args.empty?
         NA.restore_last_modified_file
       else
         args.each do |arg|

data/bin/na

@@ -87,6 +87,7 @@ class App
   end
 
   pre do |global, _command, _options, _args|
+    NA.move_deprecated_backups
     NA.verbose = global[:debug]
     NA::Pager.paginate = global[:pager] && $stdout.isatty
     NA::Color.coloring = global[:color] && $stdout.isatty

data/lib/na/array.rb

@@ -12,6 +12,8 @@ class ::Array
   end
 
   def wrap(width, indent, color)
+    return map { |l| "#{color}  #{l.wrap(width, 2)}" } if width < 60
+
     map! do |l|
       "#{color}#{' ' * indent }• #{l.wrap(width, indent)}{x}"
     end

data/lib/na/next_action.rb

@@ -410,7 +410,6 @@ module NA
       parent = project.split(%r{[:/]})
 
       if NA.global_file
-        puts NA.global_file
         if NA.cwd_is == :tag
           add_tag = [NA.cwd]
         else
@@ -622,10 +621,7 @@ module NA
     ## @param      search  The search
     ##
     def last_modified_file(search: nil)
-      db = database_path(file: 'last_modified.txt')
-      return nil unless File.exist?(db)
-
-      files = IO.read(db).split(/\n/).map(&:strip)
+      files = backup_files
       files.delete_if { |f| f !~ Regexp.new(search.dir_to_rx(require_last: true)) } if search
       files.last
     end
@@ -644,19 +640,72 @@ module NA
       end
     end
 
+    ##
+    ## Get list of backed up files
+    ##
+    ## @return     [Array] list of file paths
+    ##
+    def backup_files
+      db = database_path(file: 'last_modified.txt')
+      NA.notify("#{NA.theme[:error]}Backup database not found", exit_code: 1) unless File.exist?(db)
+
+      IO.read(db).strip.split(/\n/).map(&:strip)
+    end
+
+    def move_deprecated_backups
+      backup_files.each do |file|
+        if File.exist?(old_backup_path(file))
+          NA.notify("Moving deprecated backup to new backup folder (#{file})", debug: true)
+          backup_path(file)
+        end
+      end
+    end
+
+    def old_backup_path(file)
+      File.join(File.dirname(file), ".#{File.basename(file)}.bak")
+    end
+
+    ##
+    ## Get the backup file path for a file
+    ##
+    ## @param      file  The file
+    ##
+    def backup_path(file)
+      backup_home = File.expand_path('~/.local/share/na/backup')
+      backup = old_backup_path(file)
+      backup_dir = File.join(backup_home, File.dirname(backup))
+      FileUtils.mkdir_p(backup_dir) unless File.directory?(backup_dir)
+
+      backup_target = File.join(backup_home, backup)
+      FileUtils.mv(backup, backup_target) if File.exist?(backup)
+      backup_target
+    end
+
+    def weed_modified_files(file = nil)
+      files = backup_files
+
+      files.delete_if { |f| f =~ /#{file}/ } if file
+
+      files.delete_if { |f| !File.exist?(backup_path(f)) }
+
+      File.open(database_path(file: 'last_modified.txt'), 'w') { |f| f.puts files.join("\n") }
+    end
+
     ##
     ## Restore a file from backup
     ##
     ## @param      file  The file
     ##
     def restore_modified_file(file)
-      bak_file = File.join(File.dirname(file), ".#{File.basename(file)}.bak")
+      bak_file = backup_path(file)
       if File.exist?(bak_file)
         FileUtils.mv(bak_file, file)
         NA.notify("#{NA.theme[:success]}Backup restored for #{file.highlight_filename}")
       else
         NA.notify("#{NA.theme[:error]}Backup file for #{file.highlight_filename} not found")
       end
+
+      weed_modified_files(file)
     end
 
     ##
@@ -821,11 +870,9 @@ module NA
     ## @param      target [String] The file to back up
     ##
     def backup_file(target)
-      file = ".#{File.basename(target)}.bak"
-      backup = File.join(File.dirname(target), file)
-      FileUtils.cp(target, backup)
+      FileUtils.cp(target, backup_path(target))
       save_modified_file(target)
-      NA.notify("#{NA.theme[:warning]}Backup file created at #{backup.highlight_filename}", debug: true)
+      NA.notify("#{NA.theme[:warning]}Backup file created for #{target.highlight_filename}", debug: true)
     end
 
     ##

data/lib/na/string.rb

@@ -52,7 +52,7 @@ class ::String
     prefix = match(/(^[ \t]+)/)
     return 0 if prefix.nil?
 
-    prefix[1].gsub(/  /, "\t").scan(/\t/).count
+    prefix[1].gsub(/    /, "\t").scan(/\t/).count
   end
 
   def action?
@@ -149,6 +149,8 @@ class ::String
   end
 
   def wrap(width, indent)
+    return "\n#{self}" if width < 60
+
     output = []
     line = []
     length = indent

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.53'
+  VERSION = '1.2.54'
 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.52<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.53<!--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. 
 

data/test2.txt

@@ -0,0 +1,7 @@
+---
+comment: 2023
+keywords:
+---
+
+Inbox:
+	- Test @na

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.53
+  version: 1.2.54
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -247,6 +247,7 @@ files:
 - na.rdoc
 - scripts/fixreadme.rb
 - src/_README.md
+- test2.txt
 homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT