ggsm 1.8.1 → 1.8.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.rb +3 -3
- data/lib/ggsm/command/mr.rb +7 -1
- data/lib/ggsm/mr/email.rb +2 -2
- 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: 1f4858389fb5c20a3b246395fe6e5c18246cc46a
|
4
|
+
data.tar.gz: 2b203824bf4e802240216383f27da655ce3ee4f0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 744718845e73d92210fe384d7e62849c575fd3f408c3a659e983e054b7e587588f852ebf51b69dbd6c59d219c9e0781c818ac92d55434e3026eb7baa23376611
|
7
|
+
data.tar.gz: 1da3aec6b3dd0ff132746d7a06083a023f2aec752df821d7365710c7793e4051b70e629206d812448a5fc2775967ac0f00c9555c9e74dd43d5ddaf88c8b24449
|
data/lib/ggsm.rb
CHANGED
@@ -30,21 +30,21 @@ module GGSM
|
|
30
30
|
start_flow(branch, action)
|
31
31
|
end
|
32
32
|
|
33
|
-
desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行;
|
33
|
+
desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; -r:主工程强制rebase'
|
34
34
|
option :rebase, :default => false, :type => :boolean, aliases: '-r'
|
35
35
|
def merge(branch)
|
36
36
|
rebase = options[:rebase]
|
37
37
|
merge_flow(branch, rebase)
|
38
38
|
end
|
39
39
|
|
40
|
-
desc 'finish [-f|--force]', 'Merge后并解决冲突后执行;
|
40
|
+
desc 'finish [-f|--force]', 'Merge后并解决冲突后执行; -f:主工程强制推送'
|
41
41
|
option :force, :default => false, :type => :boolean, aliases: '-f'
|
42
42
|
def finish
|
43
43
|
force = options[:force]
|
44
44
|
finish_flow(force)
|
45
45
|
end
|
46
46
|
|
47
|
-
desc 'mr <branch> <
|
47
|
+
desc 'mr <branch> <title>', '创建MR'
|
48
48
|
def mr(branch, title)
|
49
49
|
mr_flow(branch, title)
|
50
50
|
end
|
data/lib/ggsm/command/mr.rb
CHANGED
@@ -17,6 +17,7 @@ module GGSM
|
|
17
17
|
@@token = ''
|
18
18
|
@@msg = ''
|
19
19
|
@@urls = {}
|
20
|
+
@@user = ''
|
20
21
|
|
21
22
|
def mr_flow(target_branch, msg)
|
22
23
|
check_submodule
|
@@ -45,7 +46,7 @@ module GGSM
|
|
45
46
|
end
|
46
47
|
|
47
48
|
if content != ''
|
48
|
-
send_email(@@msg, content)
|
49
|
+
send_email(@@user, @@msg, content)
|
49
50
|
end
|
50
51
|
end
|
51
52
|
|
@@ -106,6 +107,11 @@ module GGSM
|
|
106
107
|
|
107
108
|
if Net::HTTPSuccess
|
108
109
|
mr_url = result['web_url']
|
110
|
+
|
111
|
+
if @@user == ''
|
112
|
+
@@user = result['author']['username']
|
113
|
+
end
|
114
|
+
|
109
115
|
if mr_url != nil
|
110
116
|
@@urls[sub] = mr_url
|
111
117
|
puts mr_url.blue
|
data/lib/ggsm/mr/email.rb
CHANGED
@@ -3,11 +3,11 @@ require 'net/smtp'
|
|
3
3
|
|
4
4
|
module GGSM
|
5
5
|
module Email
|
6
|
-
def send_email(title,msg)
|
6
|
+
def send_email(user,title,msg)
|
7
7
|
message = <<END_OF_MESSAGE
|
8
8
|
From: GGSM Merge Request <18019913184@163.com>
|
9
9
|
To: 王右右 <wangyouyou@souche.com>,王锡臣 <wangxichen@souche.com>,沈若川 <shenruochuan@souche.com>,朱久言 <zhujiuyan@souche.com>
|
10
|
-
Subject: #{title}
|
10
|
+
Subject: [#{user}] #{title}
|
11
11
|
|
12
12
|
#{msg}
|
13
13
|
END_OF_MESSAGE
|
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.2
|
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-
|
11
|
+
date: 2017-11-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|