bake-modernize 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d9ed3838e0c1b650676239018878a1a0c45be35c7b587aad73d6f0d5ac21be
-  data.tar.gz: b86bbe7de20c897da7c0a54c5fa37be6757507a54fe85abe99c9eccb18d8044d
+  metadata.gz: 715e7310bed56e56203b7b689bae99fcfaea4d1466d314cc2ce91b6902550596
+  data.tar.gz: 20bd920437aaf896ff8dbc71c7ddcd9cd29a3d4a32ebc099234cd366df6e8e91
 SHA512:
-  metadata.gz: 0bed6a9e824ef41b28ecd3b3e57c441765f9db7fcadff7a8c45384ef69cc7532713bb226af17e1ded790f35876bf0bf4f02aed46854e25fe0553aff91d75d00f
-  data.tar.gz: 7fdba301e95c47787c6dec71ce311b0a410967568771ad4b1f1349cb0ce346dc89345fd3a725a8692e51256313e83f7601850883af272d235d583915d5f5c39d
+  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'
 

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.15.0"
+		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.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -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:
     - - ">="