bake-modernize 0.17.3 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 184e24f86a0a681ca38a59b54e78d61eed0494880d8d7ca1e8003c45a759caba
-  data.tar.gz: 5af9b347cfd4618c6fdfe06a08f3dc93a33a06ff1e529ea9918d4cb025cecc73
+  metadata.gz: f6bf8c1f1f973846d16af55aa30a9b62960b2db001d80e7a19506161a9992203
+  data.tar.gz: 047c44563a79018b3163b9dabf1498d23b9f538c3f18a403177b580fb3156157
 SHA512:
-  metadata.gz: 728803e53abe00984a92208e0da5dd137c24311c0f3c1ba52d740524dfcab82c8932d6f8f00a72c0eb2e03975d819ff90d8758dcf813bfbf05c1f90b107dcb80
-  data.tar.gz: 5963dfa6c4519cd50ccf4f6b2e1b85442d1722533c96a0dee3520141873cc47511accef685781411fa065906f4dc8a86f8bd074db8101bc38b90b73064f18601
+  metadata.gz: fbea3be9c9830f12f1590704cfddd527bdc7a7876b0cd00b9b6e008c6c17e9a6282dfe2c975ced005292925b57c08e433f374a9de3ba7b49bf9de91d713cef15
+  data.tar.gz: 18b73153b2156878413a7dd34b232e12cb4477b2cedf070c4d11bf2ed10a758d7036bfe9c39f436956e24329a2e1a01d48bf3cf4523cf4370ef44806d9c1b8aa

data/bake/modernize/gemspec.rb

@@ -33,7 +33,7 @@ def update(path: default_gemspec_path, output: $stdout)
 	spec.metadata["funding_uri"] ||= detect_funding_uri(spec)
 	spec.metadata["documentation_uri"] ||= detect_documentation_uri(spec)
 	
-	spec.authors = sorted_authors(spec)
+	spec.authors = sorted_authors(Dir.pwd)
 	
 	spec.metadata.delete_if{|_, value| value.nil?}
 	
@@ -220,23 +220,11 @@ def detect_documentation_uri(spec)
 	end
 end
 
-def sorted_authors(spec)
-	input, output = IO.pipe
+def sorted_authors(root)
+	authorship = Bake::Modernize::License::Authorship.new
+	authorship.extract(root)
 	
-	pid = Process.spawn("git", "log", "--format=%aN", out: output)
-	output.close
-	
-	authors = Hash.new{|h,k| h[k] = 0}
-	
-	input.each_line do |author|
-		author = author.chomp!
-		authors[author] += 1
-	end
-	
-	Process.wait(pid)
-	input.close
-	
-	return authors.sort_by{|k,v| [-v, k]}.map(&:first)
+	return authorship.sorted_authors
 end
 
 IGNORE_GEMS = %w[

data/lib/bake/modernize/license.rb

@@ -9,6 +9,39 @@ require 'yaml'
 module Bake
 	module Modernize
 		module License
+			GIT_BLAME_IGNORE_REVS = ".git-blame-ignore-revs"
+			
+			class SkipList
+				def self.for(root)
+					full_path = File.join(root, GIT_BLAME_IGNORE_REVS)
+					
+					if File.exist?(full_path)
+						skip_list = self.new
+						skip_list.extract(full_path)
+						return skip_list
+					end
+				end
+				
+				def initialize(revisions = [])
+					@revisions = Set.new(revisions)
+				end
+				
+				def extract(path)
+					File.open(path, 'r') do |file|
+						file.each_line do |line|
+							# Skip empty lines and comments
+							next if line =~ /^\s*(#|$)/
+							# Parse line
+							@revisions << line.strip
+						end
+					end
+				end
+				
+				def ignore?(commit)
+					@revisions.include?(commit.oid)
+				end
+			end
+			
 			class Mailmap
 				def self.for(root)
 					full_path = File.join(root, '.mailmap')
@@ -119,6 +152,7 @@ module Bake
 				
 				def extract(root = Dir.pwd)
 					mailmap = Mailmap.for(root)
+					skip_list = SkipList.for(root)
 					
 					if contributors = Contributors.for(root)
 						contributors.each do |path, author, time|
@@ -126,11 +160,23 @@ module Bake
 						end
 					end
 					
-					walk(Rugged::Repository.discover(root), mailmap: mailmap)
+					walk(Rugged::Repository.discover(root), mailmap: mailmap, skip_list: skip_list)
 					
 					return self
 				end
 				
+				def sorted_authors
+					authors = Hash.new{|h,k| h[k] = 0}
+					
+					@paths.each do |path, modifications|
+						modifications.each do |modification|
+							authors[modification.full_name] += 1
+						end
+					end
+					
+					return authors.sort_by{|k,v| [-v, k]}.map(&:first)
+				end
+				
 				def copyrights
 					copyrights_for_modifications(@paths.values.flatten)
 				end
@@ -151,8 +197,10 @@ module Bake
 				
 				DEFAULT_SORT = Rugged::SORT_DATE | Rugged::SORT_TOPO | Rugged::SORT_REVERSE
 				
-				def walk(repository, mailmap: nil, show: "HEAD")
+				def walk(repository, mailmap: nil, skip_list: nil, show: "HEAD")
 					Rugged::Walker.walk(repository, show: show, sort: DEFAULT_SORT) do |commit|
+						next if skip_list&.ignore?(commit)
+						
 						diff = commit.diff
 						
 						# We relax the threshold for copy and rename detection because we want to detect files that have been moved and modified more generously.

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.17.3"
+		VERSION = "0.17.5"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.17.5
 platform: ruby
 authors:
 - Samuel Williams