na 1.2.74 → 1.2.76

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    na (1.2.74)
+    na (1.2.76)
       chronic (~> 0.10, >= 0.10.2)
+      git (~> 3.0.0)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
       tty-reader (~> 0.9, >= 0.9.0)
@@ -12,63 +13,78 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
     chronic (0.10.2)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.1)
+    drb (2.2.1)
+    git (3.0.0)
+      activesupport (>= 5.0)
+      addressable (~> 2.8)
+      process_executer (~> 1.3)
+      rchardet (~> 1.9)
     gli (2.21.5)
-    json (2.10.2)
-    language_server-protocol (3.17.0.4)
-    lint_roller (1.1.0)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    logger (1.6.6)
     mdless (1.0.37)
-    minitest (5.20.0)
-    parallel (1.26.3)
-    parser (3.3.7.1)
-      ast (~> 2.4.1)
-      racc
-    racc (1.8.1)
-    rainbow (3.1.1)
-    rake (0.9.6)
+    minitest (5.25.5)
+    process_executer (1.3.0)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rchardet (1.9.0)
     rdoc (4.3.0)
-    regexp_parser (2.10.0)
-    rubocop (1.74.0)
-      json (~> 2.3)
-      language_server-protocol (~> 3.17.0.2)
-      lint_roller (~> 1.1.0)
-      parallel (~> 1.10)
-      parser (>= 3.3.0.2)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
-      parser (>= 3.3.1.0)
-    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     tty-cursor (0.7.1)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
     tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
     tty-which (0.5.0)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.3)
     wisper (2.0.1)
-    yard (0.9.34)
 
 PLATFORMS
-  arm64-darwin-20
-  arm64-darwin-21
-  arm64-darwin-24
-  x86_64-darwin-20
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   minitest (~> 5.14)
   na!
-  rake (~> 0.9.2)
+  rake
   rdoc (~> 4.3)
-  rubocop (~> 1.74)
-  yard (~> 0.9, >= 0.9.26)
+  tty-spinner (~> 0.9, >= 0.9.0)
 
 BUNDLED WITH
    2.6.6

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.74.
+The current version of `na` is 1.2.76.
 
 `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. 
 
@@ -76,7 +76,7 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.74
+    1.2.76
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
@@ -93,8 +93,9 @@ GLOBAL OPTIONS
     -p, --priority=PRIORITY - Set a priority 0-5 (deprecated, for backwards compatibility) (default: none)
     --[no-]pager            - Enable pagination (default: enabled)
     -r, --[no-]recurse      - Recurse 3 directories deep (deprecated, for backwards compatability)
+    --[no-]repo             - Use a taskpaper file named after the git repository (default: enabled)
     -t, --na_tag=TAG        - Tag to consider a next action (default: na)
-    --template=PATH         - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
+    --template=arg          - Provide a template for new/blank todo files, use initconfig to make permanent (default: none)
     --version               - Display the program version
 
 COMMANDS
@@ -223,6 +224,7 @@ COMMAND OPTIONS
     -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)
     --nest                                 - Output actions nested by file
+    --no_file                              - No filename in output
     --[no-]notes                           - Include notes in output
     -o, --or                               - Combine search tokens with OR, displaying actions matching ANY of the terms
     --omnifocus                            - Output actions nested by file and project

data/Rakefile

@@ -1,43 +1,70 @@
-require 'rake/clean'
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rdoc/task'
-require 'yard'
+require "rake/clean"
+require "rubygems"
+require "rubygems/package_task"
+require "rdoc/task"
+require "bump/tasks"
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "rubocop/rake_task"
+require "yard"
+require "tty-spinner"
+require "English"
 
 YARD::Rake::YardocTask.new do |t|
- t.files = ['lib/na/*.rb']
- t.options = ['--markup-provider=redcarpet', '--markup=markdown', '--no-private', '-p', 'yard_templates']
- # t.stats_options = ['--list-undoc']
+  t.files = ["lib/na/*.rb"]
+  t.options = ["--markup-provider=redcarpet", "--markup=markdown", "--no-private", "-p", "yard_templates"]
+  t.stats_options = ["--list-undoc"] # Uncommented this line for stats options
+end
+
+## Docker error class
+class DockerError < StandardError
+  def initialize(msg = nil)
+    msg = msg ? "Docker error: #{msg}" : "Docker error"
+    super(msg)
+  end
+end
+
+task default: %i[test yard]
+
+desc "Run test suite"
+task test: %i[rubocop spec]
+
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = "--format documentation"
+end
+
+RuboCop::RakeTask.new do |t|
+  t.formatters = ["progress"]
 end
 
 task :doc, [*Rake.application[:yard].arg_names] => [:yard]
 
 Rake::RDocTask.new do |rd|
   rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
-  rd.title = 'na'
+  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb", "bin/**/*")
+  rd.title = "na"
 end
 
-spec = eval(File.read('na.gemspec'))
+spec = eval(File.read("na.gemspec"))
 
 Gem::PackageTask.new(spec) do |pkg|
 end
-require 'rake/testtask'
+require "rake/testtask"
 Rake::TestTask.new do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_test.rb']
+  t.test_files = FileList["test/*_test.rb"]
 end
 
-desc 'Install current gem in all versions of asdf-controlled ruby'
+desc "Install current gem in all versions of asdf-controlled ruby"
 task :install do
-  Rake::Task['clobber'].invoke
-  Rake::Task['package'].invoke
-  Dir.chdir 'pkg'
-  file = Dir.glob('*.gem').last
+  Rake::Task["clobber"].invoke
+  Rake::Task["package"].invoke
+  Dir.chdir "pkg"
+  file = Dir.glob("*.gem").last
 
   current_ruby = `asdf current ruby`.match(/(\d.\d+.\d+)/)[1]
 
-  `asdf list ruby`.split.map { |ruby| ruby.strip.sub(/^*/, '') }.each do |ruby|
+  `asdf list ruby`.split.map { |ruby| ruby.strip.sub(/^*/, "") }.each do |ruby|
     `asdf shell ruby #{ruby}`
     puts `gem install #{file}`
   end
@@ -45,10 +72,10 @@ task :install do
   `asdf shell ruby #{current_ruby}`
 end
 
-desc 'Development version check'
+desc "Development version check"
 task :ver do
   gver = `git ver`
-  cver = IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
+  cver = IO.read(File.join(File.dirname(__FILE__), "CHANGELOG.md")).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
   res = `grep VERSION lib/na/version.rb`
   version = res.match(/VERSION *= *['"](\d+\.\d+\.\d+(\w+)?)/)[1]
   puts "git tag: #{gver}"
@@ -56,22 +83,22 @@ task :ver do
   puts "changelog: #{cver}"
 end
 
-desc 'Changelog version check'
+desc "Changelog version check"
 task :cver do
-  puts IO.read(File.join(File.dirname(__FILE__), 'CHANGELOG.md')).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
+  puts IO.read(File.join(File.dirname(__FILE__), "CHANGELOG.md")).match(/^#+ (\d+\.\d+\.\d+(\w+)?)/)[1]
 end
 
-desc 'Bump incremental version number'
+desc "Bump incremental version number"
 task :bump, :type do |_, args|
-  args.with_defaults(type: 'inc')
-  version_file = 'lib/na/version.rb'
+  args.with_defaults(type: "inc")
+  version_file = "lib/na/version.rb"
   content = IO.read(version_file)
   content.sub!(/VERSION = '(?<major>\d+)\.(?<minor>\d+)\.(?<inc>\d+)(?<pre>\S+)?'/) do
     m = Regexp.last_match
-    major = m['major'].to_i
-    minor = m['minor'].to_i
-    inc = m['inc'].to_i
-    pre = m['pre']
+    major = m["major"].to_i
+    minor = m["minor"].to_i
+    inc = m["inc"].to_i
+    pre = m["pre"]
 
     case args[:type]
     when /^maj/
@@ -88,7 +115,95 @@ task :bump, :type do |_, args|
     $stdout.puts "At version #{major}.#{minor}.#{inc}#{pre}"
     "VERSION = '#{major}.#{minor}.#{inc}#{pre}'"
   end
-  File.open(version_file, 'w+') { |f| f.puts content }
+  File.open(version_file, "w+") { |f| f.puts content }
+end
+
+# task default: %i[test clobber package]
+
+desc "Remove packages"
+task :clobber_packages do
+  FileUtils.rm_f "pkg/*"
+end
+# Make a prerequisite of the preexisting clobber task
+desc "Clobber files"
+task clobber: :clobber_packages
+
+desc "Get Script Version"
+task :sver do
+  res = `grep VERSION lib/na/version.rb`
+  version = res.match(/VERSION *= *['"](\d+\.\d+\.\d+(\w+)?)/)[1]
+  print version
+end
+
+desc "Run tests in Docker"
+task :dockertest, :version, :login, :attempt do |_, args|
+  args.with_defaults(version: "all", login: false, attempt: 1)
+  `open -a Docker`
+
+  Rake::Task["clobber"].reenable
+  Rake::Task["clobber"].invoke
+  Rake::Task["build"].reenable
+  Rake::Task["build"].invoke
+
+  case args[:version]
+  when /^a/
+    %w[6 7 3].each do |v|
+      Rake::Task["dockertest"].reenable
+      Rake::Task["dockertest"].invoke(v, false)
+    end
+    Process.exit 0
+  when /^3\.?3/
+    img = "natest33"
+    file = "docker/Dockerfile-3.3"
+  when /^3/
+    version = "3.0"
+    img = "natest3"
+    file = "docker/Dockerfile-3.0"
+  when /6$/
+    version = "2.6"
+    img = "natest26"
+    file = "docker/Dockerfile-2.6"
+  when /(^2|7$)/
+    version = "2.7"
+    img = "natest27"
+    file = "docker/Dockerfile-2.7"
+  else
+    version = "3.0.1"
+    img = "natest"
+    file = "docker/Dockerfile"
+  end
+
+  puts `docker build . --file #{file} -t #{img}`
+
+  raise DockerError, "Error building docker image" unless $CHILD_STATUS.success?
+
+  dirs = {
+    File.dirname(__FILE__) => "/na",
+    File.expand_path("~/.config") => "/root/.config"
+  }
+  dir_args = dirs.map { |s, d| " -v '#{s}:#{d}'" }.join(" ")
+  exec "docker run #{dir_args} -it #{img} /bin/bash -l" if args[:login]
+
+  spinner = TTY::Spinner.new("[:spinner] Running tests (#{version})...", hide_cursor: true)
+
+  spinner.auto_spin
+  `docker run --rm #{dir_args} -it #{img}`
+  # raise DockerError.new("Error running docker image") unless $CHILD_STATUS.success?
+
+  # commit = puts `bash -c "docker commit $(docker ps -a|grep #{img}|awk '{print $1}'|head -n 1) #{img}"`.strip
+  $CHILD_STATUS.success? ? spinner.success : spinner.error
+  spinner.stop
+
+  # puts res
+  # puts commit&.empty? ? "Error commiting Docker tag #{img}" : "Committed Docker tag #{img}"
+rescue DockerError
+  raise StandardError.new("Docker not responding") if args[:attempt] > 3
+
+  `open -a Docker`
+  sleep 3
+  Rake::Task["dockertest"].reenable
+  Rake::Task["dockertest"].invoke(args[:version], args[:login], args[:attempt] + 1)
 end
 
-task default: %i[test clobber package]
+desc "alias for build"
+task package: :build

data/bin/commands/find.rb

@@ -2,111 +2,114 @@
 
 class App
   extend GLI::App
-  desc 'Find actions matching a search pattern'
-  long_desc 'Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown
+  desc "Find actions matching a search pattern"
+  long_desc "Search tokens are separated by spaces. Actions matching all tokens in the pattern will be shown
   (partial matches allowed). Add a + before a token to make it required, e.g. `na find +feature +maybe`,
-  add a - or ! to ignore matches containing that token.'
-  arg_name 'PATTERN'
+  add a - or ! to ignore matches containing that token."
+  arg_name "PATTERN"
   command %i[find grep search] do |c|
-    c.example 'na find feature idea swift', desc: 'Find all actions containing feature, idea, and swift'
-    c.example 'na find feature idea -swift', desc: 'Find all actions containing feature and idea but NOT swift'
-    c.example 'na find -x feature idea', desc: 'Find all actions containing the exact text "feature idea"'
+    c.example "na find feature idea swift", desc: "Find all actions containing feature, idea, and swift"
+    c.example "na find feature idea -swift", desc: "Find all actions containing feature and idea but NOT swift"
+    c.example "na find -x feature idea", desc: 'Find all actions containing the exact text "feature idea"'
 
-    c.desc 'Interpret search pattern as regular expression'
+    c.desc "Interpret search pattern as regular expression"
     c.switch %i[e regex], negatable: false
 
-    c.desc 'Match pattern exactly'
+    c.desc "Match pattern exactly"
     c.switch %i[x exact], negatable: false
 
-    c.desc 'Recurse to depth'
-    c.arg_name 'DEPTH'
+    c.desc "Recurse to depth"
+    c.arg_name "DEPTH"
     c.flag %i[d depth], type: :integer, must_match: /^\d+$/
 
-    c.desc 'Show actions from a specific todo file in history. May use wildcards (* and ?)'
-    c.arg_name 'TODO_PATH'
+    c.desc "Show actions from a specific todo file in history. May use wildcards (* and ?)"
+    c.arg_name "TODO_PATH"
     c.flag %i[in]
 
-    c.desc 'Include notes in output'
+    c.desc "Include notes in output"
     c.switch %i[notes], negatable: true, default_value: false
 
-    c.desc 'Include notes in search'
+    c.desc "Include notes in search"
     c.switch %i[search_notes], negatable: true, default_value: true
 
-    c.desc 'Combine search tokens with OR, displaying actions matching ANY of the terms'
+    c.desc "Combine search tokens with OR, displaying actions matching ANY of the terms"
     c.switch %i[o or], negatable: false
 
-    c.desc 'Show actions from a specific project'
-    c.arg_name 'PROJECT[/SUBPROJECT]'
+    c.desc "Show actions from a specific project"
+    c.arg_name "PROJECT[/SUBPROJECT]"
     c.flag %i[proj project]
 
-    c.desc 'Match actions containing tag. Allows value comparisons'
-    c.arg_name 'TAG'
+    c.desc "Match actions containing tag. Allows value comparisons"
+    c.arg_name "TAG"
     c.flag %i[tagged], multiple: true
 
-    c.desc 'Include @done actions'
+    c.desc "Include @done actions"
     c.switch %i[done]
 
-    c.desc 'Show actions not matching search pattern'
+    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.desc "Save this search for future use"
+    c.arg_name "TITLE"
     c.flag %i[save]
 
-    c.desc 'Output actions nested by file'
+    c.desc "Output actions nested by file"
     c.switch %[nest], negatable: false
 
-    c.desc 'Output actions nested by file and project'
+    c.desc "No filename in output"
+    c.switch %i[no_file], negatable: false
+
+    c.desc "Output actions nested by file and project"
     c.switch %[omnifocus], negatable: false
 
     c.action do |global_options, options, args|
       options[:nest] = true if options[:omnifocus]
 
       if options[:save]
-        title = options[:save].gsub(/[^a-z0-9]/, '_').gsub(/_+/, '_')
-        cmd = NA.command_line.join(' ').sub(/ --save[= ]*\S+/, '').split(' ').map { |t| %("#{t}") }.join(' ')
+        title = options[:save].gsub(/[^a-z0-9]/, "_").gsub(/_+/, "_")
+        cmd = NA.command_line.join(" ").sub(/ --save[= ]*\S+/, "").split(" ").map { |t| %("#{t}") }.join(" ")
         NA.save_search(title, cmd)
       end
 
       depth = if global_options[:recurse] && options[:depth].nil? && global_options[:depth] == 1
-                3
-              else
-                options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
-              end
+          3
+        else
+          options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
+        end
 
       if options[:exact] || options[:regex]
-        search = args.join(' ')
+        search = args.join(" ")
       else
         rx = [
           '(?<=\A|[ ,])(?<req>[+!-])?@(?<tag>[^ *=<>$*\^,@(]+)',
           '(?:\((?<value>.*?)\)| *(?<op>[=<>~]{1,2}|[*$\^]=) *',
-          '(?<val>.*?(?=\Z|[,@])))?'
-        ].join('')
-        search = args.join(' ').gsub(Regexp.new(rx)) do
+          '(?<val>.*?(?=\Z|[,@])))?',
+        ].join("")
+        search = args.join(" ").gsub(Regexp.new(rx)) do
           m = Regexp.last_match
-          string = if m['value']
-                     "#{m['req']}#{m['tag']}=#{m['value']}"
-                   else
-                     m[0]
-                   end
-          options[:tagged] << string.sub(/@/, '')
-          ''
+          string = if m["value"]
+              "#{m["req"]}#{m["tag"]}=#{m["value"]}"
+            else
+              m[0]
+            end
+          options[:tagged] << string.sub(/@/, "")
+          ""
         end
       end
 
-      search = search.gsub(/ +/, ' ').strip
+      search = search.gsub(/ +/, " ").strip
 
-      all_req = options[:tagged].join(' ') !~ /(?<=[, ])[+!-]/ && !options[:or]
+      all_req = options[:tagged].join(" ") !~ /(?<=[, ])[+!-]/ && !options[:or]
       tags = []
-      options[:tagged].join(',').split(/ *, */).each do |arg|
+      options[:tagged].join(",").split(/ *, */).each do |arg|
         m = arg.match(/^(?<req>[+!-])?(?<tag>[^ =<>$~\^]+?) *(?:(?<op>[=<>~]{1,2}|[*$\^]=) *(?<val>.*?))?$/)
 
         tags.push({
-                    tag: m['tag'].wildcard_to_rx,
-                    comp: m['op'],
-                    value: m['val'],
-                    required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                    negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                    tag: m["tag"].wildcard_to_rx,
+                    comp: m["op"],
+                    value: m["val"],
+                    required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                    negate: !m["req"].nil? && m["req"] =~ /[!-]/ ? true : false,
                   })
       end
 
@@ -127,9 +130,9 @@ class App
           m = arg.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
 
           tokens.push({
-                        token: m['tok'],
-                        required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                        negate: !m['req'].nil? && m['req'] =~ /[!-]/ ? true : false
+                        token: m["tok"],
+                        required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                        negate: !m["req"].nil? && m["req"] =~ /[!-]/ ? true : false,
                       })
         end
       end
@@ -140,9 +143,9 @@ class App
         options[:in].split(/ *, */).each do |a|
           m = a.match(/^(?<req>[+\-!])?(?<tok>.*?)$/)
           todos.push({
-                       token: m['tok'],
-                       required: all_req || (!m['req'].nil? && m['req'] == '+'),
-                       negate: !m['req'].nil? && m['req'] =~ /[!-]/
+                       token: m["tok"],
+                       required: all_req || (!m["req"].nil? && m["req"] == "+"),
+                       negate: !m["req"].nil? && m["req"] =~ /[!-]/,
                      })
         end
       end
@@ -157,21 +160,22 @@ class App
                             negate: options[:invert],
                             regex: options[:regex],
                             project: options[:project],
-                            require_na: false
+                            require_na: false,
                           })
 
       regexes = if tokens.is_a?(Array)
-                  tokens.delete_if { |token| token[:negate] }.map { |token| token[:token].wildcard_to_rx }
-                else
-                  [tokens]
-                end
+          tokens.delete_if { |token| token[:negate] }.map { |token| token[:token].wildcard_to_rx }
+        else
+          [tokens]
+        end
 
       todo.actions.output(depth,
-                          files: todo.files,
-                          regexes: regexes,
-                          notes: options[:notes],
-                          nest: options[:nest],
-                          nest_projects: options[:omnifocus])
+                          { files: todo.files,
+                            regexes: regexes,
+                            notes: options[:notes],
+                            nest: options[:nest],
+                            nest_projects: options[:omnifocus],
+                            no_files: options[:no_file] })
     end
   end
 end