ggsm 1.5.0 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a1815f21d14345d4fb9eaee303c6d9db195b5741
4
- data.tar.gz: 89df586f2ed17db5c1d1bb8e07cff935d8d321da
3
+ metadata.gz: 720e88a2a9390cc061414bf6acde20035124fa03
4
+ data.tar.gz: 8eacd0a554174bfbba66ea2affd3e9f3daa75372
5
5
  SHA512:
6
- metadata.gz: 59e2f95a29e0d224f9864d8284a4550db3195c1ca200c77c42d6cc273acddbfd631ab88e8f739b4d56c61af8343ab8018d911d8b00ec299a646a32d9ddea2f12
7
- data.tar.gz: 472f1d7bfbf0959cacf90b3e9559a56a0705b5e6f9cde4c0ebd9c0a8a540ee5b1dc2b39aaaffc4514c7b3a61c1ee5bac9590a75ebf72c994b4f362c8debab79f
6
+ metadata.gz: 576e5d9a73dd563d26c6c6c6ba4401b79fdd00fc1f8d6b8aa1cae4b2e3febe312d6a8c11857ed4122b212d0530f6b1fea5c33d4e3713e5bc787c02cf9579130d
7
+ data.tar.gz: ffc96b9267b7247ce786f5f066fc07d119a9c87513608c5284b10ed5a35766b8ad8a97154f00ab05c926a59bbdb26d2eb15f9dd57aacbf038f46a80a9f2bbaf0
@@ -9,13 +9,26 @@ module GGSM
9
9
  check_submodule
10
10
 
11
11
  foreach_module {
12
- system "git add .;git commit;git push origin #{get_current_branch}"
12
+ process_finish
13
13
  }
14
14
 
15
15
  puts '==> 进入主工程:'.yellow
16
- system "git add .;git commit;git push origin #{get_current_branch}"
16
+ process_finish
17
17
 
18
18
  puts 'Modules执行:git add & commit & push'.blue
19
19
  end
20
+
21
+ def process_finish
22
+ system 'git add .'
23
+
24
+ branch = get_current_branch
25
+ if branch.include?('rebas')
26
+ system 'git rebase --continue'
27
+ else
28
+ system 'git commit'
29
+ end
30
+
31
+ system "git push origin #{get_current_branch}"
32
+ end
20
33
  end
21
34
  end
@@ -1,3 +1,3 @@
1
1
  module GGSM
2
- VERSION = '1.5.0'
2
+ VERSION = '1.5.1'
3
3
  end
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.5.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - YoKey