ggsm 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8443e6515f5083d6b1fac949d561eab55f81c8
-  data.tar.gz: '03857679e235bd84e55f5e9dd7c839460371e1c7'
+  metadata.gz: 1f4858389fb5c20a3b246395fe6e5c18246cc46a
+  data.tar.gz: 2b203824bf4e802240216383f27da655ce3ee4f0
 SHA512:
-  metadata.gz: 4ec65becd0d79eb1da38e540d22dd7d20e477d8db69199b65a959c77cab6d2518501b60c5a7089fae98ec418b7d527c16e62d17af901f9429e4ed4ad573f9cfa
-  data.tar.gz: 19decfbfe42f871d3533c5ab87888b62415685428b0196ef77a42535d8687f449d2aa56fc16e843fc8879c1068e30372572dbae54005f43331f8cba26caa0152
+  metadata.gz: 744718845e73d92210fe384d7e62849c575fd3f408c3a659e983e054b7e587588f852ebf51b69dbd6c59d219c9e0781c818ac92d55434e3026eb7baa23376611
+  data.tar.gz: 1da3aec6b3dd0ff132746d7a06083a023f2aec752df821d7365710c7793e4051b70e629206d812448a5fc2775967ac0f00c9555c9e74dd43d5ddaf88c8b24449

data/lib/ggsm.rb

@@ -30,21 +30,21 @@ module GGSM
       start_flow(branch, action)
     end
 
-    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; --rebase：主工程强制rebase'
+    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; -r：主工程强制rebase'
     option :rebase, :default => false, :type => :boolean, aliases: '-r'
     def merge(branch)
       rebase = options[:rebase]
       merge_flow(branch, rebase)
     end
 
-    desc 'finish [-f|--force]', 'Merge后并解决冲突后执行; --force：主工程强制推送'
+    desc 'finish [-f|--force]', 'Merge后并解决冲突后执行; -f：主工程强制推送'
     option :force, :default => false, :type => :boolean, aliases: '-f'
     def finish
       force = options[:force]
       finish_flow(force)
     end
 
-    desc 'mr <branch> <MR Title>', '创建MR'
+    desc 'mr <branch> <title>', '创建MR'
     def mr(branch, title)
       mr_flow(branch, title)
     end

data/lib/ggsm/command/mr.rb

@@ -17,6 +17,7 @@ module GGSM
     @@token = ''
     @@msg = ''
     @@urls = {}
+    @@user = ''
 
     def mr_flow(target_branch, msg)
       check_submodule
@@ -45,7 +46,7 @@ module GGSM
       end
 
       if content != ''
-        send_email(@@msg, content)
+        send_email(@@user, @@msg, content)
       end
     end
 
@@ -106,6 +107,11 @@ module GGSM
 
             if Net::HTTPSuccess
               mr_url = result['web_url']
+
+              if @@user == ''
+                @@user = result['author']['username']
+              end
+
               if mr_url != nil
                 @@urls[sub] = mr_url
                 puts mr_url.blue

data/lib/ggsm/mr/email.rb

@@ -3,11 +3,11 @@ require 'net/smtp'
 
 module GGSM
   module Email
-    def send_email(title,msg)
+    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>,朱久言 <zhujiuyan@souche.com>
-Subject: #{title}
+Subject: [#{user}] #{title}
 
 #{msg}
 END_OF_MESSAGE

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler