dngg 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed83c69c8ffd9f281d9bda6d8d0a2534f5f543b80052dc9b445c49a99144ce5d
-  data.tar.gz: 2406d79be38a740e8ed633c4c89efab8ba1036d524405cdb8972e9a1136a15db
+  metadata.gz: 46475e5573f76ae8f910ca96f92148c2fd293604f025867361937654e6a3a687
+  data.tar.gz: d7409ea217cb0d13cd383c41147e51f1f993ddcfaa927decc15102dddcc89d92
 SHA512:
-  metadata.gz: cc0258704a57f9703daf63be525ca98f7b8065c4c392cbcd8814972116b5d9542439b829579011c3436da2d273830ad4eda4e236a0eaa686e72450af35301d21
-  data.tar.gz: df102c00a4c7b29081032559a9797f6f03a75d4226af1f71841c082f3c3f9ce9da4ccd61d077864f8a9533bbb4eb5ea8e7a09561bfb068e0e0833e0c4e2616ce
+  metadata.gz: d8a1e819c468466ffc54df57fe9556e00d1b43ca06fc237eb8f1e67b02e3016f1ffd25cd739d0fa967d95c068a314666d60cbb9f640d7acc9f48c7c97b795387
+  data.tar.gz: 478f40447cd5cde885291b88def7f81baa5d463af8b4e31a4b44c4d7245035b202afba86e2f0b7fc3c5d43c68a8b1355823fae451efe17d1fcc6ad986be14090

data/Gemfile.lock

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

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)

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/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/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
@@ -83,11 +86,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 +147,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.5'
-end
+  VERSION = '0.0.9'
+end

metadata

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