bake-modernize 0.14.0 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c20cae9dae81e435771d980f8c7944a78e818809cca3161ac428d94fd690f6
-  data.tar.gz: 1bb494fe765f62e0da2ad5b4a690e519499acc01db7e19ec66949d574cb83a7b
+  metadata.gz: d59918cbe614fb303d0eb679b167205430ba98ad6584fb24408466a7d1a4da7a
+  data.tar.gz: 8a0fa7d2d03cd7851fabc5a38812f01e61704229a7be2caee72cc75769a7def9
 SHA512:
-  metadata.gz: f287b0e61d32d6d3f9b60e6b93a796a3de8529581617691b6bfc784a5a6f30e9c7405b994736d5c0cbed774a89371431fd2b2202ec044b92705a06e981ed390c
-  data.tar.gz: e36f6ef0a58d24e8196726d732fdb2b4d09643ea299636ff66279b326e2eccd07c47ab1387c903edb03442dc540b93118b8ca811123040a6d030014e4490ee4e
+  metadata.gz: 61d8594e2e976bd22619bbb34016c96e8fcd1622adba9610105a64c86ff06809405d6b16cd57a46215bb5b1262fbad05f2f6597dd1acaa991edaeb520bd1be57
+  data.tar.gz: b8db4b4096a4a409d179062c8652d2f10f6394fa92ca6bed74d82b7693dd1ada770f106f191014269183a0a07ce2ef8b1a63dc8625c7e60d0e163081ed0413e6

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/lib/bake/modernize/license.rb

@@ -4,6 +4,7 @@
 # Copyright, 2022, by Samuel Williams.
 
 require 'rugged'
+require 'yaml'
 
 module Bake
 	module Modernize
@@ -42,6 +43,35 @@ module Bake
 				end
 			end
 
+			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 = '.'
+				
+				def self.for(root)
+					full_path = File.join(root, '.contributors.yaml')
+					
+					if File.exist?(full_path)
+						contributors = self.new
+						contributors.extract(full_path)
+						return contributors
+					end
+				end
+
+				def initialize
+					@contributions = []
+				end
+				
+				def each(&block)
+					@contributions.each do |contribution|
+						yield (contribution[:path] || DEFAULT_PATH), contribution[:author], contribution[:time]
+					end
+				end
+				
+				def extract(path)
+					YAML.load_file(path, aliases: true, symbolize_names: true)
+				end
+			end
+
 			class Authorship
 				Modification = Struct.new(:author, :time, :path) do
 					def full_name
@@ -66,9 +96,20 @@ module Bake
 				
 				attr :paths
 				
+				def add(author, time, path)
+					@paths[path] ||= []
+					@paths[path] << Modification.new(author, time, path)
+				end
+				
 				def extract(root = Dir.pwd)
 					mailmap = Mailmap.for(root)
 					
+					if contributors = Contributors.for(root)
+						contributors.each do |author, time, path|
+							add(author, time, path)
+						end
+					end
+					
 					walk(Rugged::Repository.discover(root), mailmap: mailmap)
 					
 					return self

data/lib/bake/modernize/version.rb

@@ -5,6 +5,6 @@
 
 module Bake
 	module Modernize
-		VERSION = "0.14.0"
+		VERSION = "0.14.2"
 	end
 end

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.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -172,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.