dngg 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed83c69c8ffd9f281d9bda6d8d0a2534f5f543b80052dc9b445c49a99144ce5d
-  data.tar.gz: 2406d79be38a740e8ed633c4c89efab8ba1036d524405cdb8972e9a1136a15db
+  metadata.gz: 2ecfeb442ed96915e6fdc9101590f01e2efe062593976b072cf298319781a9d7
+  data.tar.gz: 7a74ad2ec1d7ec59b18696ca68f8e01f3cf435e9fad1d38e8db0e18eac42a60e
 SHA512:
-  metadata.gz: cc0258704a57f9703daf63be525ca98f7b8065c4c392cbcd8814972116b5d9542439b829579011c3436da2d273830ad4eda4e236a0eaa686e72450af35301d21
-  data.tar.gz: df102c00a4c7b29081032559a9797f6f03a75d4226af1f71841c082f3c3f9ce9da4ccd61d077864f8a9533bbb4eb5ea8e7a09561bfb068e0e0833e0c4e2616ce
+  metadata.gz: ae5244fd440c15209f5e0d40c8a77ad4c87a4e12aeae9cbcac792fa7f3846e6f2ec83589dbab9fbd6003eb1a4e3c08073b95d802c0193f3a9cc11245e65ee73b
+  data.tar.gz: 4d9bfb71b7254a58483437faf444b66efc39cc6ff3b66c14bf423a2615c3da27d697c5272cba80ac397b850d5d745afdda34a9dd3807773fb5dc7e9018e8ef64

data/Gemfile.lock

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

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

@@ -83,11 +83,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 +144,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.6'
+end

metadata

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