dngg 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9d121406a49a1a7dae5b56c5e81530773d993123db786f3121fd6e2d852cef
-  data.tar.gz: 5243df3729a8099d5afce4fbfd4d89df0d54177df7bdefdf80c59652dcb8cdaf
+  metadata.gz: 2ecfeb442ed96915e6fdc9101590f01e2efe062593976b072cf298319781a9d7
+  data.tar.gz: 7a74ad2ec1d7ec59b18696ca68f8e01f3cf435e9fad1d38e8db0e18eac42a60e
 SHA512:
-  metadata.gz: 8fe67c78d44ee0e0606a7759a35802a7551bf943c6505a5b16dd6e9e4d2757c30e6fa8f4706e97bc8125844345054d2b1093cefdf8dd86c27151537d809f5f50
-  data.tar.gz: 42a2c2d243d42e84333d62658983d57c8226117ea410654e0e23b131a6b8f28b4e30ba1cd6d1a395009f52620d767fc302b3fd86389e72dc9f06afba72a1f8e6
+  metadata.gz: ae5244fd440c15209f5e0d40c8a77ad4c87a4e12aeae9cbcac792fa7f3846e6f2ec83589dbab9fbd6003eb1a4e3c08073b95d802c0193f3a9cc11245e65ee73b
+  data.tar.gz: 4d9bfb71b7254a58483437faf444b66efc39cc6ff3b66c14bf423a2615c3da27d697c5272cba80ac397b850d5d745afdda34a9dd3807773fb5dc7e9018e8ef64

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dngg (0.0.2)
+    dngg (0.0.6)
       colorize (= 0.8.1)
       oj (= 3.8.0)
       thor (= 1.0.0)

data/bin/dngg

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
-# require_relative "../lib/dngg.rb"
 
-set -euo pipefail
+# set -euo pipefail
+require_relative '../lib/dngg'
 
-IFS=$'\n\t'
-set -vx
+# IFS=$'\n\t'
+# set -vx
+DNGG::Cli.start(ARGV)
 
-bundle install
+# bundle install
 
 # Do any other automated setup that you need to do here

data/lib/dngg.rb

@@ -1,77 +1,80 @@
-require 'thor'
-require_relative 'dngg/version'
-require_relative 'dngg/command/start'
-require_relative 'dngg/command/sync'
-require_relative 'dngg/command/switch'
-require_relative 'dngg/command/delete'
-require_relative 'dngg/command/foreach'
-require_relative 'dngg/command/merge'
-require_relative 'dngg/command/finish'
-require_relative 'dngg/command/mr'
-
-module DNGG
-  class Cli < Thor
-    include Start
-    include Sync
-    include Switch
-    include Delete
-    include Foreach
-    include Merge
-    include Finish
-    include MR
-    
-    desc 'sync', '当前分支同步(拉取)远程代码'
-    def sync
-      sync_flow
-    end
-
-    desc 'start <branch> [<commit>] [<origin>]', '检出新分支，新功能、修bug务必使用该命令'
-    def start(branch, action='')
-      start_flow(branch, action)
-    end
-
-    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后并解决冲突后执行; -f：主工程强制推送'
-    option :force, :default => false, :type => :boolean, aliases: '-f'
-    def finish
-      force = options[:force]
-      finish_flow(force)
-    end
-
-    desc 'mr <branch> <title>', '创建MR'
-    def mr(branch, title)
-      mr_flow(branch, title)
-    end
-
-    desc 'switch <branch>', '切换分支'
-    def switch(branch)
-      switch_flow(branch)
-    end
-
-    desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
-    option :remote, :default => false, :type => :boolean, aliases: '-r'
-    option :all, :default => false, :type => :boolean, aliases: '-a'
-    def delete(branch)
-      remote = options[:remote]
-      all = options[:all]
-      delete_flow(branch, remote, all)
-    end
-
-    desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
-    def foreach(*commands)
-      foreach_flow(*commands)
-    end
-
-    desc 'v', '查看版本'
-    def version
-      puts VERSION
-    end
-  end
-  # Cli.start(ARGV)
-end
+require 'thor'
+require_relative 'dngg/version'
+require_relative 'dngg/command/start'
+require_relative 'dngg/command/sync'
+require_relative 'dngg/command/switch'
+require_relative 'dngg/command/delete'
+require_relative 'dngg/command/foreach'
+require_relative 'dngg/command/merge'
+require_relative 'dngg/command/finish'
+require_relative 'dngg/command/mr'
+
+module DNGG
+  class Cli < Thor
+    include Start
+    include Sync
+    include Switch
+    include Delete
+    include Foreach
+    include Merge
+    include Finish
+    include MR
+    
+    def self.exit_on_failure?
+      true
+    end
+
+    desc 'sync', '当前分支同步(拉取)远程代码'
+    def sync
+      sync_flow
+    end
+
+    desc 'start <branch> [<commit>] [<origin>]', '检出新分支，新功能、修bug务必使用该命令'
+    def start(branch, action='')
+      start_flow(branch, action)
+    end
+
+    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后并解决冲突后执行; -f：主工程强制推送'
+    option :force, :default => false, :type => :boolean, aliases: '-f'
+    def finish
+      force = options[:force]
+      finish_flow(force)
+    end
+
+    desc 'mr <branch> <title>', '创建MR'
+    def mr(branch, title)
+      mr_flow(branch, title)
+    end
+
+    desc 'switch <branch>', '切换分支'
+    def switch(branch)
+      switch_flow(branch)
+    end
+
+    desc 'delete <branch> [-r|--remote] [-a|--all]', '删除指定分支'
+    option :remote, :default => false, :type => :boolean, aliases: '-r'
+    option :all, :default => false, :type => :boolean, aliases: '-a'
+    def delete(branch)
+      remote = options[:remote]
+      all = options[:all]
+      delete_flow(branch, remote, all)
+    end
+
+    desc 'foreach [<commands>...]', '所有模块执行git命令(foreach后跟git命令)'
+    def foreach(*commands)
+      foreach_flow(*commands)
+    end
+
+    desc 'v', '查看版本'
+    def version
+      puts VERSION
+    end
+  end
+end

data/lib/dngg/command/finish.rb

@@ -59,16 +59,16 @@ module DNGG
           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 msg.index(':')
+          outputs += msg.insert(msg.index(':') + 1, "[#{get_module_name(m)}]")
+        end
         if index != modified.length - 1
           outputs += "\n"
         end
@@ -79,7 +79,7 @@ module DNGG
     end
 
     def get_module_name(module_name)
-      module_name.split(/\//).last.downcase
+      module_name.split(/\//).last
     end
 
   end

data/lib/dngg/command/mr.rb

@@ -80,8 +80,8 @@ module DNGG
 
       if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
           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)
+        # origin	git@gitlab.qima-inc.com:guang-mobile-shop/AiGuangMaxApp.git (push)
+        # origin	https://gitlab.qima-inc.com/guang-mobile-shop/AiGuangMaxApp.git (push)
         result = `git remote -v | grep push`
         project_name = result.split('.com/')[1]
         if project_name == nil || project_name.strip == ''
@@ -90,14 +90,13 @@ module DNGG
 
         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
             # params['remove_source_branch'] = true
-            uri = URI.parse("https://git.souche-inc.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
+            uri = URI.parse("https://gitlab.qima-inc.com/api/v4/projects/#{project_name}/merge_requests?private_token=#{@@token}")
             response = Net::HTTP.post_form(uri, params)
             result = Oj.load(response.body)
 
@@ -121,6 +120,8 @@ module DNGG
                 @@token = init_check_token
                 create_mr(sub)
                 return
+              when Net::HTTPForbidden then
+                puts response.body.red
             end
           rescue => e
             puts "error: #{e}".red

data/lib/dngg/hook/commit-msg

@@ -8,7 +8,7 @@ def commit_check
   standards.each do |standard|
     check(standard)
   end
-  puts '====> commit message不符合规范，请查看规范'.red
+  puts '====> commit message不符合规范，请查看规范 https://naxg5qz90v.feishu.cn/wiki/wikcnGAC0ayqRw5SSyj6QFQESKb'.red
   exit 1
 end
 

data/lib/dngg/hook/hooks.rb

@@ -2,7 +2,6 @@ module DNGG
   module Hooks
     def check_hooks
       if update_hooks
-        install_billow
         subs = get_submodule
         subs.each do |sub|
           cp_hooks(sub)
@@ -10,11 +9,6 @@ module DNGG
       end
     end
 
-    def install_billow
-      path = `gem which dngg`.split('/dngg.rb')[0]
-      `sudo sh #{path}/res/install_billow.sh`
-    end
-
     def update_hooks
       version = `dngg v`
       ggsm_path = '.git/dngg'

data/lib/dngg/mr/email.rb

@@ -4,18 +4,21 @@ require 'net/smtp'
 module DNGG
   module Email
     def send_email(user,title,msg)
+      user_mail = `git config user.email`
       message = <<END_OF_MESSAGE
-DNGG Merge Request <android.dev@guang.com>
+DNGG Merge Request <team_android@aiguang.com>
+From: #{user}
 To: Guang Android Team
 Subject: [#{user}] #{title}
 
 #{msg}
+
 END_OF_MESSAGE
 
-      Net::SMTP.start('smtp.exmail.qq.com', 25, 'iSnow',
-                      'zhuruixue@aiguang.com', 'wwL9RS9cLeBxv7co') do |smtp|
-        smtp.send_message message,
-                          'android.dev@guang.com'
+      Net::SMTP.start('smtp.exmail.qq.com',25,'zhuruixue',
+        'zhuruixue@aiguang.com','wwL9RS9cLeBxv7co', :plain) do |smtp|
+        smtp.send_message message, 'zhuruixue@aiguang.com',
+                                  'team_android@aiguang.com'
       end
     end
   end

data/lib/dngg/util/submodule.rb

@@ -83,11 +83,11 @@ module DNGG
     def get_submodule_commit
       sub_tree = 'git ls-tree HEAD | grep "160000"'
       sub_commits = `#{sub_tree}`
-      if sub_commits.strip == '' && (File.directory? 'submodules')
-        Dir.chdir 'submodules'
-        sub_commits = `#{sub_tree}`
-        Dir.chdir '..'
-      end
+      # if sub_commits.strip == '' && (File.directory? 'submodules')
+      #   Dir.chdir 'submodules'
+      #   sub_commits = `#{sub_tree}`
+      #   Dir.chdir '..'
+      # end
       pattern = /(?<=\s)[0-9a-zA-Z]{40}(?=\s)/
       sub_commits = sub_commits.split(/\n/)
       result = []
@@ -144,16 +144,17 @@ module DNGG
       get_submodule.include?(module_name)
     end
 
+    # 寻找上次merge之后的commit消息
     def get_lastest_msg_not_merge
       depth = 1
-      while (msg = get_lastest_msg(depth)).start_with?('Merge branch') do
+      while (msg = get_lastest_msg(depth)).start_with?('Merge ') do
         depth += 1
       end
       msg
     end
 
     def get_lastest_msg(depth) 
-      msg = `git log --format=%B -n #{depth}`.split(/\n\n/)
+      msg = `git log --oneline --format=%B -n #{depth}`.split(/\n\n/)
       msg[depth - 1].strip
     end
 

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.2'
-end
+  VERSION = '0.0.6'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -55,7 +55,6 @@ dependencies:
 description: A submodule tools for Guang-Teams
 email: schnee1109@163.com
 executables:
-- console
 - dngg
 extensions: []
 extra_rdoc_files: []
@@ -65,7 +64,6 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- bin/console
 - bin/dngg
 - dngg.gemspec
 - lib/dngg.rb
@@ -85,7 +83,6 @@ files:
 - lib/dngg/util/stash.rb
 - lib/dngg/util/submodule.rb
 - lib/dngg/version.rb
-- lib/res/install_billow.sh
 homepage: http://rubygems.org/gems/dngg
 licenses:
 - MIT

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "dngg"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/lib/res/install_billow.sh

@@ -1,33 +0,0 @@
-# # 下载
-# curl -o ~/billow.zip http://7xq884.com1.z0.glb.clouddn.com/Billow.zip
-
-# pushd ~/Library/Application\ Support
-
-# # 解压到Application Support/AS
-# for file in ./AndroidStudio*
-# do
-#     if test -d $file
-#     then
-#          pushd ~/Library/Application\ Support/$file
-# 		 unzip -o ~/billow.zip
-# 		 popd
-#     fi
-# done
-
-# popd
-
-# # 修改Preferences，开启插件
-# for file in ~/Library/Preferences/AndroidStudio*
-# do
-#     if test -d $file
-#     then
-# 		 sed '/^com.souche.plugin.billow/'d $file/disabled_plugins.txt > disabled_plugins_billow.txt
-#  		 cp disabled_plugins_billow.txt $file/disabled_plugins.txt
-#  		 rm -rf disabled_plugins_billow.txt
-#     fi
-# done
-
-# rm -rf ~/billow.zip
-
-# echo Billow安装成功，请重新启动AndroidStudio
-