na 1.2.64 → 1.2.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2accac212d5f998f830299693f13e3ec27e692b1bc5f460bcd977fb1ce95042
-  data.tar.gz: ad75051381180b3d4cc99fe3edb841a591e76ca649eaa051a12752f6066a1ed2
+  metadata.gz: e55a544aa2a32d81e208e30dc4e3c43cda1e6f91df7b27ee956a72fda328a575
+  data.tar.gz: 54f9bba1d550e62b6e2d509f2a3b69263b10049cea0f69b39cd304b6328ec7f7
 SHA512:
-  metadata.gz: 96a9f0120855bf9569dd5d35f7701c24196185fa0d82a12e143486687072778cca636369264c45b286e0e4030722cb817258f585f399e50929b3f500bdea47f9
-  data.tar.gz: bd58a4c3872fb7ad608f15bdc31fd954f8f7581f168c30e7db3c1e11986df884905a964cfcd263d7807a3f583e22d22e33e0f8c9a46842407a5096d5f17b2271
+  metadata.gz: cfb11dacafe1d09ec339eb10b419c540fb42f45c0d4bf2492ddc23fabd7df4a7174268e4b9d054fa7b9c5c1e08bb22c6834b32b583ac874a8e2b28261bf7437e
+  data.tar.gz: 567acf2c48eb5e84ca4af54fe03aab6d6b4a1b6f74f446d0a723ce9e6ce2bf4f04c8ffa9e41ffbeba5f7e2ba23785a742db2c2dca656b783f40113fad9a03c74

data/CHANGELOG.md

@@ -1,6 +1,18 @@
+### 1.2.66
+
+2024-06-23 10:56
+
+#### IMPROVED
+
+- When passing a query to `next`, prefer exact matches when available
+
 ### 1.2.64
 
-2024-06-20 12:25
+2024-06-22 12:06
+
+#### FIXED
+
+- Handle file searches where the filename matches the dirname and previously returned a "FILE is a directory" error by testing with an extension or a DIRNAME/BASENAME/BASENAME.EXT
 
 #### NEW
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.64)
+    na (1.2.66)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -23,7 +23,7 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-which (0.5.0)
     wisper (2.0.1)
     yard (0.9.34)

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.64.
+The current version of `na` is 1.2.66.
 
 `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,14 +76,14 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.64
+    1.2.66
 
 GLOBAL OPTIONS
     -a, --add               - Add a next action (deprecated, for backwards compatibility)
     --add_at=POSITION       - Add all new/moved entries at [s]tart or [e]nd of target project (default: start)
     --[no-]color            - Colorize output (default: enabled)
     --cwd_as=TYPE           - Use current working directory as [p]roject, [t]ag, or [n]one (default: none)
-    -d, --depth=DEPTH       - Recurse to depth (default: 1)
+    -d, --depth=DEPTH       - Recurse to depth (default: 3)
     --[no-]debug            - Display verbose output
     --ext=EXT               - File extension to consider a todo file (default: taskpaper)
     -f, --file=PATH         - Use a single file as global todo, use initconfig to make permanent (default: none)

data/Rakefile

@@ -28,6 +28,23 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['test/*_test.rb']
 end
 
+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
+
+  current_ruby = `asdf current ruby`.match(/(\d.\d+.\d+)/)[1]
+
+  `asdf list ruby`.split.map { |ruby| ruby.strip.sub(/^*/, '') }.each do |ruby|
+    `asdf shell ruby #{ruby}`
+    puts `gem install #{file}`
+  end
+
+  `asdf shell ruby #{current_ruby}`
+end
+
 desc 'Development version check'
 task :ver do
   gver = `git ver`

data/lib/na/next_action.rb

@@ -513,6 +513,7 @@ module NA
       }
       opts = defaults.merge(options)
       files = find_files(depth: options[:depth])
+
       files.delete_if do |file|
         cmd_options = {
           depth: options[:depth],
@@ -577,6 +578,9 @@ module NA
       end
 
       dirs = dirs.sort_by { |d| File.basename(d) }.uniq
+
+      dirs = find_exact_dir(dirs, search)
+
       if dirs.empty? && require_last
         NA.notify("#{NA.theme[:warning]}No matches, loosening search", debug: true)
         match_working_dir(search, distance: 2, require_last: false)
@@ -586,6 +590,18 @@ module NA
       end
     end
 
+    def find_exact_dir(dirs, search)
+      terms = search.filter { |s| !s[:negate] }.map { |t| t[:token] }.join(' ')
+      out = dirs
+      dirs.each do |dir|
+        if File.basename(dir).sub(/\.#{NA.extension}$/, '') =~ /^#{terms}$/
+          out = [dir]
+          break
+        end
+      end
+      out
+    end
+
     ##
     ## Save a todo file path to the database
     ##

data/lib/na/string.rb

@@ -39,7 +39,15 @@ class ::String
     file = File.expand_path(self)
     raise "Missing file #{file}" unless File.exist?(file)
 
-    NA.notify("#{NA.theme[:error]}#{file} is a directory", exit_code: 2) if File.directory?(file)
+    if File.directory?(file)
+      if File.exist?("#{file}.#{NA.extension}")
+        file = "#{file}.#{NA.extension}"
+      elsif File.exist?("#{file}/#{File.basename(file)}.#{NA.extension}")
+        file = "#{file}/#{File.basename(file)}.#{NA.extension}"
+      else
+        NA.notify("#{NA.theme[:error]}#{file} is a directory", exit_code: 2)
+      end
+    end
 
     # IO.read(file).force_encoding('ASCII-8BIT').encode('UTF-8', invalid: :replace, undef: :replace, replace: '?')
     IO.read(file).force_encoding('utf-8')

data/lib/na/todo.rb

@@ -94,7 +94,7 @@ module NA
               else
                 NA.match_working_dir(settings[:query])
               end
-      NA.notify("Files: #{files.join(', ')}", debug:true)
+      NA.notify("Files: #{files.join(', ')}", debug: true)
       files.each do |file|
         NA.save_working_dir(File.expand_path(file))
         content = file.read_file

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.64'
+  VERSION = '1.2.66'
 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.63<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.65<!--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.2.64
+  version: 1.2.66
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos