na 1.1.23 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8bee2cada1590cdc80fe9943947c719649d441ed15a6c51228fa0bebe4e94eb
-  data.tar.gz: 3dfc5a53bb88952243388b86e853af744b76938cbc69ef3b6f6ac8e58c03a9fc
+  metadata.gz: 62880dc0ab0313e02a68a0a7f40b36698a1d726000b38ade8681688b63f0c803
+  data.tar.gz: '0078690a38f209a84d3ee4cce9d75c189ac771d9db63c283bb815eb44518038b'
 SHA512:
-  metadata.gz: 0603c3187363e3c5895f9e49af6deab11779cbf47442f4f76b7b5ad2608e4676d0cb337368e2a0d6a5f9bad7f5aff957d63e986cefe1997c671a6b6b5193e3e4
-  data.tar.gz: e570fe4a32d7e45b4bd2171c73bee68adb6017ae22901c92486ccbe1bdb2461a50dac988d8ed862aa85237c070ebb305d3b6c2c61afc920826568c628d630faf
+  metadata.gz: f02db71885150be723a415da09fac878d0f4621ca91c58cc9eca11c3748a74406e54ca6f9cc16ed63ea8008325bd60ec8b694940c765ff19013e412465afb67f
+  data.tar.gz: ebb292d4689aaa942146f00c451faee7ecc8994e7feef0a9b498f7ab70cfbd97fcafcc80cf7f4e25a44837932f60f4f5bf891fec29b754a5f5f4d20fcef21a5f

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 1.1.25
+
+2022-10-12 08:37
+
+#### FIXED
+
+- Unable to search for next action tag with `find` or `tagged`
+
+### 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.1.23)
+    na (1.1.25)
       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.23
+The current version of `na` is 1.1.25
 .
 
 `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.23
+    1.1.25
 
 GLOBAL OPTIONS
     -a, --[no-]add          - Add a next action (deprecated, for backwards compatibility)

data/lib/na/action.rb

@@ -58,7 +58,7 @@ module NA
       file_tpl = "#{template[:file]}#{file} {x}"
       filename = NA::Color.template(file_tpl)
 
-      action = NA::Color.template("#{template[:action]}#{@action}{x}")
+      action = NA::Color.template("#{template[:action]}#{@action.sub(/ @#{NA.na_tag}\b/, '')}{x}")
       action = action.highlight_tags(color: template[:tags],
                                      parens: template[:value_parens],
                                      value: template[:values],

data/lib/na/next_action.rb

@@ -144,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}"
@@ -255,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|
@@ -276,7 +276,7 @@ module NA
           elsif line =~ /^[ \t]*- / && line !~ / @done/
             next if require_na && line !~ /@#{NA.na_tag}\b/
 
-            action = line.sub(/^[ \t]*- /, '').sub(/ @#{NA.na_tag}\b/, '')
+            action = line.sub(/^[ \t]*- /, '')
             new_action = NA::Action.new(file, File.basename(file, ".#{NA.extension}"), parent.dup, action)
 
             has_search = !optional.empty? || !required.empty? || !negated.empty?
@@ -330,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
@@ -341,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/)
@@ -373,7 +373,7 @@ module NA
     def load_searches
       file = database_path(file: 'saved_searches.yml')
       if File.exist?(file)
-        searches = YAML.safe_load(IO.read(file))
+        searches = YAML.safe_load(file.read_file)
       else
         searches = {
           'soon' => 'tagged "due<in 2 days,due>yesterday"',
@@ -459,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] }
@@ -478,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
   ##

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.1.23'
+  VERSION = '1.1.25'
 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.22<!--END VER-->.
+The current version of `na` is <!--VER-->1.1.24<!--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.23
+  version: 1.1.25
 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: []