bake-modernize 0.17.5 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6bf8c1f1f973846d16af55aa30a9b62960b2db001d80e7a19506161a9992203
-  data.tar.gz: 047c44563a79018b3163b9dabf1498d23b9f538c3f18a403177b580fb3156157
+  metadata.gz: 90130235dfa991ea6c2a2e44747bd1af6a6af02ede3ca0d26fe883f5d270076d
+  data.tar.gz: '084c5bbc66e242bb232585034ccfef70e46cf53b563311d4d16abdcd775b3a53'
 SHA512:
-  metadata.gz: fbea3be9c9830f12f1590704cfddd527bdc7a7876b0cd00b9b6e008c6c17e9a6282dfe2c975ced005292925b57c08e433f374a9de3ba7b49bf9de91d713cef15
-  data.tar.gz: 18b73153b2156878413a7dd34b232e12cb4477b2cedf070c4d11bf2ed10a758d7036bfe9c39f436956e24329a2e1a01d48bf3cf4523cf4370ef44806d9c1b8aa
+  metadata.gz: e1a186343dfcb4cc628e8c83253c03449e34e9d76912285224bdc8d2ad322612d35a1768b1c0115adf1c480727507435cc59148c4a3a477a3117a58e1ae982ce
+  data.tar.gz: 8aa617e6cad8690923eabdd00dab64af5e2f292d663b92981e1e7fbc0d78baf7aa0c970840cfef63b1a6d128ee16608f55f3396b7313c8435c117fa899aca2b4

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)
@@ -168,9 +175,9 @@ module Bake
 				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
+					@commits.each do |key, modifications|
+						modifications.map(&:full_name).uniq.each do |full_name|
+							authors[full_name] += 1
 						end
 					end
 					
@@ -230,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.5"
+		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.5
+  version: 0.17.6
 platform: ruby
 authors:
 - Samuel Williams