bake-modernize 0.19.4 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '090227967d7ffd1c1ba5dbc2b745e540c8a0d0a23f618714fb34bfbc1828cfbc'
-  data.tar.gz: c8558fa61980e1e94195719f5f5187f31bf257d271dc130064bd87b2b03697ef
+  metadata.gz: 97619ecf26d612765128d5d230c2ef3eaf1206672924340fc4d39b954fb9b57a
+  data.tar.gz: 6902a97b42d283fdd766bf9ed1da7fcc9d48b5a5aa99ccadb4b258ac4c3bcc97
 SHA512:
-  metadata.gz: 4c8e52410842a30554ce66c7608a11462739223f413720191711aea72790f3dabfaac48fc28e9d8a5472656bcc7571cada3b022fae7ffb4ec21aae6737445079
-  data.tar.gz: 55a756873973464dc566f9c35a2a55fe1232053b48f7e6ea1a7f8e3dbabac42f204d22edcfa5371be6d3f26b5c8b17edb230b02379ce24970657c7d366d7a636
+  metadata.gz: 0d40bb9823d62852a886c663d501b3834eadce9b81535a090d5b5641e59d9a8dab76896f38256bcd1afefdb20287428b616a402c4a3cc07da0e4dc333c3d3e38
+  data.tar.gz: 6a8e1e291023423f566ec76147f93aab94a63587f1596e2e44a6758458f092eb14663c11384f98deeaf5532d3a608d9248be782a1a8f5e519e996d9ed62bcbe8

data/bake/modernize/contributors.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+def initialize(context)
+	super
+	
+	require 'bake/modernize/license'
+end
+
+# Extract changes from a repository and generate a list of contributors.
+# @parameter root [String] The root directory of the repository.
+# @parameter paths [Array(String)] The paths to extract changes from.
+def extract(root:, paths:)
+	authorship = Bake::Modernize::License::Authorship.new
+	
+	authorship.extract(root)
+	
+	modifications = []
+	
+	paths.each do |path|
+		authorship.paths[path].each do |modification|
+			modification = modification.to_h
+			
+			if modification[:path] != path
+				modification[:original_path] = modification[:path]
+				modification[:path] = path
+			end
+			
+			modifications << modification
+		end
+	end
+	
+	modifications.sort_by!{|modification| modification[:time]}
+	
+	return modifications
+end
+
+# Map the changes to a new path.
+# @parameter input [Array(Hash)] The list of changes.
+# @parameter original_path [String] The original path of the changes.
+# @parameter path [String] The path that now contains the content of the original changes.
+def map(original_path, path, input:)
+	input.each do |modification|
+		if modification[:path] == original_path
+			modification[:original_path] = modification[:path]
+			modification[:path] = path
+		end
+	end
+	
+	return input
+end

data/bake/modernize/gemspec.rb

@@ -14,7 +14,7 @@ def gemspec
 end
 
 # The latest end-of-life Ruby version.
-MINIMUM_RUBY_VERSION = ::Gem::Requirement.new(">= 3.0")
+MINIMUM_RUBY_VERSION = ::Gem::Requirement.new(">= 3.1")
 
 # Rewrite the specified gemspec.
 # @param

data/lib/bake/modernize/license.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2023, by Samuel Williams.
+# Copyright, 2022-2024, by Samuel Williams.
 
 require 'rugged'
 require 'yaml'
@@ -89,7 +89,8 @@ module Bake
 					line.match(PATTERN)
 				end
 			end
-
+			
+			# Extract contributors from a YAML file which can be generated from another repository.
 			class Contributors
 				# The default path is the root of the repository and for authors who have contributed to the entire repository or unspecified paths in the past.
 				DEFAULT_PATH = '.'
@@ -110,15 +111,32 @@ module Bake
 				
 				def each(&block)
 					@contributions.each do |contribution|
-						yield (contribution[:path] || DEFAULT_PATH), contribution[:author], contribution[:time]
+						author = contribution[:author]
+						time = contribution[:time]
+						
+						paths_for(contribution) do |path|
+							yield path, author, time
+						end
 					end
 				end
 				
 				def extract(path)
 					@contributions.concat(
-						YAML.load_file(path, aliases: true, symbolize_names: true, permitted_classes: [Date, Time])
+						YAML.load_file(path, aliases: true, symbolize_names: true, permitted_classes: [Symbol, Date, Time])
 					)
 				end
+				
+				def paths_for(contribution)
+					if path = contribution[:path]
+						yield path
+					# elsif paths = contribution[:paths]
+					# 	paths.each do |path|
+					# 		yield path
+					# 	end
+					else
+						yield DEFAULT_PATH
+					end
+				end
 			end
 
 			class Authorship
@@ -130,6 +148,15 @@ module Bake
 					def key
 						self.id || "#{self.author[:email]}:#{self.time.iso8601}"
 					end
+					
+					def to_h
+						{
+							id: id,
+							time: time,
+							path: path,
+							author: author,
+						}
+					end
 				end
 				
 				Copyright = Struct.new(:dates, :author) do
@@ -149,6 +176,7 @@ module Bake
 				end
 				
 				attr :paths
+				attr :commits
 				
 				def add(path, author, time, id = nil)
 					modification = Modification.new(author, time, path, id)

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.19.4"
+		VERSION = "0.21.0"
 	end
 end

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

@@ -20,7 +20,6 @@ jobs:
           - macos
         
         ruby:
-          - "3.0"
           - "3.1"
           - "3.2"
           - "3.3"

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

@@ -21,7 +21,6 @@ jobs:
           - macos
         
         ruby:
-          - "3.0"
           - "3.1"
           - "3.2"
           - "3.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.21.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -119,6 +119,7 @@ files:
 - bake/modernize.rb
 - bake/modernize/actions.rb
 - bake/modernize/contributing.rb
+- bake/modernize/contributors.rb
 - bake/modernize/editorconfig.rb
 - bake/modernize/frozen_string_literal.rb
 - bake/modernize/gemfile.rb
@@ -152,14 +153,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.5
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Automatically modernize parts of your project/gem.