dngg 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ecfeb442ed96915e6fdc9101590f01e2efe062593976b072cf298319781a9d7
-  data.tar.gz: 7a74ad2ec1d7ec59b18696ca68f8e01f3cf435e9fad1d38e8db0e18eac42a60e
+  metadata.gz: e6d5f915a14b4aea8a2e33030f9ce394a6974189b43b0861e9fb833e4718a04e
+  data.tar.gz: fb05504fa11446623ec4f51e75d9c5f401d2ee300ecd6249d9ac946c47327f34
 SHA512:
-  metadata.gz: ae5244fd440c15209f5e0d40c8a77ad4c87a4e12aeae9cbcac792fa7f3846e6f2ec83589dbab9fbd6003eb1a4e3c08073b95d802c0193f3a9cc11245e65ee73b
-  data.tar.gz: 4d9bfb71b7254a58483437faf444b66efc39cc6ff3b66c14bf423a2615c3da27d697c5272cba80ac397b850d5d745afdda34a9dd3807773fb5dc7e9018e8ef64
+  metadata.gz: 6ac1a49dbd6ede11aca9be3f35347db2f8c23b4e457f472a7217206841034d6c950750300372157758deea1a4e463f21650e871a866197464708a82a63dbcae2
+  data.tar.gz: b181f805ff8643b96ae0fb3511ec6f663bf8eb50cc43d852d0cdbde295243f9797b379b11d48577aaa72f5301d6cb311cae5fd8c62e2f84cbcc45c6cc2f1e011

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dngg (0.0.6)
+    dngg (0.1.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/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`
@@ -32,6 +31,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

data/lib/dngg/version.rb

@@ -1,3 +1,3 @@
 module DNGG
-  VERSION = '0.0.6'
+  VERSION = '0.1.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.6
+  version: 0.1.0
 platform: ruby
 authors:
 - iSnow
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor