trk 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d801933ed2fbbba2061aa5c63fa026f44204ac35b0b3d9c2a7268e024b924d87
-  data.tar.gz: bf385c29ba9af81e616f969261fa491ec4a649a7ec54ef13c63de4bb103cc9dd
+  metadata.gz: 938ec057cb06d6a7467a26653943a062af7254486277899baf915afcac3d37ae
+  data.tar.gz: 6aea1eeff668b49f91a3d5929580a372e729a60b807b85a098dd059ebf932daa
 SHA512:
-  metadata.gz: 206534aa53d7b5cc0f98b91e844b9468654fc8c7b913ca2603256a692bdb818be50421540328417791c8f34abe18a540b798728bfe0df15d31cdc0259ab83190
-  data.tar.gz: 46f5c88ab980c63e22edfbfd36090b97874dcc44e1d7235c1387e403a1db4110939a3f2eb08a8ad3e01a4835499b0c8681fdce21c0a7ca976663038d5190c450
+  metadata.gz: 0b02763b21935ea8c286790ae4f336ea0de9c6658eabb7da19dd3e9db5f22e8f7c1d1b19992563da9764871a039040834b0e1c3f7266d13dda1199f77b3beda9
+  data.tar.gz: 156e9ed56d7d5570633db0d7d5f987d1355a1565fcebe7a8f9f72c2cc9c1aab97030f4b4a192cf4a592c743f0d5d33785860c34079acedc753b734392519280c

data/README.md

@@ -122,6 +122,7 @@ ruby -Itest test/test_link.rb --name test_link_show_success
 To release a new version, update the version number, git commit
 ```
 vi lib/trk/version.rb
+bundle
 
 git commit -am"Update"
 ```

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,17 +48,26 @@ 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 = Open3.capture3("glab api projects/#{encoded_project}/repository/commits?per_page=1")
+          unless status.success?
+            puts "#{UNCHECK_ICON} Glab api failed: #{dir}\n#{stderr}"
+            open_shell
+            next
+          end
+            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 "#{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) ?"
@@ -70,19 +80,43 @@ module Trk
                 end
               end
             else
-              puts "#{UNCHECK_ICON} Git push failed in: #{dir}\n#{stderr}"
-              open_shell
+              puts "\n🔄 Pulling updates in: #{dir}"
+              _stdout, stderr, status = Open3.capture3("git pull")
+              unless status.success?
+                puts "#{UNCHECK_ICON} Git pull failed in: #{dir}\n#{stderr}"
+                open_shell
+                next
+              end
+                _stdout, stderr, status = Open3.capture3("git push")
+                unless status.success?
+                  puts "#{UNCHECK_ICON} Git push failed in: #{dir}\n#{stderr}"
+                  open_shell
+                  next
+                end
+                  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
             end
-          else
-            puts "#{UNCHECK_ICON} Git pull failed in: #{dir}\n#{stderr}"
-            open_shell
-          end
         end
       end
 
       puts "\n#{CHECK_ICON} All done!"
     end
 
+    desc "helper command to stop and investigate"
     def open_shell
       puts "Opening shell for manual fix. Type 'exit' when done."
       system('PS1="trk pull paused on [$(basename $(pwd))]$ " bash --norc')

data/lib/trk/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trk
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Dusan Orlovic
 bindir: exe
 cert_chain: []
-date: 2025-05-24 00:00:00.000000000 Z
+date: 2025-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor