ggsm 1.8.2 → 1.8.3
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 +27 -22
- data/lib/ggsm/mr/token.rb +1 -1
- 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: d386e708f7018def7b458edf3e3f8e84833d5e50
|
4
|
+
data.tar.gz: c33fb18cb77719cec6b1e3bc436ca422758a798e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fe40bf703d42359e094aaeed1f6b86de37899cfb4cde86fd9909150bc2a4480f5f73bd56038ae54ce7dfebf0239769576849ca59e2fec3aa1f29657fe3191721
|
7
|
+
data.tar.gz: 9b5b30eca73b56baf9efe752abc755b9aa59d03d207fdb2e847a2784c971d0078667fef0165f24e7bd851352e44927102c64e41c589709d5131bd8818ffb3245
|
data/lib/ggsm/command/mr.rb
CHANGED
@@ -56,7 +56,7 @@ module GGSM
|
|
56
56
|
unless check_token
|
57
57
|
system "vim #{path}"
|
58
58
|
|
59
|
-
result = IO.read(path).split('#
|
59
|
+
result = IO.read(path).split('# 请输入正确的GitLab private-token')
|
60
60
|
|
61
61
|
if result.length > 1
|
62
62
|
token = result[0]
|
@@ -64,7 +64,7 @@ module GGSM
|
|
64
64
|
end
|
65
65
|
|
66
66
|
if token == ''
|
67
|
-
token = IO.read(path).split('#
|
67
|
+
token = IO.read(path).split('# 请输入正确的GitLab private-token')[0]
|
68
68
|
end
|
69
69
|
|
70
70
|
if token == ''
|
@@ -76,7 +76,10 @@ module GGSM
|
|
76
76
|
end
|
77
77
|
|
78
78
|
def create_mr(sub)
|
79
|
-
|
79
|
+
current_branch_head_commit = get_head_commit("origin/#{@@current_branch}").chomp
|
80
|
+
|
81
|
+
if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
|
82
|
+
current_branch_head_commit != get_head_commit("origin/#{@@target_branch}")
|
80
83
|
# origin git@git.souche.com:Destiny_Android/Destiny_Android.git (push)
|
81
84
|
# origin http://git.souche.com/Destiny_Android/Mine.git (push)
|
82
85
|
result = `git remote -v | grep push`
|
@@ -93,29 +96,31 @@ module GGSM
|
|
93
96
|
params['source_branch'] = @@current_branch
|
94
97
|
params['target_branch'] = @@target_branch
|
95
98
|
params['title'] = @@msg
|
99
|
+
params['remove_source_branch'] = true
|
96
100
|
uri = URI.parse("http://git.souche.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
|
97
101
|
response = Net::HTTP.post_form(uri, params)
|
98
102
|
result = Oj.load(response.body)
|
99
103
|
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
104
|
+
case response
|
105
|
+
when Net::HTTPSuccess then
|
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
|
115
|
+
end
|
116
|
+
when Net::HTTPConflict then
|
117
|
+
puts 'Merge Request已存在!'
|
118
|
+
when Net::HTTPNotFound, Net::HTTPUnauthorized
|
119
|
+
Dir.chdir @@pwd
|
120
|
+
`rm -rf .git/ggsm/TOKEN`
|
121
|
+
@@token = init_check_token
|
122
|
+
create_mr(sub)
|
123
|
+
return
|
119
124
|
end
|
120
125
|
rescue => e
|
121
126
|
puts "error: #{e}".red
|
data/lib/ggsm/mr/token.rb
CHANGED
@@ -10,7 +10,7 @@ module GGSM
|
|
10
10
|
|
11
11
|
if !File.exist?(config_path) || '' == IO.read(config_path).strip || IO.readlines(config_path)[0].strip == ''
|
12
12
|
file = File.new(config_path, 'w')
|
13
|
-
file << "\n#
|
13
|
+
file << "\n# 请输入正确的GitLab private-token"
|
14
14
|
file.close
|
15
15
|
return false
|
16
16
|
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.8.
|
4
|
+
version: 1.8.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- YoKey
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-12-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|