ggsm 1.1.2 → 1.2.0
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/finish.rb +2 -6
- data/lib/ggsm/version.rb +1 -1
- data/lib/ggsm.rb +8 -8
- metadata +2 -3
- data/ggsm-1.1.0.gem +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d194bcbcc90cdf2025160a000a16360e3de891a7
|
4
|
+
data.tar.gz: e84546de9fcaacbf29e0c95ee69591e3d2cd98f8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 15111fb0282681c54cc30635b6b323c15e729349774c49550d1a1791988c3da63a1c77496f45ecd2b40bfa7bf1126d4c4af3a070be3483ba32d0c8ec50ce9eaf
|
7
|
+
data.tar.gz: 2a263cbb1f36d1bd8e748b35a44bd8afa5e361e680ab3d2aa7a7298350c148c676b7892c6a2c785fb5d2e2a66eade4583724df43e63f1dfe42729949612f7df5
|
data/lib/ggsm/flow/finish.rb
CHANGED
@@ -12,16 +12,12 @@ module GGSM
|
|
12
12
|
subs.each do |sub|
|
13
13
|
Dir.chdir sub
|
14
14
|
puts "==> 进入#{sub}:".yellow
|
15
|
-
system
|
16
|
-
system 'git commit'
|
17
|
-
system "git push origin #{get_current_branch}"
|
15
|
+
system "git add .;git commit;git push origin #{get_current_branch}"
|
18
16
|
Dir.chdir '..'
|
19
17
|
end
|
20
18
|
|
21
19
|
puts '==> 进入主工程:'.yellow
|
22
|
-
system
|
23
|
-
system 'git commit'
|
24
|
-
system "git push origin #{get_current_branch}"
|
20
|
+
system "git add .;git commit;git push origin #{get_current_branch}"
|
25
21
|
|
26
22
|
puts 'Modules执行:git add & commit & push'.blue
|
27
23
|
end
|
data/lib/ggsm/version.rb
CHANGED
data/lib/ggsm.rb
CHANGED
@@ -20,27 +20,27 @@ module GGSM
|
|
20
20
|
include Merge
|
21
21
|
include Finish
|
22
22
|
|
23
|
-
desc 'start <branch> [<commit>] [<origin>]', '
|
23
|
+
desc 'start <branch> [<commit>] [<origin>]', '检出新分支,新功能、修bug务必使用该命令'
|
24
24
|
def start(branch, action='')
|
25
25
|
start_flow(branch, action)
|
26
26
|
end
|
27
27
|
|
28
|
-
desc 'switch <branch>', '
|
28
|
+
desc 'switch <branch>', '切换分支'
|
29
29
|
def switch(branch)
|
30
30
|
switch_flow(branch)
|
31
31
|
end
|
32
32
|
|
33
|
-
desc 'update', '
|
33
|
+
desc 'update', '更新当前commit对应的子模块commit'
|
34
34
|
def update
|
35
35
|
update_flow
|
36
36
|
end
|
37
37
|
|
38
|
-
desc 'sync', '
|
38
|
+
desc 'sync', '当前分支同步(拉取)远程代码'
|
39
39
|
def sync
|
40
40
|
sync_flow
|
41
41
|
end
|
42
42
|
|
43
|
-
desc 'delete <branch> [-r|--remote] [-a|--all]', '
|
43
|
+
desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
|
44
44
|
option :remote, :default => false, :type => :boolean, aliases: '-r'
|
45
45
|
option :all, :default => false, :type => :boolean, aliases: '-a'
|
46
46
|
def delete(branch)
|
@@ -49,17 +49,17 @@ module GGSM
|
|
49
49
|
delete_flow(branch, remote, all)
|
50
50
|
end
|
51
51
|
|
52
|
-
desc 'foreach [<commands>...]', '
|
52
|
+
desc 'foreach [<commands>...]', '全模块执行git命令(foreach后跟git命令)'
|
53
53
|
def foreach(*commands)
|
54
54
|
foreach_flow(*commands)
|
55
55
|
end
|
56
56
|
|
57
|
-
desc 'merge [<branch>]', 'Merge
|
57
|
+
desc 'merge [<branch>]', 'Merge,开发完成后执行'
|
58
58
|
def merge(branch='origin/dev')
|
59
59
|
merge_flow(branch)
|
60
60
|
end
|
61
61
|
|
62
|
-
desc 'finish', '
|
62
|
+
desc 'finish', '完成开发,ggsm merge并解决冲突后执行'
|
63
63
|
def finish
|
64
64
|
finish_flow
|
65
65
|
end
|
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.
|
4
|
+
version: 1.2.0
|
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-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -84,7 +84,6 @@ files:
|
|
84
84
|
- Rakefile
|
85
85
|
- bin/ggsm
|
86
86
|
- ggsm-1.0.0.gem
|
87
|
-
- ggsm-1.1.0.gem
|
88
87
|
- ggsm.gemspec
|
89
88
|
- lib/ggsm.rb
|
90
89
|
- lib/ggsm/flow/delete.rb
|
data/ggsm-1.1.0.gem
DELETED
Binary file
|