dngg 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df153f7aa9a80914809d7f3915339d1a77579cb7acb572ffa5587258b6ca4d5
-  data.tar.gz: 6cef40653c132cf070b9b68a497992249d91dcaf3798934cc936f361562c6a9d
+  metadata.gz: 536740e8f6ec1c466c0e89e86f6ae018838567078e83a694649895a4146e8e14
+  data.tar.gz: a9024ad1877be60d8ce1c193bd6d75dcdc76ce31ccaaa95a21dbc8f4a86b20c5
 SHA512:
-  metadata.gz: 8def88976670a26691caf0bce996473421ee685cb8e380a04357f832f04485133178b9305d6be6feb0b66bcd97e5a62ab85421597a49c5b696ef9b3627705722
-  data.tar.gz: cc732898c05e77720cb1c8353ddadb221fdbc3a4e9f893d3702f7ba2cdf63cc68947be41519bbb37345cc8003147b4743b7b55aa7d00bf11b8ee92c8fe569b9d
+  metadata.gz: 55e30407957768302ab371429d73d8084bba07677425259ccfddcaefcb074094a95bd9e67b7ddb9c72ba51a1ebf94579f04d35cf8e821139a56ba3731f4e168c
+  data.tar.gz: f7e1ca15f3421095b6cfc0f3cc5cf682e65e851d5988ee8d9a55e7862550e97ebe7bf85ebffe0acda1375f4175f3487a301abdeeb7ba13806e0a42f8316f8f37

data/Gemfile.lock

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

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

@@ -18,8 +18,9 @@ module DNGG
     @@msg = ''
     @@urls = {}
     @@user = ''
+    @@assign = ''
 
-    def mr_flow(target_branch, msg)
+    def mr_flow(target_branch, name, msg)
       check_submodule(false)
 
       @@current_branch = get_current_branch
@@ -33,6 +34,12 @@ module DNGG
       @@token = init_check_token
       @@msg = msg
 
+      git_id = Hash["luwenjun" => 1526, "zhuruixue" => 1859,"hehongqing"=> 1949, "machenfei"=> 2199,"tanhua"=> 2031,"wulei"=> 2014, "yangyanpeng"=> 1865,"yangfan"=> 1928,"yuezhiyu"=> 2569]
+  
+      @@assign = git_id[name]
+      if @@assign.nil?
+        @@assign = git_id['luwenjun']
+      end
       foreach_module {|sub|
         create_mr(sub)
       }
@@ -95,7 +102,8 @@ module DNGG
             params['source_branch'] = @@current_branch
             params['target_branch'] = @@target_branch
             params['title'] = @@msg
-            # params['remove_source_branch'] = true
+            params['assignee_id'] = @@assign
+
             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)

data/lib/dngg/hook/commit-msg

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

data/lib/dngg/util/submodule.rb

@@ -16,12 +16,11 @@ module DNGG
     end
 
     def get_submodule
-      pattern = /(?<=\s)[\/0-9a-zA-Z]*(?=\s)/
+      pattern = /(?<=\s)[\/0-9a-zA-Z\-]*(?=\s)/
 
       sub_status = `git submodule`
       sub_status = sub_status.split(/\n/)
       match = pattern.match(sub_status[0])
-
       if match==nil
         puts '==> 初始化子模块'.yellow
         `git submodule update --init --recursive`

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.7'
+  VERSION = '1.0.0'
 end

data/lib/dngg.rb

@@ -34,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)
@@ -48,9 +48,9 @@ module DNGG
       finish_flow(force)
     end
 
-    desc 'mr <branch> <title>', '创建MR'
-    def mr(branch, title)
-      mr_flow(branch, title)
+    desc 'mr <branch> <name> <title>', '创建MR'
+    def mr(branch, name, title)
+      mr_flow(branch, name, title)
     end
 
     desc 'switch <branch>', '切换分支'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dngg
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor