trk 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aadec329696267ada6db94f0d871454eece18090a4566e3a6f9684c406e48db6
-  data.tar.gz: c2a28757d21a24d0197332ca50c30aa36bf2a69de43accd5e54c550ca8b3b695
+  metadata.gz: 90564bb5743c70ff927900dbcb29c94264daa6a9d956f9d5c8459856a248b206
+  data.tar.gz: 794412abfb305ca51b57ece396051cfe892677dad151a3ca097aaae5957b1d61
 SHA512:
-  metadata.gz: 6d0ed0b289b76acbf65269be76b22a5ad8ea2284e38dbe0a04b48e221a7b17343b80b4df496a2b0dfe3f24e2f8971a0fcedee50490fe7d94c3916db88316edaf
-  data.tar.gz: 9cde2261c3bad6236099fce1901cb0d5e63965073f3557f1400f7dec939f33922d28399643c14b5e36ecf14d88ab58dca2c74139667ae9c3bca6cc38cbfd6f0e
+  metadata.gz: 66fae02f19163eabbe3d992d5c48d9046def0c2538f7d443295e4ca7b14de80542d90310913b99261616e6f18b71161f56b44a415e5923d22446589a8557337e
+  data.tar.gz: b9024873d8ad9e7f92d50bb131c0fef22f232cae2d241941ae6cee6e9a9615b985539ee8cb31cd92db4c172aa22854e48f0e4e7ec090c4d2f7c12038785ae34a

data/README.md

@@ -42,10 +42,14 @@ 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>
@@ -83,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
@@ -113,8 +119,13 @@ 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
+bundle
+
+git commit -am"Update"
+```
 then deploy with:
 ```
 bundle exec rake release

data/lib/trk/cli.rb

@@ -3,6 +3,7 @@ require "open3"
 require "net/http"
 require "uri"
 require "debug"
+require "json"
 
 module Trk
   class CLI < Thor
@@ -47,29 +48,68 @@ module Trk
         next unless File.directory?(File.join(dir, ".git"))
 
         Dir.chdir(dir) do
-          puts "\n🔄 Pulling updates in: #{dir}"
-          _stdout, stderr, status = Open3.capture3("git pull")
+          puts "\n🔄 Check if the last commit is the same in: #{dir}"
+          # Get remote latest commit SHA via glab API
+          project_path = dir.sub("#{base_dir}/", "")
+          encoded_project = URI.encode_www_form_component(project_path)
+          stdout_remote, stderr, status_remote = Open3.capture3("glab api projects/#{encoded_project}/repository/commits?per_page=1")
+          if status_remote.success?
+            remote_commit = JSON.parse(stdout_remote).first["id"]
+            stdout_local, _stderr_local, status_local = Open3.capture3("git rev-parse HEAD")
+            local_commit = stdout_local.strip if status_local.success?
+            if remote_commit == local_commit
 
-          if status.success?
-            _stdout, stderr, status = Open3.capture3("git push")
-            if status.success?
               stdout, stderr, _status = Open3.capture3("git status --porcelain")
               if stdout.empty?
-                puts "#{CHECK_ICON} Git pull push successful in: #{dir}"
+                puts "#{CHECK_ICON} Up-to-date: #{project_path}, skipping pull"
               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')
+                puts "#{UNCHECK_ICON} Up-to-date but Git status --porcelain failed in: #{dir}\n#{stdout}\n#{stderr}"
+                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')
+              puts "\n🔄 Pulling updates in: #{dir}"
+              _stdout, stderr, status = Open3.capture3("git pull")
+
+              if status.success?
+                _stdout, stderr, status = Open3.capture3("git push")
+                if status.success?
+                  stdout, stderr, _status = Open3.capture3("git status --porcelain")
+                  if stdout.empty?
+                    puts "#{CHECK_ICON} Git pull push successful in: #{dir}"
+                  else
+                    puts "#{UNCHECK_ICON} Git status --porcelain failed in: #{dir}\n#{stdout}\n#{stderr}"
+                    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}"
+                  open_shell
+                end
+              else
+                puts "#{UNCHECK_ICON} Git pull failed in: #{dir}\n#{stderr}"
+                open_shell
+              end
             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')
+            puts "#{UNCHECK_ICON} Glab api failed: #{dir}\n#{stderr}"
+            open_shell
           end
         end
       end
@@ -77,6 +117,11 @@ module Trk
       puts "\n#{CHECK_ICON} All done!"
     end
 
+    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

data/lib/trk/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trk
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Dusan Orlovic
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-31 00:00:00.000000000 Z
+date: 2025-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -51,7 +50,6 @@ licenses:
 metadata:
   homepage_uri: https://trk.tools
   source_code_uri: https://trk.tools/app/trk-readme-source-links
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,8 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CLI tools to manipulate https://trk.tools README files and projects.
 test_files: []