trk 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daa75cf6eea07a201c466b5d8d18bf320ed898bf9458d94345b8481a0b9ec110
-  data.tar.gz: d1698a006089a9e4a49b6d63efed1aace33a9bdd9a311f99e6014e14994e5a26
+  metadata.gz: d801933ed2fbbba2061aa5c63fa026f44204ac35b0b3d9c2a7268e024b924d87
+  data.tar.gz: bf385c29ba9af81e616f969261fa491ec4a649a7ec54ef13c63de4bb103cc9dd
 SHA512:
-  metadata.gz: 0d77302b31fe36f291dd222e777de1f3f05999e8b67b03288296817e2e81e596017fe9a73507f5f89697e269c08e570eed3597774d0e2860ee163e00d607e574
-  data.tar.gz: ea4d57c56eb0edffc2498a10780b3f797d3d75f1b0c57a34b512dd01cf762111a7c6630a7cdcc683f71b866d73d317f9dfb54e68eadc8492aa9796833e85a8bc
+  metadata.gz: 206534aa53d7b5cc0f98b91e844b9468654fc8c7b913ca2603256a692bdb818be50421540328417791c8f34abe18a540b798728bfe0df15d31cdc0259ab83190
+  data.tar.gz: 46f5c88ab980c63e22edfbfd36090b97874dcc44e1d7235c1387e403a1db4110939a3f2eb08a8ad3e01a4835499b0c8681fdce21c0a7ca976663038d5190c450

data/README.md

@@ -17,13 +17,13 @@ mkdir ~/trk
 
 ### Links for code in README
 
-For complete file
+For a single line or for complete file we can use comment
 ```
 # This code is from: https://trk.tools/app/trk-readme-source-links/-/blob/main/README.md
 ```
 
-When only a part of the file is extracted from trk.tools use Start and End of
-code
+When a part of the file is extracted from trk.tools we can use `Start` and `End
+of code from:`
 
 ```
 # .bashrc
@@ -42,13 +42,18 @@ Using this gem you can get the string with
 trk link-show
 ```
 
+### Vim mapping link show
+
 For vim you can use mapping
 ```
 # .vimrc
+# Start of code from: https://trk.tools/app/trk-readme-source-links/-/blob/main/README.md
 nnoremap <leader>s :r !trk link-show %<CR>
+# End of code from: https://trk.tools/app/trk-readme-source-links/-/blob/main/README.md
 
 # local gem
 nnoremap <leader>s :r !cd ~/trk.tools/app/trk-readme-source-links && bundle exec exe/trk link-show %:p<CR>
+nnoremap <leader>e :r !cd ~/trk.tools/app/trk-readme-source-links && bundle exec exe/trk link-show-end %:p<CR>
 nnoremap <leader>r :r !cd ~/trk.tools/app/trk-readme-source-links && bundle exec exe/trk link-show-raw %:p<CR>
 ```
 
@@ -82,6 +87,8 @@ trk pull
 
 ## Development
 
+To install this gem onto your local machine, run `bundle exec rake install`.
+
 Run without installing the gem
 ```
 bundle exec exe/trk pull
@@ -112,8 +119,12 @@ ruby -Itest test/test_link.rb --name test_link_show_success
 
 ## Gem push
 
-To install this gem onto your local machine, run `bundle exec rake install`.
-To release a new version, update the version number in `lib/trk/version.rb`, and
+To release a new version, update the version number, git commit
+```
+vi lib/trk/version.rb
+
+git commit -am"Update"
+```
 then deploy with:
 ```
 bundle exec rake release

data/lib/trk/cli.rb

@@ -16,8 +16,8 @@ module Trk
 
     def self.help(shell, subcommand = false)
       super
-      puts "\n To enable autocomplete, put in .bashrc: 'complete -W \"$(trk completion)\" trk', eg:\n"
-      puts "echo '# https://trk.tools/app/trk-readme-source-links\ncomplete -W \"$(trk completion)\" trk' >> ~/.bashrc && source ~/.bashrc"
+      puts "\nTo enable autocomplete, put in .bashrc following two lines:"
+      puts "# https://trk.tools/app/trk-readme-source-links\ntrk completion > /dev/null 2>&1 && complete -W \"$(trk completion)\" trk"
     end
 
     desc "completion", "Outputs available commands for autocompletion"
@@ -58,18 +58,24 @@ module Trk
                 puts "#{CHECK_ICON} Git pull push successful in: #{dir}"
               else
                 puts "#{UNCHECK_ICON} Git status --porcelain failed in: #{dir}\n#{stdout}\n#{stderr}"
-                puts "Opening shell for manual fix. Type 'exit' when done."
-                system('PS1="trk pull paused on [$(basename $(pwd))]$ " bash --norc')
+                system "git status"
+                system "git diff"
+                puts "Do you want to run 'git add . && git commit -amUpdate' and continue (Y/n) ?"
+                answer = $stdin.gets.strip.downcase
+                if answer == "" || answer == "y"
+                  success = system "git add . && git commit -amUpdate && git push"
+                  open_shell unless success
+                else
+                  open_shell
+                end
               end
             else
               puts "#{UNCHECK_ICON} Git push failed in: #{dir}\n#{stderr}"
-              puts "Opening shell for manual fix. Type 'exit' when done."
-              system('PS1="trk pull paused on [$(basename $(pwd))]$ " bash --norc')
+              open_shell
             end
           else
             puts "#{UNCHECK_ICON} Git pull failed in: #{dir}\n#{stderr}"
-            puts "Opening shell for manual fix. Type 'exit' when done."
-            system('PS1="trk pull paused on [$(basename $(pwd))]$ " bash --norc')
+            open_shell
           end
         end
       end
@@ -77,7 +83,12 @@ module Trk
       puts "\n#{CHECK_ICON} All done!"
     end
 
-    desc "link-show FILENAME", "Show link of the file"
+    def open_shell
+      puts "Opening shell for manual fix. Type 'exit' when done."
+      system('PS1="trk pull paused on [$(basename $(pwd))]$ " bash --norc')
+    end
+
+    desc "link-show FILENAME", "Show start link of the file"
     def link_show(filename)
       result = Link.new(filename).show
       if result.success?
@@ -88,6 +99,17 @@ module Trk
       end
     end
 
+    desc "link-show-end FILENAME", "Show end link of the file"
+    def link_show_end(filename)
+      result = Link.new(filename).show_end
+      if result.success?
+        # puts "#{CHECK_ICON} link done #{result.message}\n#{result.data[:link]}"
+        puts result.data[:link]
+      else
+        puts "#{UNCHECK_ICON} link failed\n#{result.message}"
+      end
+    end
+
     desc "link-show-raw FILENAME", "Show wget link of the file"
     def link_show_raw(filename)
       result = Link.new(filename).raw

data/lib/trk/link.rb

@@ -13,26 +13,35 @@ module Trk
     end
 
     def show
-      full_path = File.absolute_path?(@filename) ? @filename : File.expand_path(@filename)
-      home_path = Dir.home
-      folders_from_home = full_path.sub(/^#{Regexp.escape(home_path)}\//, "").split("/")
-      return Error.new "File #{@filename} is not inside ~/trk.tools" unless folders_from_home.first == "trk.tools"
+      full_path = File.absolute_path?(@filename) ? @filename : File.expand_path(@filename) # /Volumes/ONETB/dule/trk.tools/app/trk-readme-source-links/test/test_link.rb
+      folders_from_trk_tools = full_path.sub(/.*trk.tools\//, "")
+      return Error.new "File #{@filename} is not inside trk.tools" if full_path == folders_from_trk_tools
 
-      repo_path = folders_from_home[1..2].join("/")
-      file_path = folders_from_home[3..].join("/")
-      link = "# #{THIS_CODE_IS_FROM} #{BASE_URL}/#{repo_path}/#{BRANCH_PREFIX}#{file_path}"
+      repo_path = folders_from_trk_tools.split("/")[0..1].join("/")
+      file_path = folders_from_trk_tools.split("/")[2..].join("/")
+      link = "# #{START_OF_CODE_FROM} #{BASE_URL}/#{repo_path}/#{BRANCH_PREFIX}#{file_path}"
+      Result.new "OK", link: link
+    end
+
+    def show_end
+      full_path = File.absolute_path?(@filename) ? @filename : File.expand_path(@filename) # /Volumes/ONETB/dule/trk.tools/app/trk-readme-source-links/test/test_link.rb
+      folders_from_trk_tools = full_path.sub(/.*trk.tools\//, "")
+      return Error.new "File #{@filename} is not inside trk.tools" if full_path == folders_from_trk_tools
+
+      repo_path = folders_from_trk_tools.split("/")[0..1].join("/")
+      file_path = folders_from_trk_tools.split("/")[2..].join("/")
+      link = "# #{END_OF_CODE_FROM} #{BASE_URL}/#{repo_path}/#{BRANCH_PREFIX}#{file_path}"
       Result.new "OK", link: link
     end
 
     def raw
-      full_path = File.absolute_path?(@filename) ? @filename : File.expand_path(@filename)
-      home_path = Dir.home
-      folders_from_home = full_path.sub(/^#{Regexp.escape(home_path)}\//, "").split("/")
-      return Error.new "File #{@filename} is not inside ~/trk.tools" unless folders_from_home.first == "trk.tools"
+      full_path = File.absolute_path?(@filename) ? @filename : File.expand_path(@filename) # /Volumes/ONETB/dule/trk.tools/app/trk-readme-source-links/test/test_link.rb
+      folders_from_trk_tools = full_path.sub(/.*trk.tools\//, "")
+      return Error.new "File #{@filename} is not inside trk.tools" if full_path == folders_from_trk_tools
 
-      repo_path = folders_from_home[1..2].join("/")
-      file_path = folders_from_home[3..].join("/")
-      file_folder = folders_from_home[3..-2].join("/") || "."
+      repo_path = folders_from_trk_tools.split("/")[0..1].join("/")
+      file_path = folders_from_trk_tools.split("/")[2..].join("/")
+      file_folder = folders_from_trk_tools.split("/")[2..-2].join("/") || "."
       link = "#{WGET} #{file_folder} #{BASE_URL}/#{repo_path}/#{BRANCH_RAW_PREFIX}#{file_path}"
       Result.new "OK", link: link
     end

data/lib/trk/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Trk
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
   CHECK_ICON = "✅ "
   UNCHECK_ICON = "❌ "
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trk
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Dusan Orlovic
 bindir: exe
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.0.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="