dngg 0.0.8 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0dd6c12a2cc8781b3c7828027f5b67bd83f78daf766f9f6a8d4ebf6bf54fc1
-  data.tar.gz: 31cbcf1c0f1d1f038fdefb657fe20ee90e6e8ca0530ee78c0124b056f9048dc5
+  metadata.gz: 91176d05b0f7accbc344f92f187a7da11bce1f6ec269286f3497f1a46e46d9d3
+  data.tar.gz: 96a75858b12bcc7aeb91c3f15bc5742d3d333eb3c0496ada02418fd25b09a129
 SHA512:
-  metadata.gz: 3b1579fde8500f989b65ed7099a23219191ff47b3db321c084c341ed53be6e208e6091e2e5f09b50dbcf2cbab6136c5c55d86e17604a48d38b29153a83f3a90f
-  data.tar.gz: 83f6698ec58560949c3c628856f080cf007f7fc4b25b42ebb36bc957a8ac88cd1de7f1d5c5221b20aeec91059c26a85737808f1a73b40ec21a74e05909e08df3
+  metadata.gz: ed67b851f9318ce81512581175d8df15b261d2e1f3d76881113191c8c870faa61b717c0eb79f2b0bb647774290938f8722d54c3382130230da37503ee594a011
+  data.tar.gz: dce0208c82d7fd0d9e8f74c2691d765561630bec0220d0bb89f46afe279860f86275657c434e4caf849edf54030833b9716075f5a2dee029e28c4ee4b5619c84

data/Gemfile.lock

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

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

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.8'
+  VERSION = '1.0.1'
 end

data/lib/dngg.rb

@@ -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.8
+  version: 1.0.1
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor