trk 0.1.9 ā 0.1.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/trk/cli.rb +17 -17
- data/lib/trk/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2cff062b00416a42019adb07b272159252fc059b87513ca4dbdedd8a92027353
|
|
4
|
+
data.tar.gz: c81f8aa5afdfc55d75276ee43b280f30129cf3c8b6ef4ea2a7008d7c47623dff
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c0d6b1a025cfd4b5438bea4709f331ae93add0b7e5db414feb1eabdc496d45c739bfbd7fcf49194f676ca82af23128011080566dc62238493c9c10857e50f5a0
|
|
7
|
+
data.tar.gz: 05f0c50c8c333f88dfa15884e11bf4d07387f5b46f53340630b0880da12c68b195f6fba92b52057b99a3380f1637fb06ecacc40fe30d262ac254d85c99a1565b
|
data/lib/trk/cli.rb
CHANGED
|
@@ -52,8 +52,12 @@ module Trk
|
|
|
52
52
|
# Get remote latest commit SHA via glab API
|
|
53
53
|
project_path = dir.sub("#{base_dir}/", "")
|
|
54
54
|
encoded_project = URI.encode_www_form_component(project_path)
|
|
55
|
-
stdout_remote, stderr,
|
|
56
|
-
|
|
55
|
+
stdout_remote, stderr, status = Open3.capture3("glab api projects/#{encoded_project}/repository/commits?per_page=1")
|
|
56
|
+
unless status.success?
|
|
57
|
+
puts "#{UNCHECK_ICON} Glab api failed: #{dir}\n#{stderr}"
|
|
58
|
+
open_shell
|
|
59
|
+
next
|
|
60
|
+
end
|
|
57
61
|
remote_commit = JSON.parse(stdout_remote).first["id"]
|
|
58
62
|
stdout_local, _stderr_local, status_local = Open3.capture3("git rev-parse HEAD")
|
|
59
63
|
local_commit = stdout_local.strip if status_local.success?
|
|
@@ -78,10 +82,17 @@ module Trk
|
|
|
78
82
|
else
|
|
79
83
|
puts "\nš Pulling updates in: #{dir}"
|
|
80
84
|
_stdout, stderr, status = Open3.capture3("git pull")
|
|
81
|
-
|
|
82
|
-
|
|
85
|
+
unless status.success?
|
|
86
|
+
puts "#{UNCHECK_ICON} Git pull failed in: #{dir}\n#{stderr}"
|
|
87
|
+
open_shell
|
|
88
|
+
next
|
|
89
|
+
end
|
|
83
90
|
_stdout, stderr, status = Open3.capture3("git push")
|
|
84
|
-
|
|
91
|
+
unless status.success?
|
|
92
|
+
puts "#{UNCHECK_ICON} Git push failed in: #{dir}\n#{stderr}"
|
|
93
|
+
open_shell
|
|
94
|
+
next
|
|
95
|
+
end
|
|
85
96
|
stdout, stderr, _status = Open3.capture3("git status --porcelain")
|
|
86
97
|
if stdout.empty?
|
|
87
98
|
puts "#{CHECK_ICON} Git pull push successful in: #{dir}"
|
|
@@ -98,25 +109,14 @@ module Trk
|
|
|
98
109
|
open_shell
|
|
99
110
|
end
|
|
100
111
|
end
|
|
101
|
-
else
|
|
102
|
-
puts "#{UNCHECK_ICON} Git push failed in: #{dir}\n#{stderr}"
|
|
103
|
-
open_shell
|
|
104
|
-
end
|
|
105
|
-
else
|
|
106
|
-
puts "#{UNCHECK_ICON} Git pull failed in: #{dir}\n#{stderr}"
|
|
107
|
-
open_shell
|
|
108
|
-
end
|
|
109
112
|
end
|
|
110
|
-
else
|
|
111
|
-
puts "#{UNCHECK_ICON} Glab api failed: #{dir}\n#{stderr}"
|
|
112
|
-
open_shell
|
|
113
|
-
end
|
|
114
113
|
end
|
|
115
114
|
end
|
|
116
115
|
|
|
117
116
|
puts "\n#{CHECK_ICON} All done!"
|
|
118
117
|
end
|
|
119
118
|
|
|
119
|
+
desc "open_shell", "helper command to stop and investigate"
|
|
120
120
|
def open_shell
|
|
121
121
|
puts "Opening shell for manual fix. Type 'exit' when done."
|
|
122
122
|
system('PS1="trk pull paused on [$(basename $(pwd))]$ " bash --norc')
|
data/lib/trk/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: trk
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dusan Orlovic
|
|
8
8
|
bindir: exe
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date: 2025-
|
|
10
|
+
date: 2025-06-29 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
12
|
- !ruby/object:Gem::Dependency
|
|
13
13
|
name: thor
|