ggsm 1.9.0 → 1.9.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ggsm/command/mr.rb +49 -26
- data/lib/ggsm/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2e3db0d922cbb3319db68a35b1266e9280009de0
|
4
|
+
data.tar.gz: 78282fa39aff4c9962e676bc21770967c2bfd611
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ff341201951c97639e1ebd5c721f7ea3a303b8c1a63e6d2ebe79d12c4a7740b8daa464446f5213ee4b79a040b321c1d7c216c1aee925f442595e4881befd3dbc
|
7
|
+
data.tar.gz: 3f07193eb11ee94e1b80b091b46f510e40ef315c2b5a143ea641c8a5c033fd271ea29a51235badaacaa5738c7e53d028b1362ea037a4150d9fc0fcec9286bced
|
data/lib/ggsm/command/mr.rb
CHANGED
@@ -81,40 +81,29 @@ module GGSM
|
|
81
81
|
if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
|
82
82
|
get_head_commit("origin/#{@@current_branch}") != get_head_commit("origin/#{@@target_branch}")
|
83
83
|
# origin git@git.souche.com:Destiny_Android/Destiny_Android.git (push)
|
84
|
-
# origin
|
84
|
+
# origin https://git.souche-inc.com/Destiny_Android/Mine.git (push)
|
85
85
|
result = `git remote -v | grep push`
|
86
|
-
|
87
|
-
if
|
88
|
-
|
86
|
+
project_path = result.split('.com/')[1]
|
87
|
+
if project_path == nil || project_path.strip == ''
|
88
|
+
project_path = result.split('.com:')[1]
|
89
89
|
end
|
90
90
|
|
91
|
-
if
|
92
|
-
|
93
|
-
|
91
|
+
if project_path != nil
|
92
|
+
project_path = project_path.split('.git')[0]
|
93
|
+
project_name = project_path.split('/')[1]
|
94
94
|
begin
|
95
|
-
|
96
|
-
|
97
|
-
params['target_branch'] = @@target_branch
|
98
|
-
params['title'] = @@msg
|
99
|
-
# params['remove_source_branch'] = true
|
100
|
-
uri = URI.parse("http://git.souche.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
|
101
|
-
response = Net::HTTP.post_form(uri, params)
|
102
|
-
result = Oj.load(response.body)
|
95
|
+
uri = URI.parse("https://git.souche-inc.com/api/v4/projects?private_token=#{@@token}&search=#{project_name}")
|
96
|
+
response = Net::HTTP.get_response(uri)
|
103
97
|
|
104
98
|
case response
|
105
99
|
when Net::HTTPSuccess then
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
if mr_url != nil
|
113
|
-
@@urls[sub] = mr_url
|
114
|
-
puts mr_url.blue
|
100
|
+
result = Oj.load(response.body)
|
101
|
+
result.each do |object|
|
102
|
+
if object['path_with_namespace'].strip == project_path.strip
|
103
|
+
id = object['id']
|
104
|
+
return request_mr(id, sub)
|
105
|
+
end
|
115
106
|
end
|
116
|
-
when Net::HTTPConflict then
|
117
|
-
puts 'Merge Request已存在!'
|
118
107
|
when Net::HTTPNotFound, Net::HTTPUnauthorized
|
119
108
|
Dir.chdir @@pwd
|
120
109
|
`rm -rf .git/ggsm/TOKEN`
|
@@ -122,6 +111,7 @@ module GGSM
|
|
122
111
|
create_mr(sub)
|
123
112
|
return
|
124
113
|
end
|
114
|
+
|
125
115
|
rescue => e
|
126
116
|
puts "error: #{e}".red
|
127
117
|
exit 1
|
@@ -129,5 +119,38 @@ module GGSM
|
|
129
119
|
end
|
130
120
|
end
|
131
121
|
end
|
122
|
+
|
123
|
+
def request_mr(id, sub)
|
124
|
+
params = {}
|
125
|
+
params['source_branch'] = @@current_branch
|
126
|
+
params['target_branch'] = @@target_branch
|
127
|
+
params['title'] = @@msg
|
128
|
+
# params['remove_source_branch'] = true
|
129
|
+
uri = URI.parse("https://git.souche-inc.com/api/v4/projects/#{id}/merge_requests?private_token=#{@@token}")
|
130
|
+
response = Net::HTTP.post_form(uri, params)
|
131
|
+
|
132
|
+
case response
|
133
|
+
when Net::HTTPSuccess then
|
134
|
+
result = Oj.load(response.body)
|
135
|
+
mr_url = result['web_url']
|
136
|
+
|
137
|
+
if @@user == ''
|
138
|
+
@@user = result['author']['username']
|
139
|
+
end
|
140
|
+
|
141
|
+
if mr_url != nil
|
142
|
+
@@urls[sub] = mr_url
|
143
|
+
puts mr_url.blue
|
144
|
+
end
|
145
|
+
when Net::HTTPConflict then
|
146
|
+
puts 'Merge Request已存在!'
|
147
|
+
when Net::HTTPNotFound, Net::HTTPUnauthorized
|
148
|
+
Dir.chdir @@pwd
|
149
|
+
`rm -rf .git/ggsm/TOKEN`
|
150
|
+
@@token = init_check_token
|
151
|
+
create_mr(sub)
|
152
|
+
return
|
153
|
+
end
|
154
|
+
end
|
132
155
|
end
|
133
156
|
end
|
data/lib/ggsm/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ggsm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.9.
|
4
|
+
version: 1.9.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- YoKey
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-01-
|
11
|
+
date: 2018-01-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|