ggsm 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1815f21d14345d4fb9eaee303c6d9db195b5741
-  data.tar.gz: 89df586f2ed17db5c1d1bb8e07cff935d8d321da
+  metadata.gz: 720e88a2a9390cc061414bf6acde20035124fa03
+  data.tar.gz: 8eacd0a554174bfbba66ea2affd3e9f3daa75372
 SHA512:
-  metadata.gz: 59e2f95a29e0d224f9864d8284a4550db3195c1ca200c77c42d6cc273acddbfd631ab88e8f739b4d56c61af8343ab8018d911d8b00ec299a646a32d9ddea2f12
-  data.tar.gz: 472f1d7bfbf0959cacf90b3e9559a56a0705b5e6f9cde4c0ebd9c0a8a540ee5b1dc2b39aaaffc4514c7b3a61c1ee5bac9590a75ebf72c994b4f362c8debab79f
+  metadata.gz: 576e5d9a73dd563d26c6c6c6ba4401b79fdd00fc1f8d6b8aa1cae4b2e3febe312d6a8c11857ed4122b212d0530f6b1fea5c33d4e3713e5bc787c02cf9579130d
+  data.tar.gz: ffc96b9267b7247ce786f5f066fc07d119a9c87513608c5284b10ed5a35766b8ad8a97154f00ab05c926a59bbdb26d2eb15f9dd57aacbf038f46a80a9f2bbaf0

data/lib/ggsm/flow/finish.rb

@@ -9,13 +9,26 @@ module GGSM
       check_submodule
 
       foreach_module {
-        system "git add .;git commit;git push origin #{get_current_branch}"
+        process_finish
       }
 
       puts '==> 进入主工程：'.yellow
-      system "git add .;git commit;git push origin #{get_current_branch}"
+      process_finish
 
       puts 'Modules执行：git add & commit & push'.blue
     end
+
+    def process_finish
+      system 'git add .'
+
+      branch = get_current_branch
+      if branch.include?('rebas')
+        system 'git rebase --continue'
+      else
+        system 'git commit'
+      end
+
+      system "git push origin #{get_current_branch}"
+    end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - YoKey