ggsm 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d8ec3398b296685a823e6a4a109630681b754b
-  data.tar.gz: cd58b2223ee96d9131f6ab7d286c477a6f14663e
+  metadata.gz: eff4d91dbecc7d102b873839c5a84f575e7406d5
+  data.tar.gz: bf4a0ae3ad526699a70f6f6bb1aee32dbda6dc10
 SHA512:
-  metadata.gz: 53a5a489d8673d8306fc0d5b7f82ed2103b51abc007ab9e42082441f3ea094fde321c0661911f007d6b9f17898706d6ff5e96a257fe7bf6e661a55d24fcc431a
-  data.tar.gz: f0dd23ca8408b5aa04e2d96428ea74b269711a13315b2136c85e5120ea9fad67e03bc3ce358e4d5ab596152039f3153afb0393c174d1d065c50c82895d227472
+  metadata.gz: a4187a7c6e88bbd134f08cf976c466490ce0bf39fafcad8fc18e863412f9761d3b441478f99fc6505132f2c8fcf88f51c25fd4701c189b29551aa209f6bc2830
+  data.tar.gz: 5540f513a9502b77ddfe91b349d42471153c57e128accd8bd4dbaed3621fa54c4d1a95f183871fa2dbb63b17a371292e4c2b640da70f4b62a37c0c6ad4408380

data/.gitignore

@@ -11,3 +11,4 @@
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/lib/ggsm/command/finish.rb

@@ -13,12 +13,12 @@ module GGSM
       }
 
       puts '==> 进入主工程：'.yellow
-      process_finish(force)
+      process_finish(force, get_main_project_msg)
 
       puts 'Modules执行：git add & commit & push'.blue
     end
 
-    def process_finish(force)
+    def process_finish(force, msg='')
       system 'git add .'
 
       branch = get_current_branch
@@ -29,7 +29,11 @@ module GGSM
         if stage == ''
           `git commit`
         else
-          result = system 'git commit'
+          if msg == ''
+            result = system 'git commit'
+          else
+            result = system "git commit -m \"#{msg}\""
+          end
           unless result
             exit 1
           end
@@ -38,5 +42,45 @@ module GGSM
 
       `git push -u origin #{get_current_branch} #{force ? '-f' : ''}`
     end
+
+    def get_main_project_msg()
+      system 'git add .'
+
+      pattern = /[A-Z]\s*(.*)/
+      result = `git status -s | grep -e '[A-Z].*'`.split(/\n/).delete_if do |r|
+        r == ''
+      end
+      modified = []
+      result.each do |r|
+        if match = r.match(pattern)
+          module_name = match[1].strip
+          if is_submodule(module_name)
+            modified.push(match[1].strip)
+          end
+        end
+      end
+
+      whole_files = `git status -s`.split(/\n/).delete_if do |w|
+        w == ''
+      end
+      return '' if whole_files.length != modified.length
+
+      outputs = ''
+      modified.each_with_index do |m, index|
+        msg = get_lastest_msg_of_module(m)
+        outputs += msg.insert(msg.index(':') + 1, "[#{get_module_name(m)}]")
+        if index != modified.length - 1
+          outputs += "\n"
+        end
+      end
+
+      puts outputs
+      outputs
+    end
+
+    def get_module_name(module_name)
+      module_name.split(/\//).last.downcase
+    end
+
   end
 end

data/lib/ggsm/mr/email.rb

@@ -6,7 +6,7 @@ module GGSM
     def send_email(user,title,msg)
       message = <<END_OF_MESSAGE
 From: GGSM Merge Request <18019913184@163.com>
-To: 王右右 <wangyouyou@souche.com>,王锡臣 <wangxichen@souche.com>,沈若川 <shenruochuan@souche.com>,洪晨 <hongchen@souche.com>,朱瑞雪 <zhuruixue@souche.com>,朱久言 <zhujiuyan@souche.com>
+To: 王右右 <wangyouyou@souche.com>,沈若川 <shenruochuan@souche.com>,刘林儒 <liulinru@souche.com>,朱久言 <zhujiuyan@souche.com>
 Subject: [#{user}] #{title}
 
 #{msg}
@@ -17,10 +17,8 @@ END_OF_MESSAGE
         smtp.send_message message,
                           '18019913184@163.com',
                           'wangyouyou@souche.com',
-                          'wangxichen@souche.com',
                           'shenruochuan@souche.com',
-                          'hongchen@souche.com',
-                          'zhuruixue@souche.com',
+                          'liulinru@souche.com',
                           'zhujiuyan@souche.com'
       end
     end

data/lib/ggsm/util/submodule.rb

@@ -129,6 +129,34 @@ module GGSM
       end
     end
 
+    def get_lastest_msg_of_module(module_name)
+      msg = ''
+      project_path = Dir.pwd
+      if is_submodule(module_name)
+        Dir.chdir module_name
+        msg = get_lastest_msg_not_merge
+        Dir.chdir project_path
+      end
+      msg
+    end
+
+    def is_submodule(module_name)
+      get_submodule.include?(module_name)
+    end
+
+    def get_lastest_msg_not_merge
+      depth = 1
+      while (msg = get_lastest_msg(depth)).start_with?('Merge branch') do
+        depth += 1
+      end
+      msg
+    end
+
+    def get_lastest_msg(depth) 
+      msg = `git log --format=%B -n #{depth}`.split(/\n\n/)
+      msg[depth - 1].strip
+    end
+
     def get_current_branch
       `git branch | grep "*"`.split('* ')[1].split("\n")[0]
     end
@@ -153,4 +181,4 @@ module GGSM
       `git rev-parse #{branch}`
     end
   end
-end
+end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.9.5'
+  VERSION = '1.9.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - YoKey
@@ -97,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - bin/ggsm
+- ggsm-1.9.4.gem
 - ggsm.gemspec
 - lib/ggsm.rb
 - lib/ggsm/command/delete.rb