ggsm 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b4173c21c484fb8244e9c5bdcc967234257041
-  data.tar.gz: 6833e332f0d83e5c6d2b8be3eaa6ae64cb864aa5
+  metadata.gz: 05c8795b96d0aa91153b1ba4e4d78aa378f49261
+  data.tar.gz: e00c2d488a3cb08f3936e3bf063ce7573b8393e9
 SHA512:
-  metadata.gz: 5a65c1adcde424213eeb986538bfc45643adeb793ad706a5901ed4b930980a3b23651d01b0a6e90aa79c55637c5f718dc402b40428c9c92fb7bbc1c4a2cc097e
-  data.tar.gz: cc7482734962413291e0bacfb30ed62645bf7684adf9b701eb534e6431f821f77a1b65af10a842dd7b9b35a8fc81a1156dd78c86cfd996a7d8b19e31d45ae7c0
+  metadata.gz: cf1bfd574589d40f400b6f87765d8192505dfa0551542d0cfd1e4ce14a4115d27129ca0f8c61ddec4c9ae2cd28e7bc8e357a8eca3c0039ef40581edf48fb93f5
+  data.tar.gz: f1593b8be071bf1b649519b1439bc173fb8d3e7daf8bf8b920aa0e2e7d9ca3fade2473e1fc1131f4010eb439482ea27b77006b2c3dca99b5eff11e53e7877f54

data/lib/ggsm.rb

@@ -28,14 +28,18 @@ module GGSM
       start_flow(branch, action)
     end
 
-    desc 'merge <branch>', 'Merge，开发完成后执行'
+    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; --rebase：主工程强制rebase'
+    option :rebase, :default => false, :type => :boolean, aliases: '-r'
     def merge(branch)
-      merge_flow(branch)
+      rebase = options[:rebase]
+      merge_flow(branch, rebase)
     end
 
-    desc 'finish', 'Merge后并解决冲突后执行'
+    desc 'finish [-f|--force]', 'Merge后并解决冲突后执行; --force：主工程强制推送'
+    option :force, :default => false, :type => :boolean, aliases: '-f'
     def finish
-      finish_flow
+      force = options[:force]
+      finish_flow(force)
     end
 
     desc 'switch <branch>', '切换分支'

data/lib/ggsm/command/finish.rb

@@ -5,20 +5,20 @@ module GGSM
   module Finish
     include Submodule
 
-    def finish_flow
+    def finish_flow(force)
       check_submodule
 
       foreach_module {
-        process_finish
+        process_finish(false)
       }
 
       puts '==> 进入主工程：'.yellow
-      process_finish
+      process_finish(force)
 
       puts 'Modules执行：git add & commit & push'.blue
     end
 
-    def process_finish
+    def process_finish(force)
       system 'git add .'
 
       branch = get_current_branch
@@ -28,7 +28,11 @@ module GGSM
         system 'git commit'
       end
 
-      system "git push origin #{get_current_branch}"
+      if force
+        system "git push origin #{get_current_branch} -f"
+      else
+        system "git push origin #{get_current_branch}"
+      end
     end
   end
 end

data/lib/ggsm/command/merge.rb

@@ -5,7 +5,7 @@ module GGSM
   module Merge
     include Submodule
 
-    def merge_flow(branch)
+    def merge_flow(branch, force_rebase)
       check_submodule
       check_un_commit_code
 
@@ -16,8 +16,19 @@ module GGSM
       }
 
       puts '==> 进入主工程：'.yellow
-      process_rebase(arry_conflict, branch)
-      puts "Modules执行：git merge #{branch}".blue
+
+      main_rebase = false
+      if force_rebase
+        main_rebase = true
+      end
+
+      if need_rebase(branch) || force_rebase
+        process_rebase(arry_conflict, branch)
+        puts 'Tip: 主工程rebase模式'.blue
+      else
+        process_merge(arry_conflict, '主工程', branch)
+        puts 'Tip: 主工程merge模式'.blue
+      end
 
       if arry_conflict.size > 0
         tip = "==> #{arry_conflict.size}个模块冲突："
@@ -25,6 +36,14 @@ module GGSM
           tip = "#{tip}  #{sub}"
         end
         puts tip.red
+        puts "Tip: 当你解决冲突后，执行\"git add .\"，如需推送远程，在主工程执行\"ggsm finish\"".blue
+      else
+
+        if main_rebase
+          puts "Tip: 如需推送远程，执行\"ggsm finish -f|--force\"".blue
+        else
+          puts "Tip: 如需推送远程，执行\"ggsm finish\"".blue
+        end
       end
     end
 
@@ -45,5 +64,27 @@ module GGSM
         arry_conflict.push('主工程')
       end
     end
+
+    def need_rebase(branch)
+      pattern = /[0-9a-z]{7}(?=\s)/
+      current_branch = get_current_branch
+
+      remote = `git config --get branch.#{current_branch}.remote`
+      if remote == ''
+        return true
+      end
+
+      diff_logs = `git log --oneline #{branch}..#{current_branch}`.split("\n").reverse
+
+      diff_logs.each do |log|
+        commit = pattern.match(log.strip)[0]
+        result = `git log #{remote}/#{current_branch} |grep #{commit}`
+
+        if result.strip != ''
+          return false
+        end
+      end
+      true
+    end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.6.2'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler