na 1.2.23 → 1.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 156cd1491d6307f4e28005d50c7b7fd0bd9d40da460533fa5a52e0a472ead137
-  data.tar.gz: fc1900ffb0aa9984f039aa9ca8f3b85fb787069f31a7ed2d071c786b4fe2638b
+  metadata.gz: fb2c991e3e916c35ac9820504725f1e8b41f0030c0f87a0672ec4cfcc5190c09
+  data.tar.gz: 97de5c78cf2ce7f53a6268030b9c0fb5d4881c7f40e312d289207353fc53801a
 SHA512:
-  metadata.gz: 190d47fd1308faf2401234d9dc28c02ed61c89888a5fa96139ffad51a6ff41f0f48babb90971c132c3e890abeaf3177b878fa94363bd8a4f534b2eab7dadf43c
-  data.tar.gz: 6e40bf25ec1e3dd609181c467c4d885efbd9a634e8ab90424f4d443683d01d8594bace90df10c47cc12a498caae12e32efff20d0ad2d749508406bd838b05401
+  metadata.gz: 74a6012339df8e359f39942c481905de44c066a1d0c464ce942de7590d23a80da3fe68b79f86215faeaa5efc831e3b88f96630b51ca2285967afbd9b24956e07
+  data.tar.gz: 134d9db7430525d873025c23b00bd57c2494038a8af9e4bb48d1544f39e804b065313ad4f542ebe871129fe09eda3fc4330ce796e870514e2370616e51291c22

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 1.2.25
+
+2023-08-21 07:23
+
+#### FIXED
+
+- Find command on Linux
+
+### 1.2.24
+
+2023-06-14 09:16
+
 ### 1.2.23
 
 2023-06-05 10:42

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    na (1.2.23)
+    na (1.2.25)
       chronic (~> 0.10, >= 0.10.2)
       gli (~> 2.21.0)
       mdless (~> 1.0, >= 1.0.32)
@@ -14,7 +14,7 @@ GEM
   specs:
     chronic (0.10.2)
     gli (2.21.0)
-    mdless (1.0.32)
+    mdless (1.0.33)
     minitest (5.16.3)
     rake (0.9.6)
     rdoc (4.3.0)

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.23
+The current version of `na` is 1.2.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. 
@@ -20,7 +20,7 @@ It can also auto-display next actions when you enter a project directory, automa
 
 ### Installation
 
-Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
+Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, try `gem install --user-install na`, or use `sudo gem install na`.
 
 If you're using Homebrew, you have the option to install via [brew-gem](https://github.com/sportngin/brew-gem):
 
@@ -77,14 +77,14 @@ SYNOPSIS
     na [global options] command [command options] [arguments...]
 
 VERSION
-    1.2.23
+    1.2.25
 
 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/lib/na/next_action.rb

@@ -105,7 +105,7 @@ module NA
     def find_files(depth: 1)
       return [NA.global_file] if NA.global_file
 
-      files = `find . -name "*.#{NA.extension}" -maxdepth #{depth}`.strip.split("\n")
+      files = `find . -maxdepth #{depth} -name "*.#{NA.extension}"`.strip.split("\n")
       files.each { |f| save_working_dir(File.expand_path(f)) }
       files
     end
@@ -166,7 +166,7 @@ module NA
       [projects, selected]
     end
 
-    def insert_project(target, project)
+    def insert_project(target, project, projects)
       path = project.split(%r{[:/]})
       _, _, projects = parse_actions(file_path: target)
       built = []
@@ -196,9 +196,13 @@ module NA
         end
 
         if new_path.join('') =~ /Archive/i
-          content = "#{content.strip}\n#{input.join("\n")}"
+          line = projects.last.last_line
+          content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         else
-          content = "#{input.join("\n")}\n#{content}"
+          split = content.split(/\n/)
+          before = split.slice(0, projects.first.line).join("\n")
+          after = split.slice(projects.first.line, split.count - projects.first.line).join("\n")
+          content = "#{before}\n#{input.join("\n")}\n#{after}"
         end
 
         new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, input.count - 1, input.count - 1)
@@ -210,7 +214,7 @@ module NA
           input.push("#{"\t" * indent}#{part.cap_first}:")
           indent += 1
         end
-        content = content.split("\n").insert(line, input.join("\n")).join("\n")
+        content = content.split(/\n/).insert(line, input.join("\n")).join("\n")
         new_project = NA::Project.new(path.map(&:cap_first).join(':'), indent - 1, line + input.count - 1, line + input.count - 1)
       end
 
@@ -273,7 +277,7 @@ module NA
         if target_proj.nil?
           res = NA.yn(NA::Color.template("{y}Project {bw}#{project}{xy} doesn't exist, add it"), default: true)
           if res
-            target_proj = insert_project(target, project)
+            target_proj = insert_project(target, project, projects)
           else
             NA.notify('{x}Cancelled', exit_code: 1)
           end

data/lib/na/version.rb

@@ -1,3 +1,3 @@
 module Na
-  VERSION = '1.2.23'
+  VERSION = '1.2.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.2.22<!--END VER-->.
+The current version of `na` is <!--VER-->1.2.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. 
 
@@ -19,7 +19,7 @@ It can also auto-display next actions when you enter a project directory, automa
 
 ### Installation
 
-Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, use `sudo gem install na`.
+Assuming you have Ruby and RubyGems installed, you can just run `gem install na`. If you run into errors, try `gem install --user-install na`, or use `sudo gem install na`.
 
 If you're using Homebrew, you have the option to install via [brew-gem](https://github.com/sportngin/brew-gem):
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: na
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.25
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.16
 signing_key:
 specification_version: 4
 summary: A command line tool for adding and listing project todos