ggsm 1.0.1 → 1.0.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/flow/delete.rb +8 -2
- data/lib/ggsm/flow/finish.rb +1 -35
- data/lib/ggsm/flow/foreach.rb +0 -1
- data/lib/ggsm/flow/switch.rb +0 -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: 34d9787f4320d45a2351369c10eb1d20f8a044e9
|
4
|
+
data.tar.gz: 76b1eea58ff025fa196b8d26bc361661a5216714
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0811971955639f68dbc09319acf62c820a9a636eacfdbcaeb1e78b05069fb9667ceffd442fc0a8acbb2581a2815fbe01dfd979ac352fdfb4f82d77f72fca7214
|
7
|
+
data.tar.gz: 9198afa8a6e42e81495a488fc55646d297ffb082ec003c4faf8453b7364f6384d6b13a029e0ed8293114fd88ccceb32e7eb0b2f6b2b36af87d144aecf4ef21f2
|
data/lib/ggsm/flow/delete.rb
CHANGED
@@ -27,9 +27,15 @@ module GGSM
|
|
27
27
|
def delete_branch(all, branch, remote)
|
28
28
|
if all
|
29
29
|
system "git branch -D #{branch}"
|
30
|
-
system "git push origin -d #{branch}"
|
30
|
+
result = system "git push origin -d #{branch}"
|
31
|
+
unless result
|
32
|
+
system 'git fetch -p origin'
|
33
|
+
end
|
31
34
|
elsif remote
|
32
|
-
system "git push origin -d #{branch}"
|
35
|
+
result = system "git push origin -d #{branch}"
|
36
|
+
unless result
|
37
|
+
system 'git fetch -p origin'
|
38
|
+
end
|
33
39
|
else
|
34
40
|
system "git branch -D #{branch}"
|
35
41
|
end
|
data/lib/ggsm/flow/finish.rb
CHANGED
@@ -7,46 +7,12 @@ module GGSM
|
|
7
7
|
include Submodule
|
8
8
|
include Stash
|
9
9
|
|
10
|
-
def
|
10
|
+
def finish_flow(branch)
|
11
11
|
unless check_submodule
|
12
12
|
return
|
13
13
|
end
|
14
14
|
|
15
15
|
puts '==> 进入主工程:'.yellow
|
16
|
-
|
17
|
-
arry_conflict = []
|
18
|
-
|
19
|
-
need_stash = try_stash
|
20
|
-
result = system "git checkout -b #{branch} #{action}"
|
21
|
-
if need_stash
|
22
|
-
stash_pop(arry_conflict, '主工程')
|
23
|
-
end
|
24
|
-
|
25
|
-
unless result
|
26
|
-
return
|
27
|
-
end
|
28
|
-
|
29
|
-
`git submodule update --init --recursive`
|
30
|
-
|
31
|
-
subs = get_submodule
|
32
|
-
subs.each do |sub|
|
33
|
-
Dir.chdir sub
|
34
|
-
puts "==> 进入#{sub}:".yellow
|
35
|
-
need_stash = try_stash
|
36
|
-
system "git checkout -b #{branch}"
|
37
|
-
if need_stash
|
38
|
-
stash_pop(arry_conflict, sub)
|
39
|
-
end
|
40
|
-
Dir.chdir '..'
|
41
|
-
end
|
42
|
-
|
43
|
-
if arry_conflict.size > 0
|
44
|
-
tip = '==> 冲突待解决:'
|
45
|
-
arry_conflict.each do |sub|
|
46
|
-
tip = "#{tip} #{sub}"
|
47
|
-
end
|
48
|
-
puts tip.red
|
49
|
-
end
|
50
16
|
end
|
51
17
|
end
|
52
18
|
end
|
data/lib/ggsm/flow/foreach.rb
CHANGED
data/lib/ggsm/flow/switch.rb
CHANGED
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.0.
|
4
|
+
version: 1.0.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-06-
|
11
|
+
date: 2017-06-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|