na 1.1.22 → 1.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 584d55c84c26fddeb65bf537b4743b5cac4308f39d796d336d95c900fc966deb
-  data.tar.gz: 73ea4289a1e43ce0b67f66f803a0db07359fe3f077358328a58c172c06daa107
+  metadata.gz: 627281aeb89624e4b083114fe2247e459383a0a00517901003deb4d361e6b6ed
+  data.tar.gz: 4c811e25d7b2a882c058bc04465d08777ba6275192b4b4f262a6be05ff927d7f
 SHA512:
-  metadata.gz: 89945d2a8df1c1ea11360da4258c09f9b5c8ad38f41ca5ef98a68b99c33b41fb0b718919cc680eb356903f284cef8dd4271acea94af7f8c4adca031d445a6a26
-  data.tar.gz: 7c3f8c30bf5a4c69270641aadfb036303c42ee8678a09c2e8b5faad7883aff0ac0139caf465f9d37b84cf170ed4ee072ad20d4872b8c760b97d0e2ca1f3b6e2e
+  metadata.gz: 3d8197e283363015d007cd04748f82452306724b172ea68a4928fe368c19ce842af4c16d0f1ed05d7e885a7f76f5757c1e95e58181a7b1e75295d146797d8a18
+  data.tar.gz: 216f752c87e8143f0332309a4c6a00cff3c6d53f0645d189bc03acfe2f68319618a9c4fa9bae0fbeca23a74a7fd555cef17cd612676fca1ebc263af75c378b8d

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 1.1.24
+
+2022-10-12 08:27
+
+#### FIXED
+
+- Force utf-8 encoding when reading files, should fix invalid byte sequence errors
+
+### 1.1.23
+
+2022-10-07 10:02
+
+#### NEW
+
+- Saved searches. Add `--save TITLE` to `tagged` or `find` commands to save the parameters for use with `na saved TITLE`
+
+#### FIXED
+
+- Restore wildcard capability of tag searches
+
 ### 1.1.22
 
 2022-10-07 05:58

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.22)
+    na (1.1.24)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       tty-reader (~> 0.9, >= 0.9.0)
@@ -30,6 +30,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-20
+  arm64-darwin-21
 
 DEPENDENCIES
   minitest (~> 5.14)

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.1.22
+The current version of `na` is 1.1.24
 .
 
 `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.1.22
+    1.1.24
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)
@@ -82,6 +82,7 @@ COMMANDS
     initconfig   - Initialize the config file using current global options
     next, show   - Show next actions
     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
 ```
@@ -174,6 +175,7 @@ COMMAND OPTIONS
     --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
     --proj, --project=PROJECT[/SUBPROJECT] - Show actions from a specific project (default: none)
+    --save=TITLE                           - Save this search for future use (default: none)
     -v, --invert                           - Show actions not matching search pattern
     -x, --exact                            - Match pattern exactly
 

data/bin/na

@@ -271,7 +271,16 @@ class App
     c.desc 'Show actions not matching search pattern'
     c.switch %i[v invert], negatable: false
 
+    c.desc 'Save this search for future use'
+    c.arg_name 'TITLE'
+    c.flag %i[save]
+
     c.action do |global_options, options, args|
+      if options[:save]
+        title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
+        NA.save_search(title, "find #{NA.command_line.map { |c| "\"#{c}\"" }.join(' ')}")
+      end
+
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
@@ -359,7 +368,16 @@ class App
     c.desc 'Show actions not matching tags'
     c.switch %i[v invert], negatable: false
 
+    c.desc 'Save this search for future use'
+    c.arg_name 'TITLE'
+    c.flag %i[save]
+
     c.action do |global_options, options, args|
+      if options[:save]
+        title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
+        NA.save_search(title, "tagged #{NA.command_line.map { |cmd| "\"#{cmd}\"" }.join(' ')}")
+      end
+
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
                 3
               else
@@ -371,9 +389,10 @@ class App
       all_req = args.join(' ') !~ /[+!\-]/ && !options[:or]
       args.join(',').split(/ *, */).each do |arg|
         # TODO: <> comparisons do nothing right now
-        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>*$\^]+)(?:(?<op>[=<>*$\^]+)(?<val>.*?))?$/)
+        m = arg.match(/^(?<req>[+\-!])?(?<tag>[^ =<>$\^]+?)(?:(?<op>[=<>]{1,2}|[*$\^]=)(?<val>.*?))?$/)
+
         tags.push({
-                    tag: m['tag'],
+                    tag: m['tag'].wildcard_to_rx,
                     comp: m['op'],
                     value: m['val'],
                     required: all_req || (!m['req'].nil? && m['req'] == '+'),
@@ -387,9 +406,9 @@ class App
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>\+)?(?<tok>.*?)$/)
           todo.push({
-                        token: m['tok'],
-                        required: !m['req'].nil?
-                      })
+                      token: m['tok'],
+                      required: !m['req'].nil?
+                    })
         end
       end
 
@@ -545,6 +564,26 @@ class App
     end
   end
 
+  desc 'Execute a saved search'
+  long_desc 'Run without argument to list saved searches'
+  arg_name 'SEARCH_TITLE', optional: true
+  command %i[saved] do |c|
+    c.action do |_global_options, _options, args|
+      searches = NA.load_searches
+      if args.empty?
+        NA.notify("{bg}Saved searches stored in {bw}#{NA.database_path(file: 'saved_searches.yml')}")
+        NA.notify(searches.map { |k, v| "{y}#{k}: {w}#{v}" }.join("\n"), exit_code: 0)
+      else
+        keys = searches.keys.delete_if { |k| k !~ /#{args[0]}/ }
+        NA.notify("{r}Search #{args[0]} not found", exit_code: 1) if keys.empty?
+
+        key = keys[0]
+        cmd = Shellwords.shellsplit(searches[key])
+        exit run(cmd)
+      end
+    end
+  end
+
   pre do |global, _command, _options, _args|
     NA.verbose = global[:debug]
     NA.extension = global[:ext]
@@ -574,6 +613,7 @@ class App
   end
 end
 
+NA.command_line = ARGV
 @command = ARGV[0]
 $first_arg = ARGV[1]
 

data/lib/na/action.rb

@@ -127,11 +127,14 @@ module NA
     end
 
     def compare_tag(tag)
-      return false unless @tags.key?(tag[:tag])
+      keys = @tags.keys.delete_if { |k| k !~ Regexp.new(tag[:tag], Regexp::IGNORECASE) }
+      return false if keys.empty?
+
+      key = keys[0]
 
       return true if tag[:comp].nil?
 
-      tag_val = @tags[tag[:tag]]
+      tag_val = @tags[key]
       val = tag[:value]
 
       return false if tag_val.nil?

data/lib/na/next_action.rb

@@ -3,7 +3,7 @@
 # Next Action methods
 module NA
   class << self
-    attr_accessor :verbose, :extension, :na_tag
+    attr_accessor :verbose, :extension, :na_tag, :command_line
 
     ##
     ## Output to STDERR
@@ -15,11 +15,57 @@ module NA
       return if debug && !@verbose
 
       $stderr.puts NA::Color.template("{x}#{msg}{x}")
-      if exit_code && exit_code.is_a?(Number)
+      if exit_code
         Process.exit exit_code
       end
     end
 
+    ##
+    ## Display and read a Yes/No prompt
+    ##
+    ## @param      prompt   [String] The prompt string
+    ## @param      default  [Boolean] default value if
+    ##                      return is pressed or prompt is
+    ##                      skipped
+    ##
+    ## @return     [Boolean] result
+    ##
+    def yn(prompt, default: true)
+      return default unless $stdout.isatty
+
+      tty_state = `stty -g`
+      system 'stty raw -echo cbreak isig'
+      yn = color_single_options(default ? %w[Y n] : %w[y N])
+      $stdout.syswrite "\e[1;37m#{prompt} #{yn}\e[1;37m? \e[0m"
+      res = $stdin.sysread 1
+      res.chomp!
+      puts
+      system 'stty cooked'
+      system "stty #{tty_state}"
+      res.empty? ? default : res =~ /y/i
+    end
+
+    ##
+    ## Helper function to colorize the Y/N prompt
+    ##
+    ## @param      choices  [Array] The choices with
+    ##                      default capitalized
+    ##
+    ## @return     [String] colorized string
+    ##
+    def color_single_options(choices = %w[y n])
+      out = []
+      choices.each do |choice|
+        case choice
+        when /[A-Z]/
+          out.push(NA::Color.template("{bw}#{choice}{x}"))
+        else
+          out.push(NA::Color.template("{dw}#{choice}{xg}"))
+        end
+      end
+      NA::Color.template("{xg}[#{out.join('/')}{xg}]{x}")
+    end
+
     ##
     ## Create a new todo file
     ##
@@ -98,7 +144,7 @@ module NA
     ## @param      note     [String] The note
     ##
     def add_action(file, project, action, note = nil)
-      content = IO.read(file)
+      content = file.read_file
       # Insert the target project at the top if it doesn't exist
       unless content =~ /^[ \t]*#{project}:/i
         content = "#{project.cap_first}:\n#{content}"
@@ -209,7 +255,7 @@ module NA
 
       files.each do |file|
         save_working_dir(File.expand_path(file))
-        content = IO.read(file)
+        content = file.read_file
         indent_level = 0
         parent = []
         content.split("\n").each do |line|
@@ -284,7 +330,7 @@ module NA
       db_file = 'tdlist.txt'
       file = File.join(db_dir, db_file)
       if File.exist?(file)
-        dirs = IO.read(file).split("\n")
+        dirs = file.read_file.split("\n")
         dirs.delete_if { |f| !File.exist?(f) }
         File.open(file, 'w') { |f| f.puts dirs.join("\n") }
       end
@@ -295,7 +341,7 @@ module NA
         dirs = match_working_dir(query)
       else
         file = database_path
-        content = File.exist?(file) ? IO.read(file).strip : ''
+        content = File.exist?(file) ? file.read_file.strip : ''
         notify('{br}Database empty', exit_code: 1) if content.empty?
 
         dirs = content.split(/\n/)
@@ -308,6 +354,50 @@ module NA
       puts NA::Color.template(dirs.join("\n"))
     end
 
+    def save_search(title, search)
+      file = database_path(file: 'saved_searches.yml')
+      searches = load_searches
+      title = title.gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
+
+      if searches.key?(title)
+        res = yn('Overwrite existing definition?', default: true)
+        notify('{r}Cancelled', exit_code: 0) unless res
+
+      end
+
+      searches[title] = search
+      File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
+      NA.notify("{y}Search #{title} saved", exit_code: 0)
+    end
+
+    def load_searches
+      file = database_path(file: 'saved_searches.yml')
+      if File.exist?(file)
+        searches = YAML.safe_load(file.read_file)
+      else
+        searches = {
+          'soon' => 'tagged "due<in 2 days,due>yesterday"',
+          'overdue' => 'tagged "due<now"',
+          'high' => 'tagged "prio>3"',
+          'maybe' => 'tagged "maybe"'
+        }
+        File.open(file, 'w') { |f| f.puts(YAML.dump(searches)) }
+      end
+      searches
+    end
+
+    ##
+    ## Get path to database of known todo files
+    ##
+    ## @return     [String] File path
+    ##
+    def database_path(file: 'tdlist.txt')
+      db_dir = File.expand_path('~/.local/share/na')
+      # Create directory if needed
+      FileUtils.mkdir_p(db_dir) unless File.directory?(db_dir)
+      File.join(db_dir, file)
+    end
+
     private
 
     ##
@@ -356,19 +446,6 @@ module NA
       [optional, required, negated]
     end
 
-    ##
-    ## Get path to database of known todo files
-    ##
-    ## @return     [String] File path
-    ##
-    def database_path
-      db_dir = File.expand_path('~/.local/share/na')
-      # Create directory if needed
-      FileUtils.mkdir_p(db_dir) unless File.directory?(db_dir)
-      db_file = 'tdlist.txt'
-      File.join(db_dir, db_file)
-    end
-
     ##
     ## Find a matching path using semi-fuzzy matching.
     ## Search tokens can include ! and + to negate or make
@@ -382,7 +459,7 @@ module NA
       file = database_path
       notify('{r}No na database found', exit_code: 1) unless File.exist?(file)
 
-      dirs = IO.read(file).split("\n")
+      dirs = file.read_file.split("\n")
 
       optional = search.map { |t| t[:token] }
       required = search.filter { |s| s[:required] }.map { |t| t[:token] }
@@ -401,7 +478,7 @@ module NA
     ##
     def save_working_dir(todo_file)
       file = database_path
-      content = File.exist?(file) ? IO.read(file) : ''
+      content = File.exist?(file) ? file.read_file : ''
       dirs = content.split(/\n/)
       dirs.push(File.expand_path(todo_file))
       dirs.sort!.uniq!

data/lib/na/string.rb

@@ -2,6 +2,14 @@
 
 # String helpers
 class ::String
+  def read_file
+    file = File.expand_path(self)
+    raise "Missing file #{file}" unless File.exist?(file)
+
+    # IO.read(file).force_encoding('ASCII-8BIT').encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
+    IO.read(file).force_encoding('utf-8')
+  end
+
   ##
   ## Determine indentation level of line
   ##
@@ -106,7 +114,7 @@ class ::String
   ## @return     [String] Regex string
   ##
   def wildcard_to_rx
-    gsub(/\./, '\\.').gsub(/\*/, '[^ ]*?').gsub(/\?/, '.')
+    gsub(/\./, '\\.').gsub(/\?/, '.').gsub(/\*/, '[^ ]*?')
   end
 
   def cap_first!

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.22'
+  VERSION = '1.1.24'
 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.21<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.23<!--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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.1.22
+  version: 1.1.24
 platform: ruby
 authors:
 - Brett Terpstra
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,22 +90,22 @@ dependencies:
   name: tty-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: tty-screen
   requirement: !ruby/object:Gem::Requirement
@@ -130,22 +130,22 @@ dependencies:
   name: tty-which
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: chronic
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ homepage: https://brettterpstra.com/projects/na/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--title"
 - na
@@ -225,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.16
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: A command line tool for adding and listing project todos
 test_files: []