itools 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fee95574b4a2ca643e109e17df75d75050cb917e6cd09e73c70be923d6467f2c
-  data.tar.gz: ce675001b6f2eb94759faeec217c5feaba47200236b8b6da434ce60f7f4a3d42
+  metadata.gz: f3b5c349732e2bb90e9fc7aec7f8ab9e1b6535fa073f4f28907eaf20b46234aa
+  data.tar.gz: ababa610ee5cdec9bb35c93a5ff37bb7d5ba7dba94f30c967dba3445ca2a4e34
 SHA512:
-  metadata.gz: 0d6018c7b8b8a98ef56eb46f4b45dd4c9267260fca10c3a7c7b9c49edf496014bdb7bcad4e79575ca2e23d157ffe8f5911d4a3a85cc7307b49bfe2a4c6fd2737
-  data.tar.gz: 1d7b7023b00725e9548e4dd2a21c494c8d40bd3e1a1a992c0053d0802a46f48f01a984945720140bd3180b6a498c0df3d1b999238df2b59bd8ac198c766c6496
+  metadata.gz: 3041ce76c44e3a65a733766a0141758cd9e6535591406256e255b745d6e3de532920c72891d1bdad3ae60e972a58d098be0eb812339e8b4f93b0435cd5315c3e
+  data.tar.gz: 96045040c53f1f1ffd08e93cad27f42bd0407b41c7eeab43d87701b74b52ba72088c1c7ec801c965e1a595e57c3ec58b3b4e5402ffcf4f25aa7af5194d03aab4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    itools (0.4.6)
+    itools (0.4.7)
       bundler (~> 1.17)
       git (~> 1.5)
       gli (~> 2.17)

data/README.md

@@ -129,5 +129,5 @@ itools count_code_line /User/zhanggui/mydemoapp  #统计mydemoapp项目的代码
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ScottZg/itools. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the 
 
-## Warning
-如有误删而导致的线上问题，本人概不负责！
+## FBI Warning
+如有误删而导致的线上问题，本人概不负责！

data/lib/itools/git_sets.rb

@@ -16,7 +16,13 @@ echo  '''\n#TYPE类型\n#新功能       feature\n#bug修复      bugfix\n#性
             File.open('.git/hooks/pre-commit', 'w') do |f|
                 f.puts a
             end
+            logo_path = File.join( File.dirname(__FILE__), 'temple-commit-msg.dat' )
+            content = File.read( logo_path )
+            File.open('.git/hooks/commit-msg', 'w') do |f|
+                f.puts content
+            end
             system('chmod a+x .git/hooks/pre-commit')
+            system('chmod a+x .git/hooks/commit-msg')
             puts "\033[32m配置成功，后续请直接使用git commit ,不要加 -m\033[0m"
         end
     end

data/lib/itools/temple-commit-msg.dat

@@ -0,0 +1,112 @@
+#!/usr/bin/env ruby
+require 'find'
+class CommitMsg
+	attr_accessor :edit_file_path, :branch_name
+	def initialize(editing_file_path,branch_name)
+		@edit_file_path = editing_file_path
+		@branch_name = branch_name		
+	end
+
+	# type 规范判断
+	def is_white_list_branch_type
+		if @branch_name.match(/^(feature|bugfix|refactor|pref|hotfix|release|docs)\//)
+			return true
+		else
+			return false
+		end
+	end
+	# subject校验
+	def verify_subject(str)
+		subject = ''
+		contain_subs = str.split(" ")
+		if contain_subs.size == 2  #理想情况，也是大多数情况，只取subject即可
+			subject = contain_subs[1]
+		elsif contain_subs.size == 1
+			subject = str.gsub(/#{@branch_name}/,"")
+		else
+			contain_subs.delete_at(0)
+			subject = contain_subs.join("")   #把剩下的数据组合起来
+		end
+		if subject.size > 50
+			fail_with_msg("subject内容过长，请不要超过50个字")
+		elsif subject == "subject"
+			fail_with_msg("请完善subject的内容")
+		else
+			puts "subject校验通过..."
+		end
+	end
+	# cause校验
+	def verify_cause(str)
+		if str.strip.size > 6
+			puts "Cause校验通过..."
+		else
+			fail_with_msg("请完善Cause内容")
+		end
+	end
+	#solution校验
+	def verify_solution(str)
+		if str.strip.size > 9
+			puts "Solution校验通过..."
+		else
+			fail_with_msg("请完善Solution内容")
+		end
+	end
+	# doc address校验
+	def verify_doc_address(str)
+		if str.strip.size > 21
+			puts "Doc Address校验通过..."
+		else
+			fail_with_msg("请完善Doc Address内容")
+		end
+	end
+
+	# 逐行校验
+	def handle_line(line)
+		handle_line_method = ''
+		if line.match(/^#{@branch_name.strip}/)
+			handle_line_method = 'verify_subject'
+		elsif line.match(/^Cause/)
+			handle_line_method = 'verify_cause'
+		elsif line.match(/^Solution/)
+			handle_line_method = 'verify_solution'
+		elsif line.match(/^Releated Doc Address/)
+			handle_line_method = 'verify_doc_address'
+		else
+			fail_with_msg("系统错误")
+		end
+		self.send(handle_line_method,line)
+	end
+# 校验commit message内容是否符合规范
+	def verify_content
+		if File.file?(@edit_file_path)
+			File.read(@edit_file_path).each_line do |line|
+				match_data = line.match(/^#|^$/)
+				if match_data == nil   #过滤注释内容
+					handle_line(line)
+				end
+			end
+		end
+	end
+	# faile method
+	def fail_with_msg(msg)
+		puts "\033[31m#{msg}\033[0m"
+		puts "\033[31mcommit fail!\033[0m"
+		exit 1
+	end
+end
+
+puts "commit message校验中..."
+branch_name = `git symbolic-ref --short HEAD` 
+file_path = ARGV[0]
+commit_msg = CommitMsg.new(file_path,branch_name)
+# 校验分支名是否符合规范，这里没有对taskid进行校验
+# -------------------------------type校验-------------------------------
+if commit_msg.is_white_list_branch_type
+	puts "分支名称校验通过..."
+else
+	commit_msg.fail_with_msg("分支名称不符合规则，请按照约定规则处理")
+end
+
+if commit_msg.verify_content
+	puts "\033[32mcommit success!\033[0m"
+end

data/lib/itools/version.rb

@@ -1,3 +1,3 @@
 module Itools
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itools
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - zhanggui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ files:
 - lib/itools/git_sets.rb
 - lib/itools/link_map.rb
 - lib/itools/string_searcher.rb
+- lib/itools/temple-commit-msg.dat
 - lib/itools/version.rb
 homepage: https://github.com/ScottZg/itools
 licenses: