na 1.2.73 → 1.2.75

data/Gemfile

@@ -1,2 +1,26 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "bump", "~> 0.10"
+gem "bundler", "~> 2.2"
+gem "rake", "~> 13.0"
+
+gem "guard", "~> 2.16"
+gem "guard-rspec", "~> 4.5"
+gem "guard-rubocop", "~> 1.2"
+gem "guard-yard", "~> 2.1"
+
+gem "cli-test", "~> 1.0"
+gem "fuubar", "~> 2.0"
+gem "rspec", "~> 3.13"
+gem "rubocop", ">= 1.50"
+gem "rubocop-rake", ">= 0.6.0"
+gem "rubocop-rspec", ">= 2.20.0"
+gem "simplecov", "~> 0.9"
+
+gem "github-markup", "~> 1.3"
+gem "redcarpet", "~> 3.2"
+gem "yard", "~> 0.9.5"
+
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.73)
+    na (1.2.75)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -13,22 +13,96 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
+    bump (0.10.0)
     chronic (0.10.2)
+    cli-test (1.0.0)
+    coderay (1.1.3)
+    diff-lcs (1.6.0)
+    docile (1.4.1)
+    ffi (1.17.1)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-arm-linux-gnu)
+    ffi (1.17.1-arm-linux-musl)
+    ffi (1.17.1-arm64-darwin)
+    ffi (1.17.1-x86-linux-gnu)
+    ffi (1.17.1-x86-linux-musl)
+    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
+    formatador (1.1.0)
+    fuubar (2.5.1)
+      rspec-core (~> 3.0)
+      ruby-progressbar (~> 1.4)
+    github-markup (1.7.0)
     gli (2.21.5)
+    guard (2.19.1)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      ostruct (~> 0.6)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-rubocop (1.5.0)
+      guard (~> 2.0)
+      rubocop (< 2.0)
+    guard-yard (2.2.1)
+      guard (>= 1.1.0)
+      yard (>= 0.7.0)
     json (2.10.2)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.6)
+    lumberjack (1.2.10)
     mdless (1.0.37)
-    minitest (5.20.0)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    ostruct (0.6.1)
     parallel (1.26.3)
     parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (0.9.6)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
     rdoc (4.3.0)
+    redcarpet (3.6.1)
     regexp_parser (2.10.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.3)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.2)
     rubocop (1.74.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -40,35 +114,78 @@ GEM
       rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
+    rubocop-ast (1.39.0)
       parser (>= 3.3.1.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.5.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
     ruby-progressbar (1.13.0)
+    shellany (0.0.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    strings-ansi (0.2.0)
+    thor (1.3.2)
     tty-cursor (0.7.1)
+    tty-progressbar (0.18.3)
+      strings-ansi (~> 0.2)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      unicode-display_width (>= 1.6, < 3.0)
     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)
+    unicode-display_width (2.6.0)
     wisper (2.0.1)
-    yard (0.9.34)
+    yard (0.9.37)
 
 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
+  bump (~> 0.10)
+  bundler (~> 2.2)
+  cli-test (~> 1.0)
+  fuubar (~> 2.0)
+  github-markup (~> 1.3)
+  guard (~> 2.16)
+  guard-rspec (~> 4.5)
+  guard-rubocop (~> 1.2)
+  guard-yard (~> 2.1)
   minitest (~> 5.14)
   na!
-  rake (~> 0.9.2)
+  rake (~> 13.0)
   rdoc (~> 4.3)
-  rubocop (~> 1.74)
-  yard (~> 0.9, >= 0.9.26)
+  redcarpet (~> 3.2)
+  rspec (~> 3.13)
+  rubocop (>= 1.50)
+  rubocop-rake (>= 0.6.0)
+  rubocop-rspec (>= 2.20.0)
+  simplecov (~> 0.9)
+  tty-progressbar (~> 0.18, >= 0.18.3)
+  tty-spinner (~> 0.9, >= 0.9.0)
+  yard (~> 0.9.5)
 
 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.73.
+The current version of `na` is 1.2.75.
 
 `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.73
+    1.2.75
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)

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/add.rb

@@ -59,7 +59,7 @@ class App
       reader = TTY::Reader.new
       append = options[:at] ? options[:at] =~ /^[ae]/i : global_options[:add_at] =~ /^[ae]/
 
-      priority = options[:priority]
+      priority = options[:priority].to_s || "0"
       if priority =~ /^[1-5]$/
         priority = priority.to_i
       elsif priority =~ /^[hml]$/