ggsm 1.9.1 → 1.9.2
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 +26 -49
- data/lib/ggsm/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 4cd4084d853bd726f1af235384a2518fac554273
|
4
|
+
data.tar.gz: 3b6d2f5783054e843c99e9e9e91c3eb3d46bbce0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4f6605690a3c7653a1ba4f4c189a10821e53c869322f09a2f48db432caef9b64cd6e12a1b0e46c794962c463a36acfd4805f7ae65a4ce47412d5014264f87f27
|
7
|
+
data.tar.gz: 9bb5c54c7cb0730c59d75ad7e82fa60e34bdf1cc52c596a6e0e252bee72f06b51e22bb032a245aa9df81be82dd91a494aca2316d69658efd08d48eec3699c719
|
data/lib/ggsm/command/mr.rb
CHANGED
@@ -81,29 +81,40 @@ 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 http://git.souche.com/Destiny_Android/Mine.git (push)
|
85
85
|
result = `git remote -v | grep push`
|
86
|
-
|
87
|
-
if
|
88
|
-
|
86
|
+
project_name = result.split('.com/')[1]
|
87
|
+
if project_name == nil || project_name.strip == ''
|
88
|
+
project_name = result.split('.com:')[1]
|
89
89
|
end
|
90
90
|
|
91
|
-
if
|
92
|
-
|
93
|
-
|
91
|
+
if project_name != nil
|
92
|
+
project_name = project_name.split('.git')[0].gsub('/', '%2F')
|
93
|
+
|
94
94
|
begin
|
95
|
-
|
96
|
-
|
95
|
+
params = {}
|
96
|
+
params['source_branch'] = @@current_branch
|
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)
|
97
103
|
|
98
104
|
case response
|
99
105
|
when Net::HTTPSuccess then
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
+
mr_url = result['web_url']
|
107
|
+
|
108
|
+
if @@user == ''
|
109
|
+
@@user = result['author']['username']
|
110
|
+
end
|
111
|
+
|
112
|
+
if mr_url != nil
|
113
|
+
@@urls[sub] = mr_url
|
114
|
+
puts mr_url.blue
|
106
115
|
end
|
116
|
+
when Net::HTTPConflict then
|
117
|
+
puts 'Merge Request已存在!'
|
107
118
|
when Net::HTTPNotFound, Net::HTTPUnauthorized
|
108
119
|
Dir.chdir @@pwd
|
109
120
|
`rm -rf .git/ggsm/TOKEN`
|
@@ -111,7 +122,6 @@ module GGSM
|
|
111
122
|
create_mr(sub)
|
112
123
|
return
|
113
124
|
end
|
114
|
-
|
115
125
|
rescue => e
|
116
126
|
puts "error: #{e}".red
|
117
127
|
exit 1
|
@@ -119,38 +129,5 @@ module GGSM
|
|
119
129
|
end
|
120
130
|
end
|
121
131
|
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
|
155
132
|
end
|
156
133
|
end
|
data/lib/ggsm/version.rb
CHANGED