bake-modernize 0.13.5 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2047cc401761b2a99b5e702ee54e45500f4b1dae3d01079754023c07797ea7ea
-  data.tar.gz: 73ead30a3b412d0010321ab7ce4a88abebc978e14ac912cb06375da1ddd4a457
+  metadata.gz: a7c628b23ad3f6c917cecca7b5f0b81cd18047eeb4b60e64146394638a5cb141
+  data.tar.gz: 01a578fd9f4a36e9881b1954317dcca8ab78bbf6234701a8818b0aa0eb88fa4b
 SHA512:
-  metadata.gz: c628b25804a29175e23d2d9a34d8f2609eea158799d9a51b68f71f5327d463f050881b7a246c0b98422d17ed6aa7a90e8c68110ef9597425e94433cd49f572a8
-  data.tar.gz: 35ae365477c6f1c2d287771635870eb58132c651e73dfcc43741cb7b55933d71ab64a8d38b614b1cd33abb11db8ca29edc203809c7a0230f4ceeca9c55d00ab8
+  metadata.gz: f133f854aaf6d0b309d4ae29efe814563541eb781b8d3882654ff6a80a144213ddcf582b1b1f3727c3e3fb6bc66b7548e17ac3af508b59e7b74db6b8bc1ccdcd
+  data.tar.gz: 20a7299113e214c81a26aebda737a604218c33353e9258e27ad1ffaf5df2a477a86bd093e4ff6aadcac53bee1c0e2eb6a5dd086c110d5ac2d77df4747d2effd9

data/bake/modernize/git.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
+# Copyright, 2021-2023, by Samuel Williams.
 
 require 'bake/modernize'
 
@@ -10,7 +10,7 @@ def git
 end
 
 def update(root:)
-	if current_branch != "main"
+	if current_branch == "master"
 		# https://github.com/github/renaming
 		system("git", "branch", "-M", "main")
 		system("git", "push", "-u", "origin", "main")

data/bake/modernize/license.rb

@@ -3,7 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2022, by Samuel Williams.
 
-require 'console'
+require 'bake/modernize'
 
 LICENSE = <<~LICENSE
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -31,16 +31,15 @@ def license
 end
 
 def update(root:)
-	authors, paths = self.authors(root)
+	authorship = Bake::Modernize::License::Authorship.new
+	authorship.extract(root)
 	
 	buffer = StringIO.new
 	buffer.puts "# MIT License"
 	buffer.puts
 	
-	authors.map do |author, dates|
-		years = dates.map(&:year).uniq
-		
-		buffer.puts "Copyright, #{years.join('-')}, by #{author}.  "
+	authorship.copyrights.each do |copyright|
+		buffer.puts "#{copyright.statement}  "
 	end
 	
 	buffer.puts
@@ -50,19 +49,21 @@ def update(root:)
 		file.write(buffer.string)
 	end
 	
-	paths.each do |path, authors|
+	authorship.paths.each do |path, modifications|
 		next unless File.exist?(path)
 		
 		case path
 		when /\.rb$/
-			self.update_source_file_authors(path, authors)
+			self.update_source_file_authors(authorship, path, modifications)
 		end
 	end
 end
 
 private
 
-def update_source_file_authors(path, authors)
+def update_source_file_authors(authorship, path, modifications)
+	copyrights = authorship.copyrights_for_modifications(modifications)
+	
 	input = File.readlines(path)
 	output = []
 	
@@ -90,10 +91,8 @@ def update_source_file_authors(path, authors)
 	
 	output << "# Released under the MIT License.\n"
 	
-	authors.each do |author, dates|
-		years = dates.map(&:year).uniq
-		
-		output << "# Copyright, #{years.join('-')}, by #{author}.\n"
+	copyrights.each do |copyright|
+		output << "# #{copyright.statement}\n"
 	end
 	
 	output << "\n"
@@ -104,67 +103,3 @@ def update_source_file_authors(path, authors)
 		file.puts(output)
 	end
 end
-
-def authors(root)
-	paths = {}
-	authors = {}
-	
-	total = `git rev-list --count HEAD`.to_i
-	
-	input, output = IO.pipe
-	pid = Process.spawn("git", "log", "--name-only", "--pretty=format:%ad\t%an", out: output, chdir: root)
-	
-	output.close
-	
-	progress = Console.logger.progress(self, total)
-	
-	while header = (input.readline.chomp rescue nil)
-		break if header.empty?
-		progress.increment
-		
-		date, author = header.split("\t", 2)
-		date = Date.parse(date)
-		
-		while path = (input.readline.chomp rescue nil)
-			break if path.empty?
-			
-			paths[path] ||= {}
-			paths[path][author] ||= []
-			paths[path][author] << date
-			
-			authors[author] ||= []
-			authors[author] << date
-		end
-	end
-	
-	input.close
-	Process.wait2(pid)
-	
-	paths.each do |path, authors|
-		authors.transform_values! do |dates|
-			dates.minmax
-		end
-	end
-	
-	paths.transform_values! do |authors|
-		authors.transform_values! do |dates|
-			dates.minmax
-		end
-		
-		authors.sort_by do |author, dates|
-			dates
-		end
-	end
-	
-	authors.transform_values! do |dates|
-		dates.minmax
-	end
-	
-	authors = authors.to_a
-	
-	authors.sort_by! do |author, dates|
-		dates
-	end
-	
-	return authors, paths
-end

data/lib/bake/modernize/license.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
+require 'rugged'
+
+module Bake
+	module Modernize
+		module License
+			class Mailmap
+				def self.for(root)
+					full_path = File.join(root, '.mailmap')
+					
+					if File.exist?(full_path)
+						mailmap = self.new
+						mailmap.extract(full_path)
+						return mailmap
+					end
+				end
+				
+				def initialize
+					@names = {}
+				end
+				
+				attr :names
+				
+				def extract(path)
+					File.open(path, 'r') do |file|
+						file.each_line do |line|
+							# Skip comments
+							next if line =~ /^#/
+							# Skip empty lines
+							next if line =~ /^\s*$/
+							# Parse line
+							# Format: Full Name <email@address>
+							line.match(/^(.*) <(.*)>$/) do |match|
+								@names[match[2]] = match[1]
+							end
+						end
+					end
+				end
+			end
+
+			class Authorship
+				Modification = Struct.new(:author, :time, :path) do
+					def full_name
+						author[:name]
+					end
+				end
+				
+				Copyright = Struct.new(:dates, :author) do
+					def <=> other
+						self.to_a <=> other.to_a
+					end
+					
+					def statement
+						years = self.dates.map(&:year).uniq
+						return "Copyright, #{years.join('-')}, by #{author}."
+					end
+				end
+				
+				def initialize
+					@paths = {}
+				end
+				
+				attr :paths
+				
+				def extract(root = Dir.pwd)
+					mailmap = Mailmap.for(root)
+					
+					walk(Rugged::Repository.discover(root), mailmap: mailmap)
+					
+					return self
+				end
+				
+				def copyrights
+					copyrights_for_modifications(@paths.values.flatten)
+				end
+				
+				def copyrights_for_path(path)
+					copyrights_for_modifications(@paths[path])
+				end
+				
+				def copyrights_for_modifications(modifications)
+					authors = modifications.group_by{|modification| modification.full_name}
+					
+					authors.map do |name, modifications|
+						Copyright.new(modifications.map(&:time).minmax, name)
+					end.sort
+				end
+				
+				private
+				
+				DEFAULT_SORT = Rugged::SORT_DATE | Rugged::SORT_TOPO | Rugged::SORT_REVERSE
+				
+				def walk(repository, mailmap: nil, show: "HEAD")
+					Rugged::Walker.walk(repository, show: show, sort: DEFAULT_SORT) do |commit|
+						diff = commit.diff
+						diff.find_similar!
+				
+						diff.each_delta do |delta|
+							old_path = delta.old_file[:path]
+							new_path = delta.new_file[:path]
+							
+							@paths[new_path] ||= []
+							
+							if old_path != new_path
+								# The file was moved, move copyright information too:
+								@paths[new_path].concat(@paths[old_path])
+							end
+							
+							author = commit.author
+							
+							if mailmap
+								if name = mailmap.names[author[:email]]
+									author[:name] = name
+								end
+							end
+							
+							@paths[new_path] << Modification.new(author, commit.time, new_path)
+						end
+					end
+				end
+			end
+		end
+	end
+end

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.13.5"
+		VERSION = "0.14.1"
 	end
 end

data/lib/bake/modernize.rb

@@ -3,7 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2020-2022, by Samuel Williams.
 
-require "bake/modernize/version"
+require_relative 'modernize/license'
+require_relative 'modernize/version'
 require 'build/files/glob'
 require 'fileutils'
 

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2020-2022, by Samuel Williams.  
+Copyright, 2020-2023, by Samuel Williams.  
 Copyright, 2021-2022, by Olle Jonsson.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/template/actions/.github/workflows/coverage.yaml

@@ -21,7 +21,7 @@ jobs:
           - macos
         
         ruby:
-          - "3.1"
+          - "3.2"
     
     steps:
     - uses: actions/checkout@v3
@@ -47,7 +47,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
         bundler-cache: true
     
     - uses: actions/download-artifact@v3

data/template/actions/.github/workflows/documentation.yaml

@@ -32,7 +32,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.1"
+        ruby-version: "3.2"
         bundler-cache: true
     
     - name: Installing packages

data/template/actions/.github/workflows/test-external.yaml

@@ -23,6 +23,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
     
     steps:
     - uses: actions/checkout@v3

data/template/actions/.github/workflows/test.yaml

@@ -24,6 +24,7 @@ jobs:
           - "2.7"
           - "3.0"
           - "3.1"
+          - "3.2"
         
         experimental: [false]
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.13.5
+  version: 0.14.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-27 00:00:00.000000000 Z
+date: 2023-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -141,6 +141,7 @@ files:
 - bake/modernize/readme.rb
 - bake/modernize/signing.rb
 - lib/bake/modernize.rb
+- lib/bake/modernize/license.rb
 - lib/bake/modernize/version.rb
 - license.md
 - readme.md
@@ -171,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Automatically modernize parts of your project/gem.