ggsm 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ggsm-1.1.0.gem +0 -0
- data/lib/ggsm/flow/merge.rb +26 -0
- data/lib/ggsm/version.rb +1 -1
- metadata +3 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 090da4639738262f7af9b6571fa5aac20496b8a6
|
|
4
|
+
data.tar.gz: d963431ebb6f164d06aaa73e36bc41e2f2f87cc5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4b7d72258013aba6055e34490cf3554883bd5bf1a45c8fd47b53989bbb1c8f5d0845561e4e9c9ed0246c6c7dd1f220a08e7f2a48718cdfe8aec8f435812d63c5
|
|
7
|
+
data.tar.gz: 06593359899ee4a12f7fab23d930117b545c13c15f6ef31c7d361bfb02f2fcf863d3aa8d71d3ba948de5b1eb324d1a73eba427b63eb31fddac4dc277e6692983
|
data/ggsm-1.1.0.gem
ADDED
|
Binary file
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
require 'colorize'
|
|
2
|
+
require_relative '../util/submodule'
|
|
3
|
+
|
|
4
|
+
module GGSM
|
|
5
|
+
module Merge
|
|
6
|
+
include Submodule
|
|
7
|
+
|
|
8
|
+
def merge_flow(branch)
|
|
9
|
+
check_submodule
|
|
10
|
+
check_un_commit_code
|
|
11
|
+
|
|
12
|
+
subs = get_submodule
|
|
13
|
+
subs.each do |sub|
|
|
14
|
+
Dir.chdir sub
|
|
15
|
+
puts "==> 进入#{sub}：".yellow
|
|
16
|
+
system "git merge #{branch}"
|
|
17
|
+
Dir.chdir '..'
|
|
18
|
+
end
|
|
19
|
+
|
|
20
|
+
puts '==> 进入主工程：'.yellow
|
|
21
|
+
system "git merge #{branch}"
|
|
22
|
+
|
|
23
|
+
puts "Modules执行：git merge #{branch}".blue
|
|
24
|
+
end
|
|
25
|
+
end
|
|
26
|
+
end
|
data/lib/ggsm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ggsm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- YoKey
|
|
@@ -84,11 +84,13 @@ files:
|
|
|
84
84
|
- Rakefile
|
|
85
85
|
- bin/ggsm
|
|
86
86
|
- ggsm-1.0.0.gem
|
|
87
|
+
- ggsm-1.1.0.gem
|
|
87
88
|
- ggsm.gemspec
|
|
88
89
|
- lib/ggsm.rb
|
|
89
90
|
- lib/ggsm/flow/delete.rb
|
|
90
91
|
- lib/ggsm/flow/finish.rb
|
|
91
92
|
- lib/ggsm/flow/foreach.rb
|
|
93
|
+
- lib/ggsm/flow/merge.rb
|
|
92
94
|
- lib/ggsm/flow/start.rb
|
|
93
95
|
- lib/ggsm/flow/switch.rb
|
|
94
96
|
- lib/ggsm/flow/sync.rb
|