ggsm 1.7.6 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 795b8de152b638ebab0a9f7a3cb80b7851c9cb0d
-  data.tar.gz: 12ab6c4efa2777a56008267fd99a03184762185b
+  metadata.gz: 0be12725fee53fd80de5c2de0dbd250ab7b8ae4b
+  data.tar.gz: b4d61c3e51b60de4308f79110a4c859b2b1b8a04
 SHA512:
-  metadata.gz: e152ece1e540a7950e72a06678702854a198bae0b598b799827fa70c64fe93287f2c3728015284b52b45e4aa92285c8d4f427579e65f0937c581df30106feeda
-  data.tar.gz: e587ffc8315150c605d8e0303676edd470fd7f62167d77f5c30f7a98d3ae40162083f930231e80a184eb5b98a62b1ee951759e6a3e0e8950e01ad0ed6a57a9e4
+  metadata.gz: 3a871787a322c2f49466f49c43dfcde9f3b2142de9d48fb3810eb930517c1a4b1e0919cf9760f66df901d010e9bd4b643d33e6e1443347b5e38b88c9ccc7d1f2
+  data.tar.gz: 18eb4148f3052ae07b11631d65e5eecfc97a991a13f0fd2d3fb2191199f1f732d3f9cbe3e3e18d7fe99334652b6c56f4b010339a05e13bc61a03baa3067f3b1d

data/lib/ggsm/command/mr.rb

@@ -0,0 +1,122 @@
+require 'colorize'
+require 'oj'
+require 'net/http'
+require_relative '../util/submodule'
+require_relative '../mr/token'
+require_relative '../mr/email'
+
+module GGSM
+  module MR
+    include Submodule
+    include Token
+    include Email
+
+    @@current_branch = ''
+    @@target_branch = ''
+    @@pwd = ''
+    @@token = ''
+    @@msg = ''
+    @@urls = {}
+
+    def mr_flow(target_branch, msg)
+      check_submodule
+
+      @@current_branch = get_current_branch
+      @@target_branch = target_branch
+
+      if target_branch.start_with?('origin/')
+        @@target_branch = target_branch.split('origin/')[1]
+      end
+
+      @@pwd = Dir.pwd
+      @@token = init_check_token
+      @@msg = msg
+
+      foreach_module {|sub|
+        create_mr(sub)
+      }
+
+      puts '==> 进入主工程：'.yellow
+      create_mr('主工程')
+
+      content = ''
+      @@urls.each do |sub, url|
+        content = " #{content}\n #{sub}: #{url}"
+      end
+
+      if content != ''
+        send_email(@@msg, content)
+      end
+    end
+
+    def init_check_token
+      token = ''
+      path = '.git/ggsm/TOKEN'
+      unless check_token
+        system "vim #{path}"
+
+        result = IO.read(path).split('# 请输入GitLab private-token')
+
+        if result.length > 1
+          token = result[0]
+        end
+      end
+
+      if token == ''
+        token = IO.read(path).split('# 请输入GitLab private-token')[0]
+      end
+
+      if token == ''
+        puts '请输入GitLab private-token'.red
+        exit 1
+      end
+
+      return token
+    end
+
+    def create_mr(sub)
+      if get_head_commit("origin/#{@@current_branch}") != get_head_commit("origin/#{@@target_branch}")
+        # origin	git@git.souche.com:Destiny_Android/Destiny_Android.git (push)
+        # origin	http://git.souche.com/Destiny_Android/Mine.git (push)
+        result = `git remote -v | grep push`
+        project_name = result.split('.com/')[1]
+        if project_name == nil || project_name.strip == ''
+          project_name = result.split('.com:')[1]
+        end
+
+        if project_name != nil
+          project_name = project_name.split('.git')[0].gsub('/', '%2F')
+
+          begin
+            params = {}
+            params['source_branch'] = @@current_branch
+            params['target_branch'] = @@target_branch
+            params['title'] = @@msg
+            uri = URI.parse("http://git.souche.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
+            response = Net::HTTP.post_form(uri, params)
+            result = Oj.load(response.body)
+
+            if result['message'] == '404 Project Not Found'
+              Dir.chdir @@pwd
+              `rm -rf .git/ggsm/TOKEN`
+              @@token = init_check_token
+              create_mr(sub)
+              return
+            end
+
+            if Net::HTTPSuccess
+              mr_url = result['web_url']
+              if mr_url != nil
+                @@urls[sub] = mr_url
+                puts mr_url.blue
+              end
+            end
+          rescue => e
+            puts "error: #{e}".red
+            exit 1
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ggsm/mr/email.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+require 'net/smtp'
+
+module GGSM
+  module Email
+    def send_email(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}
+
+#{msg}
+END_OF_MESSAGE
+
+      Net::SMTP.start('smtp.163.com', 25, 'YoKey',
+                      '18019913184@163.com', 'able180896919') do |smtp|
+        smtp.send_message message,
+                          '18019913184@163.com',
+                          'wangyouyou@souche.com',
+                          'wangxichen@souche.com',
+                          'shenruochuan@souche.com',
+                          'zhujiuyan@souche.com'
+      end
+    end
+  end
+end

data/lib/ggsm/mr/token.rb

@@ -0,0 +1,21 @@
+module GGSM
+  module Token
+    def check_token
+      ggsm_path = '.git/ggsm'
+      unless File.exist?(ggsm_path)
+        Dir.mkdir(ggsm_path)
+      end
+
+      config_path = "#{ggsm_path}/TOKEN"
+
+      if !File.exist?(config_path) || '' == IO.read(config_path).strip || IO.readlines(config_path)[0].strip == ''
+        file = File.new(config_path, 'w')
+        file << "\n# 请输入GitLab private-token"
+        file.close
+        return false
+      end
+
+      return true
+    end
+  end
+end

data/lib/ggsm/util/submodule.rb

@@ -1,4 +1,4 @@
-require_relative 'hooks'
+require_relative '../hook/hooks'
 
 module GGSM
   module Submodule
@@ -147,5 +147,10 @@ module GGSM
       Dir.chdir '..'
       correct_dir
     end
+
+    # 获取#{branch}上HEAD的commit id
+    def get_head_commit(branch)
+      `git rev-parse #{branch}`
+    end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.7.6'
+  VERSION = '1.8.0'
 end

data/lib/ggsm.rb

@@ -7,6 +7,7 @@ require_relative 'ggsm/command/delete'
 require_relative 'ggsm/command/foreach'
 require_relative 'ggsm/command/merge'
 require_relative 'ggsm/command/finish'
+require_relative 'ggsm/command/mr'
 
 module GGSM
   class Cli < Thor
@@ -17,6 +18,7 @@ module GGSM
     include Foreach
     include Merge
     include Finish
+    include MR
 
     desc 'sync', '当前分支同步(拉取)远程代码'
     def sync
@@ -42,6 +44,11 @@ module GGSM
       finish_flow(force)
     end
 
+    desc 'mr <branch> <MR Title>', '创建MR'
+    def mr(branch, title)
+      mr_flow(branch, title)
+    end
+
     desc 'switch <branch>', '切换分支'
     def switch(branch)
       switch_flow(branch)
@@ -56,11 +63,6 @@ module GGSM
       delete_flow(branch, remote, all)
     end
 
-    desc 'status', '显示所有模块的状态'
-    def status
-      foreach('status')
-    end
-
     desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
     def foreach(*commands)
       foreach_flow(*commands)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.8.0
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,12 +89,15 @@ files:
 - lib/ggsm/command/finish.rb
 - lib/ggsm/command/foreach.rb
 - lib/ggsm/command/merge.rb
+- lib/ggsm/command/mr.rb
 - lib/ggsm/command/start.rb
 - lib/ggsm/command/switch.rb
 - lib/ggsm/command/sync.rb
 - lib/ggsm/hook/commit-msg
+- lib/ggsm/hook/hooks.rb
 - lib/ggsm/hook/pre-commit
-- lib/ggsm/util/hooks.rb
+- lib/ggsm/mr/email.rb
+- lib/ggsm/mr/token.rb
 - lib/ggsm/util/stash.rb
 - lib/ggsm/util/submodule.rb
 - lib/ggsm/version.rb