bake-modernize 0.17.4 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d6b9a42133ae86ab48a97a908f5539b0223f1bf7fec948f5f3cd20d178e043
-  data.tar.gz: 7390a861caca26af8389d00da3409722eb08632f4a2e7f0db4c6938ba12e2c42
+  metadata.gz: 90130235dfa991ea6c2a2e44747bd1af6a6af02ede3ca0d26fe883f5d270076d
+  data.tar.gz: '084c5bbc66e242bb232585034ccfef70e46cf53b563311d4d16abdcd775b3a53'
 SHA512:
-  metadata.gz: 44a727be6bc7dd4e3a4edd7b6d4b022139314fecd9b8305cdc2e573f5eee726cedb81873cb25362900038c851a6e8bf483f218ae043479069110a61cd5cd81fc
-  data.tar.gz: 7dc3a78ad44ce97113ca1e63558e059c14c168a9b6ef6563f899b5ad14695a661aabd57f6457df5f404b37002d2b8a22f38cb0a8b0f41d0635498061f92ad83c
+  metadata.gz: e1a186343dfcb4cc628e8c83253c03449e34e9d76912285224bdc8d2ad322612d35a1768b1c0115adf1c480727507435cc59148c4a3a477a3117a58e1ae982ce
+  data.tar.gz: 8aa617e6cad8690923eabdd00dab64af5e2f292d663b92981e1e7fbc0d78baf7aa0c970840cfef63b1a6d128ee16608f55f3396b7313c8435c117fa899aca2b4

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

@@ -122,10 +122,14 @@ module Bake
 			end
 
 			class Authorship
-				Modification = Struct.new(:author, :time, :path) do
+				Modification = Struct.new(:author, :time, :path, :id) do
 					def full_name
 						author[:name]
 					end
+					
+					def key
+						self.id || "#{self.author[:email]}:#{self.time.iso8601}"
+					end
 				end
 				
 				Copyright = Struct.new(:dates, :author) do
@@ -140,14 +144,17 @@ module Bake
 				end
 				
 				def initialize
-					@paths = {}
+					@paths = Hash.new{|h,k| h[k] = []}
+					@commits = Hash.new{|h,k| h[k] = []}
 				end
 				
 				attr :paths
 				
-				def add(path, author, time)
-					@paths[path] ||= []
-					@paths[path] << Modification.new(author, time, path)
+				def add(path, author, time, id = nil)
+					modification = Modification.new(author, time, path, id)
+					
+					@commits[modification.key] << modification
+					@paths[path] << modification
 				end
 				
 				def extract(root = Dir.pwd)
@@ -165,6 +172,18 @@ module Bake
 					return self
 				end
 				
+				def sorted_authors
+					authors = Hash.new{|h,k| h[k] = 0}
+					
+					@commits.each do |key, modifications|
+						modifications.map(&:full_name).uniq.each do |full_name|
+							authors[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
@@ -218,7 +237,7 @@ module Bake
 								end
 							end
 							
-							@paths[new_path] << Modification.new(author, commit.time, new_path)
+							add(new_path, author, commit.time, commit.oid)
 						end
 					end
 				end

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.17.4"
+		VERSION = "0.17.6"
 	end
 end

metadata

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