trk 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d801933ed2fbbba2061aa5c63fa026f44204ac35b0b3d9c2a7268e024b924d87
-  data.tar.gz: bf385c29ba9af81e616f969261fa491ec4a649a7ec54ef13c63de4bb103cc9dd
+  metadata.gz: 90564bb5743c70ff927900dbcb29c94264daa6a9d956f9d5c8459856a248b206
+  data.tar.gz: 794412abfb305ca51b57ece396051cfe892677dad151a3ca097aaae5957b1d61
 SHA512:
-  metadata.gz: 206534aa53d7b5cc0f98b91e844b9468654fc8c7b913ca2603256a692bdb818be50421540328417791c8f34abe18a540b798728bfe0df15d31cdc0259ab83190
-  data.tar.gz: 46f5c88ab980c63e22edfbfd36090b97874dcc44e1d7235c1387e403a1db4110939a3f2eb08a8ad3e01a4835499b0c8681fdce21c0a7ca976663038d5190c450
+  metadata.gz: 66fae02f19163eabbe3d992d5c48d9046def0c2538f7d443295e4ca7b14de80542d90310913b99261616e6f18b71161f56b44a415e5923d22446589a8557337e
+  data.tar.gz: b9024873d8ad9e7f92d50bb131c0fef22f232cae2d241941ae6cee6e9a9615b985539ee8cb31cd92db4c172aa22854e48f0e4e7ec090c4d2f7c12038785ae34a

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,22 @@ 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 "#{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,11 +76,39 @@ 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")
+
+              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 "#{UNCHECK_ICON} Glab api failed: #{dir}\n#{stderr}"
             open_shell
           end
         end

data/lib/trk/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trk
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Dusan Orlovic