dngg 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a44d21d8641e361b5ffa3b19b5b4198ef7da899f21364f0042e33df241ddfe0
-  data.tar.gz: 6023c6a7996eea055fc8cd3cd90af3db0023b74d04d5b90dbd130f3593eec63e
+  metadata.gz: be0dd6c12a2cc8781b3c7828027f5b67bd83f78daf766f9f6a8d4ebf6bf54fc1
+  data.tar.gz: 31cbcf1c0f1d1f038fdefb657fe20ee90e6e8ca0530ee78c0124b056f9048dc5
 SHA512:
-  metadata.gz: b7603c1f0d4a837a8985ee257d2da193b28b7316c19a493d49f22c003e2f8aad4a2ee4a323eb969cb43996f4b52629ae10bdb507f1c76f5f34a33b03a6ce5dec
-  data.tar.gz: fe2b17bccd2ed52dd0cb45a42e6703dde4ed6186243ad88498483cc263228994e717adfde40bbb56d3c4d23d986461cdb90feb75554f6066395f4970f31223ca
+  metadata.gz: 3b1579fde8500f989b65ed7099a23219191ff47b3db321c084c341ed53be6e208e6091e2e5f09b50dbcf2cbab6136c5c55d86e17604a48d38b29153a83f3a90f
+  data.tar.gz: 83f6698ec58560949c3c628856f080cf007f7fc4b25b42ebb36bc957a8ac88cd1de7f1d5c5221b20aeec91059c26a85737808f1a73b40ec21a74e05909e08df3

data/Gemfile.lock

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

data/lib/dngg.rb

@@ -20,6 +20,10 @@ module DNGG
     include Finish
     include MR
     
+    def self.exit_on_failure?
+      true
+    end
+
     desc 'sync', '当前分支同步(拉取)远程代码'
     def sync
       sync_flow
@@ -30,8 +34,8 @@ module DNGG
       start_flow(branch, action)
     end
 
-    desc 'merge <branch> [-r|--rebase]', 'Merge,开发完成后执行; -r：主工程强制rebase'
-    option :rebase, :default => false, :type => :boolean, aliases: '-r'
+    desc 'merge <branch>', 'Merge,开发完成后执行'
+    # option :rebase, :default => false, :type => :boolean, aliases: '-r'
     def merge(branch)
       rebase = options[:rebase]
       merge_flow(branch, rebase)
@@ -73,5 +77,4 @@ module DNGG
       puts VERSION
     end
   end
-  # Cli.start(ARGV)
 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/merge.rb

@@ -29,13 +29,14 @@ module DNGG
         `git fetch | grep 'ignored'`
       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 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
+      process_merge(arry_conflict, '主工程', branch)
 
       if arry_conflict.size > 0
         tip = "==> #{arry_conflict.size}个模块冲突："

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/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

@@ -32,6 +32,10 @@ module DNGG
       result = []
       sub_status.each do |sub|
         match = pattern.match(sub.strip)
+        unless match
+          puts `pwd`,"====>>>子模块id #{sub}拉取异常！！！ 执行 git submodule 检查".red
+          next
+        end
         result.push(match[0])
       end
       result
@@ -83,11 +87,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 +148,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.4'
-end
+  VERSION = '0.0.8'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor