bake-modernize 0.14.4 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cec63d20974df25945fd6814f8d3482ebf15d2c6a8f8f115bb52fdc7bb1edbe2
-  data.tar.gz: 1de8853d24bea2632cf43d45212c0e54a729d04a7628c0ef310d2c25fe0eec9b
+  metadata.gz: 715e7310bed56e56203b7b689bae99fcfaea4d1466d314cc2ce91b6902550596
+  data.tar.gz: 20bd920437aaf896ff8dbc71c7ddcd9cd29a3d4a32ebc099234cd366df6e8e91
 SHA512:
-  metadata.gz: 0b2a8578649c5c1af9ddb4c9c9798e5da8bf7f72d38f0124736fcceface78e92c6c2c3b042721a8a0993b240b24b78d5594ea9f3352ed4139d6cc53eab0e88b6
-  data.tar.gz: 4b642194ec8bf3dc1b85bb6809b9cb26c397677beff1af7886496251ab3303dd1c68ad33ce05f7d5548c12d60ebeac2d583093eaa46513427ba833e77ebb2018
+  metadata.gz: fe0673005c97cfe3dabe1e11db1e6412194544b7eb0f3a68849381c505003d007f2ededbb470bdcb93801efc6fee608e0aa94722b01c1129e2726383c7e244dc
+  data.tar.gz: 43edd77b36cbdd4438447dce0b065c89127b531e7e227444ddf717a063c6d4d2c6859963215860dce04a8f5a79db80a96d15877d1c915fbf64f457d563e6e9f2

data/bake/modernize/license.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'bake/modernize'
 
@@ -71,6 +71,11 @@ def update_source_file_authors(authorship, path, modifications)
 		output.push input.shift
 	end
 	
+	# Drop any old copyright statements.
+	while input.first =~ /Copyright/i
+		input.shift
+	end
+	
 	if input.first =~ /^\#.*?\:/
 		output.push input.shift
 		if input.first.chomp.empty?

data/lib/bake/modernize/license.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2022-2023, by Samuel Williams.
 
 require 'rugged'
 require 'yaml'
@@ -34,13 +34,27 @@ module Bake
 							# Skip empty lines
 							next if line =~ /^\s*$/
 							# Parse line
-							# Format: Full Name <email@address>
-							line.match(/^(.*) <(.*)>$/) do |match|
-								@names[match[2]] = match[1]
+							
+							
+							user = extract_from_line(line)
+							if commit_email = user[:commit_email] and proper_name = user[:proper_name]
+								@names[commit_email] = proper_name
 							end
 						end
 					end
 				end
+				
+				# Format: Proper Name <proper@email.xx> Commit Name <commit@email.xx>
+				PATTERN = /
+					(?<proper_name>[^<]+)?
+					(\s+<(?<proper_email>[^>]+)>)?
+					(\s+(?<commit_name>[^<]+)?)?
+					\s+<(?<commit_email>[^>]+)>
+				/x
+				
+				def extract_from_line(line)
+					line.match(PATTERN)
+				end
 			end
 
 			class Contributors

data/lib/bake/modernize/version.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2022, by Samuel Williams.
+# Copyright, 2020-2023, by Samuel Williams.
 
 module Bake
 	module Modernize
-		VERSION = "0.14.4"
+		VERSION = "0.15.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bake-modernize
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-http
@@ -111,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: sus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Automatically modernize parts of your project/gem.